Changeset 9790

Timestamp:

Oct 30, 2006, 11:56:09 AM (20 years ago)

Author:

jhoblitt

Message:

add phase 3 masking support

Location:

trunk/ippTools

Files:

• configure.ac (modified) (1 diff)
• src/camtool.c (modified) (6 diffs)
• src/camtool.h (modified) (1 diff)
• src/camtoolConfig.c (modified) (2 diffs)
• src/chiptool.c (modified) (1 diff)
• src/pxtables.c (modified) (2 diffs)

trunk/ippTools/configure.ac

@@ -16 +16 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 0.12.99]) 
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 0.12.0]) 
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.52]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.53]) 
 
 AC_PROG_PERL_MODULES(

trunk/ippTools/src/camtool.c

@@ -30 +30 @@
 static bool pendingimfileMode(pxConfig *config);
 static bool addprocessedexpMode(pxConfig *config);
+static bool blockMode(pxConfig *config);
+static bool maskedMode(pxConfig *config);
+static bool unblockMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -48 +51 @@
         MODECASE(P3TOOL_MODE_PENDINGIMFILE,     pendingimfileMode);
         MODECASE(P3TOOL_MODE_ADDPROCESSEDEXP,   addprocessedexpMode);
+        MODECASE(P3TOOL_MODE_BLOCK,             blockMode);
+        MODECASE(P3TOOL_MODE_MASKED,            maskedMode);
+        MODECASE(P3TOOL_MODE_UNBLOCK,           unblockMode);
         default:
             psAbort(argv[0], "invalid option (this should not happen)");
@@ -76 +82 @@
             " LEFT JOIN p3ProcessedExp"
             "   USING(exp_tag)"
+            " LEFT JOIN p3Mask"
+            "   ON p3PendingExp.label = p3Mask.label"
             " WHERE"
             "   p3ProcessedExp.exp_tag IS NULL"
+            "   AND p3Mask.label IS NULL"
     );
 
@@ -132 +141 @@
 
     psString query = psStringCopy(
-        "SELECT p2ProcessedImfile.*"
-        " FROM p3PendingExp"
-        " JOIN p2ProcessedImfile"
-        " USING(exp_tag, p2_version)"
+            "SELECT p2ProcessedImfile.*"
+            " FROM p3PendingExp"
+            " JOIN p2ProcessedImfile"
+            "   USING(exp_tag, p2_version)"
+            " LEFT JOIN p3ProcessedExp"
+            "   USING(exp_tag)"
+            " LEFT JOIN p3Mask"
+            "   ON p3PendingExp.label = p3Mask.label"
+            " WHERE"
+            "   p3ProcessedExp.exp_tag IS NULL"
+            "   AND p3Mask.label IS NULL"
     );
 
@@ -349 +365 @@
         zp_stdev,
         pendingRow->p2_version,
-        pendingRow->p3_version
+        pendingRow->p3_version,
+        pendingRow->label
     );
     psFree(pendingRow);
@@ -364 +381 @@
     return true;
 }
+
+static bool blockMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    bool status = false;
+    psString label = psMetadataLookupStr(&status, config->args, "-label");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -label");
+        return false;
+    }
+    if (!label) {
+        psError(PS_ERR_UNKNOWN, true, "-label is required");
+        return false;
+    }
+
+    if (!p3MaskInsert(config->dbh, label)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}
+
+static bool maskedMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psString query = psStringCopy("SELECT * FROM p3Mask");
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        // XXX check psError here
+        psError(PS_ERR_UNKNOWN, false, "no p3Mask rows found");
+        psFree(output);
+        return true;
+    }
+
+    bool simple = false;
+    {
+        bool status = false;
+        simple = psMetadataLookupBool(&status, config->args, "-simple");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
+            return false;
+        }
+    }
+
+    // negative simple so the default is true
+    if (!ippdbPrintMetadatas(stdout, output, "p3Mask", !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+
+    psFree(output);
+
+    return true;
+}
+
+static bool unblockMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    bool status = false;
+    psString label = psMetadataLookupStr(&status, config->args, "-label");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -label");
+        return false;
+    }
+    if (!label) {
+        psError(PS_ERR_UNKNOWN, true, "-label is required");
+        return false;
+    }
+
+    char *query = "DELETE FROM p3Mask WHERE label = '%s'";
+
+    if (!p_psDBRunQuery(config->dbh, query, label)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+
+    return true;
+}

trunk/ippTools/src/camtool.h

@@ -28 +28 @@
     P3TOOL_MODE_PENDINGIMFILE,
     P3TOOL_MODE_ADDPROCESSEDEXP,
+    P3TOOL_MODE_BLOCK,
+    P3TOOL_MODE_MASKED,
+    P3TOOL_MODE_UNBLOCK
 } p3toolMode;
 

trunk/ippTools/src/camtoolConfig.c

@@ -93 +93 @@
             "define banana 2", NULL);
 
+    // -block
+    psMetadata *blockArgs = psMetadataAlloc();
+    psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label",  0,
+            "name of a label to mask out", NULL);
+    
+    // -masked
+    psMetadata *maskedArgs = psMetadataAlloc();
+    psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
+    
+    // -unblock
+    psMetadata *unblockArgs = psMetadataAlloc();
+    psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label",  0,
+            "name of a label to unmask", NULL);
+
 #define PXTOOL_MODE(option, modeval, argset) \
 { \
@@ -116 +131 @@
     PXTOOL_MODE("-pendingimfile",P3TOOL_MODE_PENDINGIMFILE,pendingimfileArgs);
     PXTOOL_MODE("-addprocessedexp", P3TOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
+    PXTOOL_MODE("-block",        P3TOOL_MODE_BLOCK,          blockArgs);
+    PXTOOL_MODE("-masked",       P3TOOL_MODE_MASKED,         maskedArgs);
+    PXTOOL_MODE("-unblock",      P3TOOL_MODE_UNBLOCK,        unblockArgs);
 
     bool argErr = false;

trunk/ippTools/src/chiptool.c

@@ -711 +711 @@
         pendingExp->exp_tag,
         pendingExp->p1_version,
-        pendingExp->p2_version
+        pendingExp->p2_version,
+        pendingExp->label
     );
 }

trunk/ippTools/src/pxtables.c

@@ -60 +60 @@
     CREATE_TABLE(p3PendingExpCreateTable);
     CREATE_TABLE(p3ProcessedExpCreateTable);
+    CREATE_TABLE(p3MaskCreateTable);
     CREATE_TABLE(detRunCreateTable);
     CREATE_TABLE(detInputExpCreateTable);
@@ -119 +120 @@
     DROP_TABLE(p3PendingExpDropTable);
     DROP_TABLE(p3ProcessedExpDropTable);
+    DROP_TABLE(p3MaskDropTable);
     DROP_TABLE(detRunDropTable);
     DROP_TABLE(detInputExpDropTable);