Index: trunk/MagicSoft/Mars/datacenter/db/magicdefs.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/magicdefs.php	(revision 9486)
+++ trunk/MagicSoft/Mars/datacenter/db/magicdefs.php	(revision 9498)
@@ -66,64 +66,64 @@
 $checkwhere = array
     (
-     "fRunTypeName"                      => CheckWhere("fRunTypeKEY",                      $_GET),
-     "fProjectName"                      => CheckWhere("fProjectKEY",                      $_GET),
-     "fSourceName"                       => CheckWhere("fSourceKEY",                       $_GET),
-     "fMagicNumberName"                  => CheckWhere("fMagicNumberKEY",                  $_GET),
-     "fL1TriggerTableName"               => CheckWhere("fL1TriggerTableKEY",               $_GET),
-     "fL2TriggerTableName"               => CheckWhere("fL2TriggerTableKEY",               $_GET),
-     "fL3TriggerTableName"               => CheckWhere("fL3TriggerTableKEY",               $_GET),
-     "fHvSettingsName"                   => CheckWhere("fHvSettingsKEY",                   $_GET),
-     "fCalibrationScriptName"            => CheckWhere("fCalibrationScriptKEY",            $_GET),
-     "fExcludedFDAName"                  => CheckWhere("fExcludedFDAKEY",                  $_GET),
-     "fManuallyChangedName"              => CheckWhere("fManuallyChangedKEY",              $_GET),
-     "fObservationModeName"              => CheckWhere("fObservationModeKEY",              $_GET),
-     "fSumTriggerFlagName"               => CheckWhere("fSumTriggerFlagKEY",               $_GET),
-     "fDiscriminatorThresholdTableName"  => CheckWhere("fDiscriminatorThresholdTableKEY",  $_GET),
-     "fTriggerDelayTableName"            => CheckWhere("fTriggerDelayTableKEY",            $_GET),
-     "fTestFlagName"                     => CheckWhere("fTestFlagKEY",                     $_GET),
-     "fLightConditionsName"              => CheckWhere("fLightConditionsKEY",              $_GET),
-     "fParticleTypeName"                 => CheckWhere("fParticleTypeKEY",                 $_GET),
-     "fFitsFileName"                     => CheckWhere("fFitsFileKEY",                     $_GET),
-     "fObjectName"                       => CheckWhere("fObjectKEY",                       $_GET),
-     "fStatusName"                       => CheckWhere("fStatusKEY",                       $_GET),
-     "fTelescopeName"                    => CheckWhere("fTelescopeKEY",                    $_GET),
-     "fBandName"                         => CheckWhere("fBandKEY",                         $_GET),
-     "fUserName"                         => CheckWhere("fUserKEY",                         $_GET),
-     "fCycleName"                        => CheckWhere("fCycleKEY",                        $_GET),
-     "fPIName"                           => CheckWhere("fPIKEY",                           $_GET),
-     "fWorkingGroupName"                 => CheckWhere("fWorkingGroupKEY",                 $_GET),
-     "fProposalName"                     => CheckWhere("fProposalKEY",                     $_GET),
+     "fRunTypeName"                      => CheckWhere("fRunTypeKEY"),
+     "fProjectName"                      => CheckWhere("fProjectKEY"),
+     "fSourceName"                       => CheckWhere("fSourceKEY"),
+     "fMagicNumberName"                  => CheckWhere("fMagicNumberKEY"),
+     "fL1TriggerTableName"               => CheckWhere("fL1TriggerTableKEY"),
+     "fL2TriggerTableName"               => CheckWhere("fL2TriggerTableKEY"),
+     "fL3TriggerTableName"               => CheckWhere("fL3TriggerTableKEY"),
+     "fHvSettingsName"                   => CheckWhere("fHvSettingsKEY"),
+     "fCalibrationScriptName"            => CheckWhere("fCalibrationScriptKEY"),
+     "fExcludedFDAName"                  => CheckWhere("fExcludedFDAKEY"),
+     "fManuallyChangedName"              => CheckWhere("fManuallyChangedKEY"),
+     "fObservationModeName"              => CheckWhere("fObservationModeKEY"),
+     "fSumTriggerFlagName"               => CheckWhere("fSumTriggerFlagKEY"),
+     "fDiscriminatorThresholdTableName"  => CheckWhere("fDiscriminatorThresholdTableKEY"),
+     "fTriggerDelayTableName"            => CheckWhere("fTriggerDelayTableKEY"),
+     "fTestFlagName"                     => CheckWhere("fTestFlagKEY"),
+     "fLightConditionsName"              => CheckWhere("fLightConditionsKEY"),
+     "fParticleTypeName"                 => CheckWhere("fParticleTypeKEY"),
+     "fFitsFileName"                     => CheckWhere("fFitsFileKEY"),
+     "fObjectName"                       => CheckWhere("fObjectKEY"),
+     "fStatusName"                       => CheckWhere("fStatusKEY"),
+     "fTelescopeName"                    => CheckWhere("fTelescopeKEY"),
+     "fBandName"                         => CheckWhere("fBandKEY"),
+     "fUserName"                         => CheckWhere("fUserKEY"),
+     "fCycleName"                        => CheckWhere("fCycleKEY"),
+     "fPIName"                           => CheckWhere("fPIKEY"),
+     "fWorkingGroupName"                 => CheckWhere("fWorkingGroupKEY"),
+     "fProposalName"                     => CheckWhere("fProposalKEY"),
     );
 
 $checkgroup = array
     (
-     "fRunTypeName"                      => CheckGroup("fRunTypeKEY",                      $_GET),
-     "fProjectName"                      => CheckGroup("fProjectKEY",                      $_GET),
-     "fSourceName"                       => CheckGroup("fSourceKEY",                       $_GET),
-     "fMagicNumberName"                  => CheckGroup("fMagicNumberKEY",                  $_GET),
-     "fL1TriggerTableName"               => CheckGroup("fL1TriggerTableKEY",               $_GET),
-     "fL2TriggerTableName"               => CheckGroup("fL2TriggerTableKEY",               $_GET),
-     "fL3TriggerTableName"               => CheckGroup("fL3TriggerTableKEY",               $_GET),
-     "fHvSettingsName"                   => CheckGroup("fHvSettingsKEY",                   $_GET),
-     "fCalibrationScriptName"            => CheckGroup("fCalibrationScriptKEY",            $_GET),
-     "fExcludedFDAName"                  => CheckGroup("fExcludedFDAKEY",                  $_GET),
-     "fManuallyChangedName"              => CheckGroup("fManuallyChangedKEY",              $_GET),
-     "fObservationModeName"              => CheckGroup("fObservationModeKEY",              $_GET),
-     "fSumTriggerFlagName"               => CheckGroup("fSumTriggerFlagKEY",              $_GET),
-     "fDiscriminatorThresholdTableName"  => CheckGroup("fDiscriminatorThresholdTableKEY",  $_GET),
-     "fTriggerDelayTableName"            => CheckGroup("fTriggerDelayTableKEY",            $_GET),
-     "fTestFlagName"                     => CheckGroup("fTestFlagKEY",                     $_GET),
-     "fLightConditionsName"              => CheckGroup("fLightConditionsKEY",              $_GET),
-     "fParticleTypeName"                 => CheckGroup("fParticleTypeKEY",                 $_GET),
-     "fFitsFileName"                     => CheckGroup("fFitsFileKEY",                     $_GET),
-     "fObjectName"                       => CheckGroup("fObjectKEY",                       $_GET),
-     "fStatusName"                       => CheckGroup("fStatusKEY",                       $_GET),
-     "fBandName"                         => CheckGroup("fBandKEY",                         $_GET),
-     "fUserName"                         => CheckGroup("fUserKEY",                         $_GET),
-     "fTelescopeName"                    => CheckGroup("fTelescopeKEY",                    $_GET),
-     "fCycleName"                        => CheckWhere("fCycleKEY",                        $_GET),
-     "fPIName"                           => CheckWhere("fPIKEY",                           $_GET),
-     "fWorkingGroupName"                 => CheckWhere("fWorkingGroupKEY",                 $_GET),
-     "fProposalName"                     => CheckWhere("fProposalKEY",                     $_GET),
+     "fRunTypeName"                      => CheckGroup("fRunTypeKEY"),
+     "fProjectName"                      => CheckGroup("fProjectKEY"),
+     "fSourceName"                       => CheckGroup("fSourceKEY"),
+     "fMagicNumberName"                  => CheckGroup("fMagicNumberKEY"),
+     "fL1TriggerTableName"               => CheckGroup("fL1TriggerTableKEY"),
+     "fL2TriggerTableName"               => CheckGroup("fL2TriggerTableKEY"),
+     "fL3TriggerTableName"               => CheckGroup("fL3TriggerTableKEY"),
+     "fHvSettingsName"                   => CheckGroup("fHvSettingsKEY"),
+     "fCalibrationScriptName"            => CheckGroup("fCalibrationScriptKEY"),
+     "fExcludedFDAName"                  => CheckGroup("fExcludedFDAKEY"),
+     "fManuallyChangedName"              => CheckGroup("fManuallyChangedKEY"),
+     "fObservationModeName"              => CheckGroup("fObservationModeKEY"),
+     "fSumTriggerFlagName"               => CheckGroup("fSumTriggerFlagKEY"),
+     "fDiscriminatorThresholdTableName"  => CheckGroup("fDiscriminatorThresholdTableKEY"),
+     "fTriggerDelayTableName"            => CheckGroup("fTriggerDelayTableKEY"),
+     "fTestFlagName"                     => CheckGroup("fTestFlagKEY"),
+     "fLightConditionsName"              => CheckGroup("fLightConditionsKEY"),
+     "fParticleTypeName"                 => CheckGroup("fParticleTypeKEY"),
+     "fFitsFileName"                     => CheckGroup("fFitsFileKEY"),
+     "fObjectName"                       => CheckGroup("fObjectKEY"),
+     "fStatusName"                       => CheckGroup("fStatusKEY"),
+     "fBandName"                         => CheckGroup("fBandKEY"),
+     "fUserName"                         => CheckGroup("fUserKEY"),
+     "fTelescopeName"                    => CheckGroup("fTelescopeKEY"),
+     "fCycleName"                        => CheckWhere("fCycleKEY"),
+     "fPIName"                           => CheckWhere("fPIKEY"),
+     "fWorkingGroupName"                 => CheckWhere("fWorkingGroupKEY"),
+     "fProposalName"                     => CheckWhere("fProposalKEY"),
     );
 
