Changeset 28083

Timestamp:

May 25, 2010, 8:17:29 AM (16 years ago)

Author:

rhenders

Message:

Improved auditing; improved regexs for survey type

File:

• trunk/ippToPsps/scripts/ippToPsps_run.pl (modified) (6 diffs)

trunk/ippToPsps/scripts/ippToPsps_run.pl

@@ -87 +87 @@
     my ($distGroup) = @_;
 
-    if ($distGroup eq "MD01") {return $distGroup;}
-    if ($distGroup eq "MD02") {return $distGroup;}
-    if ($distGroup eq "MD03") {return $distGroup;}
-    if ($distGroup eq "MD04") {return $distGroup;}
-    if ($distGroup eq "MD05") {return $distGroup;}
-    if ($distGroup eq "MD06") {return $distGroup;}
-    if ($distGroup eq "MD07") {return $distGroup;}
-    if ($distGroup eq "MD08") {return $distGroup;}
-    if ($distGroup eq "MD09") {return $distGroup;}
-    if ($distGroup eq "MD10") {return $distGroup;}
-    if ($distGroup eq "M31") {return $distGroup;}
-    if ($distGroup eq "sts") {return "STS";}
-    if ($distGroup eq "SweetSpot") {return "SS";}
-    if ($distGroup eq "3PI") {return $distGroup;}
-    if ($distGroup eq "ThreePi") {return "3PI";}
-    if ($distGroup eq "SAS") {return "3PI";}
-
-    print "* Do not understand distribution group: '$distGroup'\n";
+    if ($distGroup =~ m/^MD([0-1][0-9])$/i) {return "MD$1";}
+    if ($distGroup =~ m/^M31$/i) {return "M31";}
+    if ($distGroup =~ m/^sts$/i) {return "STS";}
+    if ($distGroup =~ m/^SweetSpot$/i) {return "SSS";}
+    if ($distGroup =~ m/^(3PI)|(ThreePi)|(SAS)$/i) {return "3PI";}
+
+    print "* Unknown distribution group: '$distGroup'\n";
     return undef;
 }
@@ -156 +145 @@
     # get a new jobId
     my $jobId = getJobId();
-    $jobId++;
     if ($jobId < 0) { print "* Cannot find sensible jobId ($jobId)\n";
         return 0;
@@ -173 +161 @@
     while (my @row = $query->fetchrow_array()) {
         my ($expId, $distGroup) = @row;
-
-        print "* Exposure ID = $expId with dist group = '$distGroup'\n";
+        $jobId++;
+        setJobId($jobId);
+
+        print "* Exposure ID = $expId with dist group = '$distGroup' as job ID $jobId\n";
 
         my $surveyType = getSurveyTypeFromDistGroup($distGroup);
@@ -192 +182 @@
         mkdir($jobOutputPath, 0777);
         mkdir($batchOutputPath, 0777);
-        setJobId($jobId);
 
         # run IppToPsps program
@@ -222 +211 @@
                 print LOGFILE "$jobId $expId\n";
 
-                $jobId++;
                 $batchId = 0;
                 $anyBatches = 0;
@@ -228 +216 @@
             else {
 
-                print "* No batches to publish\n"
+                print "* No batches to publish\n";
+                print LOGFILE "$jobId $expId ERROR\n";
             }
+        }
+        else {
+            print LOGFILE "$jobId $expId ERROR\n";
         }