Index: /trunk/Mars/datacenter/db/run_comment.php =================================================================== --- /trunk/Mars/datacenter/db/run_comment.php (revision 13314) +++ /trunk/Mars/datacenter/db/run_comment.php (revision 13315) @@ -12,5 +12,16 @@ if (empty($_GET["fRunID"])) - $_GET["fRunID"]="001"; + $_GET["fRunID"]="all"; + + if (empty($_GET["fSequenceID"])) + $_GET["fSequenceID"]="all"; + + if (empty($_GET["fTable"])) + { + $_GET["fTable"]="RunComments"; +// $_GET["fTable"]="SequenceComments"; + $sign=strpos($_SERVER['REQUEST_URI'], "?")==false ? "?" : "&"; + $_SERVER['REQUEST_URI']=$_SERVER['REQUEST_URI'] . $sign . "fTable=RunComments"; + } if (empty($_GET["fNight"])) @@ -19,5 +30,4 @@ if (strcmp($_GET["fMode"], "tooltip")!=0) echo (file_get_contents("index-header.html")); - @@ -52,8 +62,8 @@ //for insert if (strcmp($_GET["fMode"], "insert")==0) - $query0 = "INSERT RunComments SET "; + $query0 = "INSERT " . $_GET["fTable"] . " SET "; //for update if (strcmp($_GET["fMode"], "update")==0) - $query0 = "UPDATE RunComments SET "; + $query0 = "UPDATE " . $_GET["fTable"] . " SET "; //for both $query0.= " fComment='".str_replace("'", "\'", $_GET["fComment"])."'"; @@ -63,12 +73,18 @@ { $query0.=", fNight=".$_GET["fNight"]; - $query0.= ", fRunID=".$_GET["fRunID"]; + if (strcmp($_GET["fTable"], "RunComments")==0) + $query0.= ", fRunID=".$_GET["fRunID"]; + if (strcmp($_GET["fTable"], "SequenceComments")==0) + $query0.= ", fSequenceID=".$_GET["fSequenceID"]; } //for update if (strcmp($_GET["fMode"], "update")==0) { - $query2="SELECT fCommentKEY FROM RunComments "; + $query2="SELECT fCommentKEY FROM " . $_GET["fTable"]; $query2.=" WHERE fNight=".$_GET["fNight"]; - $query2.=" AND fRunID=".$_GET["fRunID"]; + if (strcmp($_GET["fTable"], "RunComments")==0) + $query2.=" AND fRunID=".$_GET["fRunID"]; + if (strcmp($_GET["fTable"], "SequenceComments")==0) + $query2.=" AND fSequenceID=".$_GET["fSequenceID"]; $query2.=" AND fComment='".str_replace("'", "\'", $_GET["fOldComment"])."'"; $result2=mysql_query($query2, $db_id); @@ -78,4 +94,5 @@ $query0.=" WHERE fCommentKEY=".$commentkey; } + //echo "insert query: " . $query0 . "
"; $result0=mysql_query($query0, $db_id); mysql_close($db_id); @@ -91,31 +108,73 @@ if (strcmp($_GET["fMode"], "tooltip")!=0) { + //mode printf("With this page, you can \n"); //view mode if (strcmp($_GET["fMode"], "view")==0) - printf("view,\n"); + printf("view,\n"); else printf("view,\n", str_replace($_GET["fMode"], 'view', $_SERVER['REQUEST_URI'])); //update mode if (strcmp($_GET["fMode"], "update")==0) - printf("update and\n"); + printf("update and\n"); else printf("update and \n", str_replace($_GET["fMode"], 'update', $_SERVER['REQUEST_URI'])); //insert mode if (strcmp($_GET["fMode"], "insert")==0) - printf("insert\n"); + printf("insert\n"); else printf("insert \n", str_replace($_GET["fMode"], 'insert', $_SERVER['REQUEST_URI'])); - printf("entries in the table RunComment from the DB %s.

\n", $db); - - //insert field for run number + + //table + printf("entries in the tables %s \n", $_GET["fTable"]); + if (strcmp($_GET["fTable"], "RunComments")==0) + printf(" and SequenceComments \n", str_replace($_GET["fTable"], 'SequenceComments', $_SERVER['REQUEST_URI'])); + else + printf(" and RunComments \n", str_replace($_GET["fTable"], 'RunComments', $_SERVER['REQUEST_URI'])); + //database + printf("from the DB %s.

\n", $db); + + //insert field for run/sequence number printf("
\n"); - printf("Run# (YYYYMMDD_FFF) \n", $_GET["fNight"]); - printf("_ \n", $_GET["fRunID"]); + if (strcmp($_GET["fTable"], "RunComments")==0) + { + printf("Run# (YYYYMMDD_FFF) \n", $_GET["fNight"]); + printf("_ \n", $_GET["fRunID"]); + } + if (strcmp($_GET["fTable"], "SequenceComments")==0) + { + printf("Sequence# (YYYYMMDD_FFF) \n", $_GET["fNight"]); + printf("_ \n", $_GET["fSequenceID"]); + } printf("", $_GET["fMode"]); + printf("", $_GET["fTable"]); printf("

\n"); printf("
\n"); } + if (!(preg_match("/20[0-9][0-9][01][0-9][0-3][0-9]/",$_GET["fNight"]) + || (preg_match("/all/",$_GET["fNight"]) && strcmp($_GET["fMode"], "view")==0))) + { + printf("-%s-
", $_GET["fMode"]); + printf("Please enter a valid number for the Night (format: YYYYMMDD)."); + return; + } + + if (strcmp($_GET["fTable"], "RunComments")==0 && + (!(preg_match("/[0-9][0-9][0-9]/",$_GET["fRunID"]) + || (preg_match("/all/",$_GET["fRunID"]) && strcmp($_GET["fMode"], "view")==0)))) + { + printf("Please enter a valid number for the RunID (format: FFF, e.g. 001)."); + return; + } + + if (strcmp($_GET["fTable"], "SequenceComments")==0 && + (!(preg_match("/[0-9][0-9][0-9]/",$_GET["fSequenceID"]) + || (preg_match("/all/",$_GET["fSequenceID"]) && strcmp($_GET["fMode"], "view")==0)))) + { + printf("Please enter a valid number for the SequenceID (format: FFF, e.g. 001)."); + return; + } + $db_id = mysql_pconnect($host, $user, $pw); if ($db_id==FALSE) @@ -126,6 +185,26 @@ mysql_select_db($db); - $query1 = "SELECT CONCAT(fNight,'_', LPAD(fRunID, 3, 0)), fComment FROM RunComments "; - $query1 .= "WHERE fNight=".$_GET["fNight"]." AND fRunID=".$_GET["fRunID"]; + if (strcmp($_GET["fTable"], "RunComments")==0) + $query1 = "SELECT CONCAT(fNight,'_', LPAD(fRunID, 3, 0))"; + if (strcmp($_GET["fTable"], "SequenceComments")==0) + $query1 = "SELECT CONCAT(fNight,'_', LPAD(fSequenceID, 3, 0))"; + $query1 .= ", fComment FROM " . $_GET["fTable"] . " "; + + if (strcmp($_GET["fNight"], "all")!=0) + { + $query1 .= "WHERE fNight=".$_GET["fNight"]; + if (strcmp($_GET["fTable"], "RunComments")==0) + if (strcmp($_GET["fRunID"], "all")!=0) + $query1 .=" AND fRunID=".$_GET["fRunID"]; + if (strcmp($_GET["fTable"], "SequenceComments")==0) + if (strcmp($_GET["fSequenceID"], "all")!=0) + $query1 .=" AND fSequenceID=".$_GET["fSequenceID"]; + } + if (strcmp($_GET["fTable"], "RunComments")==0) + $query1 .= " ORDER BY fNight, fRunID, fCommentKEY "; + if (strcmp($_GET["fTable"], "SequenceComments")==0) + $query1 .= " ORDER BY fNight, fSequenceID, fCommentKEY "; + + //printf("Query: %s
\n\n", $query1); $result1=mysql_query($query1, $db_id); printf("Found %d comment(s).\n\n", mysql_num_rows($result1)); @@ -158,4 +237,6 @@ printf("\n", $_GET["fNight"]); printf("\n", $_GET["fRunID"]); + printf("\n", $_GET["fSequenceID"]); + printf("\n", $_GET["fTable"]); printf("\n"); printf("\n"); @@ -167,5 +248,10 @@ } else - printf("%s_%s: %s\n", $_GET["fNight"], $_GET["fRunID"], $row1[1]); + { + if (strcmp($_GET["fTable"], "RunComments")==0) + printf("%s_%s: %s\n", $_GET["fNight"], $_GET["fRunID"], $row1[1]); + if (strcmp($_GET["fTable"], "SequenceComments")==0) + printf("%s_%s: %s\n", $_GET["fNight"], $_GET["fSequenceID"], $row1[1]); + } } //insert mode @@ -173,5 +259,8 @@ { printf(""); - printf("%s_%s\n", $_GET["fNight"], $_GET["fRunID"]); + if (strcmp($_GET["fTable"], "RunComments")==0) + printf("%s_%s\n", $_GET["fNight"], $_GET["fRunID"]); + if (strcmp($_GET["fTable"], "SequenceComments")==0) + printf("%s_%s\n", $_GET["fNight"], $_GET["fSequenceID"]); printf("\n"); printf("
\n"); @@ -180,4 +269,6 @@ printf("\n", $_GET["fNight"]); printf("\n", $_GET["fRunID"]); + printf("\n", $_GET["fSequenceID"]); + printf("\n", $_GET["fTable"]); printf("\n"); printf("
\n");