Changeset 7571 for trunk

Timestamp:

03/06/06 02:41:44 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/ganymed.php (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/03/06 Daniela Dorner
+
+   * datacenter/db/ganymed.php: 
+     - added sequences + links to star-plots of sequences
+     - improved layout
+
+
+
  2006/03/04 Daniela Dorner
 

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

@@ -40 +40 @@
             $_GET["fAll"]="Off";
 
+        if (empty($_GET["fSequ"]))
+            $_GET["fSequ"]="Off";
+
     }
 
@@ -71 +74 @@
             $checked = "";
         printf("<input type=\"checkbox\" name=\"fAll\" value=\"On\" %s>plots\n", $checked);
+
+        if ($_GET["fSequ"]=="On")
+            $checked = "checked";
+        else
+            $checked = "";
+        printf("<input type=\"checkbox\" name=\"fSequ\" value=\"On\" %s>sequences\n", $checked);
 
         printf(" <P>\n");
@@ -165 +174 @@
             $scale=mysql_result($result0, $i, 12);
             $effontime=mysql_result($result0, $i, 13);
+            $num=sprintf("%08d",$datasetno);
+            $num2=substr($num,0,5);
+            $datasetfile="http://www.astro.uni-wuerzburg.de/datacenter/datasets/" . $num2 . "/dataset" . $num . ".txt";
 
             printf("<tr><td>");
@@ -170 +182 @@
             printf(" <table BORDER=\"1\">");
             printf(" <tr BGCOLOR='#C0C0C0'>\n");
-            printf(" <th colspan=\"6\"><u>DataSet#:</u> %s - %s </th>", $datasetno, $source);
+            printf(" <th colspan=\"6\"><big>Source: <big>%s </big></big>(DataSet#:", $source, $datasetno);
+            printf(" <a href=\"%s\">%s</a>) </th>", $datasetfile, $datasetno);
             printf(" </tr><tr BGCOLOR='#E0E0E0' ALIGN='left'>\n");
             printf(" <th colspan=\"6\"> %s ", $comment);
@@ -184 +197 @@
             {
                 printf("<td colspan=\"6\"></td></tr>\n");
-                printf(" <tr BGCOLOR='#C0C0C0'><th colspan=\"6\">results - ");
-                $num=sprintf("%08d",$datasetno);
-                printf(" <a href=\"http://www.astro.uni-wuerzburg.de/datacenter/ganymed/%s/%s/\">plots</a>",
-                       substr($num,0,5), $num);
+                printf(" <tr BGCOLOR='#C0C0C0'><th colspan=\"6\">results ");
+                printf(" (<a href=\"http://www.astro.uni-wuerzburg.de/datacenter/ganymed/%s/%s/\">plots</a>)",
+                       $num2, $num);
                 printf(" </th></tr><tr BGCOLOR='#E0E0E0'>\n");
                 printf(" <td>excess events</td>\n");
@@ -204 +216 @@
             }
 
+            if ($_GET["fSequ"]=="On")
+            {
+                $dataset=file_get_contents($datasetfile);
+                $onpos=strpos($dataset, "SequencesOn:");
+                $offpos=strpos($dataset, "SequencesOff:");
+                $possource=strpos($dataset, "SourceName:");
+                $sequoff="";
+                if (!empty($offpos))
+                    $sequoff=substr($dataset, $offpos+13, $possource-($offpos+13));
+                if (empty($offpos))
+                    $offpos=$possource;
+                $sequon=substr($dataset, $onpos+12, $offpos-($onpos+12));
+
+                if (!empty($sequon))
+                {
+                    printf("<tr><td colspan=\"6\">\n SequencesOn: ");
+                    $sequences=split(" ", trim($sequon));
+                    foreach($sequences as $key => $sequ)
+                    {
+                        $sequno=sprintf("%08d",$sequ);
+                        $sequno2=substr($sequno,0,4);
+                        printf("<a href=\"http://www.astro.uni-wuerzburg.de/datacenter/star/%s/%s/\">%s</a> ",
+                               $sequno2, $sequno, $sequ);
+                    }
+                    printf("</td></tr>");
+
+                    if (!empty($sequoff))
+                    {
+                        printf("<tr><td colspan=\"6\">\n SequencesOff: ");
+                        $sequences=split(" ", trim($sequoff));
+                        foreach($sequences as $key => $sequ)
+                        {
+                            $sequno=sprintf("%08d",$sequ);
+                            $sequno2=substr($sequno,0,4);
+                            printf("<a href=\"http://www.astro.uni-wuerzburg.de/datacenter/star/%s/%s/\">%s</a> ",
+                                   $sequno2, $sequno, $sequ);
+                        }
+                    }
+                }
+            }
+
             if ($_GET["fAll"]=="On" && !is_null($ganymed))
             {
                 printf("<tr><td colspan=\"6\" align='center'>\n");
                 printf(" <img src=\"http://www.astro.uni-wuerzburg.de/datacenter/ganymed/%s/%s/ganymed%s-tab11.png\">",
-                       substr($num,0,5), $num, $num);
+                       $num2, $num, $num);
                 printf(" <img src=\"http://www.astro.uni-wuerzburg.de/datacenter/ganymed/%s/%s/ganymed%s-tab10.png\">",
-                       substr($num,0,5), $num, $num);
+                       $num2, $num, $num);
                 printf(" </td></tr>");
             }