fixes to web interface to work with new geometry

PecanProject · Sep 4, 2014 · 3c0a9fc · 3c0a9fc
1 parent b82fc69
commit 3c0a9fc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/web/03-inputs.php b/web/03-inputs.php
@@ -68,7 +68,7 @@
 }
 
 // get site information
-$stmt = $pdo->prepare("SELECT * FROM sites WHERE sites.id=?");
+$stmt = $pdo->prepare("SELECT sitename, city, state, country, ST_X(sites.geometry) AS lon, ST_Y(sites.geometry) AS lat FROM sites WHERE sites.id=?");
 if (!$stmt->execute(array($siteid))) {
   die('Invalid query: ' . error_database());
 }
@@ -91,7 +91,7 @@
 $stmt->closeCursor();
 
 // get list of tags
-$tags=[];
+$tags=array();
 foreach($inputs as $input) {
   $tags[$input['tag']] = $input['required'];
 }

diff --git a/web/04-runpecan.php b/web/04-runpecan.php
@@ -17,9 +17,6 @@
 	}
 }
 
-print_r($_REQUEST);
-
-
 # boolean parameters
 $userok=isset($_REQUEST['userok']);
 $offline=isset($_REQUEST['offline']);
@@ -91,13 +88,13 @@
 }
 
 // get model info
-$stmt = $pdo->prepare("SELECT model_type, revision FROM models, modeltypes WHERE models.id=? AND modeltypes.id=models.modeltype_id");
+$stmt = $pdo->prepare("SELECT name, revision FROM models, modeltypes WHERE models.id=? AND modeltypes.id=models.modeltype_id");
 if (!$stmt->execute(array($modelid))) {
   die('Invalid query: ' . (error_database()));
 }
 $row = $stmt->fetch(PDO::FETCH_ASSOC);
 $revision=$row['revision'];
-$modeltype=$row['model_type'];
+$modeltype=$row['name'];
 $stmt->closeCursor();
 
 // create the workflow execution

diff --git a/web/sites.php b/web/sites.php
@@ -57,7 +57,7 @@
     $stmt->closeCursor();
 
     // 3. Get list of all sites, formats
-    $stmt = $pdo->prepare("SELECT DISTINCT sites.*, format_id FROM sites, inputs, dbfiles, machines" .
+    $stmt = $pdo->prepare("SELECT DISTINCT sites.id, sites.sitename, sites.city, sites.country, ST_X(sites.geometry) AS lon, ST_Y(sites.geometry) AS lat, format_id FROM sites, inputs, dbfiles, machines" .
                           " WHERE sites.id=inputs.site_id AND inputs.id=dbfiles.container_id" .
                           " AND dbfiles.container_type='Input' and dbfiles.machine_id=machines.id" .
                           " AND machines.hostname=? GROUP BY sites.id, format_id;");
@@ -66,13 +66,13 @@
     }
 
     // 4. Loop over result, collecting formats used
-    $sites = [];
+    $sites = array();
     while ($row = @$stmt->fetch(PDO::FETCH_ASSOC)) {
       if (in_array($row['format_id'], $formats)) {
         if (array_key_exists($row['id'], $sites)) {
           $sites[$row['id']]['format_id'][] = $row['format_id'];
         } else {
-          $row['format_id'] = [$row['format_id']];
+          $row['format_id'] = array($row['format_id']);
           $sites[$row['id']] = $row;
         }
       }
@@ -96,7 +96,7 @@ function allSites() {
   global $pdo;
 
   // Select all the rows in the markers table
-  $result = $pdo->query("SELECT * FROM sites;");
+  $result = $pdo->query("SELECT id, sitename, city, country, ST_X(geometry) AS lon, ST_Y(geometry) AS lat FROM sites;");
   if (!$result) {
     die('Invalid query: ' . error_database());
   }