Changeset 21099

Timestamp:

Jan 9, 2009, 10:09:19 AM (17 years ago)

Author:

bills

Message:

handle -label in modes -totree and -toprocess

Location:

trunk/ippTools

Files:

• share/magictool_toprocess_tree.sql (modified) (1 diff)
• src/magictool.c (modified) (5 diffs)
• src/magictoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/magictool_toprocess_tree.sql

@@ -16 +16 @@
 WHERE
     magicRun.state = 'run'
+    -- where hook %s
 ORDER BY
     magicRun.magic_id

trunk/ippTools/src/magictool.c

@@ -457 +457 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-magic_id", "magicRun.magic_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -738 +739 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
 
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -750 +752 @@
     psString whereClause = NULL;
     if (psListLength(where->list)) {
-        whereClause = psDBGenerateWhereSQL(where, NULL);
-        psStringAppend(&query, " %s", whereClause);
-        psFree(whereClause);
+        whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, " AND %s", whereClause);
     }
     psFree(where);
@@ -789 +790 @@
 
     if (whereClause) {
-        psStringAppend(&query, " %s", whereClause);
-    }
-
-    if (!p_psDBRunQuery(config->dbh, query)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
+        psString new  = NULL;
+        psStringAppend(&new, "\n AND %s", whereClause);
+        psFree(whereClause);
+        whereClause = new;
+    }
+    if (!p_psDBRunQuery(config->dbh, query, whereClause ? whereClause :  "")) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(whereClause);
         psFree(query);
         return false;
     }
+    psFree(whereClause);
     psFree(query);
 
@@ -886 +891 @@
     psFree(magicTree);
     psFree(output);
-    psFree(whereClause);
 
     return true;

trunk/ippTools/src/magictoolConfig.c

@@ -93 +93 @@
     psMetadataAddS64(totreeArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic ID", 0);
     psMetadataAddU64(totreeArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
+    psMetadataAddStr(totreeArgs, PS_LIST_TAIL, "-label",       0, "define label", NULL);
     psMetadataAddBool(totreeArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
 
@@ -117 +118 @@
     psMetadataAddS64(toprocessArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic ID", 0);
     psMetadataAddU64(toprocessArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
+    psMetadataAddStr(toprocessArgs, PS_LIST_TAIL, "-label",       0, "define label", NULL);
     psMetadataAddBool(toprocessArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);