Changeset 25567 for trunk/ippTasks/rcserver.pro

Timestamp:

Sep 24, 2009, 4:27:56 PM (17 years ago)

Author:

bills

Message:

fix some problems with distribution that were introduced by the removal of table rcDSProduct

File:

• trunk/ippTasks/rcserver.pro (modified) (9 diffs)

trunk/ippTasks/rcserver.pro

@@ -4 +4 @@
 check.globals
 
-#$LOGSUBDIR = $LOGDIR/rcserver
+$LOGSUBDIR = $LOGDIR/rcserver
 mkdir $LOGSUBDIR
 
@@ -66 +66 @@
 
   stdout NULL
-  stderr $LOGDIR/rcserver.makefileset.load.log
+  stderr $LOGSUBDIR/rcserver.makefileset.load.log
 
   task.exec
@@ -86 +86 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout rcPendingFS -key dist_id:prod_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    ipptool2book stdout rcPendingFS -key dist_id:dest_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
       book listbook rcPendingFS
@@ -131 +131 @@
     book getword rcPendingFS $pageName dist_dir -var DIST_DIR
 #    book getword rcPendingFS $pageName clean -var CLEAN
-    book getword rcPendingFS $pageName prod_id -var PROD_ID
+    book getword rcPendingFS $pageName dest_id -var DEST_ID
     book getword rcPendingFS $pageName product_name -var PRODUCT_NAME
     book getword rcPendingFS $pageName ds_dbhost -var DS_DBHOST
@@ -141 +141 @@
     host anyhost
 
-    sprintf logfile "%s/makefs.%s.%s.log" $DIST_DIR $DIST_ID $PROD_ID
+    sprintf logfile "%s/makefs.%s.%s.log" $DIST_DIR $DIST_ID $DEST_ID
     stdout $logfile
     stderr $logfile
@@ -147 +147 @@
     book setword rcPendingFS $pageName pantaskState RUN
 
-    $run = dist_make_fileset.pl --dist_id $DIST_ID --target_id $TARGET_ID --stage $STAGE --stage_id $STAGE_ID --prod_id $PROD_ID --product_name $PRODUCT_NAME  --ds_dbhost $DS_DBHOST --ds_dbname $DS_DBNAME --dist_dir $DIST_DIR
+    $run = dist_make_fileset.pl --dist_id $DIST_ID --target_id $TARGET_ID --stage $STAGE --stage_id $STAGE_ID --dest_id $DEST_ID --product_name $PRODUCT_NAME  --ds_dbhost $DS_DBHOST --ds_dbname $DS_DBNAME --dist_dir $DIST_DIR
 
     add_standard_args run
@@ -184 +184 @@
 
   stdout NULL
-  stderr $LOGDIR/rcserver.checkstatus.load.log
+  stderr $LOGSUBDIR/rcserver.checkstatus.load.log
 
   task.exec
@@ -241 +241 @@
 
     stdout NULL
-    stderr $LOGDIR/rcserver.checkstatus.run.log
+    stderr $LOGSUBDIR/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 dest_id -var DEST_ID
     book getword rcPendingDest $pageName status_uri -var STATUS_URI
     book getword rcPendingDest $pageName last_fileset -var LAST_FILESET
@@ -252 +252 @@
     host anyhost
 
-    $run = rcserver_checkstatus.pl --dest_id $DEST_ID --prod_id $PROD_ID --status_uri $STATUS_URI --last_fileset $LAST_FILESET
+    $run = rcserver_checkstatus.pl --dest_id $DEST_ID --dest_id $DEST_ID --status_uri $STATUS_URI --last_fileset $LAST_FILESET
     add_standard_args run