Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 8742) +++ trunk/MagicSoft/Mars/Changelog (revision 8743) @@ -18,4 +18,16 @@ -*-*- END OF LINE -*-*- + + 2007/09/06 Daniela Dorner + + * datacenter/db/resetseq.php: + - added IP addresses + - added project name and start time to list + - added color coding + - improved output + - added mars version to output + + + 2007/09/06 Stefan Ruegamer Index: trunk/MagicSoft/Mars/datacenter/db/resetseq.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/resetseq.php (revision 8742) +++ trunk/MagicSoft/Mars/datacenter/db/resetseq.php (revision 8743) @@ -11,8 +11,9 @@ mysql_select_db($db); - $query1="SELECT MAX(fStartDate) FROM MarsVersion"; - $dateresult=mysql_query($query1); - $row = mysql_fetch_row($dateresult); - $date=$row[0]; + $query1="SELECT fMarsVersionName, fStartDate FROM MarsVersion ORDER BY fMarsVersion DESC LIMIT 0,1"; + $marsresult=mysql_query($query1); + $row = mysql_fetch_row($marsresult); + $mars=$row[0]; + $date=$row[1]; if (mysql_errno()>0) printf("  Error-Number: %s
", mysql_errno()); @@ -21,8 +22,8 @@ if (mysql_info()!="") printf("  Mysql-Info: %s
", mysql_info()); - mysql_free_result($dateresult); - if (empty($date)) - { - printf("Could not get date of latest Mars version from database."); + mysql_free_result($marsresult); + if (empty($mars)) + { + printf("Could not get information for latest Mars version from the database."); return; } @@ -30,16 +31,20 @@ if (empty($_GET["insert"])) { - $query0 = "SELECT fSequenceFirst, "; - $query0 .= "if (fCallisto " . " < '" . $date . "', 'callisto to be resetted', "; - $query0 .= "if (not isnull(fCallisto), 'callisto already processed with new release', "; - $query0 .= "if (fStartTime > ADDDATE(Now(), INTERVAL -1 DAY) AND isnull(fFailedTime), 'callisto running',"; - $query0 .= "if (isnull(fFailedTime), 'callisto already resetted for new release', "; - $query0 .= " 'callisto crashed or failed')))) as 'calstat', "; - $query0 .= "if (fStar " . " < '" . $date . "', 'star to be resetted', "; - $query0 .= "if (not isnull(fStar), 'star already processed with new release', "; - $query0 .= "if (fStartTime > ADDDATE(Now(), INTERVAL -1 DAY) AND isnull(fFailedTime), 'star running',"; - $query0 .= "if (isnull(fFailedTime), 'star already resetted for new release', "; - $query0 .= " 'star crashed or failed')))) as 'starstat' "; + $query0 = "SELECT SequenceProcessStatus.fSequenceFirst, "; +// $query0 .= "if (fCallisto " . " < '" . $date . "', 'to be resetted', "; + $query0 .= "if (fCallisto " . " < '" . $date . "', CONCAT('outdated (', (SELECT fMarsVersionName FROM MarsVersion WHERE fCallisto > fStartDate ORDER BY fMarsVersion DESC LIMIT 0,1), ')'), "; + $query0 .= "if (not isnull(fCallisto), 'up to date (" . $mars . ")', "; + $query0 .= "if (fStartTime > ADDDATE(Now(), INTERVAL -1 DAY) AND isnull(fFailedTime), 'running (" . $mars . ")',"; + $query0 .= "if (isnull(fFailedTime), 'already resetted', "; + $query0 .= " 'crashed or failed')))) as 'calstat', "; +// $query0 .= "if (fStar " . " < '" . $date . "', 'to be resetted', "; + $query0 .= "if (fStar " . " < '" . $date . "', CONCAT('outdated (', (SELECT fMarsVersionName FROM MarsVersion WHERE fStar > fStartDate ORDER BY fMarsVersion DESC LIMIT 0,1), ')'), "; + $query0 .= "if (not isnull(fStar), 'up to date (" . $mars . ")', "; + $query0 .= "if (fStartTime > ADDDATE(Now(), INTERVAL -1 DAY) AND isnull(fFailedTime) AND not isnull(fCallisto), 'running (" . $mars . ")',"; + $query0 .= "if (isnull(fFailedTime), 'already resetted', "; + $query0 .= " 'crashed or failed')))) as 'starstat', fProjectName, fRunStart "; $query0 .= "FROM SequenceProcessStatus "; + $query0 .= "LEFT JOIN Sequences ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst "; + $query0 .= "LEFT JOIN Project ON Project.fProjectKEY=Sequences.fProjectKEY "; } else @@ -63,9 +68,9 @@ if (ereg("^([ ]*[0-9]{5,8}[ ]*[,])*[ ]*[0-9]{5,8}[ ]*$",$_GET["Seqs"])) { - if (strpos($query0, " WHERE ")==FALSE) + if (strpos($query0, " WHERE ")==FALSE || (strpos($query0, " CONCAT(")==TRUE && strpos($query0, " WHERE ")==TRUE)) $query0 .= " WHERE "; else $query0 .= " AND "; - $query0 .=" fSequenceFirst IN (" . $_GET["Seqs"] . ")"; + $query0 .=" SequenceProcessStatus.fSequenceFirst IN (" . $_GET["Seqs"] . ")"; } else @@ -101,5 +106,5 @@ return; } - echo "The status of the sequences you entered:
\n"; +// echo "The status of the sequences you entered:
\n"; $star=""; $callisto=""; @@ -110,24 +115,32 @@ $col = FALSE; $bgcolor='#C0C0C0'; - printf("\n"); - printf("\n\n\n\n\n", $bgcolor); + $checked=0; + printf("
\nSequence\n\nStatus Callisto\n\nStatus Star\n
\n"); + printf("\n\n", $bgcolor); + printf("\n\n"); + printf(""); + printf("\n\n"); + printf("\n\n"); + printf("\n"); while ($row = mysql_fetch_row($result0)) { - if ($row[2]=='star to be resetted' && $_GET["step"]=='star') + if (ereg('outdated', $row[2]) && $_GET["step"]=='star') { $star[]=$row[0]; $starcolor='green'; - $style='bold'; + $style='bold'; + $row[2]=str_replace('outdated', 'marked for reset', $row[2]); } - if ($row[1]=='callisto to be resetted' && $_GET["step"]=='callisto') + if (ereg('outdated', $row[1]) && $_GET["step"]=='callisto') { $callisto[]=$row[0]; $calcolor='green'; + $starcolor='green'; $style='bold'; } - if (($row[1]=='callisto crashed or failed' || $row[2]=='star crashed or failed') && $_GET["step"]=='crashed') + if (($row[1]=='crashed or failed' || $row[2]=='crashed or failed') && $_GET["step"]=='crashed') { $crashed[]=$row[0]; - if ($row[1]=='callisto crashed or failed') + if ($row[1]=='crashed or failed') { $calcolor='green'; @@ -146,9 +159,13 @@ $col = !$col; printf("\n\n", $bgcolor, $style, $row[0]); + printf("\n", $row[3]); printf("\n", $calcolor, $row[1]); - printf("\n\n", $starcolor, $row[2]); + printf("\n", $starcolor, $row[2]); + printf("\n", $row[4]); + printf("\n"); $calcolor='black'; $starcolor='black'; $style='normal'; + $checked+=1; } printf("
\nSequence\n\nProjectName\n\nStatus Callisto\n\nStatus Star\n\nStarttime\n
\n%s \n\n %s \n\n %s \n\n %s \n
\n %s \n\n %s \n
\n"); @@ -157,22 +174,34 @@ printf("
\n You chose to reset only the sequences which are crashed or failed.
\n"); else - printf("
\n Only the sequences which have not yet been processed or resetted, will be resetted.
\n"); - printf("To reset them, please check the insert checkbox and submit again.

\n"); - + printf("
\n Only the sequences which are not 'up to date', 'running' or 'resetted', can be resetted.
\n"); if (empty($star) && empty($callisto) && empty($crashed)) echo "With your choice no sequences would be resetted."; else - echo "With your choice the following sequences would be resetted: "; + echo "With your choice the following sequences would be resetted:\n "; + $marked=0; if (!empty($star)) + { foreach($star as $num => $seq) echo $seq . " "; + $marked+=count($star); + } if (!empty($callisto)) + { foreach($callisto as $num => $seq) echo $seq . " "; + $marked+=count($callisto); + } if (!empty($crashed)) + { foreach($crashed as $num => $seq) echo $seq . " "; + $marked+=count($crashed); + } + printf("
\n Listed: %d
Marked: %d", $checked, $marked); + printf("
\n
\nTo reset the green marked entries, please press the button 'Reset Sequences'.

\n"); + mysql_free_result($result0); - printf("
\n
\n   \n", htmlspecialchars($_SERVER["REQUEST_URI"])); + printf("   \n", htmlspecialchars($_SERVER["REQUEST_URI"])); + } mysql_close($db_id); @@ -192,5 +221,5 @@ echo (file_get_contents("index-header.html")); - $ips=array("91.64.78.187", "132.187.47.10", "132.187.47.67"); + $ips=array("91.64.78.187", "132.187.47.10", "132.187.47.67", "132.187.47.63", "129.217.160.151"); if (!in_array($_SERVER['REMOTE_ADDR'], $ips)) { @@ -217,12 +246,12 @@ printf(" star
", $_GET["step"]=="star" ? "checked" : ""); - printf("\n\n\n\n\n\n\n\n
\nSequences: \n
\n"); - printf("\n
\n
\n", $_GET["Seqs"]); + printf("\n\n\n\n\n\n\n
\nSequences: \n
\n"); + printf("\n
\n
\n", $_GET["Seqs"]); ini_set("mysql.trace_mode", "Off"); // ini_set("display_errors", "Off"); - printf("   \n"); - printf("   \n"); + printf("   \n"); + printf("   \n"); // if (!empty($_GET["step"]) && ereg("^([ ]*[0-9]{5,8}[ ]*[,])*[ ]*[0-9]{5,8}[ ]*$",$_GET["Seqs"])) // printf("insert\n");