--- a/myway/myway_timeliness_reconcile.php
+++ b/myway/myway_timeliness_reconcile.php
@@ -19,25 +19,23 @@
foreach ($_REQUEST as $key => $value) {
if (strstr($key, "route") && !strstr($value, "Select")) {
$myway_route = str_replace("route", "", $key);
- $route_full_name = $value;
- $query = "update myway_routes set route_full_name = :route_full_name where myway_route = :myway_route";
+ $route_id = $value;
+ $query = "update myway_routes set route_id = :route_id where myway_route = :myway_route";
debug($query, "database");
$query = $conn->prepare($query);
$query->bindParam(":myway_route", $myway_route, PDO::PARAM_STR, 5);
- $query->bindParam(":route_full_name", $route_full_name, PDO::PARAM_STR, 42);
+ $query->bindParam(":route_id", $route_id, PDO::PARAM_STR, 42);
$query->execute();
die(print_r($conn->errorInfo(), true));
}
if (strstr($key, "myway_stop")) {
$myway_stop = $value;
- $stop_code = $_REQUEST['stop_code'];
- $stop_street = $_REQUEST['stop_street'];
- $query = "update myway_stops set stop_code = :stop_code, stop_street = :stop_street where myway_stop = :myway_stop";
+ $stop_id = $_REQUEST['stop_id'];
+ $query = "update myway_stops set stop_id = :stop_id where myway_stop = :myway_stop";
debug($query, "database");
$query = $conn->prepare($query);
$query->bindParam(":myway_stop", $myway_stop, PDO::PARAM_STR, 25);
- $query->bindParam(":stop_code", $stop_code, PDO::PARAM_STR, 32);
- $query->bindParam(":stop_street", $stop_street);
+ $query->bindParam(":stop_id", $stop_id, PDO::PARAM_STR, 32);
$query->execute();
die(print_r($conn->errorInfo(), true));
}
@@ -68,7 +66,7 @@
echo "
Stops
";
/* stops
search start of name, display map and table nuimbered, two text boxes */
-$query = "Select * from myway_stops where stop_code is NULL and stop_street is NUll;";
+$query = "Select * from myway_stops where stop_id is NUll;";
debug($query, "database");
$query = $conn->prepare($query);
$query->execute();
@@ -78,10 +76,9 @@
}
foreach ($query->fetchAll() as $myway_stop) {
echo "{$myway_stop[0]}
";
- $stopNameParts = explode(" ", $myway_stop[0]);
$markers = array();
$stopKey = 0;
- $foundStops = getStops(false, "", $stopNameParts[0] . " " . $stopNameParts[1]);
+ $foundStops = getStops("",$myway_stop[0]);
if (sizeof($foundStops) > 0) {
echo "";
foreach ($foundStops as $stopResult) {
@@ -89,7 +86,7 @@
$stopResult['stop_lat'],
$stopResult['stop_lon']
);
- echo "" . $stopKey++ . " | " . $stopResult['stop_name'] . " | " . $stopResult['stop_code'] . " |
";
+ echo "" . $stopKey++ . " | " . $stopResult['stop_name'] . " | " . $stopResult['stop_id'] . " |
";
}
echo '
';
echo "" . staticmap($markers,false,false,false,true) . "
\n";
@@ -97,50 +94,10 @@
echo '
';
- echo '
';
-}
-echo 'Routes
';
-/* routes
- remove alpha char, search present dropdown */
-$query = "Select * from myway_routes where route_full_name is NUll;";
-debug($query, "database");
-$query = $conn->prepare($query);
-$query->execute();
-if (!$query) {
- databaseError($conn->errorInfo());
- return Array();
-}
-foreach ($query->fetchAll() as $myway_route) {
- echo "{$myway_route[0]}
";
- $query = "Select * from myway_observations where myway_route = :route order by time";
- debug($query, "database");
- $query = $conn->prepare($query);
- $query->bindParam(":route", $myway_route[0]);
- $query->execute();
- if (!$query) {
- databaseError($conn->errorInfo());
- return Array();
- }
- foreach ($query->fetchAll() as $myway_obvs) {
- echo $myway_obvs['myway_stop'] . $myway_obvs['time'] . "
";
- }
- $searchRouteNo = preg_replace("/[A-Z]/", "", $myway_route[0]);
- echo $searchRouteNo;
- echo '";
echo '
';
}
include_footer();