Changeset 26986

Timestamp:

Feb 18, 2010, 11:50:07 AM (16 years ago)

Author:

Paul Price

Message:

Trying to get exposure comment line into the DataStore.

Location:

trunk

Files:

• ippScripts/scripts/publish_file.pl (modified) (4 diffs)
• ippTools/share/camtool_find_processedexp.sql (modified) (1 diff)
• ippTools/share/difftool_skyfile.sql (modified) (1 diff)

trunk/ippScripts/scripts/publish_file.pl

@@ -82 +82 @@
 my ($dsFile, $dsFileName) = tempfile("/tmp/publish.$pub_id.ds.XXXX", UNLINK => !$save_temps );
 
+my $comment;                    # Comment for exposure
 if ($stage eq 'camera') {
     my $command =  "camtool -processedexp -cam_id $stage_id";
@@ -109 +110 @@
     my $astrom = sqrt($comp->{sigma_ra}**2 + $comp->{sigma_dec}**2);
     my $name = "cam_$cam_id";
+    $comment = $comp->{comment};
 
     if ($product eq "MONET") {
@@ -157 +159 @@
         my $path_base = $comp->{path_base}; # Base name for file
         next if defined $comp->{quality} and $comp->{quality} > 0;
+        print "Warning: mis-matched comments\n" if defined $comment and $comment ne $comp->{comment};
+        $comment = $comp->{comment} unless defined $comment;
 
         (carp "Bad zpt_obs or exp_time for component" and next) if not defined $comp->{zpt_obs} or not defined $comp->{exp_time};
@@ -234 +238 @@
 unless ($no_update) {
     my $command = "$dsreg --add $stage.$stage_id --copy --abspath --product $product --type $product --list $dsFileName";
+    $command .= " --ps0 \"$comment\"" if defined $comment;
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =

trunk/ippTools/share/camtool_find_processedexp.sql

@@ -10 +10 @@
     rawExp.camera,
     rawExp.telescope,
-    rawExp.filelevel
+    rawExp.filelevel,
+    rawExp.comment
 FROM camRun
 JOIN camProcessedExp

trunk/ippTools/share/difftool_skyfile.sql

@@ -18 +18 @@
     camProcessedInput.zpt_lq,
     camProcessedInput.zpt_uq,
+    rawInput.comment,
     rawInput.exp_time,
     rawInput.camera,