Index: trunk/ippTasks/rcserver.pro
===================================================================
--- trunk/ippTasks/rcserver.pro	(revision 23861)
+++ trunk/ippTasks/rcserver.pro	(revision 23912)
@@ -9,14 +9,14 @@
 ### Initialise the books containing the tasks to do
 book init rcPendingFS
-book init rcPendingDS
+book init rcPendingDest
 
 ### Database lists
 $rcPendingFS_DB = 0
-$rcPendingDS_DB = 0
+$rcPendingDest_DB = 0
 
 ### Check status of tasks
 macro rcserver.status
   book listbook rcPendingFS
-  book listbook rcPendingDS
+  book listbook rcPendingDest
 end
 
@@ -24,5 +24,5 @@
 macro rcserver.reset
   book init rcPendingFS
-  book init rcPendingDS
+  book init rcPendingDest
 end
 
@@ -35,8 +35,8 @@
     active true
   end
-  task rcserver.checkruns.load
-    active true
-  end
-  task rcserver.checkruns.run
+  task rcserver.checkstatus.load
+    active true
+  end
+  task rcserver.checkstatus.run
     active true
   end
@@ -49,8 +49,8 @@
     active false
   end
-  task rcserver.checkruns.load
-    active false
-  end
-  task rcserver.checkruns.run
+  task rcserver.checkstatus.load
+    active false
+  end
+  task rcserver.checkstatus.run
     active false
   end
@@ -169,5 +169,5 @@
 
 
-task	       rcserver.checkruns.load
+task	       rcserver.checkstatus.load
   host         local
 
@@ -177,19 +177,17 @@
   npending     1
 
-  active false
-
   stdout NULL
-  stderr $LOGDIR/rcserver.checkruns.load.log
-
-  task.exec
-    $run = disttool -pendingdatastores
+  stderr $LOGDIR/rcserver.checkstatus.load.log
+
+  task.exec
+    $run = disttool -pendingdest
     if ($DB:n == 0)
       option DEFAULT
     else
       # save the DB name for the exit tasks
-      option $DB:$rcPendingDS_DB
-      $run = $run -dbname $DB:$rcPendingDS_DB
-      $rcPendingDS_DB ++
-      if ($rcPendingDS_DB >= $DB:n) set rcPendingDS_DB = 0
+      option $DB:$rcPendingDest_DB
+      $run = $run -dbname $DB:$rcPendingDest_DB
+      $rcPendingDest_DB ++
+      if ($rcPendingDest_DB >= $DB:n) set rcPendingDest_DB = 0
     end
     add_poll_args run
@@ -200,11 +198,11 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout rcPendingDS -key fs_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    ipptool2book stdout rcPendingDest -key dest_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
-      book listbook rcPendingDS
+      book listbook rcPendingDest
     end
 
     # delete existing entries in the appropriate pantaskStates
-    process_cleanup rcPendingDS
+    process_cleanup rcPendingDest
   end
 
@@ -220,33 +218,33 @@
 end
 
-task	       rcserver.checkruns.run
+task	       rcserver.checkstatus.run
   periods      -poll $RUNPOLL
   periods      -exec $RUNEXEC
   periods      -timeout 60
 
-  active false
-
-  task.exec
-    book npages rcPendingDS -var N
+  periods      -exec 20
+
+  task.exec
+    book npages rcPendingDest -var N
     if ($N == 0) break
     if ($NETWORK == 0) break
     
     # look for new components to process (pantaskState == INIT)
-    book getpage rcPendingDS 0 -var pageName -key pantaskState INIT
+    book getpage rcPendingDest 0 -var pageName -key pantaskState INIT
     if ("$pageName" == "NULL") break
 
-    book setword rcPendingDS $pageName pantaskState RUN
-    book getword rcPendingDS $pageName dist_id -var DIST_ID
-    book getword rcPendingDS $pageName stage   -var STAGE
-    book getword rcPendingDS $pageName stage_id -var STAGE_ID
-    book getword rcPendingDS $pageName outdir -var OUTDIR
+    stdout NULL
+    stderr $LOGDIR/rcserver.checkstatus.run.log
+
+    book setword rcPendingDest $pageName pantaskState RUN
+    book getword rcPendingDest $pageName dest_id -var DEST_ID
+    book getword rcPendingDest $pageName prod_id -var PROD_ID
+    book getword rcPendingDest $pageName status_uri -var STATUS_URI
+    book getword rcPendingDest $pageName last_fileset -var LAST_FILESET
+    book getword rcPendingDest $pageName dbname -var DBNAME
 
     host anyhost
 
-    sprintf logfile "%s/dist.advance.%s.log" $OUTDIR $DIST_ID
-    stdout $logfile
-    stderr $logfile
-
-    $run = dist_advancerun.pl --dist_id $DIST_ID --stage $STAGE --stage_id $STAGE_ID --outdir $OUTDIR --logfile $logfile
+    $run = rcserver_checkstatus.pl --dest_id $DEST_ID --prod_id $PROD_ID --status_uri $STATUS_URI --last_fileset $LAST_FILESET
     add_standard_args run
 
@@ -263,5 +261,5 @@
   # default exit status
   task.exit    default
-    process_exit rcPendingDS $options:0 $JOB_STATUS
+    process_exit rcPendingDest $options:0 $JOB_STATUS
   end
 
@@ -269,6 +267,6 @@
   task.exit    timeout
     showcommand timeout
-    book setword rcPendingDS $options:0 pantaskState TIMEOUT
-  end
-end
-
+    book setword rcPendingDest $options:0 pantaskState TIMEOUT
+  end
+end
+