Changeset 8251 for trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

Timestamp:

01/16/07 11:22:03 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/db/magicdefs.php (modified) (10 diffs)

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

@@ -19 +19 @@
      "fFillStar"             => "fStar",
      "fDataSetInserted"      => "DataSetProcessStatus.fDataSetNumber",
-     "fStarFilesAvail"       => "fDataSetInserted",
+     "fDataSetFileWritten"   => "fDataSetInserted",
+     "fStarFilesAvail"       => "fDataSetFileWritten",
      "fGanymed"              => "fStarFilesAvail",
      "fFillGanymed"          => "fGanymed",
@@ -83 +84 @@
      "fTelescopeName"                    => CheckWhere("fTelescopeKEY",                    $_GET),
      "fBandName"                         => CheckWhere("fBandKEY",                         $_GET),
+     "fUserName"                         => CheckWhere("fUserKEY",                         $_GET),
     );
 
@@ -107 +109 @@
      "fStatusName"                       => CheckGroup("fStatusKEY",                       $_GET),
      "fBandName"                         => CheckGroup("fBandKEY",                         $_GET),
+     "fUserName"                         => CheckGroup("fUserKEY",                         $_GET),
      "fTelescopeName"                    => CheckGroup("fTelescopeKEY",                    $_GET),
     );
@@ -130 +133 @@
      "fFillStar"                         => CheckStatusGroup("fFillStarStatus",            $_GET),
      "fDataSetInserted"                  => CheckStatusGroup("fDataSetInsertedStatus",     $_GET),
+     "fDataSetFileWritten"               => CheckStatusGroup("fDataSetFileWrittenStatus",  $_GET),
      "fStarFilesAvail"                   => CheckStatusGroup("fStarFilesAvailStatus",      $_GET),
      "fGanymed"                          => CheckStatusGroup("fGanymedStatus",             $_GET),
@@ -206 +210 @@
      "fFillStar"                        => "FillStar",
      "fDataSetInserted"                 => "DataSet",
+     "fDataSetFileWritten"              => "DataSetFile",
      "fStarFilesAvail"                  => "FilesAvail",
      "fGanymed"                         => "Ganymed",
@@ -271 +276 @@
      "fDataSetNumber"                   => "Data<br>Set#",
      "fComment"                         => "Comment",
+     "fUserName"                        => "User",
+     "fRunTime"                         => "Up<br>Time<br>[min]",
+     "fDataSetName"                     => "Name",
      "fExcessEvents*60/fEffOnTime"      => "Exc<br>Rate",
      "fBackgroundEvents*60/fEffOnTime"  => "Bg<br>Rate",
@@ -442 +450 @@
          "fObjectName"                       => $fromtable . ".fObjectKEY",
          "fStatusName"                       => $fromtable . ".fStatusKEY",
-         "fBandName"                       => $fromtable . ".fBandKEY",
+         "fBandName"                         => $fromtable . ".fBandKEY",
+         "fUserName"                         => $fromtable . ".fUserKEY",
          "fTelescopeName"                    => $fromtable . ".fTelescopeKEY",
         );
@@ -544 +553 @@
          "fDataSetNumber"                    => $fromtable . ".fDataSetNumber",
          "fDataSetInserted"                  => "DataSetProcessStatus.fDataSetInserted",
+         "fDataSetFileWritten"               => "DataSetProcessStatus.fDataSetFileWritten",
          "fStarFilesAvail"                   => "DataSetProcessStatus.fStarFilesAvail",
          "fGanymed"                          => "DataSetProcessStatus.fGanymed",
          "fFillGanymed"                      => "DataSetProcessStatus.fFillGanymed",
          "fComment"                          => "DataSets.fComment",
+         "fDataSetName"                      => "DataSets.fDataSetName",
          "fEvents"                           => "DataCheck.fEvents",
          "fPositionSignal"                   => "DataCheck.fPositionSignal",
@@ -593 +604 @@
          "fBandName"                         => "Band.fBandName",
          "fTelescopeName"                    => "Telescope.fTelescopeName",
+         "fUserName"                         => "User.fUserName",
         );
 
@@ -636 +648 @@
          "fStatusName"                       => " LEFT JOIN Status                       ON " . $fromtable . ".fStatusKEY=Status.fStatusKEY ",
          "fBandName"                         => " LEFT JOIN Band                         ON " . $fromtable . ".fBandKEY=Band.fBandKEY ",
+         "fUserName"                         => " LEFT JOIN User                         ON " . $fromtable . ".fUserKEY=User.fUserKEY ",
          "fTelescopeName"                    => " LEFT JOIN Telescope                    ON " . $fromtable . ".fTelescopeKEY=Telescope.fTelescopeKEY ",
         );