Changeset 30240 for trunk/ippScripts/scripts

Timestamp:

Jan 12, 2011, 1:08:55 PM (16 years ago)

Author:

watersc1

Message:

updates and bugfixes to registration. Will test this afternoon.

File:

• trunk/ippScripts/scripts/register_imfile.pl (modified) (5 diffs)

trunk/ippScripts/scripts/register_imfile.pl

@@ -39 +39 @@
 
 my ($cache, $exp_id, $tmp_class_id, $tmp_exp_name, $uri, $bytes, $md5sum, $dbname, $verbose, $no_update, $no_op, $logfile);
+my ($sunrise, $sunset);
 GetOptions(
     'caches'           => \$cache,
@@ -47 +48 @@
     'bytes=s'          => \$bytes,
     'md5sum=s'         => \$md5sum,
+    'sunrise=s'        => \$sunrise,
+    'sunset=s'         => \$sunset,
     'dbname|d=s'       => \$dbname,    # Database name
     'verbose'          => \$verbose,   # Print to stdout
@@ -65 +68 @@
     defined $uri;
 
+unless (defined($sunset)) {
+    $sunset = '03:30:00';
+}
+unless (defined($sunrise)) {
+    $sunrise = '17:30:00';
+}
 
 my $RECIPE = "REGISTER"; # Recipe to use for ppStats
@@ -181 +190 @@
 $command .= " -dbname $dbname" if defined $dbname;
 if (abs($burntoolStateCurrent) == $burntoolStateTarget) {
+    $command .= " -data_state full";
+}
+elsif (is_daytime($dateobs,$sunset,$sunrise)) {
     $command .= " -data_state full";
 }
@@ -361 +373 @@
 }
 
+sub is_daytime
+{
+    my $dateobs = shift;
+    my $sunset  = shift;
+    my $sunrise = shift;
+
+    my $date,$time;
+
+    if ($dateobs =~ /T/) {
+        ($date,$time) = split /T/, $dateobs;
+    }
+    else {
+        ($date,$time) = split / /, $dateobs;
+    }
+    my ($hour,$minute,$second) = split /\:/, $time; # /;
+    my ($ss_hour,$ss_minute,$ss_second) = split /\:/, $sunset; # /;
+    my ($sr_hour,$sr_minute,$sr_second) = split /\:/, $sunrise; # /;
+    
+    if (($hour >= $ss_hour)&&($minute >= $ss_minute)&&($second >= $ss_second)) {
+        if (($hour <= $sr_hour)&&($minute <= $sr_minute)&&($second <= $sr_second)) {
+            return(1);
+        }
+    }
+    
+    return(0);
+}
+
 sub my_die_for_add
 {