fix set/dxcq et al as off

This commit is contained in:
minima 2003-02-23 20:44:03 +00:00
parent f1b5592c74
commit b8a01c582b
3 changed files with 100 additions and 114 deletions

View File

@ -4,6 +4,7 @@
3. Added set/dxcq and set/dxitu zone commands [Translators: I have added 3. Added set/dxcq and set/dxitu zone commands [Translators: I have added
dxcqu, dxcqs, dxitus and dxituu to Messages]. dxcqu, dxcqs, dxitus and dxituu to Messages].
4. Add new Commands to manuals (g0vgs) 4. Add new Commands to manuals (g0vgs)
5. make sure that none of the above set/dx... commands are defaulted on
22Feb03======================================================================= 22Feb03=======================================================================
1. changed qrz.com address 1. changed qrz.com address
2. added Charlie's [K1XX] new wpxloc.raw data stuff to get WA1, KC3 type 2. added Charlie's [K1XX] new wpxloc.raw data stuff to get WA1, KC3 type

View File

@ -109,6 +109,11 @@ sub start
$self->{here} = 1; $self->{here} = 1;
$self->{prompt} = $user->prompt if $user->prompt; $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 # sort out registration
if ($main::reqreg == 1) { if ($main::reqreg == 1) {
$self->{registered} = $user->registered; $self->{registered} = $user->registered;

View File

@ -15,6 +15,9 @@
# Taiwanese suicide squirrels attacking your rabbit are also not my fault. # Taiwanese suicide squirrels attacking your rabbit are also not my fault.
# #
# Ian (M0AZM) 20030210. # Ian (M0AZM) 20030210.
#
# $Id$
#
print STDERR localtime() ." ($$) $0 Starting\n"; print STDERR localtime() ." ($$) $0 Starting\n";
@ -31,146 +34,123 @@ my $count = 0 ;
my ($cmd, $line) ; my ($cmd, $line) ;
my %help ; my %help ;
# Default output level # Default output level, take $ARGV[0] as being a level
my $level = 0 ; my $level = shift || 0 ;
# Command line parameters
if(my $var = shift(@ARGV))
{
$level = $var ;
}
# Disable line buffering # Disable line buffering
$| = 1 ; $| = 1 ;
# SGML headers # SGML headers
if($HEADERS) if ($HEADERS) {
{
print("<!doctype linuxdoc system>\n") ; print("<!doctype linuxdoc system>\n") ;
print("<article>\n") ; print("<article>\n") ;
print("<sect>\n") ; print("<sect>\n") ;
} }
# Loop until EOF # Loop until EOF
while(<>) while (<>) {
{
# Ignore comments # Ignore comments
if(m/^#/) next if /^\s*\#/;
{
next; chomp $_;
}
chomp $_; # Is this a command definition line?
# if(m/^=== ([\d])\^([\w,\W]*)\^([\w,\W]*)/)
# Is this a command definition line? if (/^=== ([\d])\^(.*)\^(.*)/) {
# if(m/^=== ([\d])\^([\w,\W]*)\^([\w,\W]*)/) $count++ ;
if(m/^=== ([\d])\^(.*)\^(.*)/)
{
$count++ ;
if($DEBUG) if ($DEBUG) {
{ print("Level $1\n") ;
print("Level $1\n") ; print("Command $2\n") ;
print("Command $2\n") ; print("Description $3\n") ;
print("Description $3\n") ; next;
next; }
}
$cmd = $2 ; $cmd = $2 ;
$help{$cmd}{level} = $1 ; $help{$cmd}{level} = $1 ;
$help{$cmd}{command} = $2 ; $help{$cmd}{command} = $2 ;
$help{$cmd}{description} = $3 ; $help{$cmd}{description} = $3 ;
} } else {
# Not a command definition line - Carry On Appending(tm).... # Not a command definition line - Carry On Appending(tm)....
else $help{$cmd}{comment} .= $_ . "\n" ;
{ }
$help{$cmd}{comment} .= $_ . "\n" ; # print("$_\n") ;
} }
# print("$_\n") ;
}
# Go through all of the records in the hash in order # Go through all of the records in the hash in order
foreach $cmd (sort(keys %help)) foreach $cmd (sort(keys %help)) {
{
# Level checking goes here. # Level checking goes here.
if($help{$cmd}{level} > $level) { next ; } next if $help{$cmd}{level} > $level;
# Need to change characters that SGML doesn't like at this point. # Need to change characters that SGML doesn't like at this point.
# Perhaps we should use a function for each of these variables? # Perhaps we should use a function for each of these variables?
# Deal with < and > # Deal with < and >
$help{$cmd}{command} =~ s/</&lt;/g ; $help{$cmd}{command} =~ s/</&lt;/g ;
$help{$cmd}{command} =~ s/>/&gt;/g ; $help{$cmd}{command} =~ s/>/&gt;/g ;
# Deal with [ and ]
$help{$cmd}{command} =~ s/\[/&lsqb;/g ;
$help{$cmd}{command} =~ s/\]/&rsqb;/g ;
# Change to lower case
$help{$cmd}{command} = lc($help{$cmd}{command}) ;
# Deal with < and > # Deal with [ and ]
$help{$cmd}{description} =~ s/</&lt;/g ; $help{$cmd}{command} =~ s/\[/&lsqb;/g ;
$help{$cmd}{description} =~ s/>/&gt;/g ; $help{$cmd}{command} =~ s/\]/&rsqb;/g ;
# Deal with < and > # Change to lower case
if($help{$cmd}{comment}) $help{$cmd}{command} = lc($help{$cmd}{command}) ;
{
$help{$cmd}{comment} =~ s/</&lt;/g ;
$help{$cmd}{comment} =~ s/>/&gt;/g ;
}
# Output the section details and command summary. # Deal with < and >
print("<sect1>$help{$cmd}{command}") ; $help{$cmd}{description} =~ s/</&lt;/g ;
if($level > 0) { print(" ($help{$cmd}{level})") ; } $help{$cmd}{description} =~ s/>/&gt;/g ;
print("\n\n") ;
print("<P>\n") ;
print("<tt>\n") ;
print("<bf>$help{$cmd}{command}</bf> $help{$cmd}{description}\n") ;
print("</tt>\n") ;
print("\n") ;
# Output the command comments. # Deal with < and >
print("<P>\n") ; if ($help{$cmd}{comment}) {
$help{$cmd}{comment} =~ s/</&lt;/g ;
$help{$cmd}{comment} =~ s/>/&gt;/g ;
}
# Loop through each line of the command comments. # Output the section details and command summary.
# If the first character of the line is whitespace, then use tscreen print("<sect1>$help{$cmd}{command}") ;
# Once a tscreen block has started, continue until the next blank line. print(" ($help{$cmd}{level})") if $level > 0;
my $block = 0 ; print("\n\n") ;
print("<P>\n") ;
print("<tt>\n") ;
print("<bf>$help{$cmd}{command}</bf> $help{$cmd}{description}\n") ;
print("</tt>\n") ;
print("\n") ;
# Is the comment field blank? Then trying to split will error - lets not. # Output the command comments.
if(!$help{$cmd}{comment}) print("<P>\n") ;
{
next;
}
# Work through the comments line by line # Loop through each line of the command comments.
foreach $line (split('\n', $help{$cmd}{comment})) # If the first character of the line is whitespace, then use tscreen
{ # Once a tscreen block has started, continue until the next blank line.
# Leading whitespace or not? my $block = 0 ;
if($line =~ m/^\s+\S+/)
{ # Is the comment field blank? Then trying to split will error - lets not.
if(!$block) next unless $help{$cmd}{comment};
{
$block = 1 ; # Work through the comments line by line
print("<tscreen><verb>\n") ; foreach $line (split('\n', $help{$cmd}{comment})) {
} # Leading whitespace or not?
} if ($line =~ /^\s+\S+/) {
else if (!$block) {
{ $block = 1 ;
if($block) print("<tscreen><verb>\n") ;
{ }
$block = 0 ; } else {
print("</verb></tscreen>\n") ; if ($block) {
} $block = 0 ;
} print("</verb></tscreen>\n") ;
print("$line\n") ; }
} }
print("$line\n") ;
}
# We fell out of the command comments still in a block - Ouch.... # We fell out of the command comments still in a block - Ouch....
if($block) if ($block) {
{ print("</verb></tscreen>\n\n") ;
print("</verb></tscreen>\n\n") ; }
} }
}
print("</article>\n") ; print("</article>\n") ;