Changeset 33009 for branches/haf_add201112/ippTasks/survey.pro

Timestamp:

Dec 23, 2011, 10:03:11 AM (15 years ago)

Author:

heather

Message:

debugging mergestuff

File:

• branches/haf_add201112/ippTasks/survey.pro (modified) (3 diffs)

branches/haf_add201112/ippTasks/survey.pro

@@ -267 +267 @@
   end
   book newpage SURVEY_MERGEDVODB $1
-  book setword SURVEY_MERGEDVODB $1 MERGEDVOD $2
+  book setword SURVEY_MERGEDVODB $1 MERGEDVODB $2
   book setword SURVEY_MERGEDVODB $1 MINIDVODB_GROUP $3
 end
@@ -932 +932 @@
      
  #   $run = addtool -definebyquery -destreaked -label $label -set_dvodb $dbodb
-    $run = mergetool 
+    #$run = mergetool 
+    $run = mergedvodb_queue.pl --outroot $mergedvodb --mergedvodb $mergedvodb --minidvodb_group $minidvodb_group
     if ($DB:n == 0)
       option DEFAULT
@@ -939 +940 @@
       option $DB:$SURVEY_MERGEDVODB_DB
     end
-    
-    $run = $run -definebyquery -mergedvodb $mergedvodb -minidvodb_group $minidvodb_group 
+    #this run doesn't work because there's no workdir 
+    #$run = $run -definebyquery -mergedvodb $mergedvodb -minidvodb_group $minidvodb_group 
+    
+    
     # echo $run