From b8a01c582b9914ebe5c44afed0016e594d76e938 Mon Sep 17 00:00:00 2001 From: minima Date: Sun, 23 Feb 2003 20:44:03 +0000 Subject: [PATCH] fix set/dxcq et al as off --- Changes | 1 + perl/DXCommandmode.pm | 5 + sgml/commands2sgml.pl | 226 +++++++++++++++++++----------------------- 3 files changed, 109 insertions(+), 123 deletions(-) diff --git a/Changes b/Changes index 4f4800c5..c6d5d1f4 100644 --- a/Changes +++ b/Changes @@ -4,6 +4,7 @@ 3. Added set/dxcq and set/dxitu zone commands [Translators: I have added dxcqu, dxcqs, dxitus and dxituu to Messages]. 4. Add new Commands to manuals (g0vgs) +5. make sure that none of the above set/dx... commands are defaulted on 22Feb03======================================================================= 1. changed qrz.com address 2. added Charlie's [K1XX] new wpxloc.raw data stuff to get WA1, KC3 type diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 5f8256e9..1750fee1 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -109,6 +109,11 @@ sub start $self->{here} = 1; $self->{prompt} = $user->prompt if $user->prompt; + # sort out new dx spot stuff + $user->wantdxcq(0) unless defined $user->{wantdxcq}; + $user->wantdxitu(0) unless defined $user->{wantdxitu}; + $user->wantusstate(0) unless defined $user->{wantusstate}; + # sort out registration if ($main::reqreg == 1) { $self->{registered} = $user->registered; diff --git a/sgml/commands2sgml.pl b/sgml/commands2sgml.pl index 98eaf3d1..0b588195 100755 --- a/sgml/commands2sgml.pl +++ b/sgml/commands2sgml.pl @@ -15,6 +15,9 @@ # Taiwanese suicide squirrels attacking your rabbit are also not my fault. # # Ian (M0AZM) 20030210. +# +# $Id$ +# print STDERR localtime() ." ($$) $0 Starting\n"; @@ -31,146 +34,123 @@ my $count = 0 ; my ($cmd, $line) ; my %help ; -# Default output level -my $level = 0 ; - -# Command line parameters -if(my $var = shift(@ARGV)) - { - $level = $var ; - } +# Default output level, take $ARGV[0] as being a level +my $level = shift || 0 ; # Disable line buffering $| = 1 ; # SGML headers -if($HEADERS) - { +if ($HEADERS) { print("\n") ; print("
\n") ; print("\n") ; - } +} # Loop until EOF -while(<>) - { +while (<>) { + # Ignore comments - if(m/^#/) - { - next; - } - - chomp $_; + next if /^\s*\#/; + + chomp $_; - # Is this a command definition line? - # if(m/^=== ([\d])\^([\w,\W]*)\^([\w,\W]*)/) - if(m/^=== ([\d])\^(.*)\^(.*)/) - { - $count++ ; + # Is this a command definition line? + # if(m/^=== ([\d])\^([\w,\W]*)\^([\w,\W]*)/) + if (/^=== ([\d])\^(.*)\^(.*)/) { + $count++ ; - if($DEBUG) - { - print("Level $1\n") ; - print("Command $2\n") ; - print("Description $3\n") ; - next; - } - - $cmd = $2 ; - - $help{$cmd}{level} = $1 ; - $help{$cmd}{command} = $2 ; - $help{$cmd}{description} = $3 ; - } - # Not a command definition line - Carry On Appending(tm).... - else - { - $help{$cmd}{comment} .= $_ . "\n" ; - } - # print("$_\n") ; - } + if ($DEBUG) { + print("Level $1\n") ; + print("Command $2\n") ; + print("Description $3\n") ; + next; + } + + $cmd = $2 ; + + $help{$cmd}{level} = $1 ; + $help{$cmd}{command} = $2 ; + $help{$cmd}{description} = $3 ; + } else { + # Not a command definition line - Carry On Appending(tm).... + $help{$cmd}{comment} .= $_ . "\n" ; + } + # print("$_\n") ; +} # Go through all of the records in the hash in order -foreach $cmd (sort(keys %help)) - { - # Level checking goes here. - if($help{$cmd}{level} > $level) { next ; } +foreach $cmd (sort(keys %help)) { + + # Level checking goes here. + next if $help{$cmd}{level} > $level; - # Need to change characters that SGML doesn't like at this point. - # Perhaps we should use a function for each of these variables? - # Deal with < and > - $help{$cmd}{command} =~ s//>/g ; - # Deal with [ and ] - $help{$cmd}{command} =~ s/\[/[/g ; - $help{$cmd}{command} =~ s/\]/]/g ; - # Change to lower case - $help{$cmd}{command} = lc($help{$cmd}{command}) ; - - # Deal with < and > - $help{$cmd}{description} =~ s//>/g ; - - # Deal with < and > - if($help{$cmd}{comment}) - { - $help{$cmd}{comment} =~ s//>/g ; - } - - # Output the section details and command summary. - print("$help{$cmd}{command}") ; - if($level > 0) { print(" ($help{$cmd}{level})") ; } - print("\n\n") ; - print("

