Changeset 42464

Timestamp:

May 12, 2023, 11:20:42 AM (3 years ago)

Author:

eugene

Message:

more fixes to the directory hierarchy

Location:

trunk/tools/eam/rawfix.20230221/src

Files:

• advance.rawfix.pl (modified) (1 diff)
• rawfix.burntool.pt (modified) (3 diffs)
• rawfix.fixchip.pt (modified) (5 diffs)
• rawfix.md5sum.pt (modified) (4 diffs)

trunk/tools/eam/rawfix.20230221/src/advance.rawfix.pl

@@ -56 +56 @@
 
     # select and advance nights already running
-    my $sql_get_run = "SELECT dateobs from nights where state like '%.done'";
+    my $sql_get_run = "SELECT dateobs from nights where state like '%.done' and state != 'md5fix.done'";
     my $runref   = $raw_dbh->selectall_arrayref( $sql_get_run );
     my @runarray = @$runref;

trunk/tools/eam/rawfix.20230221/src/rawfix.burntool.pt

@@ -146 +146 @@
     book getword burnhost.book $pageName fixhost -var BURNHOST
     book getword burnhost.book $pageName chipID  -var CHIP_ID
-    option $pageName $DATEOBS
-
-    stdout $DATEOBS/log.burntool.run.$CHIP_ID.v$ITER
-    stderr $DATEOBS/log.burntool.run.$CHIP_ID.v$ITER
 
     substr $DATEOBS 0 4 YEAR
@@ -156 +152 @@
     sprintf STARTDATE "%s/%s/%s" $YEAR $MONTH $DAY
     sprintf ENDDATE "%s/%s/%s,23:59:59" $YEAR $MONTH $DAY
+
+    option $pageName $DATEOBS $YEAR
+    # save DATEOBS so we can find the md5sum.book entry
+    # also save YEAR for output log
+
+    stdout $mypath/$YEAR/$DATEOBS/log.burntool.run.$CHIP_ID.v$ITER
+    stderr $mypath/$YEAR/$DATEOBS/log.burntool.run.$CHIP_ID.v$ITER
 
     host -required $BURNHOST
@@ -274 +277 @@
   $Ndone ++
   book setword burntool.book $options:1 NDONE $Ndone
+
+  sprintf tmpline "%s/%s/%s/log.burntool.runhosts.v%d" $mypath $options:2 $options:1 $ITER
   if ("$1" != "OK")
     book setword burntool.book $options:1 pantasksQuality $1
-    sprintf tmpline "%s/%s/log.burntool.runhosts.v%d" $mypath $options:1 $ITER
     exec echo "failure $1 $options:0" >> $tmpline
   else

trunk/tools/eam/rawfix.20230221/src/rawfix.fixchip.pt

@@ -86 +86 @@
     # save the page so we can use it below
 
+    substr $DATEOBS 0 4 YEAR
+
     # write an entry point in the log for this night
-    sprintf tmpline "%s/%s/log.fixchip.runhosts.v%d" $mypath $DATEOBS $ITER
+    sprintf tmpline "%s/%s/%s/log.fixchip.runhosts.v%d" $mypath $YEAR $DATEOBS $ITER
     date -var mydate
     exec echo "# start runhosts $mydate" >> $tmpline
@@ -149 +151 @@
     book getword fixhost.book $pageName fixhost -var FIXHOST
     book getword fixhost.book $pageName chipID  -var CHIP_ID
-    option $pageName $DATEOBS
 
     substr $DATEOBS 0 4 YEAR
@@ -155 +156 @@
     substr $DATEOBS 6 2 DAY
     sprintf FULLDATE "%s/%s/%s" $YEAR $MONTH $DAY
+
+    option $pageName $DATEOBS $YEAR
+    # save DATEOBS so we can find the md5sum.book entry
+    # also save YEAR for output log
 
     stdout $mypath/$YEAR/$DATEOBS/log.fixchip.run.$CHIP_ID.v$ITER
@@ -268 +273 @@
   end
 
+  # options are : pagename DATEOBS YEAR
+
   book setword fixhost.book $options:0 pantaskState DONE
   book getword fixchip.book $options:1 NHOST -var Nhosts
@@ -274 +281 @@
   $Ndone ++
   book setword fixchip.book $options:1 NDONE $Ndone
+
+  sprintf tmpline "%s/%s/%s/log.fixchip.runhosts.v%d" $mypath $options:2 $options:1 $ITER
   if ("$1" != "OK")
     book setword fixchip.book $options:1 pantasksQuality $1
-    sprintf tmpline "%s/%s/log.fixchip.runhosts.v%d" $mypath $options:1 $ITER
     exec echo "failure $1 $options:0" >> $tmpline
   else

trunk/tools/eam/rawfix.20230221/src/rawfix.md5sum.pt

@@ -86 +86 @@
     # save the page so we can use it below
 
+    substr $DATEOBS 0 4 YEAR
+
     # write an entry point in the log for this night
-    sprintf tmpline "%s/%s/log.md5sum.runhosts.v%d" $mypath $DATEOBS $ITER
+    sprintf tmpline "%s/%s/%s/log.md5sum.runhosts.v%d" $mypath $YEAR $DATEOBS $ITER
     date -var mydate
     exec echo "# start runhosts $mydate" >> $tmpline
@@ -153 +155 @@
     book getword md5host.book $pageName md5host -var MD5HOST
 
-    option $pageName $DATEOBS
+    substr $DATEOBS 0 4 YEAR
+
+    option $pageName $DATEOBS $YEAR
     # save DATEOBS so we can find the md5sum.book entry
-
-    substr $DATEOBS 0 4 YEAR
+    # also save YEAR for output log
 
     # does the output go here?
-    stdout $mypath/$YEAR/$DATEOBS/log.md5sum.runhosts.v$ITER  
-    stderr $mypath/$YEAR/$DATEOBS/log.md5sum.runhosts.v$ITER  
+    stdout $mypath/$YEAR/$DATEOBS/log.md5sum.$MD5HOST.v$ITER  
+    stderr $mypath/$YEAR/$DATEOBS/log.md5sum.$MD5HOST.v$ITER  
 
     $USE_HOST = $MD5HOST
@@ -276 +279 @@
   end
 
+  # options are : pagename DATEOBS YEAR
+
   book setword md5host.book $options:0 pantaskState DONE
   book getword md5sum.book $options:1 NHOST -var Nhosts
@@ -282 +287 @@
   $Ndone ++
   book setword md5sum.book $options:1 NDONE $Ndone
+
+  sprintf tmpline "%s/%s/%s/log.md5sum.runhosts.v%d" $mypath $options:2 $options:1 $ITER
   if ("$1" != "OK")
     book setword md5sum.book $options:1 pantasksQuality $1
-    sprintf tmpline "%s/%s/log.md5sum.runhosts.v%d" $mypath $options:1 $ITER
     exec echo "failure $1 $options:0" >> $tmpline
   else