Changeset 35789 for trunk/ippTools/src

Timestamp:

Jul 10, 2013, 12:08:57 PM (13 years ago)

Author:

bills

Message:

add chipRun.update_mode. If set do not use the config dump
file when regenerating images using update

Location:

trunk/ippTools/src

Files:

• chiptool.c (modified) (2 diffs)
• chiptoolConfig.c (modified) (2 diffs)
• pxchip.c (modified) (1 diff)

trunk/ippTools/src/chiptool.c

@@ -2018 +2018 @@
     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", false, false);
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_S16(update_mode, config->args, "-set_update_mode", false, false);
 
     psString query = pxDataGet("chiptool_setimfiletoupdate.sql");
@@ -2029 +2030 @@
         psStringAppend(&setHook, "\n , chipRun.label = '%s'", label);
     }
+    // always set update_mode. If user has not supplied it zero is the right answer.
+    psStringAppend(&setHook, "\n, chipRun.update_mode = %d", update_mode);
 
     if (class_id) {

trunk/ippTools/src/chiptoolConfig.c

@@ -52 +52 @@
 
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir",  0,            "define workdir (required)", NULL);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",  0,            "define label (required)", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",  0,            "define label", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction",  0,            "define reduction class", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_expgroup",  0,            "define exposure group", NULL);
@@ -107 +107 @@
     psMetadataAddStr(setimfiletoupdateArgs, PS_LIST_TAIL, "-class_id", 0,  "search by class_id", NULL);
     psMetadataAddStr(setimfiletoupdateArgs, PS_LIST_TAIL, "-set_label",  0,"new value for label", NULL);
+    psMetadataAddS16(setimfiletoupdateArgs, PS_LIST_TAIL, "-set_update_mode",  0,"new value for update_mode", 0);
 
     // -pendingimfile

trunk/ippTools/src/pxchip.c

@@ -283 +283 @@
                        NAN,
                        NAN,
+            0,         // update_mode
             note
             )