Changeset 9486 for trunk/MagicSoft/Mars
- Timestamp:
- 08/11/09 16:28:36 (15 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 2 added
- 19 edited
-
Changelog (modified) (1 diff)
-
datacenter/db/builddatasets.php (modified) (1 diff)
-
datacenter/db/ctadefs.php (modified) (3 diffs)
-
datacenter/db/ctamcinfo.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) (1 diff)
-
datacenter/db/findoffdata.php (modified) (1 diff)
-
datacenter/db/include.php (modified) (2 diffs)
-
datacenter/db/magicdefs.php (modified) (1 diff)
-
datacenter/db/mcdefs.php (added)
-
datacenter/db/mcinfo.php (added)
-
datacenter/db/menu.php (modified) (5 diffs)
-
datacenter/db/runinfo-aio.php (modified) (1 diff)
-
datacenter/db/runinfo.php (modified) (1 diff)
-
datacenter/db/sequinfo-aio.php (modified) (1 diff)
-
datacenter/db/sequinfo.php (modified) (1 diff)
-
datacenter/db/statusrps.php (modified) (1 diff)
-
datacenter/db/statussbs.php (modified) (1 diff)
-
datacenter/db/statussps.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r9485 r9486 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2009/08/11 Daniela Dorner 22 23 * datacenter/db/menu.php: 24 - added mc function (corsika production) 25 26 * datacenter/db/magicdefs.php: 27 - added $timelimits array 28 29 * datacenter/db/include.php: 30 - added usage of $timelimits array in function StatusQuery(), i.e. 31 provides possibility to set different values for time after 32 which job is marked as 'crashef' for diffent steps 33 34 * datacenter/db/builddatasets.php, datacenter/db/datacheck.php, 35 datacenter/db/datasetinfo-aio.php, datacenter/db/datasetinfo.php, 36 datacenter/db/dbstatus.php, datacenter/db/findoffdata.php, 37 datacenter/db/runinfo-aio.php, datacenter/db/runinfo.php, 38 datacenter/db/sequinfo-aio.php, datacenter/db/sequinfo.php, 39 datacenter/db/statusrps.php, datacenter/db/statussbs.php, 40 datacenter/db/statussps.php, datacenter/db/ctamcinfo.php: 41 - added $timelimits to function StatusQuery() 42 43 * datacenter/db/ctamcinfo.php: 44 - bugfix: combining of normal and status group-by is possible now 45 - added # of events and # of kilo-events in 'group-by' 46 47 * datacenter/db/ctadefs.php: 48 - changed time limit for corsika from 30 to 48 hours 49 - added # of events and # of kilo-events for 'group-by' 50 51 * datacenter/db/mcinfo.php: 52 - added (interface to monitor mc production (up to now only test 53 version for corsika)) 54 55 * datacenter/db/mcdefs.php: 56 - added (definition of variables for mc production) 57 58 20 59 21 60 2009/08/03 Daniel Hoehne-Moench, Stefan Ruegamer -
trunk/MagicSoft/Mars/datacenter/db/builddatasets.php
r9106 r9486 124 124 $query0 .= " AND "; 125 125 126 $query0 .= StatusQuery("fSequenceFileWritten", $needs );127 $query0 .= StatusQuery("fAllFilesAvail", $needs );128 $query0 .= StatusQuery("fCallisto", $needs );129 $query0 .= StatusQuery("fFillCallisto", $needs );130 $query0 .= StatusQuery("fStar", $needs );131 $query0 .= StatusQuery("fFillStar", $needs );126 $query0 .= StatusQuery("fSequenceFileWritten", $needs, $timelimits); 127 $query0 .= StatusQuery("fAllFilesAvail", $needs, $timelimits); 128 $query0 .= StatusQuery("fCallisto", $needs, $timelimits); 129 $query0 .= StatusQuery("fFillCallisto", $needs, $timelimits); 130 $query0 .= StatusQuery("fStar", $needs, $timelimits); 131 $query0 .= StatusQuery("fFillStar", $needs, $timelimits); 132 132 133 133 if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/ctadefs.php
r9474 r9486 14 14 $timelimits = array 15 15 ( 16 "fCorsikaSimTelarray" => " 30",16 "fCorsikaSimTelarray" => "48", 17 17 "fChimp" => "4", 18 18 "fCTAStar" => "2", … … 49 49 ( 50 50 // "fRunNumber" => "Run#", 51 "Run#" => "Run#", 52 "fNumEvents" => "#Evts", 53 "SUM(fNumEvents)" => "Evts", 54 "fParticleTypeName" => "Particle", 55 "fCorsikaSimTelarray" => "CorsikaSimtel", 56 "fChimp" => "Chimp", 57 "fCTAStar" => "Star", 58 "fStereoB" => "StereoB", 59 "fStereoC" => "StereoC", 60 "fStereoG" => "StereoG", 61 "fStartTime" => "Process", 62 "fFailedTime" => "Failed", 63 "fReturnCode" => "Ret<br>Code", 64 "fProgramId" => "Prgr<br>Id", 51 "Run#" => "Run#", 52 "fNumEvents" => "#Evts", 53 "SUM(fNumEvents)" => "Evts", 54 "SUM(fNumEvents) DIV 1000" => "kEvts", 55 "fParticleTypeName" => "Particle", 56 "fCorsikaSimTelarray" => "CorsikaSimtel", 57 "fChimp" => "Chimp", 58 "fCTAStar" => "Star", 59 "fStereoB" => "StereoB", 60 "fStereoC" => "StereoC", 61 "fStereoG" => "StereoG", 62 "fStartTime" => "Process", 63 "fFailedTime" => "Failed", 64 "fReturnCode" => "Ret<br>Code", 65 "fProgramId" => "Prgr<br>Id", 65 66 ); 66 67 … … 70 71 // $alias["fRunNumber"] => "1", 71 72 $alias["fNumEvents"] => "1", 73 $alias["SUM(fNumEvents) DIV 1000"] => "1", 72 74 "Time" => "1", 73 75 "Runs" => "1", -
trunk/MagicSoft/Mars/datacenter/db/ctamcinfo.php
r9474 r9486 17 17 $query0 = "SELECT "; 18 18 19 if ($groups>0) 20 { 21 foreach ($checkgroup as $key => $element) 22 if ($element==-1) 23 $query0 .= $key . " as '" . $alias[$key] . "' " . ", "; 24 /* 25 //-------------------------------------------------- 26 //$query0 .= " TIMEDIFF(fRunStop, fRunStart), "; 27 // Only available in MySQL>4.1.1 28 $query0 .= "SUM(if(TIME_TO_SEC(fRunStop)-TIME_TO_SEC(fRunStart)<0, " . 29 "TIME_TO_SEC(fRunStop)-TIME_TO_SEC(fRunStart)+24*60*60, " . 30 "TIME_TO_SEC(fRunStop)-TIME_TO_SEC(fRunStart)))/3600 as '" . $alias["SUM(fRunTime)/3600"] . "', "; 31 //-------------------------------------------------- 32 $query0 .= " SUM(fNumEvents) as '" . $alias["SUM(fNumEvents)"] . "', "; 33 $query0 .= " Min(fZenithDistance) as '" . $alias["Min(fZenithDistance)"] . "', "; 34 $query0 .= " Max(fZenithDistance) as '" . $alias["Max(fZenithDistance)"] . "', "; 35 */ 36 $query0 .= " COUNT(*) as '# Runs' "; 37 } 38 else 39 { 19 if ($groups>0 || $statusgroups>0) 20 { 21 if ($groups>0) 22 { 23 foreach ($checkgroup as $key => $element) 24 if ($element==-1) 25 $query0 .= $key . " as '" . $alias[$key] . "' " . ", "; 26 /* 27 //-------------------------------------------------- 28 //$query0 .= " TIMEDIFF(fRunStop, fRunStart), "; 29 // Only available in MySQL>4.1.1 30 $query0 .= "SUM(if(TIME_TO_SEC(fRunStop)-TIME_TO_SEC(fRunStart)<0, " . 31 "TIME_TO_SEC(fRunStop)-TIME_TO_SEC(fRunStart)+24*60*60, " . 32 "TIME_TO_SEC(fRunStop)-TIME_TO_SEC(fRunStart)))/3600 as '" . $alias["SUM(fRunTime)/3600"] . "', "; 33 //-------------------------------------------------- 34 $query0 .= " SUM(fNumEvents) as '" . $alias["SUM(fNumEvents)"] . "', "; 35 $query0 .= " Min(fZenithDistance) as '" . $alias["Min(fZenithDistance)"] . "', "; 36 $query0 .= " Max(fZenithDistance) as '" . $alias["Max(fZenithDistance)"] . "', "; 37 */ 38 } 40 39 if ($statusgroups>0) 41 40 { … … 43 42 if ($element==-1) 44 43 $query0 .= " (if(IsNull(" . $key . "), if(isnull(fStartTime), 'not done', if(isnull(fFailedTime),if(isnull(" . $needs[$key] . "),'not done',if(date_sub(Now(),interval " . $timelimits[$key] . " hour) < fStartTime,'running','crashed')),if(isnull(" . $needs[$key] . "),'not done','failed'))) ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', "; 45 // $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";46 47 $query0 .= " count(*) as '# Runs'";44 // $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', "; 45 46 // $query0 .= " count(*) as '# Runs'"; 48 47 49 48 } 50 else 51 { 52 $query0 .= " MCRunData.fMCRunNumber as 'Run#' "; 49 $query0 .= " COUNT(*) as '# Runs' "; 50 $query0 .= ", SUM(fNumEvents) as '" . $alias["SUM(fNumEvents)"] . "' "; 51 $query0 .= ", SUM(fNumEvents) DIV 1000 as '" . $alias["SUM(fNumEvents) DIV 1000"] . "' "; 52 } 53 else 54 { 55 $query0 .= " MCRunData.fMCRunNumber as 'Run' "; 53 56 // $query0 .= " Concat(RunData.fTelescopeNumber,':', RunData.fRunNumber,':', RunData.fFileNumber) as 'Run' "; 54 57 // $query0 .= " Concat('M', RunData.fTelescopeNumber,':', LPAD(RunData.fRunNumber,8, ' '),'/', LPAD(RunData.fFileNumber, 3, ' ')) as 'Tel:Run/File' "; 55 58 56 if (empty($_GET["fSendTxt"]) && !empty($_GET["fLinks"])) 57 { 58 $query0 .= ", CONCAT('<A&ws;HREF=\"queryrbk.php?fNight=', date_format(adddate(fRunStart, interval +13 HOUR), '%Y-%m-%d') , '&fDate=2\">rbk</A>') "; 59 $query0 .= " as 'Links'"; 60 } 61 62 foreach ($_GET as $key => $element) 63 if ($key!="fLinks" && $_GET[$key]=="On" && $key!="fTest") 64 if (empty($checkwhere[$key]) || $checkwhere[$key]==0) 65 $query0 .= ", " . $key . " as '" . $alias[$key] . "' "; 59 if (empty($_GET["fSendTxt"]) && !empty($_GET["fLinks"])) 60 { 61 $query0 .= ", CONCAT('<A&ws;HREF=\"queryrbk.php?fNight=', date_format(adddate(fRunStart, interval +13 HOUR), '%Y-%m-%d') , '&fDate=2\">rbk</A>') "; 62 $query0 .= " as 'Links'"; 66 63 } 64 65 foreach ($_GET as $key => $element) 66 if ($key!="fLinks" && $_GET[$key]=="On" && $key!="fTest") 67 if (empty($checkwhere[$key]) || $checkwhere[$key]==0) 68 $query0 .= ", " . $key . " as '" . $alias[$key] . "' "; 67 69 } 68 70 … … 105 107 $query0 .= " AND "; 106 108 107 $query0 .= StatusQuery("fCorsikaSimTelarray", $needs );108 $query0 .= StatusQuery("fChimp", $needs );109 $query0 .= StatusQuery("fCTAStar", $needs );110 $query0 .= StatusQuery("fStereoB", $needs );111 $query0 .= StatusQuery("fStereoC", $needs );112 $query0 .= StatusQuery("fStereoG", $needs );109 $query0 .= StatusQuery("fCorsikaSimTelarray", $needs, $timelimits); 110 $query0 .= StatusQuery("fChimp", $needs, $timelimits); 111 $query0 .= StatusQuery("fCTAStar", $needs, $timelimits); 112 $query0 .= StatusQuery("fStereoB", $needs, $timelimits); 113 $query0 .= StatusQuery("fStereoC", $needs, $timelimits); 114 $query0 .= StatusQuery("fStereoG", $needs, $timelimits); 113 115 114 116 if ((!empty($_GET["fRunMin"]) || $_GET["fRunMin"]=="0") && !empty($_GET["fRunMax"])) … … 176 178 if ($statusgroups>0) 177 179 { 178 $query0 .= " GROUP BY "; 180 // $query0 .= " GROUP BY "; 181 if (strpos($query0, " GROUP BY ")==FALSE) 182 $query0 .= " GROUP BY "; 183 else 184 $query0 .= ", "; 179 185 $num = $statusgroups; 180 186 foreach ($checkstatusgroup as $key => $element) -
trunk/MagicSoft/Mars/datacenter/db/datacheck.php
r9106 r9486 101 101 $query0 .= " AND "; 102 102 103 $query0 .= StatusQuery("fRawFileAvail", $needs );104 $query0 .= StatusQuery("fDataCheckDone", $needs );103 $query0 .= StatusQuery("fRawFileAvail", $needs, $timelimits); 104 $query0 .= StatusQuery("fDataCheckDone", $needs, $timelimits); 105 105 106 106 $query0 .= EnumQuery("fHasSignal"); -
trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php
r9249 r9486 97 97 $query0 .= " AND "; 98 98 99 $query0 .= StatusQuery("fDataSetInserted", $needs );100 $query0 .= StatusQuery("fStarFilesAvail", $needs );101 $query0 .= StatusQuery("fGanymed", $needs );102 $query0 .= StatusQuery("fFillGanymed", $needs );99 $query0 .= StatusQuery("fDataSetInserted", $needs, $timelimits); 100 $query0 .= StatusQuery("fStarFilesAvail", $needs, $timelimits); 101 $query0 .= StatusQuery("fGanymed", $needs, $timelimits); 102 $query0 .= StatusQuery("fFillGanymed", $needs, $timelimits); 103 103 104 104 if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/datasetinfo.php
r9106 r9486 85 85 $query0 .= " AND "; 86 86 87 $query0 .= StatusQuery("fDataSetInserted", $needs );88 $query0 .= StatusQuery("fStarFilesAvail", $needs );89 $query0 .= StatusQuery("fGanymed", $needs );90 $query0 .= StatusQuery("fFillGanymed", $needs );87 $query0 .= StatusQuery("fDataSetInserted", $needs, $timelimits); 88 $query0 .= StatusQuery("fStarFilesAvail", $needs, $timelimits); 89 $query0 .= StatusQuery("fGanymed", $needs, $timelimits); 90 $query0 .= StatusQuery("fFillGanymed", $needs, $timelimits); 91 91 92 92 if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/dbstatus.php
r9106 r9486 124 124 $query0 .= " AND "; 125 125 126 $query0 .= StatusQuery("fSequenceFileWritten", $needs );127 $query0 .= StatusQuery("fAllFilesAvail", $needs );128 $query0 .= StatusQuery("fCallisto", $needs );129 $query0 .= StatusQuery("fFillCallisto", $needs );130 $query0 .= StatusQuery("fStar", $needs );131 $query0 .= StatusQuery("fFillStar", $needs );126 $query0 .= StatusQuery("fSequenceFileWritten", $needs, $timelimits); 127 $query0 .= StatusQuery("fAllFilesAvail", $needs, $timelimits); 128 $query0 .= StatusQuery("fCallisto", $needs, $timelimits); 129 $query0 .= StatusQuery("fFillCallisto", $needs, $timelimits); 130 $query0 .= StatusQuery("fStar", $needs, $timelimits); 131 $query0 .= StatusQuery("fFillStar", $needs, $timelimits); 132 132 133 133 if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/findoffdata.php
r9106 r9486 120 120 $query0 .= " AND "; 121 121 122 $query0 .= StatusQuery("fStar", $needs );122 $query0 .= StatusQuery("fStar", $needs, $timelimits); 123 123 124 124 if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/include.php
r9451 r9486 50 50 } 51 51 52 function StatusQuery($name, $needs) 53 { 52 function StatusQuery($name, $needs, $timelimits) 53 { 54 if (empty($timelimits[$name])) 55 $timelimit="12"; 56 else 57 $timelimit=$timelimits[$name]; 54 58 $var = $name . "Status"; 55 59 $txt = ""; … … 61 65 case 2: $txt .= "IsNull(" . $name . ") AND "; break; //not done no matter what status of previous step is 62 66 case 3: $txt .= $name ."='1970-01-01 00:00:00' AND "; break; 63 case 4: $txt .= " (IsNull(" . $name . ") AND IsNull(fFailedTime) AND NOT IsNull(fStartTime) AND date_sub(Now(),interval 12hour) < fStartTime AND NOT IsNull(" . $needs[$name] . ")) AND "; break;67 case 4: $txt .= " (IsNull(" . $name . ") AND IsNull(fFailedTime) AND NOT IsNull(fStartTime) AND date_sub(Now(),interval " . $timelimit . " hour) < fStartTime AND NOT IsNull(" . $needs[$name] . ")) AND "; break; 64 68 case 5: $txt .= " (IsNull(" . $name . ") AND NOT IsNull(fFailedTime) AND NOT IsNull(fStartTime) AND NOT IsNull(" . $needs[$name] . ")) AND "; break; 65 case 6: $txt .= " (IsNull(" . $name . ") AND IsNull(fFailedTime) AND NOT IsNull(fStartTime) AND date_sub(Now(),interval 12hour) > fStartTime AND NOT IsNull(" . $needs[$name] . ")) AND "; break;69 case 6: $txt .= " (IsNull(" . $name . ") AND IsNull(fFailedTime) AND NOT IsNull(fStartTime) AND date_sub(Now(),interval " . $timelimit . " hour) > fStartTime AND NOT IsNull(" . $needs[$name] . ")) AND "; break; 66 70 // case 6: $txt .= "crashed"; break; 67 71 case 7: $txt .= ""; break; -
trunk/MagicSoft/Mars/datacenter/db/magicdefs.php
r9485 r9486 24 24 "fFillGanymed" => "fGanymed", 25 25 ); 26 27 28 $timelimits = array(); 26 29 27 30 -
trunk/MagicSoft/Mars/datacenter/db/menu.php
r9485 r9486 1 1 <?php 2 2 3 function PrintCTAMCRunInfoMenu($host,$user,$pw,$db) 3 //MC stuff 4 function PrintMCRunInfoMenu($host,$user,$pw,$db) 4 5 { 5 6 printf(" <div id='info' style='display:none'>"); … … 8 9 9 10 CheckBox("fNumEvents", "Num of events"); 10 11 CheckBox("fEnergyMin", "Emin"); 12 CheckBox("fEnergyMax", "Emax"); 13 CheckBox("fEnergySlope", "Slope"); 14 15 printf(" </tr><tr>\n"); 16 17 CheckBox("fImpactMax", "Impact"); 18 CheckBox("fViewConeMax", "Viewcone"); 19 CheckBox("fNumReUseShower", "#Shower reuse"); 20 CheckBox("fStartingAltitude", "Starting alt."); 21 22 printf(" </tr><tr>\n"); 23 24 CheckBox("fMirrorDiameter", "Mirror diam."); 25 26 printf(" </tr><tr>\n"); 27 28 CheckBox("fZenithDistanceMin", "Zenith distance min"); 29 CheckBox("fZenithDistanceMax", "Zenith distance max"); 30 CheckBox("fAzimuthMin", "Azimuth min"); 31 CheckBox("fAzimuthMax", "Azimuth max"); 32 33 printf(" </tr><tr>\n"); 11 34 printf(" <td>\n"); 12 35 PrintPullDown($host, $user, $pw, $db, "ParticleType", "fParticleTypeName", "fParticleTypeKEY", "Particle type"); 13 36 printf(" </td><td>\n"); 37 PrintPullDown($host, $user, $pw, $db, "AtmosphericModel", "fAtmosphericModelName", "fAtmosphericModelKEY", "Atm. model"); 38 printf(" </td>\n"); 14 39 15 40 printf(" </tr>\n"); … … 18 43 } 19 44 20 function Print CTAMCRunStatMenu()45 function PrintMCRunStatMenu() 21 46 { 22 47 printf(" <div id=\"stat\" style='display:none'>\n"); … … 24 49 printf(" <tr><td>\n"); 25 50 26 PrintStatusMenu("fCorsikaSimTelarray", "Corsika and Simtel"); 27 printf(" </td><td>\n"); 28 PrintStatusMenu("fChimp", "Chimp"); 29 printf(" </td><td>\n"); 30 PrintStatusMenu("fCTAStar", "Star"); 31 32 printf(" </td></tr><tr><td>\n"); 33 34 PrintStatusMenu("fStereoB", "StereoB"); 35 printf(" </td><td>\n"); 36 PrintStatusMenu("fStereoC", "StereoC"); 37 printf(" </td><td>\n"); 38 PrintStatusMenu("fStereoG", "StereoG"); 51 PrintStatusMenu("fCorsikaInputCreated", "Input"); 52 printf(" </td><td>\n"); 53 PrintStatusMenu("fCorsikaFileAvail", "Corsika"); 39 54 40 55 printf(" </td></tr></table>\n"); … … 43 58 } 44 59 60 //cta mc stuff 61 function PrintCTAMCRunInfoMenu($host,$user,$pw,$db) 62 { 63 printf(" <div id='info' style='display:none'>"); 64 printf(" <table>\n"); 65 printf(" <tr valign='top'>\n"); 66 67 CheckBox("fNumEvents", "Num of events"); 68 69 printf(" <td>\n"); 70 PrintPullDown($host, $user, $pw, $db, "ParticleType", "fParticleTypeName", "fParticleTypeKEY", "Particle type"); 71 printf(" </td><td>\n"); 72 73 printf(" </tr>\n"); 74 printf(" </table>\n"); 75 printf(" </div><p>\n"); 76 } 77 78 function PrintCTAMCRunStatMenu() 79 { 80 printf(" <div id=\"stat\" style='display:none'>\n"); 81 printf(" <table>\n"); 82 printf(" <tr><td>\n"); 83 84 PrintStatusMenu("fCorsikaSimTelarray", "Corsika and Simtel"); 85 printf(" </td><td>\n"); 86 PrintStatusMenu("fChimp", "Chimp"); 87 printf(" </td><td>\n"); 88 PrintStatusMenu("fCTAStar", "Star"); 89 90 printf(" </td></tr><tr><td>\n"); 91 92 PrintStatusMenu("fStereoB", "StereoB"); 93 printf(" </td><td>\n"); 94 PrintStatusMenu("fStereoC", "StereoC"); 95 printf(" </td><td>\n"); 96 PrintStatusMenu("fStereoG", "StereoG"); 97 98 printf(" </td></tr></table>\n"); 99 printf(" <p>\n"); 100 printf(" </div><p>\n"); 101 } 102 103 //magic data stuff 45 104 function PrintRunInfoMenu() 46 105 { -
trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php
r9249 r9486 118 118 $query0 .= " AND "; 119 119 120 $query0 .= StatusQuery("fCCFileAvail", $needs );121 $query0 .= StatusQuery("fCaCoFileAvail", $needs );122 $query0 .= StatusQuery("fCaCoFileFound", $needs );123 $query0 .= StatusQuery("fRawFileAvail", $needs );124 $query0 .= StatusQuery("fDataCheckDone", $needs );125 $query0 .= StatusQuery("fTimingCorrection", $needs );120 $query0 .= StatusQuery("fCCFileAvail", $needs, $timelimits); 121 $query0 .= StatusQuery("fCaCoFileAvail", $needs, $timelimits); 122 $query0 .= StatusQuery("fCaCoFileFound", $needs, $timelimits); 123 $query0 .= StatusQuery("fRawFileAvail", $needs, $timelimits); 124 $query0 .= StatusQuery("fDataCheckDone", $needs, $timelimits); 125 $query0 .= StatusQuery("fTimingCorrection", $needs, $timelimits); 126 126 127 127 if ((!empty($_GET["fRunMin"]) || $_GET["fRunMin"]=="0") && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/runinfo.php
r9105 r9486 93 93 $query0 .= " AND "; 94 94 95 $query0 .= StatusQuery("fCCFileAvail", $needs );96 $query0 .= StatusQuery("fCaCoFileAvail", $needs );97 $query0 .= StatusQuery("fCaCoFileFound", $needs );98 $query0 .= StatusQuery("fRawFileAvail", $needs );99 $query0 .= StatusQuery("fDataCheckDone", $needs );100 $query0 .= StatusQuery("fTimingCorrection", $needs );95 $query0 .= StatusQuery("fCCFileAvail", $needs, $timelimits); 96 $query0 .= StatusQuery("fCaCoFileAvail", $needs, $timelimits); 97 $query0 .= StatusQuery("fCaCoFileFound", $needs, $timelimits); 98 $query0 .= StatusQuery("fRawFileAvail", $needs, $timelimits); 99 $query0 .= StatusQuery("fDataCheckDone", $needs, $timelimits); 100 $query0 .= StatusQuery("fTimingCorrection", $needs, $timelimits); 101 101 102 102 if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php
r9249 r9486 167 167 $query0 .= " AND "; 168 168 169 $query0 .= StatusQuery("fSequenceFileWritten", $needs );170 $query0 .= StatusQuery("fAllFilesAvail", $needs );171 $query0 .= StatusQuery("fCallisto", $needs );172 $query0 .= StatusQuery("fFillCallisto", $needs );173 $query0 .= StatusQuery("fStar", $needs );174 $query0 .= StatusQuery("fFillStar", $needs );169 $query0 .= StatusQuery("fSequenceFileWritten", $needs, $timelimits); 170 $query0 .= StatusQuery("fAllFilesAvail", $needs, $timelimits); 171 $query0 .= StatusQuery("fCallisto", $needs, $timelimits); 172 $query0 .= StatusQuery("fFillCallisto", $needs, $timelimits); 173 $query0 .= StatusQuery("fStar", $needs, $timelimits); 174 $query0 .= StatusQuery("fFillStar", $needs, $timelimits); 175 175 176 176 if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/sequinfo.php
r9105 r9486 112 112 $query0 .= " AND "; 113 113 114 $query0 .= StatusQuery("fSequenceFileWritten", $needs );115 $query0 .= StatusQuery("fAllFilesAvail", $needs );116 $query0 .= StatusQuery("fCallisto", $needs );117 $query0 .= StatusQuery("fFillCallisto", $needs );118 $query0 .= StatusQuery("fStar", $needs );119 $query0 .= StatusQuery("fFillStar", $needs );114 $query0 .= StatusQuery("fSequenceFileWritten", $needs, $timelimits); 115 $query0 .= StatusQuery("fAllFilesAvail", $needs, $timelimits); 116 $query0 .= StatusQuery("fCallisto", $needs, $timelimits); 117 $query0 .= StatusQuery("fFillCallisto", $needs, $timelimits); 118 $query0 .= StatusQuery("fStar", $needs, $timelimits); 119 $query0 .= StatusQuery("fFillStar", $needs, $timelimits); 120 120 121 121 if (!empty($_GET["fRunMin"]) && !empty($_GET["fRunMax"])) -
trunk/MagicSoft/Mars/datacenter/db/statusrps.php
r8180 r9486 37 37 $query0 .= " AND "; 38 38 39 $query0 .= StatusQuery("fCCFileAvail", $needs );40 $query0 .= StatusQuery("fCaCoFileAvail", $needs );41 $query0 .= StatusQuery("fCaCoFileFound", $needs );42 $query0 .= StatusQuery("fRawFileAvail", $needs );43 $query0 .= StatusQuery("fDataCheckDone", $needs );44 $query0 .= StatusQuery("fTimingCorrection", $needs );39 $query0 .= StatusQuery("fCCFileAvail", $needs, $timelimits); 40 $query0 .= StatusQuery("fCaCoFileAvail", $needs, $timelimits); 41 $query0 .= StatusQuery("fCaCoFileFound", $needs, $timelimits); 42 $query0 .= StatusQuery("fRawFileAvail", $needs, $timelimits); 43 $query0 .= StatusQuery("fDataCheckDone", $needs, $timelimits); 44 $query0 .= StatusQuery("fTimingCorrection", $needs, $timelimits); 45 45 46 46 $query0 .= "fRunNumber BETWEEN " . $_GET["fRunMin"] . " AND " . $_GET["fRunMax"] . " "; -
trunk/MagicSoft/Mars/datacenter/db/statussbs.php
r8792 r9486 44 44 $query0 .= " AND "; 45 45 46 $query0 .= StatusQuery("fCCFilled", $needs );47 $query0 .= StatusQuery("fExclusionsDone", $needs );48 $query0 .= StatusQuery("fSequenceEntriesBuilt", $needs );46 $query0 .= StatusQuery("fCCFilled", $needs, $timelimits); 47 $query0 .= StatusQuery("fExclusionsDone", $needs, $timelimits); 48 $query0 .= StatusQuery("fSequenceEntriesBuilt", $needs, $timelimits); 49 49 50 50 $query0 .= "fDate BETWEEN '" . $_GET["fRunMin"] . "' AND '" . $_GET["fRunMax"] . "' "; -
trunk/MagicSoft/Mars/datacenter/db/statussps.php
r8180 r9486 41 41 $query0 .= " AND "; 42 42 43 $query0 .= StatusQuery("fSequenceFileWritten", $needs );44 $query0 .= StatusQuery("fAllFilesAvail", $needs );45 $query0 .= StatusQuery("fCallisto", $needs );46 $query0 .= StatusQuery("fFillCallisto", $needs );47 $query0 .= StatusQuery("fStar", $needs );48 $query0 .= StatusQuery("fFillStar", $needs );43 $query0 .= StatusQuery("fSequenceFileWritten", $needs, $timelimits); 44 $query0 .= StatusQuery("fAllFilesAvail", $needs, $timelimits); 45 $query0 .= StatusQuery("fCallisto", $needs, $timelimits); 46 $query0 .= StatusQuery("fFillCallisto", $needs, $timelimits); 47 $query0 .= StatusQuery("fStar", $needs, $timelimits); 48 $query0 .= StatusQuery("fFillStar", $needs, $timelimits); 49 49 50 50 $query0 .= "fSequenceFirst BETWEEN " . $_GET["fRunMin"] . " AND " . $_GET["fRunMax"] . " ";
Note:
See TracChangeset
for help on using the changeset viewer.
