Changeset 31789

Timestamp:

Jun 29, 2011, 11:19:18 AM (15 years ago)

Author:

heather

Message:

addstar survey only does one stage... I fixed this.

File:

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

trunk/ippTasks/survey.pro

@@ -231 +231 @@
 
 macro survey.add.addstar
-  if ($0 != 5)
-    echo "USAGE: survey.add.addstar (label) (dvodb) (minidvodb_group) (stage)"
+  if ($0 != 6)
+    echo "USAGE: survey.add.addstar (tag) (label) (dvodb) (minidvodb_group) (stage)"
     break
   end
   book newpage SURVEY_ADDSTAR $1
-  book setword SURVEY_ADDSTAR $1 DVODB $2
-  book setword SURVEY_ADDSTAR $1 MINIDVODB_GROUP $3
-  book setword SURVEY_ADDSTAR $1 STAGE $4  
+  book setwork SURVEY_ADDSTAR $1 LABEL $2
+  book setword SURVEY_ADDSTAR $1 DVODB $3
+  book setword SURVEY_ADDSTAR $1 MINIDVODB_GROUP $4
+  book setword SURVEY_ADDSTAR $1 STAGE $5  
   book setword SURVEY_ADDSTAR $1 STATE PENDING
 end
@@ -244 +245 @@
 macro survey.del.addstar
   if ($0 != 2)
-    echo "USAGE: survey.del.addstar (label)"
+    echo "USAGE: survey.del.addstar (tag)"
     break
   end
@@ -736 +737 @@
     endif
 
-    book getpage SURVEY_ADDSTAR 0 -var label -key STATE NEW
-    if ("$label" == "NULL")
+    book getpage SURVEY_ADDSTAR 0 -var tag -key STATE NEW
+    if ("$tag" == "NULL")
       # All labels have been done --- reset
 #      echo "Resetting labels"
       for i 0 $N
-        book getpage SURVEY_ADDSTAR $i -var label
-        book setword SURVEY_ADDSTAR $label STATE NEW
+        book getpage SURVEY_ADDSTAR $i -var tag
+        book setword SURVEY_ADDSTAR $tag STATE NEW
       end
-      book getpage SURVEY_ADDSTAR 0 -var label -key STATE NEW
+      book getpage SURVEY_ADDSTAR 0 -var tag -key STATE NEW
 
       # Select different database
@@ -751 +752 @@
     end
 
-    book setword SURVEY_ADDSTAR $label STATE DONE
-    book getword SURVEY_ADDSTAR $label DVODB -var dvodb
-    book getword SURVEY_ADDSTAR $label MINIDVODB_GROUP -var minidvodb_group
-    book getword SURVEY_ADDSTAR $label STAGE -var stage
+    book setword SURVEY_ADDSTAR $tag STATE DONE
+    book getword SURVEY_ADDSTAR $tag LABEL -var label
+    book getword SURVEY_ADDSTAR $tag DVODB -var dvodb
+    book getword SURVEY_ADDSTAR $tag MINIDVODB_GROUP -var minidvodb_group
+    book getword SURVEY_ADDSTAR $tag STAGE -var stage