Changeset 23918 for trunk/ippTools/src/pxtools.c

Timestamp:

Apr 17, 2009, 4:23:38 PM (17 years ago)

Author:

eugene

Message:

added function pxAddLabelSearchArgs to allow -label entries to be multiple

File:

• trunk/ippTools/src/pxtools.c (modified) (3 diffs)

trunk/ippTools/src/pxtools.c

@@ -60 +60 @@
         if (!state) {
             psError(PS_ERR_PROGRAMMING, false, "%s not found in row %ld of table %s",
-                columnName, i, tableName);
+                    columnName, i, tableName);
             return false;
         }
@@ -69 +69 @@
             // if state isn't cleaned or full we can't set it to cleaned
             psError(PS_ERR_PROGRAMMING, true, "%s with state %s may not be exported cleaned",
-                tableName, state);
+                    tableName, state);
             return false;
         }
@@ -75 +75 @@
     return true;
 }
+
+// XXX verify data type?
+bool pxAddLabelSearchArgs (pxConfig *config, psMetadata *where, char *name, char *field, char *op) {
+
+    psMetadataItem *item = psMetadataLookup(config->args, name);
+    if (!item) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for %s", name);
+        return false;
+    }
+    psAssert (item->type == PS_DATA_METADATA_MULTI, "%s should be a multi container", name);
+    psAssert (item->data.list->n, "%s should at least have a place-holder", name);
+    psMetadataItem *entry = (psMetadataItem *)item->data.list->head->data;
+    psAssert (entry, "%s should at least have a place-holder", name);
+    if (entry->data.str) {
+        psListIterator *iter = psListIteratorAlloc (item->data.list, PS_LIST_HEAD, true);
+        psMetadataItem *item = NULL;
+        while ((item = psListGetAndIncrement(iter))) {
+            // need to change the name and comment
+            psFree (item->name);
+            item->name = psStringCopy (field);
+            psFree (item->comment);
+            item->comment = psStringCopy (op);
+            if (!psMetadataAddItem(where, item, PS_LIST_TAIL, PS_META_DUPLICATE_OK)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item %s", field);
+                psFree(where);
+                return false;
+            }
+        }
+        psFree (iter);
+    }
+    return true;
+}