Changeset 30283

Timestamp:

Jan 14, 2011, 7:24:31 PM (15 years ago)

Author:

watersc1

Message:

is_daytime fix in register_imfile; bad class_ids in regtool; bad joins in the SQL

Location:

trunk

Files:

• ippScripts/scripts/register_imfile.pl (modified) (1 diff)
• ippTools/share/regtool_checkburntoolimfile.sql (modified) (2 diffs)
• ippTools/share/regtool_pendingburntoolimfile.sql (modified) (2 diffs)
• ippTools/src/regtool.c (modified) (9 diffs)

trunk/ippScripts/scripts/register_imfile.pl

@@ -195 +195 @@
     $command .= " -data_state full";
 }
-elsif (is_daytime($dateobs,$sunset,$sunrise)) {
+elsif (is_daytime($dateobs,$sunrise,$sunset)) {
     printf STDERR "This is a daytime exposure.\n";
     $command .= " -data_state full";

trunk/ippTools/share/regtool_checkburntoolimfile.sql

@@ -11 +11 @@
        newExp.exp_id,
        summitExp.exp_type,
-       rawExp.dateobs,
-       rawExp.obs_mode AS obs_mode,
-       rawExp.object AS object,
+       rawImfile.dateobs,
+       rawImfile.obs_mode AS obs_mode,
+       rawImfile.object AS object,
        rawImfile.burntool_state AS burntool_state,
        rawImfile.class_id,
@@ -26 +26 @@
        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)
+       LEFT JOIN rawImfile ON (rawImfile.exp_id = newExp.exp_id AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
        WHERE
              summitExp.dateobs >= '@DATEOBS_BEGIN@'

trunk/ippTools/share/regtool_pendingburntoolimfile.sql

@@ -12 +12 @@
        newImfile.tmp_class_id,
        summitExp.exp_type,
-       rawExp.dateobs,
-       rawExp.obs_mode AS obs_mode,
-       rawExp.object AS object,
+       rawImfile.dateobs,
+       rawImfile.obs_mode AS obs_mode,
+       rawImfile.object AS object,
        rawImfile.burntool_state AS burntool_state,
        rawImfile.class_id,
@@ -27 +27 @@
        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)
+       LEFT JOIN rawImfile ON (rawImfile.exp_id = newExp.exp_id AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
        WHERE
              summitExp.dateobs >= '@DATEOBS_BEGIN@'

trunk/ippTools/src/regtool.c

@@ -356 +356 @@
     char *tmp_id = psMetadataLookupStr(&status,row,"summit_class_id");
     if (!status) {
-        // fprintf (stderr, "incomplete on %s\n", psMetadataLookupStr(NULL,row,"exp_name"));
+      //      fprintf (stderr, "incomplete on %s\n", psMetadataLookupStr(NULL,row,"exp_name"));
         continue;
     }
@@ -375 +375 @@
     }
 
-    if (0 && !strcmp(this_class_id, "XY44")) {
+    if (0 && !strcmp(this_class_id, "ota44")) {
         printf("STAT 1: %s (%d %d) %d %d %d\n",
                this_class_id,
@@ -390 +390 @@
         already_burned = true;
         previous_uri = NULL;
-        // fprintf (stderr, "crossed boundary: %s : %s to %s\n", psMetadataLookupStr(NULL,row,"exp_name"), previous_class_id, this_class_id);
+        //      fprintf (stderr, "crossed boundary: %s : %s to %s\n", psMetadataLookupStr(NULL,row,"exp_name"), previous_class_id, this_class_id);
       }
     }
@@ -405 +405 @@
     if ((psMetadataLookupS32(NULL,row,"is_downloaded") != 1)||
         (psMetadataLookupS32(NULL,row,"is_registered") != 1)) {
-        // printf("I claim this isn't downloaded or registered? %s %s\n",this_uri,this_class_id);
+      // printf("I claim this isn't downloaded or registered? %s %s\n",this_uri,this_class_id);
         ok_to_burn = false;
     }
@@ -426 +426 @@
         already_burned = false;
 
-        // fprintf (stderr, "missing uri: %s %s\n", psMetadataLookupStr(NULL,row,"exp_name"), this_class_id);
+        //      fprintf (stderr, "missing uri: %s %s\n", psMetadataLookupStr(NULL,row,"exp_name"), this_class_id);
 
         // Save this round for next round.
         psFree(previous_class_id);
         psFree(previous_uri);
-        previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
-        psStringSubstitute(&previous_class_id,"XY","ota");
+        previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"summit_class_id"));
+        psStringSubstitute(&previous_class_id,"ota","XY");
         previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.
         continue;
     }
 
-    if (0 && !strcmp(this_class_id, "XY44")) {
+    if (0 && !strcmp(this_class_id, "ota44")) {
         printf("STATUS: %s %s %s %s (%d %d) %d %d %d\n",this_uri,previous_uri,this_class_id,previous_class_id,ok_to_burn,already_burned,psMetadataLookupS32(NULL,row,"burntool_state"),psMetadataLookupS32(NULL,row,"is_registered"),psMetadataLookupS32(NULL,row,"is_downloaded"));
     }
@@ -452 +452 @@
         psFree(previous_class_id);
         psFree(previous_uri);
-        previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
-        psStringSubstitute(&previous_class_id,"XY","ota");
+        previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"summit_class_id"));
+        psStringSubstitute(&previous_class_id,"ota","XY");
         previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.
         continue;
@@ -466 +466 @@
         psFree(previous_class_id);
         psFree(previous_uri);
-        previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
-        psStringSubstitute(&previous_class_id,"XY","ota");
+        previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"summit_class_id"));
+        psStringSubstitute(&previous_class_id,"ota","XY");
         previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.
         continue;
@@ -479 +479 @@
       psFree(previous_class_id);
       psFree(previous_uri);
-      previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
-      psStringSubstitute(&previous_class_id,"XY","ota");
+      previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"summit_class_id"));
+      psStringSubstitute(&previous_class_id,"ota","XY");
       previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.
       continue;
@@ -490 +490 @@
     psFree(previous_class_id);
     psFree(previous_uri);
-    previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id"));
-    psStringSubstitute(&previous_class_id,"XY","ota");
+    previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"summit_class_id"));
+    psStringSubstitute(&previous_class_id,"ota","XY");
     previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round.
   }