11. made import_users.pl accept a non related input filename and always

update the current user file.

diff --git a/Changes b/Changes
index 43d03af156a856abe5091f2707743a1169d5efdd..0d7988b53b98ac847bf34c4a8198b2db57c692b0 100644 (file)
--- 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 11a30a4ed5458c582b3f6bb8432d03500583dc1b..85c9e68eaf6498c169b48014147fd41ca27a9bb8 100644 (file)
--- 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 d4cecbfded37907c933edae41524c301869dee8f..7f77a56460b988c6b9db38ecbc191b38f45c0cb5 100755 (executable)
--- 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();