Changeset 30276

Timestamp:

Jan 14, 2011, 1:44:12 PM (15 years ago)

Author:

watersc1

Message:

daytime register bugfix

File:

• tags/ipp-20101215/ippScripts/scripts/register_imfile.pl (modified) (4 diffs)

tags/ipp-20101215/ippScripts/scripts/register_imfile.pl

@@ -191 +191 @@
 $command .= " -dbname $dbname" if defined $dbname;
 if (abs($burntoolStateCurrent) == $burntoolStateTarget) {
+    printf STDERR "This has already been burned.\n";
     $command .= " -data_state full";
 }
 elsif (is_daytime($dateobs,$sunset,$sunrise)) {
+    printf STDERR "This is a daytime exposure.\n";
     $command .= " -data_state full";
 }
 else {
+    printf STDERR "Need to check burntool.\n";
     $command .= " -data_state check_burntool";
 }
@@ -257 +260 @@
 # We now have an imfile in the database, check if we can burntool it.  If not, continue on.
 
-if (abs($burntoolStateCurrent) != $burntoolStateTarget) {
+if ((abs($burntoolStateCurrent) != $burntoolStateTarget)&&
+    (!is_daytime($dateobs,$sunrise,$sunset))) {
     my $mdcParser  = PS::IPP::Metadata::Config->new;
 
@@ -268 +272 @@
     my $bt_check_command = "$regtool -checkburntoolimfile ";
     $bt_check_command .= " -class_id $class_id ";
-    $bt_check_command .= " -date $check_date ";
+    $bt_check_command .= " -dateobs_begin ${check_date}T${sunset} ";
+    $bt_check_command .= " -dateobs_end ${check_date}T${sunrise} ";
     $bt_check_command .= " -valid_burntool $burntoolStateTarget ";
     $bt_check_command .= " -exp_name $exp_name ";
@@ -391 +396 @@
     my ($ss_hour,$ss_minute,$ss_second) = split /\:/, $sunset; # /;
     my ($sr_hour,$sr_minute,$sr_second) = split /\:/, $sunrise; # /;
-    
+    if ($second =~ /Z/) {
+        $second =~ s/Z//;
+    }
     if (($hour >= $ss_hour)&&($minute >= $ss_minute)&&($second >= $ss_second)) {
         if (($hour <= $sr_hour)&&($minute <= $sr_minute)&&($second <= $sr_second)) {