Changeset 9106 for trunk/MagicSoft
- Timestamp:
- 08/06/08 16:52:46 (16 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 12 edited
-
Changelog (modified) (1 diff)
-
datacenter/db/builddatasets.php (modified) (4 diffs)
-
datacenter/db/datacheck.php (modified) (1 diff)
-
datacenter/db/datasetinfo-aio.php (modified) (1 diff)
-
datacenter/db/datasetinfo.php (modified) (1 diff)
-
datacenter/db/dbstatus.php (modified) (2 diffs)
-
datacenter/db/findoffdata.php (modified) (1 diff)
-
datacenter/db/ganymed.php (modified) (1 diff)
-
datacenter/db/magicdefs.php (modified) (3 diffs)
-
datacenter/db/menu.php (modified) (1 diff)
-
datacenter/db/plotinclude.php (modified) (1 diff)
-
datacenter/db/resetseq.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r9103 r9106 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2008/08/06 Daniela Dorner 22 23 * datacenter/db/sequinfo.php, datacenter/db/sequinfo-aio.php, 24 datacenter/db/sequence.php, datacenter/db/runinfo.php, 25 datacenter/db/runinfo-aio.php, datacenter/db/resetseq.php, 26 datacenter/db/plotinclude.php, datacenter/db/magicdefs.php, 27 datacenter/db/ganymed.php, datacenter/db/findoffdata.php, 28 datacenter/db/dbstatus.php, datacenter/db/datasetinfo-aio.php, 29 datacenter/db/datasetinfo.php, datacenter/db/datacheck.php, 30 datacenter/db/builddatasets.php: 31 - changed syntax of left join to 'using(columnname)' 32 33 * datacenter/db/sequinfo-aio.php, datacenter/db/runinfo-aio.php, 34 datacenter/db/magicdefs.php, datacenter/db/builddatasets.php 35 datacenter/db/dbstatus.php, datacenter/db/findoffdata.php, 36 datacenter/db/plotinclude.php, datacenter/db/resetseq.php, 37 datacenter/db/sequence.php, datacenter/db/sequinfo.php: 38 - implemented telescope number 39 40 * datacenter/db/runinfo-aio.php,: 41 - moved pulldown for number of results 42 43 * datacenter/db/resetseq.php,: 44 - removed unknown ip adresses, added names to known ip adresses 45 46 * datacenter/db/menu.php: 47 - changed width input field for sequence number in run menu from 48 6 to 8 49 50 20 51 21 52 2008/08/06 Thomas Bretz -
trunk/MagicSoft/Mars/datacenter/db/builddatasets.php
r8868 r9106 68 68 $query0 .= " FROM " . $fromtable; 69 69 70 $query0 .= " LEFT JOIN SequenceProcessStatus ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst";71 $query0 .= " LEFT JOIN Calibration ON Sequences.fSequenceFirst=Calibration.fSequenceFirst";72 $query0 .= " LEFT JOIN Star ON Sequences.fSequenceFirst=Star.fSequenceFirst";70 $query0 .= " LEFT JOIN SequenceProcessStatus USING(fSequenceFirst,fTelescopeNumber) "; 71 $query0 .= " LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) "; 72 $query0 .= " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) "; 73 73 74 74 foreach ($_GET as $key => $element) … … 79 79 { 80 80 if ($_GET["fSourceName"]!="On") 81 $query0 .= " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY";81 $query0 .= " LEFT JOIN Source USING(fSourceKEY) "; 82 82 $query0 .= " WHERE fTest='no'"; 83 83 } … … 479 479 $query.=", " . $name; 480 480 $query.=" FROM Sequences "; 481 $query.=" LEFT JOIN Calibration ON Calibration.fSequenceFirst=Sequences.fSequenceFirst";482 $query.=" LEFT JOIN Star ON Star.fSequenceFirst=Sequences.fSequenceFirst";481 $query.=" LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) "; 482 $query.=" LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) "; 483 483 $query.=" WHERE Sequences.fSequenceFirst IN (" . $sequences . ")"; 484 484 $result = mysql_query($query, $db_id); … … 501 501 function GetSources($db_id, $sequences) 502 502 { 503 $query="SELECT fSourceName FROM Source LEFT JOIN Sequences ON Sequences.fSourceKEY=Source.fSourceKEY";503 $query="SELECT fSourceName FROM Source LEFT JOIN Sequences USING(fSourceKEY) "; 504 504 $query.="WHERE fSequenceFirst IN (" . $sequences . ") GROUP BY fSourceName"; 505 505 $result = mysql_query($query, $db_id); -
trunk/MagicSoft/Mars/datacenter/db/datacheck.php
r9052 r9106 76 76 $query0 .= " FROM RunData "; 77 77 78 $query0 .= " LEFT JOIN RunProcessStatus ON RunData.fRunNumber=RunProcessStatus.fRunNumber";79 $query0 .= " LEFT JOIN DataCheck ON DataCheck.fRunNumber=RunData.fRunNumber";80 $query0 .= " LEFT JOIN RunType ON RunType.fRunTypeKEY=RunData.fRunTypeKEY";78 $query0 .= " LEFT JOIN RunProcessStatus USING(fRunNumber,fTelescopeNumber,fFileNumber) "; 79 $query0 .= " LEFT JOIN DataCheck USING(fRunNumber) "; 80 $query0 .= " LEFT JOIN RunType USING(fRunTypeKEY) "; 81 81 82 82 foreach ($checkwhere as $key => $element) -
trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php
r8467 r9106 57 57 $query0 .= " FROM " . $fromtable; 58 58 59 $query0 .= " LEFT JOIN DataSetProcessStatus ON " . $fromtable . ".fDataSetNumber=DataSetProcessStatus.fDataSetNumber";60 $query0 .= " LEFT JOIN Ganymed ON " . $fromtable . ".fDataSetNumber=Ganymed.fDataSetNumber";59 $query0 .= " LEFT JOIN DataSetProcessStatus USING(fDataSetNumber) "; 60 $query0 .= " LEFT JOIN Ganymed USING(fDataSetNumber) "; 61 61 62 62 foreach ($_GET as $key => $element) -
trunk/MagicSoft/Mars/datacenter/db/datasetinfo.php
r9052 r9106 57 57 $query0 .= " FROM " . $fromtable; 58 58 59 $query0 .= " LEFT JOIN DataSetProcessStatus ON " . $fromtable . ".fDataSetNumber=DataSetProcessStatus.fDataSetNumber";60 $query0 .= " LEFT JOIN Ganymed ON " . $fromtable . ".fDataSetNumber=Ganymed.fDataSetNumber";59 $query0 .= " LEFT JOIN DataSetProcessStatus USING(fDataSetNumber) "; 60 $query0 .= " LEFT JOIN Ganymed USING(fDataSetNumber) "; 61 61 62 62 foreach ($_GET as $key => $element) -
trunk/MagicSoft/Mars/datacenter/db/dbstatus.php
r8180 r9106 5 5 $joins = array 6 6 ( 7 "fSourceName" => " LEFT JOIN Source ON Sequences.fSourceKEY=Source.fSourceKEY",7 "fSourceName" => " LEFT JOIN Source USING(fSourceKEY) ", 8 8 ); 9 9 … … 95 95 $query0 .= " FROM Sequences "; 96 96 97 $query0 .= " LEFT JOIN SequenceProcessStatus ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst "; 98 99 $query0 .= " LEFT JOIN Calibration ON Sequences.fSequenceFirst=Calibration.fSequenceFirst "; 100 101 $query0 .= " LEFT JOIN Star ON Sequences.fSequenceFirst=Star.fSequenceFirst "; 97 $query0 .= " LEFT JOIN SequenceProcessStatus USING(fSequenceFirst,fTelescopeNumber) "; 98 $query0 .= " LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) "; 99 $query0 .= " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) "; 102 100 103 101 foreach ($_GET as $key => $element) -
trunk/MagicSoft/Mars/datacenter/db/findoffdata.php
r8768 r9106 71 71 $query0 .= " FROM " . $fromtable; 72 72 73 $query0 .= " LEFT JOIN SequenceProcessStatus ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst";74 $query0 .= " LEFT JOIN Calibration ON Sequences.fSequenceFirst=Calibration.fSequenceFirst";75 $query0 .= " LEFT JOIN Star ON Sequences.fSequenceFirst=Star.fSequenceFirst";73 $query0 .= " LEFT JOIN SequenceProcessStatus USING(fSequenceFirst,fTelescopeNumber) "; 74 $query0 .= " LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) "; 75 $query0 .= " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) "; 76 76 77 77 foreach ($_GET as $key => $element) -
trunk/MagicSoft/Mars/datacenter/db/ganymed.php
r8789 r9106 16 16 $query0 .= " FROM DataSets "; 17 17 18 $query0 .= " LEFT JOIN Source ON DataSets.fSourceKEY=Source.fSourceKEY";19 $query0 .= " LEFT JOIN ObservationMode ON DataSets.fObservationModeKEY=ObservationMode.fObservationModeKEY";20 $query0 .= " LEFT JOIN DataSetProcessStatus ON DataSets.fDataSetNumber=DataSetProcessStatus.fDataSetNumber";21 $query0 .= " LEFT JOIN Ganymed ON DataSets.fDataSetNumber=Ganymed.fDataSetNumber";18 $query0 .= " LEFT JOIN Source USING(fSourceKEY) "; 19 $query0 .= " LEFT JOIN ObservationMode USING(fObservationModeKEY) "; 20 $query0 .= " LEFT JOIN DataSetProcessStatus USING(fDataSetNumber) "; 21 $query0 .= " LEFT JOIN Ganymed USING(fDataSetNumber) "; 22 22 23 23 if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/magicdefs.php
r9052 r9106 156 156 "fFormatVersion" => "F-Ver", 157 157 "fLastUpdate" => "LastUpd", 158 "fRunNumber" => "Run#", 158 // "fRunNumber" => "Run#", 159 "Run#" => "Run#", 160 "Tel:Run:File" => "Tel:Run:File", 159 161 "fRunTypeName" => "RunType", 160 162 "fMeanTriggerRate" => "Rate<br>[Hz]", … … 668 670 if (!empty($tables[$val])) 669 671 $table=$tables[$val]; 672 if ($val=="Tel:Run:File") 673 $table="'Tel:Run:File'"; 674 if ($val=="Tel:Sequ") 675 $table="'Tel:Sequ'"; 670 676 if ($val=="NumRuns") 671 677 $table="'# Runs'"; … … 686 692 $joins = array 687 693 ( 688 "fRunTypeName" => " LEFT JOIN RunType ON " . $fromtable . ".fRunTypeKEY=RunType.fRunTypeKEY",689 "fProjectName" => " LEFT JOIN Project ON " . $fromtable . ".fProjectKEY=Project.fProjectKEY",690 "fSourceName" => " LEFT JOIN Source ON " . $fromtable . ".fSourceKEY=Source.fSourceKEY",691 "fMagicNumberName" => " LEFT JOIN MagicNumber ON " . $fromtable . ".fMagicNumberKEY=MagicNumber.fMagicNumberKEY",692 "fL1TriggerTableName" => " LEFT JOIN L1TriggerTable ON " . $fromtable . ".fL1TriggerTableKEY=L1TriggerTable.fL1TriggerTableKEY",693 "fL2TriggerTableName" => " LEFT JOIN L2TriggerTable ON " . $fromtable . ".fL2TriggerTableKEY=L2TriggerTable.fL2TriggerTableKEY",694 "fHvSettingsName" => " LEFT JOIN HvSettings ON " . $fromtable . ".fHvSettingsKEY=HvSettings.fHvSettingsKEY",695 "fCalibrationScriptName" => " LEFT JOIN CalibrationScript ON " . $fromtable . ".fCalibrationScriptKEY=CalibrationScript.fCalibrationScriptKEY",696 "fExcludedFDAName" => " LEFT JOIN ExcludedFDA ON " . $fromtable . ".fExcludedFDAKEY=ExcludedFDA.fExcludedFDAKEY",697 "fManuallyChangedName" => " LEFT JOIN ManuallyChanged ON " . $fromtable . ".fManuallyChangedKEY=ManuallyChanged.fManuallyChangedKEY",698 "fObservationModeName" => " LEFT JOIN ObservationMode ON " . $fromtable . ".fObservationModeKEY=ObservationMode.fObservationModeKEY",699 "fDiscriminatorThresholdTableName" => " LEFT JOIN DiscriminatorThresholdTable ON " . $fromtable . ".fDiscriminatorThresholdTableKEY=DiscriminatorThresholdTable.fDiscriminatorThresholdTableKEY",700 "fTriggerDelayTableName" => " LEFT JOIN TriggerDelayTable ON " . $fromtable . ".fTriggerDelayTableKEY=TriggerDelayTable.fTriggerDelayTableKEY",701 "fTestFlagName" => " LEFT JOIN TestFlag ON " . $fromtable . ".fTestFlagKEY=TestFlag.fTestFlagKEY",702 "fLightConditionsName" => " LEFT JOIN LightConditions ON " . $fromtable . ".fLightConditionsKEY=LightConditions.fLightConditionsKEY",703 "fParticleTypeName" => " LEFT JOIN ParticleType ON " . $fromtable . ".fParticleTypeKEY=ParticleType.fParticleTypeKEY",704 "fFitsFileName" => " LEFT JOIN FitsFile ON " . $fromtable . ".fFitsFileKEY=FitsFile.fFitsFileKEY",705 "fObjectName" => " LEFT JOIN Object ON " . $fromtable . ".fObjectKEY=Object.fObjectKEY",706 "fStatusName" => " LEFT JOIN Status ON " . $fromtable . ".fStatusKEY=Status.fStatusKEY",707 "fBandName" => " LEFT JOIN Band ON " . $fromtable . ".fBandKEY=Band.fBandKEY",708 "fUserName" => " LEFT JOIN User ON " . $fromtable . ".fUserKEY=User.fUserKEY",709 "fTelescopeName" => " LEFT JOIN Telescope ON " . $fromtable . ".fTelescopeKEY=Telescope.fTelescopeKEY",694 "fRunTypeName" => " LEFT JOIN RunType USING(fRunTypeKEY) ", 695 "fProjectName" => " LEFT JOIN Project USING(fProjectKEY) ", 696 "fSourceName" => " LEFT JOIN Source USING(fSourceKEY) ", 697 "fMagicNumberName" => " LEFT JOIN MagicNumber USING(fMagicNumberKEY) ", 698 "fL1TriggerTableName" => " LEFT JOIN L1TriggerTable USING(fL1TriggerTableKEY) ", 699 "fL2TriggerTableName" => " LEFT JOIN L2TriggerTable USING(fL2TriggerTableKEY) ", 700 "fHvSettingsName" => " LEFT JOIN HvSettings USING(fHvSettingsKEY) ", 701 "fCalibrationScriptName" => " LEFT JOIN CalibrationScript USING(fCalibrationScriptKEY) ", 702 "fExcludedFDAName" => " LEFT JOIN ExcludedFDA USING(fExcludedFDAKEY) ", 703 "fManuallyChangedName" => " LEFT JOIN ManuallyChanged USING(fManuallyChangedKEY) ", 704 "fObservationModeName" => " LEFT JOIN ObservationMode USING(fObservationModeKEY) ", 705 "fDiscriminatorThresholdTableName" => " LEFT JOIN DiscriminatorThresholdTable USING(fDiscriminatorThresholdTableKEY) ", 706 "fTriggerDelayTableName" => " LEFT JOIN TriggerDelayTable USING(fTriggerDelayTableKEY) ", 707 "fTestFlagName" => " LEFT JOIN TestFlag USING(fTestFlagKEY) ", 708 "fLightConditionsName" => " LEFT JOIN LightConditions USING(fLightConditionsKEY) ", 709 "fParticleTypeName" => " LEFT JOIN ParticleType USING(fParticleTypeKEY) ", 710 "fFitsFileName" => " LEFT JOIN FitsFile USING(fFitsFileKEY) ", 711 "fObjectName" => " LEFT JOIN Object USING(fObjectKEY) ", 712 "fStatusName" => " LEFT JOIN Status USING(fStatusKEY) ", 713 "fBandName" => " LEFT JOIN Band USING(fBandKEY) ", 714 "fUserName" => " LEFT JOIN User USING(fUserKEY) ", 715 "fTelescopeName" => " LEFT JOIN Telescope USING(fTelescopeKEY) ", 710 716 ); 711 717 -
trunk/MagicSoft/Mars/datacenter/db/menu.php
r9089 r9106 565 565 function PrintSequMenu($host,$user,$pw,$db) 566 566 { 567 printf("Sequ# <input name=\"fSequenceNo\" type=\"text\" size=\" 6\" maxlength=\"6\" value=\"");567 printf("Sequ# <input name=\"fSequenceNo\" type=\"text\" size=\"8\" maxlength=\"8\" value=\""); 568 568 if (!empty($_GET["fSequenceNo"])) 569 569 printf("%s", $_GET["fSequenceNo"]); -
trunk/MagicSoft/Mars/datacenter/db/plotinclude.php
r8794 r9106 14 14 "DataSetNumber" => "fDataSetNumber"); 15 15 16 $joins=array("fSequenceFirst" => " LEFT JOIN Star ON Star.fSequenceFirst=Sequences.fSequenceFirst"17 ."LEFT JOIN Calibration ON Calibration.fSequenceFirst=Sequences.fSequenceFirst",18 "fRunNumber" => " LEFT JOIN DataCheck ON DataCheck.fRunNumber=RunData.fRunNumber",19 "fDataSetNumber" =>" LEFT JOIN Ganymed ON Ganymed.fDataSetNumber=DataSets.fDataSetNumber");16 $joins=array("fSequenceFirst" => " LEFT JOIN Star USING(fSequenceFirst,fTelescopeNumber) " 17 ."LEFT JOIN Calibration USING(fSequenceFirst,fTelescopeNumber) ", 18 "fRunNumber" => " LEFT JOIN DataCheck USING(fRunNumber) ", 19 "fDataSetNumber" =>" LEFT JOIN Ganymed USING(fDataSetNumber) "); 20 20 21 21 function GetList($host, $user, $pw, $db, $column, $tables) -
trunk/MagicSoft/Mars/datacenter/db/resetseq.php
r9052 r9106 45 45 $query0 .= " 'crashed or failed')))) as 'starstat', fProjectName, fRunStart "; 46 46 $query0 .= "FROM SequenceProcessStatus "; 47 $query0 .= "LEFT JOIN Sequences ON Sequences.fSequenceFirst=SequenceProcessStatus.fSequenceFirst";48 $query0 .= "LEFT JOIN Project ON Project.fProjectKEY=Sequences.fProjectKEY";47 $query0 .= "LEFT JOIN Sequences USING(fSequenceFirst,fTelescopeNumber) "; 48 $query0 .= "LEFT JOIN Project USING(fProjectKEY) "; 49 49 } 50 50 else … … 221 221 echo (file_get_contents("index-header.html")); 222 222 223 $ips=array("91.64.78.187", "132.187.47.10", "132.187.47.67", "132.187.47.63", "129.217.160.151"); 223 $ips=array("132.187.47.10", //Thomas 224 "129.194.169.21" //Dani ISDC 225 ); 224 226 if (!in_array($_SERVER['REMOTE_ADDR'], $ips)) 225 227 {
Note:
See TracChangeset
for help on using the changeset viewer.
