Changeset 10020

Timestamp:

Nov 16, 2006, 2:22:32 PM (20 years ago)

Author:

jhoblitt

Message:

init/cleanup pslib & psmodules
convert to psTrace() for debugging statements

File:

• trunk/ippTools/src/pzgetexp.c (modified) (4 diffs)

trunk/ippTools/src/pzgetexp.c

@@ -31 +31 @@
 #define PRODUCT_LS_CMD "dsproductls"
 
+static bool go (pxConfig *config);
 static psArray *parseFileSets(pxConfig *config, const char *str);
 
 int main(int argc, char **argv)
 {
+    psLibInit(NULL);
+
     pxConfig *config = pzgetexpConfig(NULL, argc, argv);
 
+    if (!go(config)) {
+        goto FAIL;
+    }
+
+    psFree(config);
+    pmConfigDone();
+    psLibFinalize();
+
+    exit(EXIT_SUCCESS);
+
+FAIL:
+    psFree(config);
+    pmConfigDone();
+    psLibFinalize();
+
+    exit(EXIT_FAILURE);
+}
+
+static bool go(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
     // find last fileset/exp_id (if we have one)
     bool haveLastFileSet = false;
@@ -75 +99 @@
     }
 
-    // XXX debugging
-    fprintf(stderr, "cmd is: %s\n", cmd);
+    psTrace("pzgetexp", PS_LOG_INFO, "cmd is: %s\n", cmd);
 
     FILE *output = popen(cmd, "r");
@@ -214 +237 @@
     psString line;
     while ((line = psListGetAndIncrement(lineCursor))) {
+        psTrace("pzgetimfile", PS_LOG_INFO, "parsing line: %s\n", line);
+
         // split line into tokens
         psList *tokens = psStringSplit(line, " ", false);
@@ -286 +311 @@
         }
 
+        // must be freed after the new metadata is built -- holds the strings
+        psFree(tokenCursor);
+        psFree(tokens);
+
         // add the new metadata to the result set
         psArrayAdd(summitExps, 0, md);
 
-        psFree(tokenCursor);
-        psFree(tokens);
+        // debugging
+        if (psTraceGetLevel("pzgetexp") == PS_LOG_INFO) {
+            psString doc = psMetadataConfigFormat(md);
+            psTrace("pzgetexp", PS_LOG_INFO, "parsed line as:\n %s\n", doc);
+            psFree(doc);
+        }
+
+        psFree(md);
 
     }