Changeset 1795

Timestamp:

09/06/10 20:33:09 (17 months ago)

Author:

paparazzia

Message:

* fix #262 (note that gettrack should really be deprecated in 0.15)

Location:

trunk/site

Files:

• gettrack.php (modified) (3 diffs)
• ws/boatinfo/tracks.php (modified) (1 diff)

trunk/site/gettrack.php

@@ -4 +4 @@
     header("content-type: text/plain; charset=UTF-8");
 
-    $idu=htmlentities(quote_smart($_REQUEST['idu']));
-    $idr=htmlentities(quote_smart($_REQUEST['idr']));
-    $all=array_key_exists('all', $_REQUEST);
+    $idu = get_cgi_var('idu', 0);
+    $idr = get_cgi_var('idr', 0);
+    $all = array_key_exists('all', $_REQUEST);
 
     if (  round($idr) == 0 || round($idu) == 0 
@@ -31 +31 @@
     */
 
-    $query_race = "SELECT deptime FROM races WHERE idraces = ".round($idr);
-    $result = wrapper_mysql_db_query_reader($query_race) or die("Query [$query_race] failed \n");
-    if ($row = mysql_fetch_assoc($result)) {
-        $deptime = $row['deptime'];
-    } else {
-        die("No such race : $idr\n");
+    $now = time();
+    
+    $users = getUserObject($idu);
+    if (is_null($users)) die("No such user/boat : $idu");
+    
+    if (!raceExists($idr)) die("No such race : $idr\n"); //FIXME : select on races table made two times !
+    $races = new races($idr);
+
+    $starttime = intval(get_cgi_var('starttime', 0)); //0 means now -1h
+    $endtime = intval(get_cgi_var('endtime', 0)); //0 means now
+
+    if ($users->hidden) die("User/Boat $idu is hidden");
+            
+    if ($races->bobegin < $now && $races->boend > $now) {
+        //BlackOut in place
+        $endtime = $races->bobegin;
     }
 
-    $query =  "SELECT histpos.time,histpos.lat,histpos.long FROM histpos" .
-              " WHERE histpos.idusers=" . round($idu) . 
-              " AND histpos.race=" . round($idr) . 
-              " AND histpos.time >= ".$deptime.
-              " ORDER BY time ASC";
-
-    $result = wrapper_mysql_db_query_reader($query) or die("Query [$query] failed \n");
-    $nbresults =  mysql_num_rows($result);
-
     if ($all) {
-        $querynow = "SELECT positions.time,positions.lat,positions.long FROM positions" .
-                    " WHERE positions.idusers=" . round($idu) .
-                    " AND positions.race=" . round($idr) .
-                    " AND positions.time >= $deptime".
-                    " ORDER BY time ASC";
-        $resultnow  = wrapper_mysql_db_query_reader($querynow) or die("Query [$querynow] failed \n");
-        $nbresults  += mysql_num_rows($resultnow);
+        $pi = new positionsIterator($users->idusers, $races->idraces, $starttime, $endtime);
+    } else {
+        $pi = new fullPositionsIterator($users->idusers, $races->idraces, $starttime, $endtime);
     }
 
@@ -64 +61 @@
     printf ("============================\n");
 
-    while(  $row = mysql_fetch_array($result, MYSQL_ASSOC) ) {
-        printf ("%d;%5.6f;%5.6f\n", $row['time'],$row['lat']/1000,$row['long']/1000) ;
+    foreach ($pi->records as $row) {
+        printf ("%d;%5.6f;%5.6f\n", $row[0],$row[1]/1000,$row[2]/1000) ;
     }
 
-    if ($all) {
-        while(  $row = mysql_fetch_array($resultnow, MYSQL_ASSOC) ) {
-            printf ("%d;%5.6f;%5.6f\n", $row['time'],$row['lat']/1000,$row['long']/1000) ;
-        }
-    }
 
 ?>

trunk/site/ws/boatinfo/tracks.php

@@ -41 +41 @@
         //BlackOut in place
         $endtime = $races->bobegin;
-    } else {
-        $endtime = intval(get_cgi_var('endtime', 0)); //0 means now
     }
-    
-    $starttime = intval(get_cgi_var('starttime', 0)); //0 means now -1h
 
     $pi = new positionsIterator($users->idusers, $races->idraces, $starttime, $endtime);