\n") ; - print("\n") ; - print("$help{$cmd}{command} $help{$cmd}{description}\n") ; - print("\n") ; - print("\n") ; - - # Output the command comments. - print("

\n") ; - - # Loop through each line of the command comments. - # If the first character of the line is whitespace, then use tscreen - # Once a tscreen block has started, continue until the next blank line. - my $block = 0 ; - - # Is the comment field blank? Then trying to split will error - lets not. - if(!$help{$cmd}{comment}) - { - next; - } - - # Work through the comments line by line - foreach $line (split('\n', $help{$cmd}{comment})) - { - # Leading whitespace or not? - if($line =~ m/^\s+\S+/) - { - if(!$block) - { - $block = 1 ; - print("\n") ; - } - } - else - { - if($block) - { - $block = 0 ; - print("\n") ; - } - } - print("$line\n") ; - } + # Need to change characters that SGML doesn't like at this point. + # Perhaps we should use a function for each of these variables? + # Deal with < and > + $help{$cmd}{command} =~ s//>/g ; + + # Deal with [ and ] + $help{$cmd}{command} =~ s/\[/[/g ; + $help{$cmd}{command} =~ s/\]/]/g ; + + # Change to lower case + $help{$cmd}{command} = lc($help{$cmd}{command}) ; + + # Deal with < and > + $help{$cmd}{description} =~ s//>/g ; + + # Deal with < and > + if ($help{$cmd}{comment}) { + $help{$cmd}{comment} =~ s//>/g ; + } + + # Output the section details and command summary. + print("$help{$cmd}{command}") ; + print(" ($help{$cmd}{level})") if $level > 0; + print("\n\n") ; + print("

\n") ; + print("\n") ; + print("$help{$cmd}{command} $help{$cmd}{description}\n") ; + print("\n") ; + print("\n") ; + + # Output the command comments. + print("

\n") ; + + # Loop through each line of the command comments. + # If the first character of the line is whitespace, then use tscreen + # Once a tscreen block has started, continue until the next blank line. + my $block = 0 ; + + # Is the comment field blank? Then trying to split will error - lets not. + next unless $help{$cmd}{comment}; + + # Work through the comments line by line + foreach $line (split('\n', $help{$cmd}{comment})) { + # Leading whitespace or not? + if ($line =~ /^\s+\S+/) { + if (!$block) { + $block = 1 ; + print("\n") ; + } + } else { + if ($block) { + $block = 0 ; + print("\n") ; + } + } + print("$line\n") ; + } - # We fell out of the command comments still in a block - Ouch.... - if($block) - { - print("\n\n") ; - } - } + # We fell out of the command comments still in a block - Ouch.... + if ($block) { + print("\n\n") ; + } +} print("

\n") ; -- 2.34.1