Changeset 30241

Timestamp:

Jan 12, 2011, 1:16:30 PM (15 years ago)

Author:

watersc1

Message:

registration updates

Location:

tags/ipp-20101215

Files:

• ippScripts/scripts/register_imfile.pl (modified) (5 diffs, 1 prop)
• ippTasks/register.pro (modified) (3 diffs, 1 prop)
• ippTools/share/regtool_checkburntoolimfile.sql (modified) (1 diff)
• ippTools/share/regtool_pendingburntoolimfile.sql (modified) (1 diff, 1 prop)
• ippTools/src/regtool.c (modified) (6 diffs, 1 prop)

tags/ipp-20101215/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
 {

tags/ipp-20101215/ippTasks/register.pro

@@ -102 +102 @@
 
 $valid_burntool_value = 14
+$sunrise = '17:30:00'
+$sunset  = '03:30:00'
 
 macro replace.survey.values
@@ -302 +304 @@
     # 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
     add_standard_args run
 
@@ -544 +547 @@
   # select entried from the current DB; cycle to the next DB, if it exists
   task.exec
+     book npages nsData -var Npages
+     if ($Npages == 0) 
+       $today = `date -u +%Y-%m-%d`
+     else 
+       book getpage nsData $ns_datePAGE -var today
+       $ns_datePAGE ++
+       if ($ns_datePAGE >= $Npages) set ns_datePAGE = 0
+     end
+
     $run = regtool -pendingburntoolimfile
-    $today = `date -u +%Y-%m-%d`
+
 # debugging purposes
 #   $today = "2010-12-25"
-    $run = $run -date $today -valid_burntool $valid_burntool_value
+    $dateobs_begin = $today\T$sunset
+    $dateobs_end   = $today\T$sunrise
+    $run = $run -dateobs_begin $dateobs_begin -dateobs_end $dateobs_end -valid_burntool $valid_burntool_value
     if ($DB:n == 0)
       option DEFAULT

tags/ipp-20101215/ippTools/share/regtool_checkburntoolimfile.sql

@@ -16 +16 @@
        rawImfile.burntool_state AS burntool_state,
        rawImfile.class_id,
+       summitImfile.class_id AS summit_class_id,
        (pzDownloadExp.state = 'stop') AS is_downloaded,
        (rawImfile.burntool_state IS NOT NULL) AS is_registered
        FROM
-            summitExp
-            LEFT JOIN pzDownloadExp USING(exp_name)
-            LEFT JOIN newExp ON exp_name = tmp_exp_name
-            LEFT JOIN rawExp USING(exp_id, exp_name)
-            LEFT JOIN rawImfile USING(exp_name)
+       summitExp
+       JOIN summitImfile USING(exp_name)
+       LEFT JOIN pzDownloadExp USING(exp_name)
+       LEFT JOIN newExp ON summitExp.exp_name = tmp_exp_name
+       LEFT JOIN newImfile ON (summitImfile.class_id = newImfile.tmp_class_id AND newExp.exp_id = newImfile.exp_id)
+       LEFT JOIN rawExp ON rawExp.exp_id = newExp.exp_id
+       LEFT JOIN rawImfile ON (rawImfile.exp_id = rawExp.exp_id AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
        WHERE
-             summitExp.dateobs >= '@DATE@T00:00:00'
-             AND summitExp.dateobs <= '@DATE@T23:59:59'
-             AND (rawImfile.class_id = '@CLASS_ID@' OR rawImfile.class_id IS NULL)
+             summitExp.dateobs >= '@DATEOBS_BEGIN@'
+             AND summitExp.dateobs <= '@DATEOBS_END@'
+             AND summitImfile.class_id = '@CLASS_ID@'
              AND (exp_name <= '@EXP_NAME@')                                                                     
 ORDER BY summitExp.dateobs

tags/ipp-20101215/ippTools/share/regtool_pendingburntoolimfile.sql

@@ -17 +17 @@
        rawImfile.burntool_state AS burntool_state,
        rawImfile.class_id,
+       summitImfile.class_id AS summit_class_id,
        (pzDownloadExp.state = 'stop') AS is_downloaded,
        (rawImfile.burntool_state IS NOT NULL) AS is_registered
        FROM
-            summitExp
-            LEFT JOIN pzDownloadExp USING(exp_name)
-            LEFT JOIN newExp ON exp_name = tmp_exp_name
-            LEFT JOIN newImfile USING(exp_id)
-            LEFT JOIN rawExp USING(exp_id, exp_name)
-            LEFT JOIN rawImfile ON (rawImfile.exp_name = newExp.tmp_exp_name AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
+       summitExp
+       JOIN summitImfile USING(exp_name)
+       LEFT JOIN pzDownloadExp USING(exp_name)
+       LEFT JOIN newExp ON summitExp.exp_name = tmp_exp_name
+       LEFT JOIN newImfile ON (summitImfile.class_id = newImfile.tmp_class_id AND newExp.exp_id = newImfile.exp_id)
+       LEFT JOIN rawExp ON rawExp.exp_id = newExp.exp_id
+       LEFT JOIN rawImfile ON (rawImfile.exp_id = rawExp.exp_id AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
        WHERE
-             summitExp.dateobs >= '@DATE@T00:00:00'
-             AND summitExp.dateobs <= '@DATE@T23:59:59'
-ORDER BY newImfile.tmp_class_id,summitExp.dateobs
+             summitExp.dateobs >= '@DATEOBS_BEGIN@'
+             AND summitExp.dateobs <= '@DATEOBS_END@'
+ORDER BY summitImfile.class_id,summitExp.dateobs

tags/ipp-20101215/ippTools/src/regtool.c

@@ -187 +187 @@
   PXOPT_LOOKUP_STR(exp_name, config->args, "-exp_name", true, false);
   PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
-  PXOPT_LOOKUP_STR(date,     config->args, "-date", true, false);
+  PXOPT_LOOKUP_STR(dateobs_begin,     config->args, "-dateobs_begin", true, false);
+  PXOPT_LOOKUP_STR(dateobs_end,     config->args, "-dateobs_end", true, false);
   PXOPT_LOOKUP_S32(valid_burntool, config->args, "-valid_burntool", true, false);
   // optional
@@ -202 +203 @@
   query = rep;
 
+  // convert regular class_id format to summitImfile.class_id format
+  psStringSubstitute(&class_id,"ota","XY");
+  
   psStringSubstitute(&query,exp_name,"@EXP_NAME@");
   psStringSubstitute(&query,class_id,"@CLASS_ID@");
-  psStringSubstitute(&query,date,"@DATE@");
+  psStringSubstitute(&query,dateobs_begin,"@DATEOBS_BEGIN@");
+  psStringSubstitute(&query,dateobs_end,"@DATEOBS_END@");
 
   fprintf(stderr,"%s",query);
@@ -284 +289 @@
 
   // required
-  PXOPT_LOOKUP_STR(date,     config->args, "-date", true, false);
+  PXOPT_LOOKUP_STR(dateobs_begin,     config->args, "-dateobs_begin", true, false);
+  PXOPT_LOOKUP_STR(dateobs_end,     config->args, "-dateobs_end", true, false);
   PXOPT_LOOKUP_S32(valid_burntool, config->args, "-valid_burntool", true, false);
   // optional
@@ -298 +304 @@
   query = rep;
 
-  psStringSubstitute(&query,date,"@DATE@");
+  psStringSubstitute(&query,dateobs_begin,"@DATEOBS_BEGIN@");
+  psStringSubstitute(&query,dateobs_end,"@DATEOBS_END@");
 
   // fprintf(stderr,"%s",query);
@@ -344 +351 @@
 
     bool status = false;
-    char *tmp_id = psMetadataLookupStr(&status,row,"tmp_class_id");
+    char *tmp_id = psMetadataLookupStr(&status,row,"summit_class_id");
     if (!status) {
         // fprintf (stderr, "incomplete on %s\n", psMetadataLookupStr(NULL,row,"exp_name"));
@@ -355 +362 @@
     this_class_id = psStringCopy(tmp_id);
 
-    psStringSubstitute(&this_class_id,"XY","ota");
     psMetadataAddStr(row,PS_LIST_TAIL,"this_class_id",PS_META_REPLACE,"",this_class_id);