@@ -131,25 +131,25 @@
 $checkstatusgroup = array
     (
-     "fCCFilled"                         => CheckStatusGroup("fCCFilledStatus",            $_GET),
-     "fExclusionsDone"                   => CheckStatusGroup("fExclusionsDoneStatus",      $_GET),
-     "fSequenceEntriesBuilt"             => CheckStatusGroup("fSequenceEntriesBuiltStatus",$_GET),
-     "fCCFileAvail"                      => CheckStatusGroup("fCCFileAvailStatus",         $_GET),
-     "fCaCoFileAvail"                    => CheckStatusGroup("fCaCoFileAvailStatus",       $_GET),
-     "fCaCoFileFound"                    => CheckStatusGroup("fCaCoFileFoundStatus",       $_GET),
-     "fRawFileAvail"                     => CheckStatusGroup("fRawFileAvailStatus",        $_GET),
-     "fTimingCorrection"                 => CheckStatusGroup("fTimingCorrectionStatus",    $_GET),
-     "fDataCheckDone"                    => CheckStatusGroup("fDataCheckDoneStatus",       $_GET),
-//     "fFillDotRaw"                       => CheckStatusGroup("fFillDotRawStatus",          $_GET),
-     "fSequenceFileWritten"              => CheckStatusGroup("fSequenceFileWrittenStatus", $_GET),
-     "fAllFilesAvail"                    => CheckStatusGroup("fAllFilesAvailStatus",       $_GET),
-     "fCallisto"                         => CheckStatusGroup("fCallistoStatus",            $_GET),
-     "fFillCallisto"                     => CheckStatusGroup("fFillCallistoStatus",        $_GET),
-     "fStar"                             => CheckStatusGroup("fStarStatus",                $_GET),
-     "fFillStar"                         => CheckStatusGroup("fFillStarStatus",            $_GET),
-     "fDataSetInserted"                  => CheckStatusGroup("fDataSetInsertedStatus",     $_GET),
-     "fDataSetFileWritten"               => CheckStatusGroup("fDataSetFileWrittenStatus",  $_GET),
-     "fStarFilesAvail"                   => CheckStatusGroup("fStarFilesAvailStatus",      $_GET),
-     "fGanymed"                          => CheckStatusGroup("fGanymedStatus",             $_GET),
-     "fFillGanymed"                      => CheckStatusGroup("fFillGanymedStatus",         $_GET),
+     "fCCFilled"                         => CheckStatusGroup("fCCFilledStatus"),
+     "fExclusionsDone"                   => CheckStatusGroup("fExclusionsDoneStatus"),
+     "fSequenceEntriesBuilt"             => CheckStatusGroup("fSequenceEntriesBuiltStatus"),
+     "fCCFileAvail"                      => CheckStatusGroup("fCCFileAvailStatus"),
+     "fCaCoFileAvail"                    => CheckStatusGroup("fCaCoFileAvailStatus"),
+     "fCaCoFileFound"                    => CheckStatusGroup("fCaCoFileFoundStatus"),
+     "fRawFileAvail"                     => CheckStatusGroup("fRawFileAvailStatus"),
+     "fTimingCorrection"                 => CheckStatusGroup("fTimingCorrectionStatus"),
+     "fDataCheckDone"                    => CheckStatusGroup("fDataCheckDoneStatus"),
+//     "fFillDotRaw"                       => CheckStatusGroup("fFillDotRawStatus"),
+     "fSequenceFileWritten"              => CheckStatusGroup("fSequenceFileWrittenStatus"),
+     "fAllFilesAvail"                    => CheckStatusGroup("fAllFilesAvailStatus"),
+     "fCallisto"                         => CheckStatusGroup("fCallistoStatus"),
+     "fFillCallisto"                     => CheckStatusGroup("fFillCallistoStatus"),
+     "fStar"                             => CheckStatusGroup("fStarStatus"),
+     "fFillStar"                         => CheckStatusGroup("fFillStarStatus"),
+     "fDataSetInserted"                  => CheckStatusGroup("fDataSetInsertedStatus"),
+     "fDataSetFileWritten"               => CheckStatusGroup("fDataSetFileWrittenStatus"),
+     "fStarFilesAvail"                   => CheckStatusGroup("fStarFilesAvailStatus"),
+     "fGanymed"                          => CheckStatusGroup("fGanymedStatus"),
+     "fFillGanymed"                      => CheckStatusGroup("fFillGanymedStatus"),
     );
 
@@ -157,8 +157,8 @@
 $checkenumgroup = array
     (
-     "fHasSignal"              => CheckEnumGroup("fHasSignalEnum",             $_GET),
-     "fHasPedestal"            => CheckEnumGroup("fHasPedestalEnum",           $_GET),
-     "fHasSignalInterlaced"    => CheckEnumGroup("fHasSignalInterlacedEnum",   $_GET),
-     "fHasPedestalInterlaced"  => CheckEnumGroup("fHasPedestalInterlacedEnum", $_GET),
+     "fHasSignal"              => CheckEnumGroup("fHasSignalEnum"),
+     "fHasPedestal"            => CheckEnumGroup("fHasPedestalEnum"),
+     "fHasSignalInterlaced"    => CheckEnumGroup("fHasSignalInterlacedEnum"),
+     "fHasPedestalInterlaced"  => CheckEnumGroup("fHasPedestalInterlacedEnum"),
     );