Changeset 8135

Timestamp:

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

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• datacenter/db/magicdefs.php (modified) (6 diffs)
• datacenter/db/opticaldata.php (added)
• datacenter/macros/filloptical.C (added)

trunk/MagicSoft/Mars/Changelog

@@ -59 +59 @@
 
  2006/10/19 Daniela Dorner
+
+   * datacenter/db/opticaldata.php:
+     - added (website to display data from KVA)
+
+   * datacenter/db/magicdefs.php:
+     - added values for opticaldata.php
+
+   * datacenter/macros/filloptical.C:
+     - added (macro to read *.instr files from KVA and fill the values
+       into the database)
 
    * datacenter/scripts/copyscript:

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
  *** <cvs>
+
+   - database: Implemented ObservationMode flag in websites.
+
+   - database: For sequences there is now also the stoptime available on the
+     websites. 
+
+   - database: Order by is now working also on printtable.php and when 
+     group-by is chosen. 
+
+   - database: Removed ManuallyChanged flag from sequence-info websites, 
+     as it is not needed anymore with the new sequence building algorithm.
 
    - general: MRolke.[cc,h]: Modification of TRolke from root_v5.12.00b.

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 ",
         );