Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 8598) +++ /trunk/MagicSoft/Mars/Changelog (revision 8599) @@ -18,4 +18,32 @@ -*-*- END OF LINE -*-*- + + 2007/06/23 Daniela Dorner + + * datacenter/db/index.html: + - added link to showplots-seq.php + - added link to builddatasets.php + + * datacenter/db/showplots-seq.php: + - added (analog to shoeplots-ds, but instead of dataset number a + sequence range and/or a source name can be chosen) + + * datacenter/db/plotinclude.php: + - added function to print pull-down menu for type in showplots*.php + + * datacenter/db/showplots.php: + - moved getting of plotname out of if-clauses + + * datacenter/db/showplots-ds.php: + - added check if datasetfile is existing + + * datacenter/db/showplots-ds.php, datacenter/db/showplots.php: + - added comments + - added home-button + - added reset-button + - changed choosing of type from input field to pull-down menu and + implemented function for this pulldown + + 2007/06/22 Thomas Bretz Index: /trunk/MagicSoft/Mars/datacenter/db/index.html =================================================================== --- /trunk/MagicSoft/Mars/datacenter/db/index.html (revision 8598) +++ /trunk/MagicSoft/Mars/datacenter/db/index.html (revision 8599) @@ -44,4 +44,7 @@
  • Sources - list of sources (possibility to ex/include test- and off-sources)
  • Sequence Build Status: querying only the information from the table SequenceBuildStatus
    • +
  • Build Datasets: webtool to build datasets for the automatic analysis +(for more information mail to: datacenter@a...)
    • +

    @@ -53,4 +56,5 @@

  • All plots of one sequence: click through all calib, signal and star plot of one sequence
  • All plots of one dataset: click through all sequences of one dataset (all plots of calib, signal and star can be viewed)
    • +
  • All plots of one source / sequence range: similar to the previous one, but the sequences are not given by a dataset, but by choosing a source and/or a sequence range.

    • Index: /trunk/MagicSoft/Mars/datacenter/db/plotinclude.php =================================================================== --- /trunk/MagicSoft/Mars/datacenter/db/plotinclude.php (revision 8598) +++ /trunk/MagicSoft/Mars/datacenter/db/plotinclude.php (revision 8599) @@ -158,5 +158,5 @@ } -//functions for showplots.php and showplots2.php +//functions for showplots*.php function gettypename($type2) { @@ -186,3 +186,15 @@ } +function PrintType2Pulldown($type2) +{ + $types=array("calib", "signal", "star"); + printf("\n"); +} + ?> Index: /trunk/MagicSoft/Mars/datacenter/db/showplots-seq.php =================================================================== --- /trunk/MagicSoft/Mars/datacenter/db/showplots-seq.php (revision 8599) +++ /trunk/MagicSoft/Mars/datacenter/db/showplots-seq.php (revision 8599) @@ -0,0 +1,186 @@ +\n"); +printf("\n\n"); +printf("\n"); +printf("show plots\n"); +printf("\n"); +printf("\n"); +printf("\n"); + +//init +$source=""; +if (!empty($_GET["source"])) + $source=$_GET["source"]; +$from=""; +if (!empty($_GET["from"])) + $from=$_GET["from"]; +$to=""; +if (!empty($_GET["to"])) + $to=$_GET["to"]; +$tabnum=1; +if (!empty($_GET["tabnum"])) + $tabnum=$_GET["tabnum"]; +$type2="calib"; +if (!empty($_GET["type2"])) + $type2=$_GET["type2"]; +$plot=""; +$nextseq=0; +$prevseq=0; +$seq=0; +if (!empty($_GET["prevseq"]) && !empty($_GET["prev"])) + $seq=$_GET["prevseq"]; +if (!empty($_GET["nextseq"]) && !empty($_GET["next"])) + $seq=$_GET["nextseq"]; +$next=0; +$prev=0; +$numseq=0; +//$sequences=array(0,10,20); +//$sequences=array(); + + +if (!empty($from) || !empty($to)) +{ + //get sequences from db + $query="SELECT fSequenceFirst FROM Sequences "; + if (!empty($from) && !empty($to)) + $query.="WHERE fSequenceFirst BETWEEN " . $from . " AND " . $to; + else + { + if (!empty($from)) + $query.="WHERE fSequenceFirst > " . $from; + if (!empty($to)) + $query.="WHERE fSequenceFirst < " . $to; + } + // WHERE has to be there as $from is given by default + if (!empty($source)) + $query.=" AND fSourceKEY=" . $source; + + //connection to database + $db_id = mysql_pconnect($host, $user, $pw); + if ($db_id==FALSE) + { + printf("mysql_connect returned the following error: %s\n", mysql_error()); + die(""); + } + mysql_select_db($db); + + $result=mysql_query($query, $db_id); + while ($row = mysql_fetch_row($result)) + $sequences[] = $row[0]; + mysql_free_result($result); + + mysql_close($db_id); + + if (isset($sequences)) + { + //get next, current and previous sequence + foreach($sequences as $key => $sequ) + { + if ($seq==0) + $seq=$sequ; + if ($next==1) + { + $nextseq=$sequ; + if ($prevseq!=0) + break; + $next=0; + } + if ($sequ==$seq) + { + $next=1; + continue; + } + $prevseq=$sequ; + } + $numseq=count($sequences); + //in case a dataset consists of less than 3 sequences + if ($numseq==2) + $nextseq=$prevseq; + } +} + + +$type=gettypename($type2); +$plot=getplotname($seq, $tabnum, $type, $type2); + +printf("

    \n"); +printf("\n"); +printf("\n\n\n\n\n
    \n"); +printf("home\n"); +printf(""); +if (!empty($prevseq)) + printf("%d  ", $prevseq); +if ($numseq>1) + printf("\n"); +if (empty($from)) + $from=34099;//21.8.2004 + +$db_id = mysql_connect($host, $user, $pw); +if ($db_id==FALSE) +{ + printf("mysql_connect returned the following error:
    "); + printf("%s
    ", mysql_error()); + die(""); +} + mysql_select_db($db); + +$query="SELECT fSourceKEY, fSourceName FROM Source ORDER BY fSourceName"; +$result=mysql_query($query); +if (!$result) + printf("-N/A-"); +printf(" \n"); +mysql_free_result($result); +mysql_close($db_id); + +printf("from \n", $from); +printf(" to \n", $to); +PrintType2PullDown($type2); +printf("\n", $tabnum); +printf("\n", $prevseq); +printf("\n", $nextseq); +if ($numseq>1) + printf("\n"); +else + printf("\n"); +if (!empty($nextseq)) + printf(" %d ", $nextseq); +if ($numseq>0) +{ + printf("  [ %d sequence", $numseq); + if ($numseq>1) + printf("s"); + print(" ] \n"); +} +printf("    		\n"); +printf("\n"); +printf("
    \n"); +if (!empty($seq)) + printf("%s ", $plot, $plot); +else + printf("Choose a source and/or a range of sequences or just click 'Plot' for going through all sequences."); +printf("
    \n"); +printf("
    \n"); +printf("\n"); +printf("\n"); + +ini_set("display_errors", "Off"); + +?>