--- search_files_unmodified/modules/search_directories/search_directories.module	2009-06-26 14:01:04.335323000 -0600
+++ search_files/modules/search_directories/search_directories.module	2009-06-26 11:24:46.201153000 -0600
@@ -79,12 +79,12 @@ function search_directories_search($op =
       break;
     case 'status':
       $return = array();
-      $return['total'] = db_result(db_query("SELECT COUNT(*) as `count` FROM {search_directories_files}"));
+      $return['total'] = db_result(db_query("SELECT COUNT(*) as `count` FROM {search_files_files}"));
       $sql = "
         SELECT
           COUNT(*) AS `count`
         FROM
-          {search_directories_files}
+          {search_files_files}
         LEFT JOIN
         (
           SELECT
@@ -93,7 +93,7 @@ function search_directories_search($op =
             {search_dataset}
           WHERE
             `type` = 'search_files'
-        ) AS `dataset` ON {search_directories_files}.`id` = `dataset`.`sid`
+        ) AS `dataset` ON {search_files_files}.`id` = `dataset`.`sid`
         WHERE
         (
           `dataset`.`reindex` IS NULL OR
@@ -112,11 +112,12 @@ function search_directories_search($op =
       //drupal_set_message($doc_root);
       $file_extensions = search_files_get_file_extensions();
       $results = array();
-      $find = do_search($keywords, 'search_directories');
+      $find = do_search($keywords, 'search_files');
       date_default_timezone_set('GMT');
+
       foreach ($find as $item) {
-        $result = db_fetch_object(db_query("SELECT * FROM {search_directories_files} WHERE `id` = '%s'", $item->sid));
-        $search_results = db_query("SELECT * FROM {search_dataset} WHERE sid = %d AND type = 'search_directories'", $item->sid);
+        $result = db_fetch_object(db_query("SELECT * FROM {search_files_files} WHERE `id` = '%s'", $item->sid));
+        $search_results = db_query("SELECT * FROM {search_dataset} WHERE sid = %d AND type = 'search_files'", $item->sid);
         if ($dataset = db_fetch_object($search_results)) {
           $file_name = explode('/', $result->full_path);
           $file_name = $file_name[count($file_name)-1];
@@ -214,13 +215,13 @@ function search_directories_directory_co
   $result = db_query("DELETE FROM {search_directories} WHERE `id`='%s'", $form_state['values']['search_directories_directory_id']);
   if ($result) {
     drupal_set_message(t('Directory %directory removed from search index', array('%directory' => $form_state['values']['search_directories_directory_path'])));
-    $sql = "SELECT * FROM {search_directories_files} WHERE `id`='%s'";
+    $sql = "SELECT * FROM {search_files_files} WHERE `id`='%s'";
     $files_result = db_query($sql, $form_state['values']['search_directories_directory_id']);
     while ($file = db_fetch_object($files_result)) {
       $sql = "DELETE FROM {search_dataset} WHERE `type`='search_directories' AND `sid`='%s'";
       $dataset_result = db_query($sql, $file->id);
       if (dataset_result) {
-        $sql = "DELETE FROM {search_directories_files} WHERE `id`='%s'";
+        $sql = "DELETE FROM {search_files_files} WHERE `id`='%s'";
         db_query($sql, $file->id);
       }
     }
@@ -338,16 +339,16 @@ function search_directories_directory_ad
 function search_directories_update_index() {
   $helpers = search_files_get_helpers();
   // only update the list of files in the directories once per day
-  if (variable_get('search_directories_last_index', 0) < (time() - 86400)) {
+#  if (variable_get('search_directories_last_index', 0) < (time() - 86400)) {
     variable_set('search_directories_last_index', time());
     $result = db_query('SELECT * FROM {search_directories}');
     while ($directory = db_fetch_object($result)) {
       search_directories_list_directory($directory->directory, $directory->id);
     }
-  }
+#  }
 
   $index_number = (int)variable_get('search_cron_limit', 10);
-  $sql = "SELECT * FROM {search_directories_files}
+  $sql = "SELECT * FROM {search_files_files}
     LEFT JOIN
     (
       SELECT
@@ -356,12 +357,12 @@ function search_directories_update_index
         {search_dataset}
       WHERE
         `type` = 'search_directories'
-    ) AS `dataset` ON {search_directories_files}.`id` = `dataset`.`sid`
+    ) AS `dataset` ON {search_files_files}.`id` = `dataset`.`sid`
     WHERE
     (
       `dataset`.`reindex` IS NULL OR
       `dataset`.`reindex` != 0
-    ) AND {search_directories_files}.`index_attempts` <= 5
+    ) AND {search_files_files}.`index_attempts` <= 5
     LIMIT %s
   ";