Changeset 30675 for branches/eam_branches/ipp-20110213/ippTools/src/regtool.c

Timestamp:

Feb 17, 2011, 3:19:36 PM (15 years ago)

Author:

eugene

Message:

merge changes from the trunk

Location:

branches/eam_branches/ipp-20110213/ippTools/src

Files:

• . (modified) (1 prop)
• regtool.c (modified) (5 diffs)

branches/eam_branches/ipp-20110213/ippTools/src/regtool.c

@@ -259 +259 @@
       continue;
     }
+    char *is_ccim = strchr(psMetadataLookupStr(NULL,row,"exp_name"),'c');
+    if (is_ccim) { // Is a camera commanded exposure
+      //      fprintf(stderr,"IN camera commanded!\n");
+      if ((strcasecmp(psMetadataLookupStr(NULL,row,"exp_type"),"DOMEFLAT") == 0)||
+          (strcasecmp(psMetadataLookupStr(NULL,row,"exp_type"),"DARK") == 0) ||
+          (strcasecmp(psMetadataLookupStr(NULL,row,"exp_type"),"BIAS") == 0)) {
+        continue;
+      }
+    }
     
     if ((psMetadataLookupS32(NULL,row,"is_downloaded") != 1)||
@@ -367 +376 @@
     }
 
+    char *is_ccim = strchr(psMetadataLookupStr(NULL,row,"exp_name"),'c');
+    if (is_ccim) { // Is a camera commanded exposure
+      //      fprintf(stderr,"IN camera commanded!\n");
+      if ((strcasecmp(psMetadataLookupStr(NULL,row,"exp_type"),"DOMEFLAT") == 0)||
+          (strcasecmp(psMetadataLookupStr(NULL,row,"exp_type"),"DARK") == 0) ||
+          (strcasecmp(psMetadataLookupStr(NULL,row,"exp_type"),"BIAS") == 0)) {
+        continue;
+      }
+    }
+
     bool status = false;
     char *tmp_id = psMetadataLookupStr(&status,row,"summit_class_id");
@@ -389 +408 @@
     }
 
+    
     if (0 && !strcmp(this_class_id, "ota44")) {
         printf("STAT 1: %s (%d %d) %d %d %d\n",
@@ -857 +877 @@
     PXOPT_LOOKUP_STR(set_md5sum, config->args, "-set_md5sum", false, false);
     PXOPT_LOOKUP_STR(set_state, config->args, "-set_state", false, false);
-
+    PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
+    
     if ((fault == INT16_MAX) && (burntool_state == INT16_MAX) && !set_state) {
         psError(PS_ERR_UNKNOWN, false, "one of -fault or -burntool_state or -set_state must be selected");
@@ -905 +926 @@
       psStringAppend(&setvalues,"rawImfile.data_state = '%s'",set_state);
     }
-
+    if (hostname) {
+      if (setvalues) {
+        psStringAppend(&setvalues,",");
+      }
+      psStringAppend(&setvalues,"rawImfile.hostname = '%s'", hostname);
+    }
     psString query = pxDataGet("regtool_updateprocessedimfile.sql");
     if (!query) {