Changeset 7518 for trunk/MagicSoft/Mars

Timestamp:

02/17/06 11:28:43 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/ganymed.php (modified) (4 diffs)
• datacenter/db/index.html (modified) (1 diff)
• datacenter/macros/fillsources.C (added)
• datacenter/scripts/copyscript (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/02/17 Daniela Dorner
+
+   * datacenter/scripts/copyscript: 
+     - fixed path length
+
+   * datacenter/macros/fillsources.C: 
+     - added (macro to read source information from catalog files and 
+       insert it into the database)
+
+
+
  2006/02/17 Thomas Bretz
 

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

@@ -38 +38 @@
 
         if (empty($_GET["fAll"]))
-            $_GET["fAll"]=$first?"On":"";
+            $_GET["fAll"]="Off";
 
     }
@@ -53 +53 @@
 
         if (empty($_GET["fRunMin"]))
-            $min = GetMin("fDataSetNumber", "DataSets", $db);
+            $min = "100";
+//            $min = GetMin("fDataSetNumber", "DataSets", $db);
         else
             $min = $_GET["fRunMin"];
@@ -169 +170 @@
             printf(" <table BORDER=\"1\">");
             printf(" <tr BGCOLOR='#C0C0C0'>\n");
-            printf(" <th colspan=\"6\"><u>DataSet#:</u> %s </th>", $datasetno);
+            printf(" <th colspan=\"6\"><u>DataSet#:</u> %s - %s </th>", $datasetno, $source);
             printf(" </tr><tr BGCOLOR='#E0E0E0' ALIGN='left'>\n");
-            printf(" <th colspan=\"6\"> %s - Wobble %s ", $comment, $wobble);
+            printf(" <th colspan=\"6\"> %s ", $comment);
+            printf(" </th></tr><tr>\n");
+
+            printf(" <td colspan=\"6\"> Wobble: %s", $wobble);
             if (!is_null($ganymed))
-                printf(", <font color='green'>ganymed done</font> ");
-            printf(" </th></tr>\n");
-
-            printf(" <tr><td colspan=\"6\"></td></tr>\n");
+                printf(", <font color='green'> ganymed done</font> ");
+
+            printf(" <tr>");
 
             if (!is_null($fillganymed))
             {
-                printf(" <tr BGCOLOR='#C0C0C0'><th colspan=\"6\">results</th></tr>");
-                printf(" <tr BGCOLOR='#E0E0E0'>\n");
+                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(" </th></tr><tr BGCOLOR='#E0E0E0'>\n");
                 printf(" <td>excess events</td>\n");
                 printf(" <td>background events</td>\n");
@@ -197 +204 @@
             }
 
-
             if ($_GET["fAll"]=="On" && !is_null($ganymed))
             {
-                printf("</td></tr><tr><td>\n");
-
-                printf(" <table BORDER=\"1\">");
-                printf(" <tr BGCOLOR='#C0C0C0'>\n");
-                printf(" <th colspan=\"6\">plots</th>");
-                printf(" </tr>\n");
-                printf(" <tr><td colspan=\"6\">\n");
-                $num=sprintf("%08d",$datasetno);
-                printf(" <a href=\"http://www.astro.uni-wuerzburg.de/datacenter/ganymed/%s/%s/\">files</a>",
-                       substr($num,0,5), $num);
-                printf(" </tr></table>");
-
+                printf("<tr><td colspan=\"6\">\n");
+                printf(" plots (to be added) </td></tr>");
             }
+
             printf(" </table>");
             printf("</td></tr><tr><td><br></td></tr>");
-
         }
         printf("</table>\n");

trunk/MagicSoft/Mars/datacenter/db/index.html

@@ -43 +43 @@
 <li><A HREF="queryrbk.php">Runbook Database</A></li>
 <li><A HREF="datasetinfo.php">Dataset Information</A> 
-(<A HREF="http://www.astro.uni-wuerzburg.de/~dorner/analysis/datasets.html">comments</A>, 
- <A HREF="http://www.astro.uni-wuerzburg.de/datacenter/datasets/">files</A>)</li>
+(<!--<A HREF="http://www.astro.uni-wuerzburg.de/~dorner/analysis/datasets.html">comments</A>, 
+-->
+ <A HREF="http://www.astro.uni-wuerzburg.de/datacenter/datasets/">dataset files</A>)</li>
+<li><A HREF="ganymed.php">Results of the Automatic Analysis</A> 
 </ul>
 Other queries:<p>

trunk/MagicSoft/Mars/datacenter/scripts/copyscript

@@ -66 +66 @@
 
 transdir=/home/lapalma/transfer
-char=23
+char=24
 datetime=`date +%F-%H-%M-%S`
 lockfile=$lockpath/lock-copyscript.txt