Changeset 32337 for branches/eam_branches/ipp-20110710/ippTasks/register.pro

Timestamp:

Sep 6, 2011, 11:00:22 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20110710/ippTasks/register.pro (modified) (6 diffs)

branches/eam_branches/ipp-20110710/ippTasks/register.pro

@@ -271 +271 @@
 
   task.exec
+    periods -exec $RUNEXEC
+
+    book npages regPendingImfile -var N
+    if ($N == 0) break
     if ($NETWORK == 0) break
-    book npages regPendingImfile -var N
-    if ($N == 0)
-        periods -exec $RUNEXEC
-        break
-    end
-    periods -exec 0.05 
     
     # look for new images in regPendingImfile
@@ -331 +329 @@
       echo command $run
     end
+    periods -exec 0.05 
     command $run
   end
@@ -636 +635 @@
 
   task.exec
+    periods -exec $RUNEXEC
+
+    book npages regPendingBurntoolImfile -var N
+    if ($N == 0) break
     if ($NETWORK == 0) break
-    book npages regPendingBurntoolImfile -var N
-    if ($N == 0) 
-      periods -exec $RUNEXEC
-      break
-    end
-    periods -exec 0.05
 
     # look for new images to burn in regPendingBurntoolImfile
@@ -651 +648 @@
 
     book getword regPendingBurntoolImfile $pageName exp_id      -var EXP_ID
+    book getword regPendingBurntoolImfile $pageName tmp_class_id -var TMP_CLASS_ID
     book getword regPendingBurntoolImfile $pageName class_id    -var CLASS_ID
     book getword regPendingBurntoolImfile $pageName uri         -var THIS_URI
@@ -656 +654 @@
     book getword regPendingBurntoolImfile $pageName camera      -var CAMERA
     book getword regPendingBurntoolImfile $pageName dbname      -var DBNAME
-    set.host.for.camera $CAMERA $CLASS_ID
+    set.host.for.camera $DBNAME $TMP_CLASS_ID
 
     stdout $LOGDIR/register.burntool.run.log
@@ -673 +671 @@
       echo command $run
     end
+    periods -exec 0.05
     command $run
   end