Changeset 10454

Timestamp:

Dec 4, 2006, 3:16:24 PM (20 years ago)

Author:

jhoblitt

Message:

add handling for file_id & complete implementation

File:

• trunk/ippTasks/summit.copy.pro (modified) (6 diffs)

trunk/ippTasks/summit.copy.pro

@@ -150 +150 @@
         for i 0 $Nstdout
             queuepop stdout -var line
-            list word -split $line
-            $exp_id     = $word:0
-            $camera     = $word:1
-            $telescope  = $word:2
-            $bytes      = $word:3
-            $md5sum     = $word:4
-            $class      = $word:5
-            $class_id   = $word:6
-            $uri        = $word:7
-
-            queuepush pzPendingImfile -uniq -key 1:2:3:6:7 "NEW $line"
+#            list word -split $line
+#            $exp_id     = $word:0
+#            $camera     = $word:1
+#            $telescope  = $word:2
+#            $file_id    = $word:3
+#            $bytes      = $word:4
+#            $md5sum     = $word:5
+#            $class      = $word:6
+#            $class_id   = $word:7
+#            $uri        = $word:8
+#            $exp_tag    = $word:9
+
+            queuepush pzPendingImfile -uniq -key 1:2:3:7:8 "NEW $line"
         end
 
@@ -192 +194 @@
 
         # put the line back into the queue with a stea of RUN
-        queuepush pzPendingImfile -replace -key 1:2:3:6:7 "RUN $line"
+        queuepush pzPendingImfile -replace -key 1:2:3:7:8 "RUN $line"
 
         # the STATE has already been removed from the line
@@ -199 +201 @@
         $camera     = $word:1
         $telescope  = $word:2
-        $bytes      = $word:3
-        $md5sum     = $word:4
-        $class      = $word:5
-        $class_id   = $word:6
-        $uri        = $word:7
+        $file_id    = $word:3
+        $bytes      = $word:4
+        $md5sum     = $word:5
+        $class      = $word:6
+        $class_id   = $word:7
+        $uri        = $word:8
+        $exp_tag    = $word:9
 
 #        # specify choice of remote host:(need to choose based on chips)
@@ -229 +233 @@
         $camera     = $word:1
         $telescope  = $word:2
-        $bytes      = $word:3
-        $md5sum     = $word:4
-        $class      = $word:5
-        $class_id   = $word:6
-        $uri        = $word:7
+        $file_id    = $word:3
+        $bytes      = $word:4
+        $md5sum     = $word:5
+        $class      = $word:6
+        $class_id   = $word:7
+        $uri        = $word:8
+        $exp_tag    = $word:9
         queuepush pzCopyDone -key 1:2:3:6:7 "NEW $exp_id $camera $telescope $bytes $md5sum $class $class_id $workdir/$exp_id.$class_id.fits"
         queuepush pzPendingExp -replace -key 1:2:3:6:7 "DONE $options:0"
@@ -265 +271 @@
 
         # put the line back into the queue with a stea of RUN
-        queuepush pzCopyDone -replace -key 1:2:3:6:7 "RUN $line"
+        queuepush pzCopyDone -replace -key 1:2:3:7:8 "RUN $line"
 
         # the STATE has already been removed from the line
@@ -272 +278 @@
         $camera     = $word:1
         $telescope  = $word:2
-        $bytes      = $word:3
-        $md5sum     = $word:4
-        $class      = $word:5
-        $class_id   = $word:6
-        $uri        = $word:7
+        $file_id    = $word:3
+        $bytes      = $word:4
+        $md5sum     = $word:5
+        $class      = $word:6
+        $class_id   = $word:7
+        $uri        = $word:8
+        $exp_tag    = $word:9
 
         # store the current line without the state
         options "$line"
 
-        local cmd
-        $cmd = pztool -copydone -exp_id $exp_id -inst $camera -telescope $telescope -class $class -class_id $class_id -uri $uri 
-        echo command $cmd
-        command $cmd
+        echo command pztool -copydone -exp_id $exp_id -inst $camera -telescope $telescope -class $class -class_id $class_id -uri $uri 
+        command pztool -copydone -exp_id $exp_id -inst $camera -telescope $telescope -class $class -class_id $class_id -uri $uri 
     end