Changeset 30240 for trunk/ippTools

Timestamp:

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

Author:

watersc1

Message:

updates and bugfixes to registration. Will test this afternoon.

Location:

trunk/ippTools

Files:

• share/regtool_checkburntoolimfile.sql (modified) (1 diff)
• share/regtool_pendingburntoolimfile.sql (modified) (1 diff)
• src/regtool.c (modified) (6 diffs)
• src/regtoolConfig.c (modified) (2 diffs)

trunk/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

trunk/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

trunk/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);
 

trunk/ippTools/src/regtoolConfig.c

@@ -57 +57 @@
     ADD_OPT(Str,  checkburntoolimfileArgs, "-exp_name",       "define the exp_name (required)",         NULL);
     ADD_OPT(Str,  checkburntoolimfileArgs, "-class_id",       "define class ID (required)",         NULL);
-    ADD_OPT(Str,  checkburntoolimfileArgs, "-date",           "select the date to process (required)", NULL);
+    ADD_OPT(Str,  checkburntoolimfileArgs, "-dateobs_begin",  "set the earliest summit dateobs to consider (required)", NULL);
+    ADD_OPT(Str,  checkburntoolimfileArgs, "-dateobs_end",    "set the latest summit dateobs to consider (required)", NULL);
     ADD_OPT(S32,  checkburntoolimfileArgs, "-valid_burntool", "define the good burntool value (required)", 0);
     ADD_OPT(Str,  checkburntoolimfileArgs, "-inst",           "define the camera name",     NULL);
@@ -65 +66 @@
     // -pendingburntoolimfile
     psMetadata *pendingburntoolimfileArgs = psMetadataAlloc();
-    ADD_OPT(Str,  pendingburntoolimfileArgs, "-date",           "select the date to process (required)", NULL);
+    ADD_OPT(Str,  pendingburntoolimfileArgs, "-dateobs_begin",  "set the earliest summit dateobs to consider (required)", NULL);
+    ADD_OPT(Str,  pendingburntoolimfileArgs, "-dateobs_end",    "set the latest summit dateobs to consider (required)", NULL);
     ADD_OPT(S32,  pendingburntoolimfileArgs, "-valid_burntool", "define the good burntool value (required)", 0);
     ADD_OPT(Bool, pendingburntoolimfileArgs, "-simple",    "use the simple output format",          false);