Changeset 26382

Timestamp:

Dec 11, 2009, 12:23:20 PM (16 years ago)

Author:

watersc1

Message:

Update to fix burntool table finding.

File:

• trunk/tools/gpc1_find_images.pl (modified) (4 diffs)

trunk/tools/gpc1_find_images.pl

@@ -3 +3 @@
 use DBI;
 use Getopt::Std;
-getopts('hFARCPp:BLMDWIvx:n:c:w:s:O:S:N:',\%opt);
+getopts('hFARCPp:BLMDWIYvx:n:c:w:s:O:S:N:',\%opt);
 #getopt('xncwOS:hARCW',\%opt);
 unless (exists($opt{O})) {
@@ -72 +72 @@
                    ) or die "Unable to connect to database $DBI::errstr\n";
 
-$sth_base = "SELECT warp_id,warpRun.workdir,chipRun.chip_id,chipRun.workdir,rawExp.exp_name,rawExp.exp_id,rawExp.workdir,rawExp.dateobs,rawExp.pon_time,0,'nostack' from warpRun JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING (exp_id)";
+if ($opt{Y}) {
+    $sth_base = "SELECT warp_id,warpRun.workdir,chipRun.chip_id,chipRun.workdir,rawExp.exp_name,rawExp.exp_id,rawExp.workdir,rawExp.dateobs,rawExp.pon_time,0,'nostack' from warpRun RIGHT OUTER JOIN fakeRun USING(fake_id) RIGHT OUTER JOIN camRun USING(cam_id) RIGHT OUTER JOIN chipRun USING(chip_id) RIGHT OUTER JOIN rawExp USING (exp_id)";
+}
+else {
+    $sth_base = "SELECT warp_id,warpRun.workdir,chipRun.chip_id,chipRun.workdir,rawExp.exp_name,rawExp.exp_id,rawExp.workdir,rawExp.dateobs,rawExp.pon_time,0,'nostack' from warpRun  JOIN fakeRun USING(fake_id)  JOIN camRun USING(cam_id)  JOIN chipRun USING(chip_id)  JOIN rawExp USING (exp_id)";
+}
 
 # What do we have?
@@ -156 +161 @@
         (exists($opt{W})&&(exists($opt{O})))||
         exists($opt{I})) {
+
         $sth_mapping = "SELECT skycell_id,class_id from warpSkyCellMap WHERE warp_id = $warp_id";
         $mr = $db->selectall_arrayref( $sth_mapping );
@@ -277 +283 @@
     elsif ($opt{B}) {
         if ($key =~ /burn.tbl/) {
+            if (($opt{O} ne '')&&($key !~ /$opt{O}/)) {
+                return(0); # Not the requested OTA
+            }
+            if (($opt{S} ne '')&& !(is_mapped($key,$opt{S}))) {
+                return(0); # Not the remapped skycell requested
+            }
             return(1);
         }