Changeset 8467 for trunk/MagicSoft/Mars/datacenter

Timestamp:

04/28/07 23:07:56 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter/db

Files:

• datasetinfo-aio.php (modified) (2 diffs)
• ganymed.php (modified) (6 diffs)
• include.php (modified) (1 diff)
• magicdefs.php (modified) (1 diff)
• runinfo-aio.php (modified) (3 diffs)
• sequinfo-aio.php (modified) (2 diffs)

trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php

@@ -249 +249 @@
     else
     {
-        echo (file_get_contents("index-header.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-header.html"));
 
         $environment = sizeof($_GET);
@@ -267 +268 @@
         }
 
-        echo (file_get_contents("index-footer.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-footer.html"));
     }
 

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

@@ -6 +6 @@
         //datasets (0-3)
         $query0 .= " DataSets.fDataSetNumber, fDataSetName, fComment, ";//0,1,2
-        $query0 .= " fSourceName, ";//3
-        //steps (4-7)
-        $query0 .= " fDataSetInserted, fStarFilesAvail, ";//4,5
-        $query0 .= " fGanymed, fFillGanymed, ";//6,7
-        //ganymed (8-13)
-        $query0 .= " fExcessEvents, fBackgroundEvents, fSignalEvents, ";//8,9,10
-        $query0 .= " fSignificance, fScaleFactor, fEffOnTime/3600 ";//11,12,13
+        $query0 .= " fSourceName, fObservationModeName, ";//3, 4
+        //steps (5-8)
+        $query0 .= " fDataSetInserted, fStarFilesAvail, ";//5,6
+        $query0 .= " fGanymed, fFillGanymed, ";//7,8
+        //ganymed (9-14)
+        $query0 .= " fExcessEvents, fBackgroundEvents, fSignalEvents, ";//9,10,11
+        $query0 .= " fSignificance, fScaleFactor, fEffOnTime/3600 ";//12,13, 14
 
         $query0 .= " FROM DataSets ";
 
         $query0 .= " LEFT JOIN Source ON DataSets.fSourceKEY=Source.fSourceKEY ";
+        $query0 .= " LEFT JOIN ObservationMode ON DataSets.fObservationModeKEY=ObservationMode.fObservationModeKEY ";
         $query0 .= " LEFT JOIN DataSetProcessStatus ON DataSets.fDataSetNumber=DataSetProcessStatus.fDataSetNumber ";
         $query0 .= " LEFT JOIN Ganymed ON DataSets.fDataSetNumber=Ganymed.fDataSetNumber ";
@@ -163 +164 @@
             $comment=mysql_result($result0, $i, 2);
             $source=mysql_result($result0, $i, 3);
-            $inserted=mysql_result($result0, $i, 4);
-            $filesavail=mysql_result($result0, $i, 5);
-            $ganymed=mysql_result($result0, $i, 6);
-            $fillganymed=mysql_result($result0, $i, 7);
-            $excess=mysql_result($result0, $i, 8);
-            $bg=mysql_result($result0, $i, 9);
-            $signal=mysql_result($result0, $i, 10);
-            $signif=mysql_result($result0, $i, 11);
-            $scale=mysql_result($result0, $i, 12);
-            $effontime=mysql_result($result0, $i, 13);
+            $wobble=mysql_result($result0, $i, 4);
+            $inserted=mysql_result($result0, $i, 5);
+            $filesavail=mysql_result($result0, $i, 6);
+            $ganymed=mysql_result($result0, $i, 7);
+            $fillganymed=mysql_result($result0, $i, 8);
+            $excess=mysql_result($result0, $i, 9);
+            $bg=mysql_result($result0, $i, 10);
+            $signal=mysql_result($result0, $i, 11);
+            $signif=mysql_result($result0, $i, 12);
+            $scale=mysql_result($result0, $i, 13);
+            $effontime=mysql_result($result0, $i, 14);
             $num=sprintf("%08d",$datasetno);
             $num2=substr($num,0,5);
@@ -184 +186 @@
             printf(" <a href=\"%s\">%s</a>) </th>", $datasetfile, $datasetno);
             printf(" </tr><tr BGCOLOR='#E0E0E0' ALIGN='left'>\n");
-            printf(" <th colspan=\"6\"> %s ", $comment);
+            printf(" <th colspan=\"6\"> <b>%s Mode</b>, %s ", $wobble, $comment);
             printf(" </th></tr><tr>\n");
 
@@ -250 +252 @@
             printf("<tr><td colspan=\"6\">\n Plots: ");
 
-            if ($wobble=='Y')
+            if ($wobble=='Wobble')
                 $tabs=$ganymedtabsw;
             else
@@ -323 +325 @@
     else
     {
-        echo (file_get_contents("index-header.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-header.html"));
 
         $environment = sizeof($_GET);
@@ -341 +344 @@
         }
 
-        echo (file_get_contents("index-footer.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-footer.html"));
     }
 

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

@@ -270 +270 @@
     else
         printf("<tr class='Block' id='showquery' style='display:block'><td>");
-    printf("<b>DB:</b> %s <br>", $db);
     if ($html=="1")
+    {
+        printf("<b>DB:</b> %s <br>", $db);
         printf("<U><B>submitted query:</B></U><BR>%s<BR>", htmlspecialchars($query0));
+    }
     printf("</td></tr>");
 }

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

@@ -228 +228 @@
      "fMeanSignalInner"                 => "Sign<br>In",
      "fMeanSignalOuter"                 => "Sign<br>Out",
+     "fMeanPulsePosInner"               => "Pulse<br>PosIn",
      "fPulsePosMean"                    => "Puls<br>Pos",
      "fConvFactorInner"                 => "Conv<br>In",

trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php

@@ -299 +299 @@
         mysql_close($db_id);
 
-        PrintSubmittedQuery($query0, $html, $db);
+        PrintSubmittedQuery($query0, $html, $db, "");
     }
 
@@ -319 +319 @@
     else
     {
-        echo (file_get_contents("index-header.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-header.html"));
 
         $environment = sizeof($_GET);
@@ -337 +338 @@
         }
 
-        echo (file_get_contents("index-footer.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-footer.html"));
     }
 

trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php

@@ -375 +375 @@
     else
     {
-        echo (file_get_contents("index-header.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-header.html"));
 
         $environment = sizeof($_GET);
@@ -393 +394 @@
         }
 
-        echo (file_get_contents("index-footer.html"));
+        if (empty($_GET["fPrintTable"]))
+            echo (file_get_contents("index-footer.html"));
     }