Changeset 18536

Timestamp:

Jul 15, 2008, 9:57:30 AM (18 years ago)

Author:

bills

Message:

adapt to changes in dsreg

Location:

trunk/ippScripts/scripts

Files:

• ipp_image_path.pl (modified) (3 diffs)
• ipp_serial_mops.pl (modified) (2 diffs)

trunk/ippScripts/scripts/ipp_image_path.pl

@@ -2 +2 @@
 
 # ipp_image_path.pl print out the unix path name(s) for rawImage files for an exposure
+# Note this program should really be called gpc1_image_path since the camera is
+# hardcoded to gpc1 and the telescope is gpc1
 #
 
@@ -39 +41 @@
 my $ota_num;
 if ($class_id) {
+    # we accept class_id in 3 formats (all we care about is the number)
+    # xy23
+    # ota23
+    # 23
     $class_id = lc($class_id);
     my $extra;
@@ -68 +74 @@
     if ($from_registered) {
         $query = "SELECT exp_id, class_id, uri FROM rawImfile"
-                . " WHERE exp_name = \'$exp_name\'";
+                . " WHERE exp_name = \'$exp_name\'"
+                . " AND camera = \'gpc1\' AND telescope = \'ps1\'";
         $query .= " AND class_id = \'xy$ota_num\'" if ($ota_num);
     } else {
-        $query = "SELECT exp_id FROM newExp WHERE tmp_exp_name = ?";
+        $query = "SELECT exp_id FROM newExp WHERE tmp_exp_name = ?"
+                . " AND tmp_camera = \'gpc1\' AND tmp_telescope = \'ps1\'";
         my $stmt = $dbh->prepare($query);
         $stmt->execute($exp_name);

trunk/ippScripts/scripts/ipp_serial_mops.pl

@@ -106 +106 @@
     }
 
-    print $dsFile "${output}|ipp-mops\n";
+    # format: filename|filesize|md5sum|filetype|  
+    # note: since we omit filesize and md5sum, dsreg will calculate them
+    print $dsFile "${output}|||ipp-mops|\n";
 }
 close $dsFile;
@@ -112 +114 @@
 # Register new files with the data store
 unless ($no_update) {
-    my $command = "$dsreg --add --product mops_transient_detections --type MOPS_TRANSIENT_DETECTIONS --fileset $fileset --list $dsName --copy --abspath --dbname DataStore";
+    my $command = "$dsreg --add $fileset --product mops_transient_detections --type MOPS_TRANSIENT_DETECTIONS --list $dsName --copy --abspath --dbname DataStore";
     my $success = run( command => $command, verbose => $verbose );
     die "Couldn't register files with data store.\n" unless $success;