Index: trunk/MagicSoft/Mars/datacenter/db/include.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/include.php (revision 7546) +++ trunk/MagicSoft/Mars/datacenter/db/include.php (revision 7873) @@ -118,25 +118,4 @@ } -function PrintLimitsMenu($limits, $rms, $alias) -{ - foreach($limits as $key => $element) - { - printf("%s\n", $alias[$key]); - $mean=$key . "Mean"; - $limitmean=$_GET[$mean]; - printf("\n", $key, $limitmean); - if ($rms[$key]=="yes") - { - $rms2=$key . "Rms"; - $limitrms=$_GET[$rms2]; - printf("\n", $key, $limitrms); - } - else - printf("
\n"); - printf("\n"); - } - -} - function PrintPullDown($host, $user, $pw, $db, $table, $name, $index, $descr) { @@ -257,4 +236,17 @@ printf("\n"); } +} + +function PrintSubmittedQuery($query0, $html, $db, $old) +{ + //diplay query on old websites + if (empty($old)) + printf(""); + else + printf(""); + printf("DB: %s
", $db); + if ($html=="1") + printf("submitted query:
%s
", htmlspecialchars($query0)); + printf(""); } @@ -323,4 +315,31 @@ if ($_GET["fNumStart"]!=0) + { + $uri = htmlspecialchars($_SERVER["REQUEST_URI"]); + $pos = strpos($uri, "fNumStart"); + $amp3=FALSE; + if ($pos!=FALSE) + { + $amp1 = substr($uri, 0, $pos-1); + $amp2 = substr($uri, $pos); + $amp3 = strchr($amp2, "&"); + + $uri = $amp1; + } + $pos = $_GET["fNumStart"]-$rows; + if ($pos<0) + $pos=0; + $uri .= "&fNumStart=" . $pos; + if ($amp3!=FALSE) + $uri .= $amp3; + + $menu .= "<<< Prev\n"; + } + + $menu .= "   --- "; + $menu .= $_GET["fNumStart"]; + $menu .= " ---   \n"; + + if ($rows==$_GET["fNumResults"]) { $uri = $_SERVER["REQUEST_URI"]; @@ -335,41 +354,14 @@ $uri = $amp1; } - $pos = $_GET["fNumStart"]-$rows; - if ($pos<0) - $pos=0; - $uri .= "&fNumStart=" . $pos; - if ($amp3!=FALSE) - $uri .= $amp3; - - $menu .= "<<< Prev\n"; - } - - $menu .= "   --- "; - $menu .= $_GET["fNumStart"]; - $menu .= " ---   \n"; - - if ($rows==$_GET["fNumResults"]) - { - $uri = $_SERVER["REQUEST_URI"]; - $pos = strpos($uri, "fNumStart"); - $amp3=FALSE; - if ($pos!=FALSE) - { - $amp1 = substr($uri, 0, $pos-1); - $amp2 = substr($uri, $pos); - $amp3 = strchr($amp2, "&"); - - $uri = $amp1; - } $uri .= "&fNumStart=" . ($_GET["fNumStart"]+$rows); if ($amp3!=FALSE) $uri .= $amp3; - $menu .= "Next >>>\n"; + $menu .= "Next >>>\n"; } return $menu; } -function RemoveSortBy($rows) +function RemoveSortBy() { $menu = ""; @@ -399,12 +391,25 @@ } -function PrintMagicTable($result0, $alias, $rightalign, $limits, $rms, $_GET) +function PrintMagicTable($result0, $alias, $rightalign, $limitsmean, $limitsmin, $limitsmax, $_GET) { $col = FALSE; $first = TRUE; + $sigma = array + ( + 5 => "#FF9900", + 3 => "#FFFF66", + 2 => "#33CC00", + 1 => "#006600", + ); + $offlimitcolour="#FF0000"; + + + $menu = CreateMenu(mysql_num_rows($result0)); - printf("\n
\n

%s

\n", $menu); + printf("\n

\n"); + if (empty($_GET["fPrintTable"])) + printf("

%s

\n", $menu); printf("\n"); while ($row0 = mysql_fetch_assoc($result0)) @@ -430,6 +435,6 @@ $issort=" "; } - printf(" \n", - RemoveSortBy($_SERVER["REQUEST_URI"]), $col, $ord, $key, $issort); + printf(" \n", + htmlspecialchars(RemoveSortBy()), $col, $ord, $key, $issort); } printf(" \n\n"); @@ -449,47 +454,70 @@ printf(" \n", str_replace("&ws;", " ", str_replace(" ", " ", $element))); } @@ -505,8 +533,10 @@ printf("

Number of displayed results: %d

\n", mysql_num_rows($result0)); - printf("%s\n", $menu); + if (empty($_GET["fPrintTable"])) + printf("%s\n", $menu); printf("

\n"); printf("\n"); - printf("

\n"); + printf("\n"); }
 %s%s  %s%s 
"); - if (!(empty($limits) && empty($rms))) + //determine color of text in cell + foreach($limitsmean as $key2 => $element2) { - foreach($limits as $key2 => $element2) + $mean=$key2 . "Mean"; + $rms2=$key2 . "Rms"; + if ($key==$alias[$element2] && !empty($_GET[$mean])) { - $mean=$key2 . "Mean"; - $rms2=$key2 . "Rms"; - if ($key==$alias[$element2] && !empty($_GET[$mean])) + if (!empty($_GET[$rms2])) { - if ($rms[$key2]=="yes") + $colour=$offlimitcolour; + foreach ($sigma as $margin => $newcolour) { - if (!empty($_GET[$rms2])) - { - $min=$_GET[$mean] - $_GET[$rms2]; - $max=$_GET[$mean] + $_GET[$rms2]; - if ($min < $element && $element < $max) - printf(""); - else - printf(""); - } + $min=$_GET[$mean] - ($margin * $_GET[$rms2]); + $max=$_GET[$mean] + ($margin * $_GET[$rms2]); + if ($min < $element && $element < $max) + $colour=$newcolour; } - else + printf("", $colour); + } + } + } + + foreach($limitsmin as $key2 => $element2) + { + $limit1=$key2 . "1"; + $limit2=$key2 . "2"; + if ($key==$alias[$element2] && !empty($_GET[$limit1])) + { + $colour=$offlimitcolour; + if ($_GET[$limit1] <= $element) + $colour=$sigma[1]; + else + { + if (!empty($_GET[$limit2])) { - if ($rms[$key2]=="min") - { - if ($_GET[$mean] <= $element) - printf(""); - else - printf(""); - } - - if ($rms[$key2]=="max") - { - if ($_GET[$mean] >= $element) - printf(""); - else - printf(""); - } + if ($_GET[$limit2] <= $element) + $colour=$sigma[5]; } } - + printf("", $colour); + } + + } + + foreach($limitsmax as $key2 => $element2) + { + $limit1=$key2 . "1"; + $limit2=$key2 . "2"; + if ($key==$alias[$element2] && !empty($_GET[$limit1])) + { + $colour=$offlimitcolour; + if ($_GET[$limit1] >= $element) + $colour=$sigma[1]; + else + { + if (!empty($_GET[$limit2])) + { + if ($_GET[$limit2] >= $element) + $colour=$sigma[5]; + } + } + printf("", $colour); } } + //fill text in cell printf(" %s 
\n"); + printf("