--- buddylist2/buddy_api_shortestroute/buddy_api_shortestroute.module	Tue Apr 8 10:03:46 2008 UTC
+++ buddylist2/buddy_api_shortestroute/buddy_api_shortestroute.module	Wed May 7 01:53:23 2008 UTC
@@ -125,14 +125,14 @@
   global $user;
   $output = array();
 
-  $result = db_query("SELECT uid FROM users");
+  $result = db_query("SELECT uid FROM {users}");
   //$longest = mysql_num_rows ($result) + 1; // longer than longest path
   $longest = variable_get('buddy_api_shortestroute_steps', 5);
   // Initialize $nodes to an array of the community members.
   // Initialize the distance to all nodes as the maximum value.
   // Initialize the previous node for every node as -1 (no known path).
-  for ($i = 0; $i < mysql_num_rows ($result); $i++) {
-    $sna_node = mysql_result ($result, $i, 0);
+  for ($i = 0; $i < db_num_rows($result); $i++) {
+    $sna_node = db_result($result, $i);
     $sna_nodes[$i] = $sna_node;
     $dist[$sna_node] = $longest;
     $previous[$sna_node] = -1;
@@ -162,9 +162,9 @@
     }
 
     // Find all nodes linked to $u
-    $invitees = db_query("SELECT uid FROM buddylist WHERE buddy='$sna_unode'");
+    $invitees = db_query("SELECT uid FROM {buddylist} WHERE buddy='$sna_unode'");
     relaxNeighbors ($sna_unode, $invitees);
-    $inviters = db_query("SELECT buddy FROM buddylist WHERE uid='$sna_unode'");
+    $inviters = db_query("SELECT buddy FROM {buddylist} WHERE uid='$sna_unode'");
     relaxNeighbors ($sna_unode, $inviters);
   }
 
@@ -250,8 +250,8 @@
  * Helper function for buddy_api_shortestroute_getroute()
  */
 function relaxNeighbors ($sna_unode, $neighbors) {
-  for ($i = 0; $i < mysql_num_rows ($neighbors); $i++) {
-    $linkee = mysql_result ($neighbors, $i, 0);
+  for ($i = 0; $i < db_num_rows($neighbors); $i++) {
+    $linkee = db_result($neighbors, $i);
       relax ($sna_unode, $linkee);
   }
 }