Changeset 28164 for branches/czw_branch/20100519/ippToPsps/scripts/ippToPsps_run.pl

Timestamp:

May 28, 2010, 3:09:59 PM (16 years ago)

Author:

watersc1

Message:

JPEG work should be done. Transitioning to try to pick up stackAssociation concept in this branch as well.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ippToPsps/scripts/ippToPsps_run.pl (modified) (11 diffs)

branches/czw_branch/20100519/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;
 }
@@ -114 +103 @@
 #######################################################################################
 sub process {
+    my $lastExpId = getLastExpId();
+
+    print "*******************************************************************************\n*\n";
+    print "* Last successfully processed exposure ID was $lastExpId\n";
 
     # Set up the database
@@ -137 +130 @@
             AND chipRun.exp_id = rawExp.exp_id
             AND camRun.label LIKE '%$label%'
+            AND rawExp.exp_id > $lastExpId
             ORDER BY rawExp.exp_id ASC
 SQL
@@ -153 +147 @@
     my $batchId = 0;
     my $batchesPerJob = 1;
-
-    # get a new jobId
-    my $jobId = getJobId();
-    $jobId++;
-    if ($jobId < 0) { print "* Cannot find sensible jobId ($jobId)\n";
-        return 0;
-    }
-
-    print "*******************************************************************************\n*\n";
-
     my $anyBatches = 0;
 
-
     $query->execute;
 
     open (LOGFILE, ">> $logFile");
+
+    my $jobId = -1;
 
     # loop round exposures
@@ -174 +159 @@
         my ($expId, $distGroup) = @row;
 
-        print "* Exposure ID = $expId with dist group = '$distGroup'\n";
+        $jobId = getNewJobId();
+
+        print "* Exposure ID = $expId with dist group = '$distGroup' as job ID $jobId\n";
 
         my $surveyType = getSurveyTypeFromDistGroup($distGroup);
@@ -192 +179 @@
         mkdir($jobOutputPath, 0777);
         mkdir($batchOutputPath, 0777);
-        setJobId($jobId);
 
         # run IppToPsps program
@@ -222 +208 @@
                 print LOGFILE "$jobId $expId\n";
 
-                $jobId++;
                 $batchId = 0;
                 $anyBatches = 0;
@@ -228 +213 @@
             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";
+        }
 
         if ($batchType eq "init" ) {print "* Wrote initialisation batch\n"; last;}
@@ -246 +235 @@
 #######################################################################################
 #
+# Gets the last processed exposure ID (ini file for now - will be Db eventually TODO) 
+#
+########################################################################################
+sub getLastExpId {
+
+    my $lastExpId = `tail $logFile -n 1 | awk '{print \$2}'`;
+    chomp($lastExpId);
+    return $lastExpId;
+}
+
+#######################################################################################
+#
 # Gets the current jobId (ini file for now - will be Db eventually TODO) 
 #
 ########################################################################################
-sub getJobId {
+sub getNewJobId {
 
     my $jobId = -1;
@@ -260 +261 @@
     close (MYFILE);
 
-    if ($verbose) { print "* Current jobId = $jobId\n"; }
-
-    return $jobId;
-}
-
-#######################################################################################
-#
-# Sets the current jobId (in file for now - will be Db eventually TODO) 
-#
-########################################################################################
-sub setJobId {
-    my ($jobId) = @_;
+    $jobId++;
 
     open (MYFILE, "> $jobIdFilePath");
@@ -277 +267 @@
     close (MYFILE);
 
-    if ($verbose) { print "* New jobId = $jobId\n"; }
-}
-
-#######################################################################################
-#
-#run IppToPsps 
+    return $jobId;
+}
+
+#######################################################################################
+#
+# run IppToPsps 
 #
 #######################################################################################