Changeset 12697 for trunk/ippTasks/pantasks.pro

Timestamp:

Mar 30, 2007, 1:09:39 PM (19 years ago)

Author:

Paul Price

Message:

Changing set_standard_args to employ a filtering approach --- it supplements the command-line instead of providing something that gets added on. Needed to do this because wanted the arguments it provides to be optional, and it really doesn't like to have a zero length string as an argument.

File:

• trunk/ippTasks/pantasks.pro (modified) (1 diff)

trunk/ippTasks/pantasks.pro

@@ -155 +155 @@
 end
 
-macro set_standard_args
-  # XXX be careful: $ARGS cannot be resolved as ""
-  # XXX currently, sprintf is the only good way of creating 
-  # an empty variable
-  if ($?WORKDIR == 0) 
-    echo error in pantasks: WORKDIR not set
+macro add_standard_args
+  if ($0 != 2)
+    echo "Must pass in the command of interest, and this function will supplement"
     stop
   end
-  if ($?DBNAME == 0) 
-    echo error in pantasks: DBNAME not set
-    stop
-  end
-  if ("$DBNAME" != "DEFAULT")
-    $ARGS = --workdir $WORKDIR --dbname $DBNAME
-  else
-    $ARGS = --workdir $WORKDIR
+
+  local command
+  $command = $$1
+
+  if ($?DBNAME && "$DBNAME" != "DEFAULT")
+    $command = $command --dbname $DBNAME
   end
   if ($?NOOP != 0)
-    $ARGS = $ARGS --no-op
-  end
-end
+    $command = $command --no-op
+  end
+  $$1 = $command
+end
+
 
 macro process_exit