Changeset 37076 for trunk/ippTasks/survey.pro

Timestamp:

Jul 17, 2014, 2:17:50 PM (12 years ago)

Author:

eugene

Message:

merge previously-unmerged changes from ops tag (20130712): add stsci1X series nodes to skycell targetting; some minor changes to processing tasks

File:

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

trunk/ippTasks/survey.pro

@@ -668 +668 @@
     end
     
-#    echo $run
     command $run
   end
@@ -752 +751 @@
     end
     
-#    echo $run
     command $run
   end
@@ -838 +836 @@
     end
     
-    # echo $run
     command $run
   end
@@ -1437 +1434 @@
   host local
  
-  periods      -poll $SURVEY_POLL
-  periods      -exec $SURVEY_EXEC
+  # we are going to use a long timeout (900 sec) between passes of the list
+  # and a short timeout (10 sec) while we are doing the full list
+  periods      -exec 10
+  periods      -poll 2
   periods      -timeout $SURVEY_TIMEOUT
   npending     1
@@ -1449 +1448 @@
     book npages SURVEY_PUBLISH -var N
     if ($N == 0)
-    #  echo "No labels for processing"
+      # echo "No labels for processing"
       break
     endif
+
+    # short timeout while we have something to do
+    periods -exec 10
 
     # survey.publish allows multiple entries per label.
@@ -1465 +1467 @@
       book getpage SURVEY_PUBLISH 0 -var tag -key STATE NEW
 
-      # Select different database
-      $SURVEY_PUBLISH ++
-      if ($SURVEY_PUBLISH >= $DB:n) set SURVEY_PUBLISH = 0
+      # Select different database, set a long timeout
+      $SURVEY_PUBLISH_DB ++
+      if ($SURVEY_PUBLISH_DB >= $DB:n) set SURVEY_PUBLISH_DB = 0
+      periods -exec 900
+      date -var mytime
+      echo "done with publish list @ $mytime"
     end
 
@@ -1484 +1489 @@
       option DEFAULT
     else
-      $run = $run -dbname $DB:$SURVEY_PUBLISH
-      option $DB:$SURVEY_PUBLISH
+      $run = $run -dbname $DB:$SURVEY_PUBLISH_DB
+      option $DB:$SURVEY_PUBLISH_DB
     end
     
     # echo $run
-
     command $run
     
@@ -1859 +1863 @@
     end
     
-     echo $run
     command $run
   end