Index: eventfinder.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/eventfinder/eventfinder.module,v
retrieving revision 1.8
diff -u -F^f -r1.8 eventfinder.module
--- eventfinder.module	19 Jul 2005 04:37:43 -0000	1.8
+++ eventfinder.module	24 Aug 2005 02:35:20 -0000
@@ -1285,13 +1285,13 @@ function eventfinder_build_sql($arg1 = '
   } else {
     $sql = 'SELECT n.nid AS nid ';
   }
-  $sql .= 'FROM {location_node} a ';
-  $sql .= 'INNER JOIN {node} n ON a.nid = n.nid ';
+  $sql .= 'FROM {location} a ';
+  $sql .= 'INNER JOIN {node} n ON a.oid = n.nid ';
   $sql .= 'INNER JOIN {event} e ON n.nid = e.nid ';
   if($arg1 == 'build'){
     $sql .= 'LEFT JOIN {term_node} t ON t.nid = n.nid ';
   }
-  $sql .= 'WHERE e.event_start > %d ';
+  $sql .= 'WHERE e.event_start > %d AND a.type = \'node\' ';
   $cond[] = time();
 
   // event terms - term_node.tid
@@ -2016,10 +2016,10 @@ function eventfinder_get_ss_nodes ($arg1
     }
     $nodes = implode(',', $nodes);
     $sql = 'SELECT n.nid AS nid, e.event_start ';
-    $sql .= 'FROM {location_node} a ';
-    $sql .= 'INNER JOIN {node} n ON a.nid = n.nid ';
+    $sql .= 'FROM {location} a ';
+    $sql .= 'INNER JOIN {node} n ON a.oid = n.nid ';
     $sql .= 'INNER JOIN {event} e ON n.nid = e.nid ';
-    $sql .= 'WHERE n.nid IN (%s) ';
+    $sql .= 'WHERE n.nid IN (%s) a.type = \'node\' ';
     $ss_results = db_query(db_prefix_tables($sql), $nodes);
     if(db_num_rows($ss_results) > 0){
       return $ss_results;