Changeset 32283 for trunk/ippTasks

Timestamp:

Sep 1, 2011, 2:12:15 PM (15 years ago)

Author:

watersc1

Message:

Fix magictool to understand that we sometimes want to allow multiple diffs in the same label to be independently processed.

File:

• trunk/ippTasks/survey.pro (modified) (3 diffs)

trunk/ippTasks/survey.pro

@@ -213 +213 @@
 # user functions to manipulate magic labels
 macro survey.add.magic
-  if ($0 != 3)
-    echo "USAGE: survey.add.magic (label) (workdir base)"
+  if (($0 != 3)&&($0 != 4))
+    echo "USAGE: survey.add.magic (label) (workdir base) (multidiff)"
     break
   end
   book newpage SURVEY_MAGIC $1
   book setword SURVEY_MAGIC $1 WORKDIR $2
+  if ($0 == 3)
+     book setword SURVEY_MAGIC $1 MULTIDIFF FALSE
+  else 
+     book setword SURVEY_MAGIC $1 MULTIDIFF $3
+  end
   book setword SURVEY_MAGIC $1 STATE PENDING
 end
@@ -725 +730 @@
     book setword SURVEY_MAGIC $label STATE DONE
     book getword SURVEY_MAGIC $label WORKDIR -var workdir
-  
-    $run = magictool -rerun -definebyquery -label $label -diff_label $label -workdir $workdir/$label
+    book getword SURVEY_MAGIC $label MULTIDIFF -var multidiff
+
+    $run = magictool -pretend -rerun -definebyquery -label $label -diff_label $label -workdir $workdir/$label
+    
+    if (("$multidiff" == "TRUE")||("$multidiff" == "MULTIDIFF"))
+       $run = $run -multidiff
+    end
 
     if ($DB:n == 0)
@@ -735 +745 @@
     end
     
-    # echo $run
+    echo $run
     command $run
   end