Changeset 16593 for trunk/pstamp/src/pstampparse.c

Timestamp:

Feb 21, 2008, 6:48:35 PM (18 years ago)

Author:

bills

Message:

Various updates and additions

Location:

trunk/pstamp/src

Files:

• . (modified) (1 prop)
• pstampparse.c (modified) (4 diffs)

trunk/pstamp/src

@@ -1 +1 @@
 ppstamp
+pstampparse
+pstamprequest
 Makefile
 Makefile.in

@@ -1 +1 @@
 ppstamp
+pstampparse
+pstamprequest
 Makefile
 Makefile.in

trunk/pstamp/src/pstampparse.c

@@ -11 +11 @@
     pmConfig    *config;
     psString    fileName;
+    psString    outputDirectory;
     psMetadata  *md;
     psString    roiString;
@@ -88 +89 @@
     if ((argnum = psArgumentGet(argc, argv, "-simple"))) {
         options->simple = true;
+        psArgumentRemove(argnum, &argc, argv);
+    }
+    if ((argnum = psArgumentGet(argc, argv, "-out_dir"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        if (argnum == argc) {
+            fprintf(stderr, "value required for out_dir\n");
+            usage();
+        }
+        options->outputDirectory = argv[argnum];
         psArgumentRemove(argnum, &argc, argv);
     }
@@ -538 +548 @@
 static psArray * parseByCoord(pspOptions *options)
 {
-    psError(PS_ERR_UNKNOWN, true, "REQ_TYPE: bycoord not implemented yet");
+    psError(PSTAMP_ERR_NOT_IMPLEMENTED, true, "REQ_TYPE: bycoord not implemented yet");
     return NULL;
 }
@@ -591 +601 @@
     psString cmd = NULL;
 
-    psStringAppend(&cmd, "pstamptool -addjob -req_id %ld -uri %s -outputBase %s -args '%s' >/dev/null",
-                                options->req_id, uri, outputBase, commandArgs);
+    psStringAppend(&cmd, "pstamptool -addjob -req_id %ld -uri %s -outputBase ", options->req_id, uri);
+    
+    if (options->outputDirectory) {
+        psStringAppend(&cmd, "%s/", options->outputDirectory);
+    }
+    
+    psStringAppend(&cmd, "%s -args '%s' >/dev/null", outputBase, commandArgs);
+
     if (options->verbose) {
         fprintf(stderr, "excuting system(%s)\n", cmd);

@@ -1 +1 @@
 ppstamp
+pstampparse
+pstamprequest
 Makefile
 Makefile.in