Changeset 29837 for branches/eam_branches/ipp-20101103/ippTasks/publish.pro

Timestamp:

Nov 26, 2010, 10:34:11 AM (16 years ago)

Author:

eugene

Message:

merge updates from trunk

Location:

branches/eam_branches/ipp-20101103/ippTasks

Files:

• . (modified) (1 prop)
• publish.pro (modified) (4 diffs)

branches/eam_branches/ipp-20101103/ippTasks/publish.pro

@@ -15 +15 @@
 
 macro publish.on
-  task publish.trigger
-    active true
-  end
   task publish.load
     active true
@@ -30 +27 @@
 
 macro publish.off
-  task publish.trigger
-    active false
-  end
   task publish.load
     active false
@@ -59 +53 @@
 
 # this variable will cycle through the known database names
-$publish_trigger_DB = 0
 $publish_load_DB = 0
 $publish_revert_DB = 0
 
-task           publish.trigger
+task           publish.load
   host         local
 
@@ -72 +65 @@
 
   stdout NULL
-  stderr $LOGDIR/publish.trigger.log
-
-  task.exec
-    if ($LABEL:n == 0) break
-    #otherwise everything will be queued when there is no label.
-    $run = pubtool -definerun
-    if ($DB:n == 0)
-      option DEFAULT
-    else
-      # save the DB name for the exit tasks
-      option $DB:$publish_trigger_DB
-      $run = $run -dbname $DB:$publish_trigger_DB
-      $publish_trigger_DB ++
-      if ($publish_trigger_DB >= $DB:n) set publish_trigger_DB = 0
-    end
-    add_poll_labels run
-    command $run
-  end
-
-  # success
-  task.exit    0
-  end
-
-  # locked list
-  task.exit    default
-    showcommand failure
-  end
-
-  task.exit    crash
-    showcommand crash
-  end
-
-  # operation times out?
-  task.exit    timeout
-    showcommand timeout
-  end
-end
-
-task           publish.load
-  host         local
-
-  periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 30
-  npending     1
-
-  stdout NULL
   stderr $LOGDIR/publish.load.log
 
-  # this query should probably be label-based...
   task.exec
     $run = pubtool -pending