From: Maxious <maxious@lambdacomplex.org>
Date: Thu, 19 Apr 2012 12:07:08 +0000
Subject: fix servicealert editor due to "end" field
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=d86046138da234caf6ebf433246ae671f31541e1
---
fix servicealert editor due to "end" field
---


--- a/include/db/servicealert-dao.inc.php
+++ b/include/db/servicealert-dao.inc.php
@@ -33,7 +33,7 @@
 
 function getServiceAlert($alertID) {
     global $conn;
-    $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as \\\'end\\\',cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id';
+    $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as end,cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id';
     debug($query, 'database');
     $query = $conn->prepare($query);
     $query->bindParam(':servicealert_id', $alertID);
@@ -93,7 +93,7 @@
 
 function getCurrentAlerts() {
     global $conn;
-    $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as "end",cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < "end"';
+    $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as end,cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < "end"';
     // debug($query, 'database');
     $query = $conn->prepare($query);
     $query->execute();
@@ -106,7 +106,7 @@
 
 function getFutureAlerts() {
     global $conn;
-    $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as "end",cause,effect,header,description,url from servicealerts_alerts where  NOW() < "end"';
+    $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as end,cause,effect,header,description,url from servicealerts_alerts where  NOW() < "end"';
     // debug($query, 'database');
     $query = $conn->prepare($query);
     $query->execute();
@@ -119,7 +119,7 @@
 
 function getAllAlerts() {
     global $conn;
-    $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as "end",cause,effect,header,description,url from servicealerts_alerts';
+    $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as end,cause,effect,header,description,url from servicealerts_alerts';
     // debug($query, 'database');
     $query = $conn->prepare($query);
     $query->execute();

--- a/rtpis/siri.php
+++ b/rtpis/siri.php
@@ -37,7 +37,7 @@
     return $toret;
 }
 function usage() {
-echo "Usage notes: Must specify format json/xml. If callback is specified, will provide jsonp. Can filter with parmaters filter_class route/stop and filter_id with the id specified in GTFS."
+echo "Usage notes: Must specify format json/xml. If callback is specified, will provide jsonp. Can filter with parmaters filter_class route/stop and filter_id with the id specified in GTFS.";
 die();
 }
 $json_types =  Array("application/json","application/x-javascript","text/javascript","text/x-javascript","text/x-json");