Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 8250) +++ /trunk/MagicSoft/Mars/Changelog (revision 8251) @@ -18,4 +18,12 @@ -*-*- END OF LINE -*-*- + + 2007/01/16 Daniela Dorner + + * datacenter/db/menu.php, datacenter/db/datasetinfo-aio.php, + datacenter/db/magicdefs.php: + - implemented new variables for datasets + + 2007/01/15 Thomas Bretz Index: /trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php =================================================================== --- /trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php (revision 8250) +++ /trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php (revision 8251) @@ -155,36 +155,4 @@ $_GET["fNumResults"]="50"; - if (empty($_GET["fLinks"])) - $_GET["fLinks"]=$first?"On":""; - - if (empty($_GET["fWobble"])) - $_GET["fWobble"]=$first?"On":""; - - if (empty($_GET["fExcessEvents"])) - $_GET["fExcessEvents"]=$first?"On":""; - - if (empty($_GET["fBackgroundEvents*60/fEffOnTime"])) - $_GET["fBackgroundEvents*60/fEffOnTime"]=$first?"On":""; - - if (empty($_GET["fBackgroundEvents"])) - $_GET["fBackgroundEvents"]=$first?"On":""; - - if (empty($_GET["fSignalEvents"])) - $_GET["fSignalEvents"]=$first?"On":""; - - if (empty($_GET["fSignificance"])) - $_GET["fSignificance"]=$first?"On":""; - - if (empty($_GET["fScaleFactor"])) - $_GET["fScaleFactor"]=$first?"On":""; - - if (empty($_GET["fEffOnTime/3600"])) - $_GET["fEffOnTime/3600"]=$first?"On":""; - if (empty($_GET["fGanymed"])) - $_GET["fGanymed"]=$first?"On":""; - - if (empty($_GET["fSourceName"])) - $_GET["fSourceName"]=$first?"On":""; - InitDataSetInfo($_GET, $first); } @@ -208,10 +176,5 @@ printf("
"); PrintDataSetInfoMenu($host, $user, $pw, $db); - printf(" "); + PrintDataSetInfoMenu2($host, $user, $pw, $db); printf("

\n"); PrintFailMenu($host, $user, $pw, $db); Index: /trunk/MagicSoft/Mars/datacenter/db/magicdefs.php =================================================================== --- /trunk/MagicSoft/Mars/datacenter/db/magicdefs.php (revision 8250) +++ /trunk/MagicSoft/Mars/datacenter/db/magicdefs.php (revision 8251) @@ -19,5 +19,6 @@ "fFillStar" => "fStar", "fDataSetInserted" => "DataSetProcessStatus.fDataSetNumber", - "fStarFilesAvail" => "fDataSetInserted", + "fDataSetFileWritten" => "fDataSetInserted", + "fStarFilesAvail" => "fDataSetFileWritten", "fGanymed" => "fStarFilesAvail", "fFillGanymed" => "fGanymed", @@ -83,4 +84,5 @@ "fTelescopeName" => CheckWhere("fTelescopeKEY", $_GET), "fBandName" => CheckWhere("fBandKEY", $_GET), + "fUserName" => CheckWhere("fUserKEY", $_GET), ); @@ -107,4 +109,5 @@ "fStatusName" => CheckGroup("fStatusKEY", $_GET), "fBandName" => CheckGroup("fBandKEY", $_GET), + "fUserName" => CheckGroup("fUserKEY", $_GET), "fTelescopeName" => CheckGroup("fTelescopeKEY", $_GET), ); @@ -130,4 +133,5 @@ "fFillStar" => CheckStatusGroup("fFillStarStatus", $_GET), "fDataSetInserted" => CheckStatusGroup("fDataSetInsertedStatus", $_GET), + "fDataSetFileWritten" => CheckStatusGroup("fDataSetFileWrittenStatus", $_GET), "fStarFilesAvail" => CheckStatusGroup("fStarFilesAvailStatus", $_GET), "fGanymed" => CheckStatusGroup("fGanymedStatus", $_GET), @@ -206,4 +210,5 @@ "fFillStar" => "FillStar", "fDataSetInserted" => "DataSet", + "fDataSetFileWritten" => "DataSetFile", "fStarFilesAvail" => "FilesAvail", "fGanymed" => "Ganymed", @@ -271,4 +276,7 @@ "fDataSetNumber" => "Data
Set#", "fComment" => "Comment", + "fUserName" => "User", + "fRunTime" => "Up
Time
[min]", + "fDataSetName" => "Name", "fExcessEvents*60/fEffOnTime" => "Exc
Rate", "fBackgroundEvents*60/fEffOnTime" => "Bg
Rate", @@ -442,5 +450,6 @@ "fObjectName" => $fromtable . ".fObjectKEY", "fStatusName" => $fromtable . ".fStatusKEY", - "fBandName" => $fromtable . ".fBandKEY", + "fBandName" => $fromtable . ".fBandKEY", + "fUserName" => $fromtable . ".fUserKEY", "fTelescopeName" => $fromtable . ".fTelescopeKEY", ); @@ -544,8 +553,10 @@ "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,4 +604,5 @@ "fBandName" => "Band.fBandName", "fTelescopeName" => "Telescope.fTelescopeName", + "fUserName" => "User.fUserName", ); @@ -636,4 +648,5 @@ "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 ", ); Index: /trunk/MagicSoft/Mars/datacenter/db/menu.php =================================================================== --- /trunk/MagicSoft/Mars/datacenter/db/menu.php (revision 8250) +++ /trunk/MagicSoft/Mars/datacenter/db/menu.php (revision 8251) @@ -351,15 +351,27 @@ printf(" \n"); - CheckBox("fComment", "Comment"); - CheckBox("fScaleFactor", "Scale"); - CheckBox("fEffOnTime/3600", "EffOnTime"); + CheckBox("fComment", "Comment"); + CheckBox("fDataSetName", "Name"); + CheckBox("fZenithDistanceMin", "ZdMin"); + CheckBox("fZenithDistanceMax", "ZdMax"); + + printf(" \n"); + + CheckBox("fRunTime", "Uptime"); + CheckBox("fRunStart", "Start"); + CheckBox("fRunStop", "Stop"); CheckBox("fLinks", "Links"); printf(" \n"); - CheckBox("fExcessEvents", "ExcEvts"); - CheckBox("fBackgroundEvents", "BgEvts"); - CheckBox("fSignalEvents", "SignEvts"); - CheckBox("fSignificance", "Sign"); + CheckBox("fEffOnTime/3600", "EffOnTime"); + CheckBox("fScaleFactor", "Scale"); + + printf(" \n"); + + CheckBox("fExcessEvents", "ExcEvts"); + CheckBox("fBackgroundEvents", "BgEvts"); + CheckBox("fSignalEvents", "SignEvts"); + CheckBox("fSignificance", "Sign"); printf(" \n"); @@ -375,4 +387,18 @@ } +function PrintDataSetInfoMenu2($host,$user,$pw,$db) +{ + printf("

"); +} + function PrintDataSetStatMenu($host,$user,$pw,$db) { @@ -383,4 +409,6 @@ printf(" \n"); PrintStatusMenu("fDataSetInserted", "DataSet Inserted"); + printf(" \n"); + PrintStatusMenu("fDataSetFileWritten", "DataSetFile"); printf(" \n"); PrintStatusMenu("fStarFilesAvail", "FilesAvail"); @@ -881,4 +909,10 @@ $_GET["fDataSetInsertedStatus"]="0"; + if (empty($_GET["fDataSetFileWritten"])) + $_GET["fDataSetFileWritten"]=$first?"On":""; + + if (empty($_GET["fDataSetFileWrittenStatus"])) + $_GET["fDataSetFileWrittenStatus"]="0"; + if (empty($_GET["fStarFilesAvail"])) $_GET["fStarFilesAvail"]="Off"; @@ -908,39 +942,67 @@ $_GET["fNumResults"]="50"; + if (empty($_GET["fLinks"])) + $_GET["fLinks"]=$first?"On":""; + + if (empty($_GET["fExcessEvents"])) + $_GET["fExcessEvents"]=$first?"On":""; + + if (empty($_GET["fBackgroundEvents*60/fEffOnTime"])) + $_GET["fBackgroundEvents*60/fEffOnTime"]=$first?"On":""; + + if (empty($_GET["fBackgroundEvents"])) + $_GET["fBackgroundEvents"]=$first?"On":""; + + if (empty($_GET["fSignalEvents"])) + $_GET["fSignalEvents"]=$first?"On":""; + + if (empty($_GET["fSignificance"])) + $_GET["fSignificance"]=$first?"On":""; + + if (empty($_GET["fScaleFactor"])) + $_GET["fScaleFactor"]=$first?"On":""; + + if (empty($_GET["fEffOnTime/3600"])) + $_GET["fEffOnTime/3600"]=$first?"On":""; + if (empty($_GET["fSourceName"])) - $_GET["fSourceName"]="Off"; + $_GET["fSourceName"]=$first?"On":""; + + if (empty($_GET["fObservationModeName"])) + $_GET["fObservationModeName"]=$first?"On":""; if (empty($_GET["fComment"])) $_GET["fComment"]="Off"; - if (empty($_GET["fExcessEvents"])) - $_GET["fExcessEvents"]="Off"; + if (empty($_GET["fUserName"])) + $_GET["fUserName"]="Off"; + + if (empty($_GET["fRunStart"])) + $_GET["fRunStart"]="Off"; + + if (empty($_GET["fRunStop"])) + $_GET["fRunStop"]="Off"; + + if (empty($_GET["fZenithDistanceMin"])) + $_GET["fZenithDistanceMin"]=$first?"On":""; + + if (empty($_GET["fZenithDistanceMax"])) + $_GET["fZenithDistanceMax"]=$first?"On":""; + + if (empty($_GET["fRunTime"])) + $_GET["fRunTime"]="Off"; + + if (empty($_GET["fDataSetName"])) + $_GET["fDataSetName"]=$first?"On":""; if (empty($_GET["fExcessEvents*60/fEffOnTime"])) $_GET["fExcessEvents*60/fEffOnTime"]="Off"; - if (empty($_GET["fBackgroundEvents*60/fEffOnTime"])) - $_GET["fBackgroundEvents*60/fEffOnTime"]="Off"; - - if (empty($_GET["fBackgroundEvents"])) - $_GET["fBackgroundEvents"]="Off"; - - if (empty($_GET["fSignalEvents"])) - $_GET["fSignalEvents"]="Off"; - if (empty($_GET["fSignalEvents*60/fEffOnTime"])) $_GET["fSignalEvents*60/fEffOnTime"]="Off"; - if (empty($_GET["fSignificance"])) - $_GET["fSignificance"]="Off"; - if (empty($_GET["Round(fSignificance/Sqrt(fEffOnTime/3600),2)"])) $_GET["Round(fSignificance/Sqrt(fEffOnTime/3600),2)"]="Off"; - if (empty($_GET["fScaleFactor"])) - $_GET["fScaleFactor"]="Off"; - - if (empty($_GET["fEffOnTime/3600"])) - $_GET["fEffOnTime/3600"]="Off"; }