projects / busui.git / blobdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
Code standards, fix base path at least for php includes and use single quotes more often
[busui.git] / include / db / trip-dao.inc.php
blob:a/include/db/trip-dao.inc.php -> blob:b/include/db/trip-dao.inc.php 
--- a/include/db/trip-dao.inc.php
+++ b/include/db/trip-dao.inc.php
@@ -3,14 +3,14 @@
 /*
  *    Copyright 2010,2011 Alexander Sadleir 
 
-  Licensed under the Apache License, Version 2.0 (the "License");
+  Licensed under the Apache License, Version 2.0 (the 'License');
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
+  distributed under the License is distributed on an 'AS IS' BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
@@ -18,13 +18,13 @@
 
 function getTrip($tripID) {
     global $conn;
-    $query = "Select * from trips
+    $query = 'Select * from trips
 	join routes on trips.route_id = routes.route_id
 	where trip_id =	:tripID
-	LIMIT 1";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":tripID", $tripID);
+	LIMIT 1';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':tripID', $tripID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -33,17 +33,18 @@
     }
     return $query->fetch(PDO :: FETCH_ASSOC);
 }
+
 function getTripStops($tripID) {
     global $conn;
-    $query = "SELECT stops.stop_id, stop_name, ST_AsKML(position) as positionkml,
+    $query = 'SELECT stops.stop_id, stop_name, ST_AsKML(position) as positionkml,
 	stop_sequence, trips.trip_id
 FROM stop_times
 join trips on trips.trip_id = stop_times.trip_id
 join stops on stops.stop_id = stop_times.stop_id
-WHERE trips.trip_id = :tripID ORDER BY stop_sequence";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":tripID", $tripID);
+WHERE trips.trip_id = :tripID ORDER BY stop_sequence';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':tripID', $tripID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -53,15 +54,15 @@
 }
 
 function getTripHasStop($tripID, $stopID) {
-        global $conn;
-    $query = "SELECT stop_id
+    global $conn;
+    $query = 'SELECT stop_id
 FROM stop_times
 join trips on trips.trip_id = stop_times.trip_id
-WHERE trips.trip_id = :tripID and stop_times.stop_id = :stopID";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":tripID", $tripID);
-    $query->bindParam(":stopID", $stopID);
+WHERE trips.trip_id = :tripID and stop_times.stop_id = :stopID';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':tripID', $tripID);
+    $query->bindParam(':stopID', $stopID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -73,13 +74,13 @@
 function getTripShape($tripID) {
     // todo, use shapes table if shape_id specified
     global $conn;
-    $query = "SELECT ST_AsKML(ST_MakeLine(geometry(a.shape_pt))) as the_route
+    $query = 'SELECT ST_AsKML(ST_MakeLine(geometry(a.shape_pt))) as the_route
 FROM (SELECT shapes.shape_id,shape_pt from shapes
 inner join trips on shapes.shape_id = trips.shape_id
-WHERE trips.trip_id = :tripID ORDER BY shape_pt_sequence) as a group by a.shape_id";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":tripID", $tripID);
+WHERE trips.trip_id = :tripID ORDER BY shape_pt_sequence) as a group by a.shape_id';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':tripID', $tripID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -90,17 +91,17 @@
 
 function getTripStopTimes($tripID) {
     global $conn;
-    $query = "SELECT stop_times.trip_id,trip_headsign,arrival_time,stop_times.stop_id
+    $query = 'SELECT stop_times.trip_id,trip_headsign,arrival_time,stop_times.stop_id
     ,stop_lat,stop_lon,stop_name,stop_desc,stop_code,
 	stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
 FROM stop_times
 join trips on trips.trip_id = stop_times.trip_id
 join routes on trips.route_id = routes.route_id
 join stops on stops.stop_id = stop_times.stop_id
-WHERE trips.trip_id = :tripID ORDER BY stop_sequence";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":tripID", $tripID);
+WHERE trips.trip_id = :tripID ORDER BY stop_sequence';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':tripID', $tripID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -121,13 +122,13 @@
 
 function getTripStartTime($tripID) {
     global $conn;
-    $query = "Select * from stop_times
+    $query = 'Select * from stop_times
 	where trip_id = :tripID
 	AND arrival_time IS NOT NULL
-	AND stop_sequence = '1'";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":tripID", $tripID);
+	AND stop_sequence = \'1\'';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':tripID', $tripID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -139,11 +140,11 @@
 
 function getTripEndTime($tripID) {
     global $conn;
-    $query = "SELECT trip_id,max(arrival_time) as arrival_time from stop_times
-	WHERE stop_times.arrival_time IS NOT NULL and trip_id = :tripID group by trip_id";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":tripID", $tripID);
+    $query = 'SELECT trip_id,max(arrival_time) as arrival_time from stop_times
+	WHERE stop_times.arrival_time IS NOT NULL and trip_id = :tripID group by trip_id';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':tripID', $tripID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -152,14 +153,15 @@
     $r = $query->fetch(PDO :: FETCH_ASSOC);
     return $r['arrival_time'];
 }
+
 function getTripStartingPoint($tripID) {
     global $conn;
-    $query = "SELECT stops.stop_id, stops.stop_name, stops.stop_desc 
+    $query = 'SELECT stops.stop_id, stops.stop_name, stops.stop_desc 
         from stop_times inner join stops on stop_times.stop_id =  stops.stop_id
-	WHERE trip_id = :tripID and stop_sequence = '1' limit 1";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":tripID", $tripID);
+	WHERE trip_id = :tripID and stop_sequence = \'1\' limit 1';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':tripID', $tripID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -171,12 +173,12 @@
 
 function getTripDestination($tripID) {
     global $conn;
-    $query = "SELECT stops.stop_id, stops.stop_name, stops.stop_desc 
+    $query = 'SELECT stops.stop_id, stops.stop_name, stops.stop_desc 
         from stop_times inner join stops on stop_times.stop_id =  stops.stop_id
-	WHERE trip_id = :tripID order by stop_sequence desc limit 1";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":tripID", $tripID);
+	WHERE trip_id = :tripID order by stop_sequence desc limit 1';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':tripID', $tripID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -188,14 +190,14 @@
 
 function getActiveTrips($time) {
     global $conn;
-    if ($time == "")
+    if ($time == '')
         $time = current_time();
-    $query = "Select distinct stop_times.trip_id, start_times.arrival_time as start_time, end_times.arrival_time as end_time from stop_times, (SELECT trip_id,arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL
-AND stop_sequence = '1') as start_times, (SELECT trip_id,max(arrival_time) as arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times
-WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND :time > start_times.arrival_time  AND :time < end_times.arrival_time";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    $query->bindParam(":time", $time);
+    $query = 'Select distinct stop_times.trip_id, start_times.arrival_time as start_time, end_times.arrival_time as end_time from stop_times, (SELECT trip_id,arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL
+AND stop_sequence = \'1\') as start_times, (SELECT trip_id,max(arrival_time) as arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times
+WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND :time > start_times.arrival_time  AND :time < end_times.arrival_time';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    $query->bindParam(':time', $time);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
@@ -204,17 +206,17 @@
     return $query->fetchAll();
 }
 
-function viaPoints($tripID, $stop_sequence = "") {
-    global $conn;
-    $query = "SELECT stops.stop_id, stop_name, arrival_time
+function viaPoints($tripID, $stop_sequence = '') {
+    global $conn;
+    $query = 'SELECT stops.stop_id, stop_name, arrival_time
 FROM stop_times join stops on stops.stop_id = stop_times.stop_id
 WHERE stop_times.trip_id = :tripID
-" . ($stop_sequence != "" ? " AND stop_sequence > :stop_sequence " : "") . " ORDER BY stop_sequence";
-    debug($query, "database");
-    $query = $conn->prepare($query);
-    if ($stop_sequence != "")
-        $query->bindParam(":stop_sequence", $stop_sequence);
-    $query->bindParam(":tripID", $tripID);
+' . ($stop_sequence != '' ? ' AND stop_sequence > :stop_sequence ' : '') . ' ORDER BY stop_sequence';
+    debug($query, 'database');
+    $query = $conn->prepare($query);
+    if ($stop_sequence != '')
+        $query->bindParam(':stop_sequence', $stop_sequence);
+    $query->bindParam(':tripID', $tripID);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());
Unnamed repository; edit this file to name it for gitweb.
GitPHP by Chris Han