Changeset 8135 for trunk/MagicSoft/Mars/datacenter

Timestamp:

10/19/06 20:30:40 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter

Files:

• db/magicdefs.php (modified) (6 diffs)
• db/opticaldata.php (added)
• macros/filloptical.C (added)

trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

@@ -76 +76 @@
      "fLightConditionsName"              => CheckWhere("fLightConditionsKEY",              $_GET),
      "fParticleTypeName"                 => CheckWhere("fParticleTypeKEY",                 $_GET),
+     "fFitsFileName"                     => CheckWhere("fFitsFileKEY",                     $_GET),
+     "fObjectName"                       => CheckWhere("fObjectKEY",                       $_GET),
+     "fStatusName"                       => CheckWhere("fStatusKEY",                       $_GET),
     );
 
@@ -96 +99 @@
      "fLightConditionsName"              => CheckGroup("fLightConditionsKEY",              $_GET),
      "fParticleTypeName"                 => CheckGroup("fParticleTypeKEY",                 $_GET),
+     "fFitsFileName"                     => CheckGroup("fFitsFileKEY",                     $_GET),
+     "fObjectName"                       => CheckGroup("fObjectKEY",                       $_GET),
+     "fStatusName"                       => CheckGroup("fStatusKEY",                       $_GET),
     );
 
@@ -299 +305 @@
      "fFailedCode"                      => "Err<br>Code",
      "fFailedCodeAdd"                   => "Code<br>Add",
+     "fTimestamp"                       => "Time",
+     "fExposure"                        => "Exposure",
+     "fFitsFileName"                    => "FitsFile",
+     "fObjectName"                      => "Object",
+     "fSkyLevel"                        => "SkyLevel",
+     "fFWHM"                            => "FWHM",
+     "fApertureRadius"                  => "Ap.Rad.",
+     "fInstrumentalMag"                 => "Instr.Mag.",
+     "fInstrumentalMagErr"              => "Instr.Mag.Err.",
+     "fStatusName"                      => "StatusCode",
 //     "COUNT(*)"                         => "# Runs",
 //     "COUNT(*)"                         => "Sequence",
@@ -414 +430 @@
          "fLightConditionsName"              => $fromtable . ".fLightConditionsKEY",
          "fParticleTypeName"                 => $fromtable . ".fParticleTypeKEY",
+         "fFitsFileName"                     => $fromtable . ".fFitsFileKEY",
+         "fObjectName"                       => $fromtable . ".fObjectKEY",
+         "fStatusName"                       => $fromtable . ".fStatusKEY",
         );
 
@@ -559 +578 @@
          "fFailedCodeAdd"                    => "fFailedCodeAdd",
          "fParticleTypeName"                 => "ParticleType.fParticleTypeName",
+         "fFitsFileName"                     => "FitsFile.fFitsFileName",
+         "fObjectName"                       => "Object.fObjectName",
+         "fStatusName"                       => "Status.fStatusName",
         );
 
@@ -598 +620 @@
          "fLightConditionsName"              => " LEFT JOIN LightConditions              ON " . $fromtable . ".fLightConditionsKEY=LightConditions.fLightConditionsKEY",
          "fParticleTypeName"                 => " LEFT JOIN ParticleType                 ON " . $fromtable . ".fParticleTypeKEY=ParticleType.fParticleTypeKEY ",
+         "fFitsFileName"                     => " LEFT JOIN FitsFile                     ON " . $fromtable . ".fFitsFileKEY=FitsFile.fFitsFileKEY",
+         "fObjectName"                       => " LEFT JOIN Object                       ON " . $fromtable . ".fObjectKEY=Object.fObjectKEY ",
+         "fStatusName"                       => " LEFT JOIN Status                       ON " . $fromtable . ".fStatusKEY=Status.fStatusKEY ",
         );