Changeset 8621 for trunk/MagicSoft
- Timestamp:
- 06/29/07 13:03:16 (17 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8619 r8621 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 22 2007/06/29 Daniela Dorner 23 24 * datacenter/db/sources.php: 25 - fixed bug (test-sources where displayed although 'incl. test 26 sources was not checked) 27 - added input field for source name (regular expressions) 28 - adapted link for source name from sequinfo.php to 29 sequinfo-aio.php 30 20 31 21 32 -
trunk/MagicSoft/Mars/datacenter/db/menu.php
r8512 r8621 1034 1034 InitSequInfo($_GET, $first); 1035 1035 1036 //init for limits 1037 1036 1038 if (empty($_GET["fArrTimeLimitMean"])) 1037 1039 $_GET["fArrTimeLimitMean"]=""; … … 1040 1042 $_GET["fArrTimeLimitRms"]=""; 1041 1043 1044 if (empty($_GET["fSkyBrightLimitMean"])) 1045 $_GET["fSkyBrightLimitMean"]=""; 1046 1047 if (empty($_GET["fSkyBrightLimitRms"])) 1048 $_GET["fSkyBrightLimitRms"]=""; 1049 1050 if (empty($_GET["fMaxHumLimit1"])) 1051 $_GET["fMaxHumLimit1"]=""; 1052 1053 if (empty($_GET["fMaxHumLimit2"])) 1054 $_GET["fMaxHumLimit2"]=""; 1055 1056 //values that differ for different data 1057 if (empty($_GET["fPSFLimitMean"])) 1058 $_GET["fPSFLimitMean"]=""; 1059 1042 1060 if (empty($_GET["fPedRmsInLimitMean"])) 1043 1061 $_GET["fPedRmsInLimitMean"]=""; 1044 1062 1045 if (empty($_GET["fPedRmsInLimitRms"]))1046 $_GET["fPedRmsInLimitRms"]="";1047 1048 if (empty($_GET["fMuonRateLimitMean"]))1049 $_GET["fMuonRateLimitMean"]="";1050 1051 if (empty($_GET["fMuonRateLimitRms"]))1052 $_GET["fMuonRateLimitRms"]="";1053 1054 if (empty($_GET["fImgRateLimitMean"]))1055 $_GET["fImgRateLimitMean"]="";1056 1057 if (empty($_GET["fImgRateLimitRms"]))1058 $_GET["fImgRateLimitRms"]="";1059 1060 if (empty($_GET["fPSFLimitMean"]))1061 $_GET["fPSFLimitMean"]="";1062 1063 if (empty($_GET["fPSFLimitRms"]))1064 $_GET["fPSFLimitRms"]="";1065 1066 if (empty($_GET["fUnsInLimit1"]))1067 $_GET["fUnsInLimit1"]="";1068 1069 if (empty($_GET["fUnsInLimit2"]))1070 $_GET["fUnsInLimit2"]="";1071 1072 if (empty($_GET["fIsoInLimit1"]))1073 $_GET["fIsoInLimit1"]="";1074 1075 if (empty($_GET["fIsoInLimit2"]))1076 $_GET["fIsoInLimit2"]="";1077 1078 if (empty($_GET["fIMCLimit1"]))1079 $_GET["fIMCLimit1"]="";1080 1081 if (empty($_GET["fIMCLimit2"]))1082 $_GET["fIMCLimit2"]="";1083 1084 1063 if (empty($_GET["fZdMinLimit1"])) 1085 1064 $_GET["fZdMinLimit1"]=""; … … 1094 1073 $_GET["fZdMaxLimit2"]=""; 1095 1074 1075 // values taken from distribution or from experience 1076 if (empty($_GET["fUnsInLimit1"])) 1077 $_GET["fUnsInLimit1"]=$first?"12":""; 1078 1079 if (empty($_GET["fUnsInLimit2"])) 1080 $_GET["fUnsInLimit2"]=$first?"20":""; 1081 1082 if (empty($_GET["fRunTimeLimit1"])) 1083 $_GET["fRunTimeLimit1"]=$first?"5":""; 1084 1085 if (empty($_GET["fRunTimeLimit2"])) 1086 $_GET["fRunTimeLimit2"]=$first?"2":""; 1087 1088 if (empty($_GET["fPSFLimitRms"])) 1089 $_GET["fPSFLimitRms"]=$first?"1.0":""; 1090 1091 if (empty($_GET["fPedRmsInLimitRms"])) 1092 $_GET["fPedRmsInLimitRms"]=$first?"0.08":""; 1093 1094 if (empty($_GET["fNumIslLimitMean"])) 1095 $_GET["fNumIslLimitMean"]=$first?"1.230":""; 1096 1097 if (empty($_GET["fNumIslLimitRms"])) 1098 $_GET["fNumIslLimitRms"]=$first?"0.013":""; 1099 1096 1100 if (empty($_GET["fMuonCalLimitMean"])) 1097 $_GET["fMuonCalLimitMean"]= "";1101 $_GET["fMuonCalLimitMean"]=$first?"100.0":""; 1098 1102 1099 1103 if (empty($_GET["fMuonCalLimitRms"])) 1100 $_GET["fMuonCalLimitRms"]=""; 1104 $_GET["fMuonCalLimitRms"]=$first?"1.6":""; 1105 1106 if (empty($_GET["fRelTimeMaxLimit1"])) 1107 $_GET["fRelTimeMaxLimit1"]=$first?"1.0":""; 1108 1109 if (empty($_GET["fRelTimeMaxLimit2"])) 1110 $_GET["fRelTimeMaxLimit2"]=$first?"1.02":""; 1111 1112 if (empty($_GET["fRelTimeMinLimit1"])) 1113 $_GET["fRelTimeMinLimit1"]=$first?"0.97":""; 1114 1115 if (empty($_GET["fRelTimeMinLimit2"])) 1116 $_GET["fRelTimeMinLimit2"]=$first?"0.93":""; 1117 1118 if (empty($_GET["fIMCLimit1"])) 1119 $_GET["fIMCLimit1"]=$first?"00":""; 1120 1121 if (empty($_GET["fIMCLimit2"])) 1122 $_GET["fIMCLimit2"]=$first?"00":""; 1123 1124 if (empty($_GET["fIsoInLimit1"])) 1125 $_GET["fIsoInLimit1"]=$first?"00":""; 1126 1127 if (empty($_GET["fIsoInLimit2"])) 1128 $_GET["fIsoInLimit2"]=$first?"00":""; 1101 1129 1102 1130 if (empty($_GET["fInhomLimitMean"])) 1103 $_GET["fInhomLimitMean"]= "";1131 $_GET["fInhomLimitMean"]=$first?"10":""; 1104 1132 1105 1133 if (empty($_GET["fInhomLimitRms"])) 1106 $_GET["fInhomLimitRms"]=""; 1107 1108 if (empty($_GET["fNumIslLimitMean"])) 1109 $_GET["fNumIslLimitMean"]=""; 1110 1111 if (empty($_GET["fNumIslLimitRms"])) 1112 $_GET["fNumIslLimitRms"]=""; 1113 1114 if (empty($_GET["fSkyBrightLimitMean"])) 1115 $_GET["fSkyBrightLimitMean"]=""; 1116 1117 if (empty($_GET["fSkyBrightLimitRms"])) 1118 $_GET["fSkyBrightLimitRms"]=""; 1134 $_GET["fInhomLimitRms"]=$first?"3":""; 1135 1136 if (empty($_GET["fImgRateLimitMean"])) 1137 $_GET["fImgRateLimitMean"]=$first?"180":""; 1138 1139 if (empty($_GET["fImgRateLimitRms"])) 1140 $_GET["fImgRateLimitRms"]=$first?"30":""; 1141 1142 if (empty($_GET["fMuonRateLimitMean"])) 1143 $_GET["fMuonRateLimitMean"]=$first?"1":""; 1144 1145 if (empty($_GET["fMuonRateLimitRms"])) 1146 $_GET["fMuonRateLimitRms"]=$first?"0.1":""; 1147 1148 if (empty($_GET["fMuonNumLimit1"])) 1149 $_GET["fMuonNumLimit1"]=$first?"180":""; 1150 1151 if (empty($_GET["fMuonNumLimit2"])) 1152 $_GET["fMuonNumLimit2"]=$first?"120":""; 1153 1154 if (empty($_GET["fPulsePosLimit1"])) 1155 $_GET["fPulsePosLimit1"]=$first?"3.5":""; 1156 1157 if (empty($_GET["fPulsePosLimit2"])) 1158 $_GET["fPulsePosLimit2"]=$first?"2.5":""; 1119 1159 1120 1160 if (empty($_GET["fNumStarsLimit1"])) 1121 $_GET["fNumStarsLimit1"]= "";1161 $_GET["fNumStarsLimit1"]=$first?"30":""; 1122 1162 1123 1163 if (empty($_GET["fNumStarsLimit2"])) 1124 $_GET["fNumStarsLimit2"]= "";1164 $_GET["fNumStarsLimit2"]=$first?"20":""; 1125 1165 1126 1166 if (empty($_GET["fNumStarsCorLimit1"])) 1127 $_GET["fNumStarsCorLimit1"]= "";1167 $_GET["fNumStarsCorLimit1"]=$first?"10":""; 1128 1168 1129 1169 if (empty($_GET["fNumStarsCorLimit2"])) 1130 $_GET["fNumStarsCorLimit2"]=""; 1131 1132 if (empty($_GET["fMuonNumLimit1"])) 1133 $_GET["fMuonNumLimit1"]=""; 1134 1135 if (empty($_GET["fMuonNumLimit2"])) 1136 $_GET["fMuonNumLimit2"]=""; 1137 1138 if (empty($_GET["fRelTimeMinLimit1"])) 1139 $_GET["fRelTimeMinLimit1"]=""; 1140 1141 if (empty($_GET["fRelTimeMinLimit2"])) 1142 $_GET["fRelTimeMinLimit2"]=""; 1143 1144 if (empty($_GET["fRelTimeMaxLimit1"])) 1145 $_GET["fRelTimeMaxLimit1"]=""; 1146 1147 if (empty($_GET["fRelTimeMaxLimit2"])) 1148 $_GET["fRelTimeMaxLimit2"]=""; 1149 1150 if (empty($_GET["fRunTimeLimit1"])) 1151 $_GET["fRunTimeLimit1"]=""; 1152 1153 if (empty($_GET["fRunTimeLimit2"])) 1154 $_GET["fRunTimeLimit2"]=""; 1155 1156 if (empty($_GET["fPulsePosLimit1"])) 1157 $_GET["fPulsePosLimit1"]=""; 1158 1159 if (empty($_GET["fPulsePosLimit2"])) 1160 $_GET["fPulsePosLimit2"]=""; 1161 1162 if (empty($_GET["fMaxHumLimit1"])) 1163 $_GET["fMaxHumLimit1"]=""; 1164 1165 if (empty($_GET["fMaxHumLimit2"])) 1166 $_GET["fMaxHumLimit2"]=""; 1167 1168 } 1169 1170 $_GET["fNumStarsCorLimit2"]=$first?"5":""; 1171 1172 } 1170 1173 1171 1174 ?> -
trunk/MagicSoft/Mars/datacenter/db/sources.php
r8249 r8621 9 9 else 10 10 { 11 $query0 .= " CONCAT('<A&ws;HREF=\"sequinfo .php?', ";11 $query0 .= " CONCAT('<A&ws;HREF=\"sequinfo-aio.php?', "; 12 12 $query0 .= " 'fRunStart=On', '&fZenithDistanceMin=On', '&fNumEvents=On', '&fRunTime%2F60=On', '&fSequenceLast=On', "; 13 $query0 .= " '&fSequenceFileWrittenStatus=0', '&fAllFilesAvail =On', '&fAllFilesAvailStatus=0', '&fCallisto=On', '&fCallistoStatus=0', '&fStar=On', '&fStarStatus=0', '&fFillCallistoStatus=0', '&fFillStarStatus=0', ";13 $query0 .= " '&fSequenceFileWrittenStatus=0', '&fAllFilesAvailStatus=0', '&fCallistoStatus=0', '&fStar=On', '&fStarStatus=0', '&fFillCallistoStatus=0', '&fFillStarStatus=0', "; 14 14 $query0 .= " '&fSourceName=On', '&fSourceKEY=', fSourceKEY, "; //'&fRunMin=0', '&fRunMax=1000000', "; 15 15 $query0 .= " '&fNumResults=500\">', fSourcename, '</A>') "; … … 19 19 $query0 .= " FROM Source "; 20 20 21 if ( empty($_GET["fTest"]))21 if ($_GET["fTest"]=="Off") 22 22 $query0 .= " WHERE fTest='no'"; 23 23 … … 31 31 $query0 .= " NOT (fSourceName like '%Off%')"; 32 32 } 33 34 if (!empty($_GET["fSourceN"])) 35 { 36 if (strpos($query0, " WHERE ")==FALSE) 37 $query0 .= " WHERE "; 38 else 39 $query0 .= " AND "; 40 41 $query0 .= " fSourceName REGEXP \"^" . $_GET["fSourceN"] . "\" "; 42 } 43 33 44 34 45 if (!empty($_GET["fSortBy"])) … … 58 69 } 59 70 60 function PrintForm($_GET )71 function PrintForm($_GET,$host,$user,$pw,$db) 61 72 { 62 73 printf("<center>\n"); … … 70 81 71 82 printf(" </table></p>\n"); 72 83 printf("<p>"); 84 PrintSourceMenu($host,$user,$pw,$db); 73 85 74 86 ini_set("mysql.trace_mode", "Off"); … … 116 128 117 129 include ("include.php"); 130 include ("menu.php"); 118 131 include ("db.php"); 119 132 include ("magicdefs.php"); … … 136 149 137 150 InitGet($_GET); 138 PrintForm($_GET );151 PrintForm($_GET,$host,$user,$pw,$db); 139 152 140 153 if ($environment==0)
Note:
See TracChangeset
for help on using the changeset viewer.