Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 9105) +++ trunk/MagicSoft/Mars/Changelog (revision 9106) @@ -18,4 +18,35 @@ -*-*- END OF LINE -*-*- + + 2008/08/06 Daniela Dorner + + * datacenter/db/sequinfo.php, datacenter/db/sequinfo-aio.php, + datacenter/db/sequence.php, datacenter/db/runinfo.php, + datacenter/db/runinfo-aio.php, datacenter/db/resetseq.php, + datacenter/db/plotinclude.php, datacenter/db/magicdefs.php, + datacenter/db/ganymed.php, datacenter/db/findoffdata.php, + datacenter/db/dbstatus.php, datacenter/db/datasetinfo-aio.php, + datacenter/db/datasetinfo.php, datacenter/db/datacheck.php, + datacenter/db/builddatasets.php: + - changed syntax of left join to 'using(columnname)' + + * datacenter/db/sequinfo-aio.php, datacenter/db/runinfo-aio.php, + datacenter/db/magicdefs.php, datacenter/db/builddatasets.php + datacenter/db/dbstatus.php, datacenter/db/findoffdata.php, + datacenter/db/plotinclude.php, datacenter/db/resetseq.php, + datacenter/db/sequence.php, datacenter/db/sequinfo.php: + - implemented telescope number + + * datacenter/db/runinfo-aio.php,: + - moved pulldown for number of results + + * datacenter/db/resetseq.php,: + - removed unknown ip adresses, added names to known ip adresses + + * datacenter/db/menu.php: + - changed width input field for sequence number in run menu from + 6 to 8 + + 2008/08/06 Thomas Bretz Index: trunk/MagicSoft/Mars/datacenter/db/builddatasets.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/builddatasets.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/builddatasets.php (revision 9106) @@ -68,7 +68,7 @@ $query0 .= " FROM " . $fromtable; - $query0 .= " LEFT JOIN SequenceProcessStatus ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst "; - $query0 .= " LEFT JOIN Calibration ON Sequences.fSequenceFirst=Calibration.fSequenceFirst "; - $query0 .= " LEFT JOIN Star ON Sequences.fSequenceFirst=Star.fSequenceFirst "; + $query0 .= " LEFT JOIN SequenceProcessStatus USING(fSequenceFirst,fTelescopeNumber) "; + $query0 .= " LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) "; + $query0 .= " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) "; foreach ($_GET as $key => $element) @@ -79,5 +79,5 @@ { if ($_GET["fSourceName"]!="On") - $query0 .= " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY "; + $query0 .= " LEFT JOIN Source USING(fSourceKEY) "; $query0 .= " WHERE fTest='no'"; } @@ -479,6 +479,6 @@ $query.=", " . $name; $query.=" FROM Sequences "; - $query.=" LEFT JOIN Calibration ON Calibration.fSequenceFirst=Sequences.fSequenceFirst "; - $query.=" LEFT JOIN Star ON Star.fSequenceFirst=Sequences.fSequenceFirst "; + $query.=" LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) "; + $query.=" LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) "; $query.=" WHERE Sequences.fSequenceFirst IN (" . $sequences . ")"; $result = mysql_query($query, $db_id); @@ -501,5 +501,5 @@ function GetSources($db_id, $sequences) { - $query="SELECT fSourceName FROM Source LEFT JOIN Sequences ON Sequences.fSourceKEY=Source.fSourceKEY "; + $query="SELECT fSourceName FROM Source LEFT JOIN Sequences USING(fSourceKEY) "; $query.="WHERE fSequenceFirst IN (" . $sequences . ") GROUP BY fSourceName"; $result = mysql_query($query, $db_id); Index: trunk/MagicSoft/Mars/datacenter/db/datacheck.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/datacheck.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/datacheck.php (revision 9106) @@ -76,7 +76,7 @@ $query0 .= " FROM RunData "; - $query0 .= " LEFT JOIN RunProcessStatus ON RunData.fRunNumber=RunProcessStatus.fRunNumber "; - $query0 .= " LEFT JOIN DataCheck ON DataCheck.fRunNumber=RunData.fRunNumber "; - $query0 .= " LEFT JOIN RunType ON RunType.fRunTypeKEY=RunData.fRunTypeKEY "; + $query0 .= " LEFT JOIN RunProcessStatus USING(fRunNumber,fTelescopeNumber,fFileNumber) "; + $query0 .= " LEFT JOIN DataCheck USING(fRunNumber) "; + $query0 .= " LEFT JOIN RunType USING(fRunTypeKEY) "; foreach ($checkwhere as $key => $element) Index: trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php (revision 9106) @@ -57,6 +57,6 @@ $query0 .= " FROM " . $fromtable; - $query0 .= " LEFT JOIN DataSetProcessStatus ON " . $fromtable . ".fDataSetNumber=DataSetProcessStatus.fDataSetNumber "; - $query0 .= " LEFT JOIN Ganymed ON " . $fromtable . ".fDataSetNumber=Ganymed.fDataSetNumber "; + $query0 .= " LEFT JOIN DataSetProcessStatus USING(fDataSetNumber) "; + $query0 .= " LEFT JOIN Ganymed USING(fDataSetNumber) "; foreach ($_GET as $key => $element) Index: trunk/MagicSoft/Mars/datacenter/db/datasetinfo.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/datasetinfo.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/datasetinfo.php (revision 9106) @@ -57,6 +57,6 @@ $query0 .= " FROM " . $fromtable; - $query0 .= " LEFT JOIN DataSetProcessStatus ON " . $fromtable . ".fDataSetNumber=DataSetProcessStatus.fDataSetNumber "; - $query0 .= " LEFT JOIN Ganymed ON " . $fromtable . ".fDataSetNumber=Ganymed.fDataSetNumber "; + $query0 .= " LEFT JOIN DataSetProcessStatus USING(fDataSetNumber) "; + $query0 .= " LEFT JOIN Ganymed USING(fDataSetNumber) "; foreach ($_GET as $key => $element) Index: trunk/MagicSoft/Mars/datacenter/db/dbstatus.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/dbstatus.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/dbstatus.php (revision 9106) @@ -5,5 +5,5 @@ $joins = array ( - "fSourceName" => " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY ", + "fSourceName" => " LEFT JOIN Source USING(fSourceKEY) ", ); @@ -95,9 +95,7 @@ $query0 .= " FROM Sequences "; - $query0 .= " LEFT JOIN SequenceProcessStatus ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst "; - - $query0 .= " LEFT JOIN Calibration ON Sequences.fSequenceFirst=Calibration.fSequenceFirst "; - - $query0 .= " LEFT JOIN Star ON Sequences.fSequenceFirst=Star.fSequenceFirst "; + $query0 .= " LEFT JOIN SequenceProcessStatus USING(fSequenceFirst,fTelescopeNumber) "; + $query0 .= " LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) "; + $query0 .= " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) "; foreach ($_GET as $key => $element) Index: trunk/MagicSoft/Mars/datacenter/db/findoffdata.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/findoffdata.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/findoffdata.php (revision 9106) @@ -71,7 +71,7 @@ $query0 .= " FROM " . $fromtable; - $query0 .= " LEFT JOIN SequenceProcessStatus ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst "; - $query0 .= " LEFT JOIN Calibration ON Sequences.fSequenceFirst=Calibration.fSequenceFirst "; - $query0 .= " LEFT JOIN Star ON Sequences.fSequenceFirst=Star.fSequenceFirst "; + $query0 .= " LEFT JOIN SequenceProcessStatus USING(fSequenceFirst,fTelescopeNumber) "; + $query0 .= " LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) "; + $query0 .= " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) "; foreach ($_GET as $key => $element) Index: trunk/MagicSoft/Mars/datacenter/db/ganymed.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/ganymed.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/ganymed.php (revision 9106) @@ -16,8 +16,8 @@ $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 "; + $query0 .= " LEFT JOIN Source USING(fSourceKEY) "; + $query0 .= " LEFT JOIN ObservationMode USING(fObservationModeKEY) "; + $query0 .= " LEFT JOIN DataSetProcessStatus USING(fDataSetNumber) "; + $query0 .= " LEFT JOIN Ganymed USING(fDataSetNumber) "; if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) Index: trunk/MagicSoft/Mars/datacenter/db/magicdefs.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/magicdefs.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/magicdefs.php (revision 9106) @@ -156,5 +156,7 @@ "fFormatVersion" => "F-Ver", "fLastUpdate" => "LastUpd", - "fRunNumber" => "Run#", +// "fRunNumber" => "Run#", + "Run#" => "Run#", + "Tel:Run:File" => "Tel:Run:File", "fRunTypeName" => "RunType", "fMeanTriggerRate" => "Rate
[Hz]", @@ -668,4 +670,8 @@ if (!empty($tables[$val])) $table=$tables[$val]; + if ($val=="Tel:Run:File") + $table="'Tel:Run:File'"; + if ($val=="Tel:Sequ") + $table="'Tel:Sequ'"; if ($val=="NumRuns") $table="'# Runs'"; @@ -686,26 +692,26 @@ $joins = array ( - "fRunTypeName" => " LEFT JOIN RunType ON " . $fromtable . ".fRunTypeKEY=RunType.fRunTypeKEY ", - "fProjectName" => " LEFT JOIN Project ON " . $fromtable . ".fProjectKEY=Project.fProjectKEY ", - "fSourceName" => " LEFT JOIN Source ON " . $fromtable . ".fSourceKEY=Source.fSourceKEY ", - "fMagicNumberName" => " LEFT JOIN MagicNumber ON " . $fromtable . ".fMagicNumberKEY=MagicNumber.fMagicNumberKEY ", - "fL1TriggerTableName" => " LEFT JOIN L1TriggerTable ON " . $fromtable . ".fL1TriggerTableKEY=L1TriggerTable.fL1TriggerTableKEY", - "fL2TriggerTableName" => " LEFT JOIN L2TriggerTable ON " . $fromtable . ".fL2TriggerTableKEY=L2TriggerTable.fL2TriggerTableKEY", - "fHvSettingsName" => " LEFT JOIN HvSettings ON " . $fromtable . ".fHvSettingsKEY=HvSettings.fHvSettingsKEY", - "fCalibrationScriptName" => " LEFT JOIN CalibrationScript ON " . $fromtable . ".fCalibrationScriptKEY=CalibrationScript.fCalibrationScriptKEY", - "fExcludedFDAName" => " LEFT JOIN ExcludedFDA ON " . $fromtable . ".fExcludedFDAKEY=ExcludedFDA.fExcludedFDAKEY", - "fManuallyChangedName" => " LEFT JOIN ManuallyChanged ON " . $fromtable . ".fManuallyChangedKEY=ManuallyChanged.fManuallyChangedKEY ", - "fObservationModeName" => " LEFT JOIN ObservationMode ON " . $fromtable . ".fObservationModeKEY=ObservationMode.fObservationModeKEY ", - "fDiscriminatorThresholdTableName" => " LEFT JOIN DiscriminatorThresholdTable ON " . $fromtable . ".fDiscriminatorThresholdTableKEY=DiscriminatorThresholdTable.fDiscriminatorThresholdTableKEY ", - "fTriggerDelayTableName" => " LEFT JOIN TriggerDelayTable ON " . $fromtable . ".fTriggerDelayTableKEY=TriggerDelayTable.fTriggerDelayTableKEY ", - "fTestFlagName" => " LEFT JOIN TestFlag ON " . $fromtable . ".fTestFlagKEY=TestFlag.fTestFlagKEY", - "fLightConditionsName" => " LEFT JOIN LightConditions ON " . $fromtable . ".fLightConditionsKEY=LightConditions.fLightConditionsKEY", - "fParticleTypeName" => " LEFT JOIN ParticleType ON " . $fromtable . ".fParticleTypeKEY=ParticleType.fParticleTypeKEY ", - "fFitsFileName" => " LEFT JOIN FitsFile ON " . $fromtable . ".fFitsFileKEY=FitsFile.fFitsFileKEY", - "fObjectName" => " LEFT JOIN Object ON " . $fromtable . ".fObjectKEY=Object.fObjectKEY ", - "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 ", + "fRunTypeName" => " LEFT JOIN RunType USING(fRunTypeKEY) ", + "fProjectName" => " LEFT JOIN Project USING(fProjectKEY) ", + "fSourceName" => " LEFT JOIN Source USING(fSourceKEY) ", + "fMagicNumberName" => " LEFT JOIN MagicNumber USING(fMagicNumberKEY) ", + "fL1TriggerTableName" => " LEFT JOIN L1TriggerTable USING(fL1TriggerTableKEY) ", + "fL2TriggerTableName" => " LEFT JOIN L2TriggerTable USING(fL2TriggerTableKEY) ", + "fHvSettingsName" => " LEFT JOIN HvSettings USING(fHvSettingsKEY) ", + "fCalibrationScriptName" => " LEFT JOIN CalibrationScript USING(fCalibrationScriptKEY) ", + "fExcludedFDAName" => " LEFT JOIN ExcludedFDA USING(fExcludedFDAKEY) ", + "fManuallyChangedName" => " LEFT JOIN ManuallyChanged USING(fManuallyChangedKEY) ", + "fObservationModeName" => " LEFT JOIN ObservationMode USING(fObservationModeKEY) ", + "fDiscriminatorThresholdTableName" => " LEFT JOIN DiscriminatorThresholdTable USING(fDiscriminatorThresholdTableKEY) ", + "fTriggerDelayTableName" => " LEFT JOIN TriggerDelayTable USING(fTriggerDelayTableKEY) ", + "fTestFlagName" => " LEFT JOIN TestFlag USING(fTestFlagKEY) ", + "fLightConditionsName" => " LEFT JOIN LightConditions USING(fLightConditionsKEY) ", + "fParticleTypeName" => " LEFT JOIN ParticleType USING(fParticleTypeKEY) ", + "fFitsFileName" => " LEFT JOIN FitsFile USING(fFitsFileKEY) ", + "fObjectName" => " LEFT JOIN Object USING(fObjectKEY) ", + "fStatusName" => " LEFT JOIN Status USING(fStatusKEY) ", + "fBandName" => " LEFT JOIN Band USING(fBandKEY) ", + "fUserName" => " LEFT JOIN User USING(fUserKEY) ", + "fTelescopeName" => " LEFT JOIN Telescope USING(fTelescopeKEY) ", ); Index: trunk/MagicSoft/Mars/datacenter/db/menu.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/menu.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/menu.php (revision 9106) @@ -565,5 +565,5 @@ function PrintSequMenu($host,$user,$pw,$db) { - printf("Sequ#  "fDataSetNumber"); -$joins=array("fSequenceFirst" => " LEFT JOIN Star ON Star.fSequenceFirst=Sequences.fSequenceFirst " - ."LEFT JOIN Calibration ON Calibration.fSequenceFirst=Sequences.fSequenceFirst", - "fRunNumber" => " LEFT JOIN DataCheck ON DataCheck.fRunNumber=RunData.fRunNumber ", - "fDataSetNumber" =>" LEFT JOIN Ganymed ON Ganymed.fDataSetNumber=DataSets.fDataSetNumber"); +$joins=array("fSequenceFirst" => " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) " + ."LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) ", + "fRunNumber" => " LEFT JOIN DataCheck USING(fRunNumber) ", + "fDataSetNumber" =>" LEFT JOIN Ganymed USING(fDataSetNumber) "); function GetList($host, $user, $pw, $db, $column, $tables) Index: trunk/MagicSoft/Mars/datacenter/db/resetseq.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/resetseq.php (revision 9105) +++ trunk/MagicSoft/Mars/datacenter/db/resetseq.php (revision 9106) @@ -45,6 +45,6 @@ $query0 .= " 'crashed or failed')))) as 'starstat', fProjectName, fRunStart "; $query0 .= "FROM SequenceProcessStatus "; - $query0 .= "LEFT JOIN Sequences ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst "; - $query0 .= "LEFT JOIN Project ON Project.fProjectKEY=Sequences.fProjectKEY "; + $query0 .= "LEFT JOIN Sequences USING(fSequenceFirst,fTelescopeNumber) "; + $query0 .= "LEFT JOIN Project USING(fProjectKEY) "; } else @@ -221,5 +221,7 @@ echo (file_get_contents("index-header.html")); - $ips=array("91.64.78.187", "132.187.47.10", "132.187.47.67", "132.187.47.63", "129.217.160.151"); + $ips=array("132.187.47.10", //Thomas + "129.194.169.21" //Dani ISDC + ); if (!in_array($_SERVER['REMOTE_ADDR'], $ips)) {