Changeset 8249 for trunk/MagicSoft/Mars
- Timestamp:
- 01/15/07 00:43:47 (18 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8248 r8249 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2007/01/15 Daniela Dorner 22 23 * datacenter/db/sources.php, datacenter/db/sequinfo-aio.php, 24 datacenter/db/runinfo-aio.php, datacenter/db/printtable.php, 25 datacenter/db/plotdb.php, datacenter/db/menu.php, 26 datacenter/db/findoffdata.php, datacenter/db/builddatasets.php, 27 datacenter/db/datasetinfo.php: 28 - fixed bug in init of $_GET 29 30 31 20 32 2007/01/12 Stefan Ruegamer 21 33 -
trunk/MagicSoft/Mars/datacenter/db/builddatasets.php
r8246 r8249 409 409 $_GET["fOnlyOff"]=$first?"Off":""; 410 410 411 Init SequInfo($_GET);411 InitFindOffData($_GET, $first); 412 412 } 413 413 -
trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php
r8241 r8249 187 187 $_GET["fSourceName"]=$first?"On":""; 188 188 189 InitDataSetInfo($_GET );189 InitDataSetInfo($_GET, $first); 190 190 } 191 191 -
trunk/MagicSoft/Mars/datacenter/db/findoffdata.php
r8180 r8249 286 286 $_GET["fDataRate"]=$first?"On":""; 287 287 288 InitFindOffData($_GET );288 InitFindOffData($_GET, $first); 289 289 } 290 290 -
trunk/MagicSoft/Mars/datacenter/db/menu.php
r8198 r8249 536 536 } 537 537 538 function InitFailInfo($_GET )538 function InitFailInfo($_GET, $first) 539 539 { 540 540 if (empty($_GET["fStartTime"])) … … 554 554 } 555 555 556 function InitInfo($_GET )556 function InitInfo($_GET, $first) 557 557 { 558 558 if (empty($_GET["fNumResults"])) … … 599 599 } 600 600 601 function InitRunStatus($_GET )601 function InitRunStatus($_GET, $first) 602 602 { 603 603 if (empty($_GET["fDataCheckDone"])) … … 638 638 } 639 639 640 function InitRunInfo($_GET )641 { 642 InitRunStatus($_GET );643 InitInfo($_GET );644 InitFailInfo($_GET );640 function InitRunInfo($_GET, $first) 641 { 642 InitRunStatus($_GET, $first); 643 InitInfo($_GET, $first); 644 InitFailInfo($_GET, $first); 645 645 646 646 if (empty($_GET["fFormatVersion"])) … … 693 693 } 694 694 695 function InitSequStatus($_GET )695 function InitSequStatus($_GET, $first) 696 696 { 697 697 if (empty($_GET["fSequenceFileWritten"])) … … 732 732 } 733 733 734 function InitStarInfo($_GET )734 function InitStarInfo($_GET, $first) 735 735 { 736 736 if (empty($_GET["fMeanNumberIslands"])) … … 763 763 if (empty($_GET["fMaxHumidity"])) 764 764 $_GET["fMaxHumidity"]="Off"; 765 } 766 767 function InitCalInfo($_GET) 765 766 if (empty($_GET["fBrightnessMed"])) 767 $_GET["fBrightnessMed"]="Off"; 768 769 if (empty($_GET["fBrightnessRMS"])) 770 $_GET["fBrightnessRMS"]="Off"; 771 772 if (empty($_GET["fNumStarsMed"])) 773 $_GET["fNumStarsMed"]="Off"; 774 775 if (empty($_GET["fNumStarsRMS"])) 776 $_GET["fNumStarsRMS"]="Off"; 777 778 if (empty($_GET["fNumStarsCorMed"])) 779 $_GET["fNumStarsCorMed"]="Off"; 780 781 if (empty($_GET["fNumStarsCorRMS"])) 782 $_GET["fNumStarsCorRMS"]="Off"; 783 } 784 785 function InitCalInfo($_GET, $first) 768 786 { 769 787 if (empty($_GET["fUnreliableInner"])) … … 822 840 } 823 841 824 function InitSequInfo($_GET )825 { 826 InitInfo($_GET );827 InitSequStatus($_GET );828 InitFailInfo($_GET );829 InitCalInfo($_GET );830 InitStarInfo($_GET );842 function InitSequInfo($_GET, $first) 843 { 844 InitInfo($_GET, $first); 845 InitSequStatus($_GET, $first); 846 InitFailInfo($_GET, $first); 847 InitCalInfo($_GET, $first); 848 InitStarInfo($_GET, $first); 831 849 832 850 if (empty($_GET["fRunTime/60"])) … … 855 873 } 856 874 857 function InitDataSetStatus($_GET )875 function InitDataSetStatus($_GET, $first) 858 876 { 859 877 if (empty($_GET["fDataSetInserted"])) … … 882 900 } 883 901 884 function InitDataSetInfo($_GET )885 { 886 InitDataSetStatus($_GET );887 InitFailInfo($_GET );902 function InitDataSetInfo($_GET, $first) 903 { 904 InitDataSetStatus($_GET, $first); 905 InitFailInfo($_GET, $first); 888 906 889 907 if (empty($_GET["fNumResults"])) … … 927 945 } 928 946 929 function InitFindOffData($_GET )930 { 931 InitSequInfo($_GET );947 function InitFindOffData($_GET, $first) 948 { 949 InitSequInfo($_GET, $first); 932 950 933 951 if (empty($_GET["fArrTimeLimitMean"])) … … 961 979 $_GET["fPSFLimitRms"]=""; 962 980 963 if (empty($_GET["fUnsInLimitMean"])) 964 $_GET["fUnsInLimitMean"]=""; 965 966 if (empty($_GET["fZdMinLimitMean"])) 967 $_GET["fZdMinLimitMean"]=""; 968 969 if (empty($_GET["fZdMaxLimitMean"])) 970 $_GET["fZdMaxLimitMean"]=""; 981 if (empty($_GET["fUnsInLimit1"])) 982 $_GET["fUnsInLimit1"]=""; 983 984 if (empty($_GET["fUnsInLimit2"])) 985 $_GET["fUnsInLimit2"]=""; 986 987 if (empty($_GET["fIsoInLimit1"])) 988 $_GET["fIsoInLimit1"]=""; 989 990 if (empty($_GET["fIsoInLimit2"])) 991 $_GET["fIsoInLimit2"]=""; 992 993 if (empty($_GET["fIMCLimit1"])) 994 $_GET["fIMCLimit1"]=""; 995 996 if (empty($_GET["fIMCLimit2"])) 997 $_GET["fIMCLimit2"]=""; 998 999 if (empty($_GET["fZdMinLimit1"])) 1000 $_GET["fZdMinLimit1"]=""; 1001 1002 if (empty($_GET["fZdMinLimit2"])) 1003 $_GET["fZdMinLimit2"]=""; 1004 1005 if (empty($_GET["fZdMaxLimit1"])) 1006 $_GET["fZdMaxLimit1"]=""; 1007 1008 if (empty($_GET["fZdMaxLimit2"])) 1009 $_GET["fZdMaxLimit2"]=""; 1010 1011 if (empty($_GET["fMuonCalLimitMean"])) 1012 $_GET["fMuonCalLimitMean"]=""; 1013 1014 if (empty($_GET["fMuonCalLimitRms"])) 1015 $_GET["fMuonCalLimitRms"]=""; 1016 1017 if (empty($_GET["fInhomLimitMean"])) 1018 $_GET["fInhomLimitMean"]=""; 1019 1020 if (empty($_GET["fInhomLimitRms"])) 1021 $_GET["fInhomLimitRms"]=""; 1022 1023 if (empty($_GET["fNumIslLimitMean"])) 1024 $_GET["fNumIslLimitMean"]=""; 1025 1026 if (empty($_GET["fNumIslLimitRms"])) 1027 $_GET["fNumIslLimitRms"]=""; 1028 1029 if (empty($_GET["fSkyBrightLimitMean"])) 1030 $_GET["fSkyBrightLimitMean"]=""; 1031 1032 if (empty($_GET["fSkyBrightLimitRms"])) 1033 $_GET["fSkyBrightLimitRms"]=""; 1034 1035 if (empty($_GET["fNumStarsLimit1"])) 1036 $_GET["fNumStarsLimit1"]=""; 1037 1038 if (empty($_GET["fNumStarsLimit2"])) 1039 $_GET["fNumStarsLimit2"]=""; 1040 1041 if (empty($_GET["fNumStarsCorLimit1"])) 1042 $_GET["fNumStarsCorLimit1"]=""; 1043 1044 if (empty($_GET["fNumStarsCorLimit2"])) 1045 $_GET["fNumStarsCorLimit2"]=""; 1046 1047 if (empty($_GET["fMuonNumLimit1"])) 1048 $_GET["fMuonNumLimit1"]=""; 1049 1050 if (empty($_GET["fMuonNumLimit2"])) 1051 $_GET["fMuonNumLimit2"]=""; 1052 1053 if (empty($_GET["fRelTimeMinLimit1"])) 1054 $_GET["fRelTimeMinLimit1"]=""; 1055 1056 if (empty($_GET["fRelTimeMinLimit2"])) 1057 $_GET["fRelTimeMinLimit2"]=""; 1058 1059 if (empty($_GET["fRelTimeMaxLimit1"])) 1060 $_GET["fRelTimeMaxLimit1"]=""; 1061 1062 if (empty($_GET["fRelTimeMaxLimit2"])) 1063 $_GET["fRelTimeMaxLimit2"]=""; 1064 1065 if (empty($_GET["fRunTimeLimit1"])) 1066 $_GET["fRunTimeLimit1"]=""; 1067 1068 if (empty($_GET["fRunTimeLimit2"])) 1069 $_GET["fRunTimeLimit2"]=""; 1070 1071 if (empty($_GET["fPulsePosLimit1"])) 1072 $_GET["fPulsePosLimit1"]=""; 1073 1074 if (empty($_GET["fPulsePosLimit2"])) 1075 $_GET["fPulsePosLimit2"]=""; 1076 1077 if (empty($_GET["fMaxHumLimit1"])) 1078 $_GET["fMaxHumLimit1"]=""; 1079 1080 if (empty($_GET["fMaxHumLimit2"])) 1081 $_GET["fMaxHumLimit2"]=""; 1082 971 1083 } 972 1084 -
trunk/MagicSoft/Mars/datacenter/db/plotdb.php
r8204 r8249 19 19 20 20 printf("</select>\n"); 21 22 if (empty($_GET[$_GET[$column."Col".$num]."Start".$num])) 23 $_GET[$_GET[$column."Col".$num]."Start".$num]=0; 24 if (empty($_GET[$_GET[$column."Col".$num]."Stop".$num])) 25 $_GET[$_GET[$column."Col".$num]."Stop".$num]=0; 26 21 27 printf(" from <input name='%sStart%s' type='text' size='6' maxlength='6' value='%s'>", $_GET[$column."Col".$num], $num, $_GET[$_GET[$column."Col".$num]."Start".$num]); 22 28 printf(" to <input name='%sStop%s' type='text' size='6' maxlength='6' value='%s'><br>\n", $_GET[$column."Col".$num], $num, $_GET[$_GET[$column."Col".$num]."Stop".$num]); … … 30 36 31 37 include("plotinclude.php"); 38 39 //init 40 if (empty($_GET["plot"])) 41 $_GET["plot"]=0; 42 if (empty($_GET["primstart"])) 43 $_GET["primstart"]=0; 44 if (empty($_GET["primstop"])) 45 $_GET["primstop"]=0; 46 if (empty($_GET["prim"])) 47 $_GET["prim"]=0; 48 if (empty($_GET["fSequenceFirstCol"])) 49 $_GET["fSequenceFirstCol"]=0; 50 if (empty($_GET["fSequenceFirstCol2"])) 51 $_GET["fSequenceFirstCol2"]=0; 52 if (empty($_GET["fRunNumberCol"])) 53 $_GET["fRunNumberCol"]=0; 54 if (empty($_GET["fRunNumberCol2"])) 55 $_GET["fRunNumberCol2"]=0; 56 if (empty($_GET["fDataSetNumberCol"])) 57 $_GET["fDataSetNumberCol"]=0; 58 if (empty($_GET["fDataSetNumberCol2"])) 59 $_GET["fDataSetNumberCol2"]=0; 60 if (empty($_GET["0Start"])) 61 $_GET["0Start"]=0; 62 if (empty($_GET["0Stop"])) 63 $_GET["0Stop"]=0; 64 if (empty($_GET["0Start2"])) 65 $_GET["0Start2"]=0; 66 if (empty($_GET["0Stop2"])) 67 $_GET["0Stop2"]=0; 68 if (empty($_GET["Set"])) 69 $_GET["Set"]=0; 70 if (empty($_GET["Set2"])) 71 $_GET["Set2"]=0; 32 72 33 73 printf("<center>\n<table cellpadding='0'>\n"); -
trunk/MagicSoft/Mars/datacenter/db/printtable.php
r8180 r8249 74 74 header("Content-Disposition: attachment; filename=query-result.txt"); 75 75 76 PrintPage("0", $host, $user, $pw, $db, $limits, $rms);76 PrintPage("0", $host, $user, $pw, $db, "", ""); 77 77 } 78 78 else … … 87 87 printf("No query submitted yet.<BR>"); 88 88 else 89 PrintPage("1", $host, $user, $pw, $db, $limits, $rms);89 PrintPage("1", $host, $user, $pw, $db, "", ""); 90 90 91 91 echo (file_get_contents("index-footer.html")); -
trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php
r8241 r8249 222 222 $_GET["fSequenceNo"]=""; 223 223 224 InitRunInfo($_GET );224 InitRunInfo($_GET, $first); 225 225 } 226 226 -
trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php
r8241 r8249 272 272 $_GET["fOnlyOff"]=$first?"Off":""; 273 273 274 Init SequInfo($_GET);274 InitFindOffData($_GET, $first); 275 275 } 276 276 -
trunk/MagicSoft/Mars/datacenter/db/sources.php
r8180 r8249 49 49 if (empty($_GET["fOff"])) 50 50 $_GET["fOff"]="Off"; 51 52 if (empty($_GET["fTest"])) 53 $_GET["fTest"]="Off"; 51 54 52 55 if (empty($_GET["fLinks"]))
Note:
See TracChangeset
for help on using the changeset viewer.