Changeset 33415 for branches/meh_branches/ppstack_test/ippTools/src/regtool.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (2 props)
• ippTools/src/regtool.c (modified) (5 diffs)

branches/meh_branches/ppstack_test/ippTools/src

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool
@@ -43 +44 @@
 minidvodbtool
 laptool
+vptool

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool
@@ -43 +44 @@
 minidvodbtool
 laptool
+vptool

branches/meh_branches/ppstack_test/ippTools/src/regtool.c

@@ -268 +268 @@
       }
     }
+    char *is_stareim = strchr(psMetadataLookupStr(NULL,row,"exp_name"),'a');
+    if (is_stareim) {
+      continue;
+    }
     
     if ((psMetadataLookupS32(NULL,row,"is_downloaded") != 1)||
@@ -386 +390 @@
       }
     }
+    char *is_stareim = strchr(psMetadataLookupStr(NULL,row,"exp_name"),'a');
+    if (is_stareim) {
+      continue;
+    }
+
 
     bool status = false;
@@ -882 +891 @@
     PXOPT_LOOKUP_STR(set_md5sum, config->args, "-set_md5sum", false, false);
     PXOPT_LOOKUP_STR(set_state, config->args, "-set_state", false, false);
+    PXOPT_LOOKUP_BOOL(set_ignored, config->args, "-set_ignored", false);
+    PXOPT_LOOKUP_BOOL(clear_ignored, config->args, "-clear_ignored", 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");
+    if ((fault == INT16_MAX) && (burntool_state == INT16_MAX) && !set_state && !set_ignored && !clear_ignored) {
+        psError(PS_ERR_UNKNOWN, false, "at least one of -fault or -burntool_state -set_ignored -clear_ignored or -set_state must be selected");
         return false;
     }
     if ((fault != INT16_MAX) && (burntool_state != INT16_MAX)) {
         psError(PS_ERR_UNKNOWN, false, "only one of -fault or -burntool_state must be selected");
+        return false;
+    }
+    if (set_ignored && clear_ignored) {
+        psError(PS_ERR_UNKNOWN, true, "only one of -set_ignored or -clear_ignored may be selected");
         return false;
     }
@@ -898 +913 @@
 
     if (fault != INT16_MAX) {
-        // this is fairly dangerous : can set all if the where is not set...
+        // this is fairly dangerous : can set all if the where is not set... but since exp_id and class_id
+        // were required above this is safe
         if (!pxSetFaultCode(config->dbh, "rawImfile", where, fault, 0)) {
             psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
@@ -930 +946 @@
       }
       psStringAppend(&setvalues,"rawImfile.data_state = '%s'",set_state);
+    }
+    if (set_ignored) {
+      if (setvalues) {
+        psStringAppend(&setvalues,",");
+      }
+      psStringAppend(&setvalues,"rawImfile.ignored = 1");
+    }
+    if (clear_ignored) {
+      if (setvalues) {
+        psStringAppend(&setvalues,",");
+      }
+      psStringAppend(&setvalues,"rawImfile.ignored = 0");
     }
     if (hostname) {

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool
@@ -43 +44 @@
 minidvodbtool
 laptool
+vptool