Changeset 30278

Timestamp:

Jan 14, 2011, 2:17:42 PM (15 years ago)

Author:

watersc1

Message:

backport with correct daytime calculation

File:

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

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

@@ -10 +10 @@
 my $date = `date`;
 print "\n\n";
-print "Starting script $0 on $host at $date\n\n";
+my $cmd_line = join ' ', @ARGV;
+print "Starting script $0 $cmd_line on $host at $date\n\n";
 
 use vars qw( $VERSION );
@@ -399 +400 @@
         $second =~ s/Z//;
     }
-    if (($hour >= $ss_hour)&&($minute >= $ss_minute)&&($second >= $ss_second)) {
-        if (($hour <= $sr_hour)&&($minute <= $sr_minute)&&($second <= $sr_second)) {
-            return(1);
+#     print "this exposure: $hour $minute $second\n";
+#     print "sunset:        $ss_hour $ss_minute $ss_second\n";
+#     print "sunrise:       $sr_hour $sr_minute $sr_second\n";
+#     printf "Hss: %d Mss: %d Sss: %d\n",($hour >= $ss_hour),($minute >= $ss_minute),($second >= $ss_second);
+#     printf "Hsr: %d Msr: %d Ssr: %d\n",($hour <= $sr_hour),($minute <= $sr_minute),($second <= $sr_second);
+
+    if (($hour > $ss_hour)&&($hour <= 24)) {
+        return(1); # After sunset by more than an hour, before midnight
+    }
+    elsif ($hour == $ss_hour) {
+        if ($minute > $ss_minute) {
+            return(1); # After sunset by more than a minute
         }
-    }
-    
-    return(0);
+        elsif ($minute == $ss_minute) {
+            if ($second >= $ss_second) {
+                return(1); # After sunset by more than a second
+            }
+            else {
+                return(0);
+            }
+        }
+        else {
+            return(0);
+        }
+    }
+    elsif (($hour < $sr_hour)&&($hour >= 0)) {
+        return(1); # Before sunrise by more than an hour, but after midnight
+    }
+    elsif ($hour == $sr_hour) {
+        if ($minute < $sr_minute) {
+            return(1); # Before sunrise by more than a minute
+        }
+        elsif ($minute == $sr_minute) {
+            if ($second <= $sr_second) {
+                return(1); # Before sunrise by more than a second
+            }
+            else {
+                return(0);
+            }
+        }
+        else {
+            return(0);
+        }
+    }
+    else {
+        return(0); # We should never get here.
+    }
 }