Changeset 31603

Timestamp:

Jun 6, 2011, 12:52:49 PM (15 years ago)

Author:

watersc1

Message:

registration summitExp.dateobs/rawExp.dateobs bugfix

Location:

trunk

Files:

• ippScripts/scripts/register_imfile.pl (modified) (5 diffs)
• ippTasks/register.pro (modified) (2 diffs)
• ippTools/share/regtool_pendingimfile.sql (modified) (1 diff)

trunk/ippScripts/scripts/register_imfile.pl

@@ -40 +40 @@
 
 my ($cache, $exp_id, $tmp_class_id, $tmp_exp_name, $uri, $bytes, $md5sum, $dbname, $verbose, $no_update, $no_op, $logfile);
-my ($sunrise, $sunset);
+my ($sunrise, $sunset, $summit_dateobs);
 GetOptions(
     'caches'           => \$cache,
@@ -51 +51 @@
     'sunrise=s'        => \$sunrise,
     'sunset=s'         => \$sunset,
+    'summit_dateobs=s' => \$summit_dateobs,
     'dbname|d=s'       => \$dbname,    # Database name
     'verbose'          => \$verbose,   # Print to stdout
@@ -181 +182 @@
 if (uc(&value_for_flag ($cmdflags, "NULL", "-exp_type"))  eq "NULL") { &my_die_for_add ("exp_type  not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }
 my $dateobs   = &value_for_flag($cmdflags, 0.0, "-dateobs");
+unless($summit_dateobs) {
+    $summit_dateobs = $dateobs;
+}
+
 my $exp_type  = &value_for_flag($cmdflags, "NULL", "-exp_type");
 
@@ -196 +201 @@
     $command .= " -data_state full";
 }
-elsif (is_daytime($dateobs,$sunrise,$sunset)) {
+elsif (is_daytime($summit_dateobs,$sunrise,$sunset)) {
     printf STDERR "This is a daytime exposure.\n";
     $command .= " -data_state full";
@@ -267 +272 @@
 
 if ((abs($burntoolStateCurrent) != $burntoolStateTarget)&&
-    (!is_daytime($dateobs,$sunrise,$sunset))&&
+    (!is_daytime($summit_dateobs,$sunrise,$sunset))&&
     (!is_ccim($tmp_exp_name,$exp_type))) {
     my $mdcParser  = PS::IPP::Metadata::Config->new;

trunk/ippTasks/register.pro

@@ -294 +294 @@
     book getword regPendingImfile $pageName workdir      -var WORKDIR_TEMPLATE
     book getword regPendingImfile $pageName dbname       -var DBNAME
+    book getword regPendingImfile $pageName summit_dateobs -var SUMMIT_DATEOBS
 
     # EXP_TAG is used to generate the unique, but human-readable, filenames
@@ -320 +321 @@
     # XXX register_imfile.pl differs from the standard script : it does not have an 'outroot' argument, and it does not take '--redirect'
     $run = register_imfile.pl --exp_id $EXP_ID --tmp_class_id $TMP_CLASS_ID --tmp_exp_name $TMP_EXP_NAME --uri $URI --logfile $logfile --bytes $BYTES --md5sum $MD5SUM
-    $run = $run --sunset $sunset --sunrise $sunrise
+    $run = $run --sunset $sunset --sunrise $sunrise --summit_dateobs $SUMMIT_DATEOBS
     add_standard_args run
 

trunk/ippTools/share/regtool_pendingimfile.sql

@@ -8 +8 @@
     newImfile.uri,
     newImfile.bytes,
-    newImfile.md5sum
+    newImfile.md5sum,
+    summitExp.dateobs AS summit_dateobs
 FROM newImfile
 JOIN newExp
     USING(exp_id)
+JOIN summitExp USING(summit_id)
 LEFT JOIN rawImfile
     ON newExp.exp_id = rawImfile.exp_id