From 436d07876d3f2253c00f146b461f3a4d3ee2a7a3 Mon Sep 17 00:00:00 2001 From: minima Date: Wed, 26 Jul 2000 12:38:36 +0000 Subject: [PATCH] 11. made import_users.pl accept a non related input filename and always update the current user file. --- Changes | 3 +++ perl/DXMsg.pm | 2 +- perl/import_users.pl | 7 +++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Changes b/Changes index 43d03af1..0d7988b5 100644 --- a/Changes +++ b/Changes @@ -12,6 +12,9 @@ export the user data in ascii from cron. 8. added export_users command to allow arbitary exporting of user files 9. added set and unset/dxgrid command to allow control over the grid squares on DX announcements +10. Removed export_user.pl (no longer needed) +11. made import_users.pl accept a non related input filename and always +update the current user file. 25Jul00======================================================================= 1. ignore \n in ax25 mode for C client. 2. remove extra space at the end of a DX spot announce when no grid square diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm index 11a30a4e..85c9e68e 100644 --- a/perl/DXMsg.pm +++ b/perl/DXMsg.pm @@ -136,7 +136,7 @@ sub process # this is periodic processing if (!$self || !$line) { - if ($main::systime > $lastq + $queueinterval) { + if ($main::systime >= $lastq + $queueinterval) { # wander down the work queue stopping any messages that have timed out for (keys %busy) { diff --git a/perl/import_users.pl b/perl/import_users.pl index d4cecbfd..7f77a564 100755 --- a/perl/import_users.pl +++ b/perl/import_users.pl @@ -22,13 +22,12 @@ use DXVars; use DXUser; use Carp; -$userfn = $ARGV[0] if @ARGV; -croak "need a filename" unless $userfn; -croak "$userfn.asc doesn't exist" unless -e "$userfn.asc"; +$inpfn = $ARGV[0] if @ARGV; +croak "need a input filename" unless $inpfn; DXUser->init($userfn, 1); -do "$userfn.asc"; +do "$inpfn"; print $@ if $@; DXUser->finish(); -- 2.43.0