Changeset 35350 for branches/eam_branches/ipp-20130307/ippTasks/minidvodb.pro

Timestamp:

Apr 2, 2013, 3:01:21 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130307

Files:

• . (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippTasks/minidvodb.pro (modified) (2 diffs)

branches/eam_branches/ipp-20130307/ippTasks/minidvodb.pro

@@ -145 +145 @@
   book setword MINIDVODB_PREMERGE $1 MINIDVODB_GROUP $1
   book setword MINIDVODB_PREMERGE $1 DVODB $3
+  book setword MINIDVODB_PREMERGE $1 CAMERA $5
   book setword MINIDVODB_PREMERGE $1 STATE PENDING
   #active  
@@ -443 +444 @@
     book getword minidvodbPreMergelist $pageName minidvodb_group -var MINIDVODB_GROUP
     book getword minidvodbPreMergelist $pageName minidvodb_path -var MINIDVODB_PATH
+    book getword minidvodbPreMergelist $pageName camera -var CAMERA
     book getword minidvodbPreMergelist $pageName state -var STATE
     stdout $LOGDIR/minidvodb.premerge.run.log
     stderr $LOGDIR/minidvodb.premerge.run.log
 
-    $run = minidvodb_premerge.pl --camera GPC1 --minidvodb $MINIDVODB_PATH --minidvodb_group $MINIDVODB_GROUP --minidvodb_id $MINIDVODB_ID
+    $run = minidvodb_premerge.pl --camera $CAMERA --minidvodb $MINIDVODB_PATH --minidvodb_group $MINIDVODB_GROUP --minidvodb_id $MINIDVODB_ID
     
   if ($DB:n == 0)