new logs use abbreviated month names. Add this to date conversion

(This used to be commit 8021669b167053b5500f035c9c50d1327d73c232)

diff --git a/source3/script/scancvslog.pl b/source3/script/scancvslog.pl
index b1114f5706e6c9a3e3ef14460dcd67a54d5a7fa6..c39f9111c10ca37343eb74a22a2d9f111ea46f7b 100755 (executable)
--- a/source3/script/scancvslog.pl
+++ b/source3/script/scancvslog.pl
@@ -37,7 +37,19 @@ open(INFILE,@ARGV[0]) || die "Unable to open @ARGV[0]\n";
        "September",    8,
        "October",      9,
        "November",     10,
-       "December",     11
+       "December",     11,
+       "Jan",          0,
+       "Feb",          1,
+       "Mar",          2,
+       "Apr",          3,
+       "May",          4,
+       "Jun",          5,
+       "Jul",          6,
+       "Aug",          7,
+       "Sep",          8,
+       "Oct",          9,
+       "Nov",          10,
+       "Dec",          11
 );
 
 $Starttime = (@ARGV[1]) ? &make_time(@ARGV[1]) : 0;
@@ -45,6 +57,10 @@ $Tagvalue = @ARGV[2];
 
 while (&get_entry) {
   $_=$Entry[0];
+# get rid of extra white space
+  s/\s+/ /g;
+# get rid of any time string in date
+  s/ \d\d:\d\d:\d\d/,/;
   s/^Date:\s*\w*\s*(\w*)\s*(\w*),\s*(\w*).*/$1 $2 $3/;
   $Testtime = &make_time($_);
   $Testtag = &get_tag;