Changeset 18045 for trunk

Timestamp:

12/29/14 23:14:42 (10 years ago)

Author:

Daniela Dorner

Message:

changed column names of the table Measurement for consistency when switching to real DB

Location:

trunk/FACT++/www/schedule

Files:

• load.php (modified) (1 diff)
• save.php (modified) (4 diffs)

trunk/FACT++/www/schedule/load.php

@@ -54 +54 @@
 query("SELECT DISTINCT(DATE(ADDTIME(fStart, '-12:00'))) AS 'd' FROM Schedule");
 query("SELECT fSourceKEY AS 'key', fSourceName AS 'val' FROM Source WHERE fSourceTypeKEY=1");
-query("SELECT fMeasurementKEY AS 'key', fMeasurement AS 'val' FROM Measurement");
+query("SELECT fMeasurementTypeKEY AS 'key', fMeasurementTypeName AS 'val' FROM MeasurementType");
 query("SELECT * FROM Schedule WHERE DATE(ADDTIME(fStart, '-12:00:00')) = '".$_POST['n']."'".$cut."ORDER BY fScheduleID ASC, fMeasurementID ASC");
 

trunk/FACT++/www/schedule/save.php

@@ -141 +141 @@
     die(mysql_error());
 
-$query = "SELECT * FROM Measurement";
+$query = "SELECT * FROM MeasurementType";
 
 $sql = mysql_query($query);
@@ -149 +149 @@
 $measurements = array();
 while($row = mysql_fetch_assoc($sql))
-    $measurements[$row['fMeasurementKey']] = $row;
+    $measurements[$row['fMeasurementTypeKey']] = $row;
 
 // ----------------------------------------------------------------
@@ -192 +192 @@
     {
         if ($measurements[$m]['fIsUnlimited']==true)
-            die("Unlimited task '".$measurements[$m]['fMeasurement']."' detected before end of observation\n[".$last."|".($id-1)."]");
+            die("Unlimited task '".$measurements[$m]['fMeasurementTypeName']."' detected before end of observation\n[".$last."|".($id-1)."]");
     }
 
@@ -206 +206 @@
     // Check if task need source or must not have a source
     if ($measurements[$m]['fNeedsSource']==true && $s==0)
-        die("Task '".$measurements[$m]['fMeasurement']."' needs source.\n[".$t."|".$id."]");
+        die("Task '".$measurements[$m]['fMeasurementTypeName']."' needs source.\n[".$t."|".$id."]");
     if ($measurements[$m]['fNeedsSource']!=true && $s>0)
-        die("Task '".$measurements[$m]['fMeasurement']."' must not have source.\n[".$t."|".$id."]");
+        die("Task '".$measurements[$m]['fMeasurementTypeName']."' must not have source.\n[".$t."|".$id."]");
 
     // Compile query