Changeset 9603 for trunk

Timestamp:

06/30/10 16:40:42 (14 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter

Files:

• db/mcinfo.php (modified) (2 diffs)
• scripts/runceres (added)
• scripts/runcorsika (modified) (1 diff)

trunk/MagicSoft/Mars/datacenter/db/mcinfo.php

@@ -55 +55 @@
                             ." IF (NOT ISNULL(" . $key . "Status.fStartTime) "
                             ." AND NOT ISNULL(" . $key . "Status.fStopTime) "
-                            ." AND ISNULL(" . $key . "Status.fReturnCode), 'done', 'bla' "
+                            ." AND ISNULL(" . $key . "Status.fReturnCode), 'done', 'failed' "
                             ." )))) AS '". $key . "', ";
             }
@@ -80 +80 @@
                         $query0 .= " ISNULL(" . $key . "Status.fStopTime) AND ";
                         $query0 .= " ISNULL(" . $key . "Status.fReturnCode), 'not done', ";
+                        $query0 .= " IF (NOT ISNULL(" . $key . "Status.fStartTime) ";
+                        $query0 .= " AND ISNULL(" . $key . "Status.fStopTime) ";
+                        $query0 .= " AND ISNULL(" . $key . "Status.fReturnCode), ";
+                        $query0 .= " CONCAT('running (since ', " . $key . "Status.fStartTime, ')'), ";
                         $query0 .= " IF (NOT ISNULL(" . $key . "Status.fReturnCode), ";
                         $query0 .= " CONCAT('failed (', " . $key . "Status.fReturnCode, ')'), ";
                         $query0 .= " CONCAT('done (', " . $key . "Status.fStopTime, ";
-                        $query0 .= " ',', TIMEDIFF(" . $key . "Status.fStopTime, " . $key . "Status.fStartTime), ')'))) ";
+                        $query0 .= " ',', TIMEDIFF(" . $key . "Status.fStopTime, " . $key . "Status.fStartTime), ')')))) ";
 
                         //$query0 .= ", CONCAT( 'halo', " . $key . "Status.fStartTime)";

trunk/MagicSoft/Mars/datacenter/scripts/runcorsika

@@ -195 +195 @@
 wavelengths=`sendquery`
 
-outpath=$mcpath"/"$program"/"`printf %08d $run | cut -c 0-4`/`printf %08d $run | cut -c 5-8`
+outpath=$mcpath"/"$program"/"`printf %08d $run | cut -c 1-4`/`printf %08d $run | cut -c 5-8`
 makedir $outpath 
 logfile=$outpath/cer000`printf %06d $file | cut -c 4-6`".log"