--- xapian.module.orig	2008-06-01 13:28:35.000000000 -0400
+++ xapian.module	2008-06-01 13:29:06.000000000 -0400
@@ -380,30 +380,16 @@
   try {
     $start_time = microtime(TRUE);
 
-    $database = _xapian_init_database();
-    if (!is_object($database)) {
+    $db = _xapian_init_database();
+    if (!is_object($db)) {
       return NULL;
     }
 
-    // Check if there are any "Special" words in the query string. Xapian handles AND and OR itself
-    if (stripos($query_string, ' and ') or stripos($query_string, ' or ')) {
-      $query_string = str_replace(' and ', ' AND ', $query_string);
-      $query_string = str_replace(' or ', ' OR ', $query_string);
-    }
-    else {
-      // No "Special" words, Make xapian default to AND
-      $keywords = explode(' ', $query_string);
-      if (count($keywords) > 1) {
-        $query_string = implode(' AND ', $keywords);
-      }
-    }
-        
-    $enquire = new XapianEnquire($database);
-  
+    $enquire = new XapianEnquire($db);
     $query_parser = new XapianQueryParser();
     $stemmer = new XapianStem("english");
     $query_parser->set_stemmer($stemmer);
-    $query_parser->set_database($database);
+    $query_parser->set_database($db);
     $query_parser->set_stemming_strategy(XapianQueryParser::STEM_SOME);
     $query = $query_parser->parse_query($query_string);