Index: apachesolr.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.admin.inc,v retrieving revision 1.1.2.28 diff -u -p -r1.1.2.28 apachesolr.admin.inc --- apachesolr.admin.inc 2 Jul 2009 09:11:09 -0000 1.1.2.28 +++ apachesolr.admin.inc 3 Jul 2009 17:08:45 -0000 @@ -360,6 +360,7 @@ function apachesolr_delete_index_confirm // This form can't be seen by anyone without 'administer search' // permission, so no need to check perms before displaying a run-cron link. drupal_set_message(t('The Apache Solr content index has been erased. You must now !run_cron until your entire site has been re-indexed.', array('!run_cron' => l(t('run cron'), 'admin/reports/status/run-cron', array('query' => array('destination' => 'admin/settings/apachesolr/index')))))); + } catch (Exception $e) { watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR); @@ -381,7 +382,9 @@ function apachesolr_delete_index() { drupal_alter('apachesolr_delete_index', $query); $solr->deleteByQuery($query); $solr->commit(); - apachesolr_clear_last_index(); + // Rebuild our node-tracking table. + module_load_include('install', 'apachesolr'); + apachesolr_enable(); apachesolr_index_updated(time()); } Index: apachesolr.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.install,v retrieving revision 1.1.4.18 diff -u -p -r1.1.4.18 apachesolr.install --- apachesolr.install 30 Jun 2009 10:57:24 -0000 1.1.4.18 +++ apachesolr.install 3 Jul 2009 17:08:45 -0000 @@ -24,7 +24,7 @@ function apachesolr_install() { */ function apachesolr_enable() { // Make sure we don't have stale data. - variable_del('apachesolr_index_last'); + apachesolr_clear_last_index(); db_query("DELETE FROM {apachesolr_search_node}"); // Populate table db_query("INSERT INTO {apachesolr_search_node} (nid, status, changed)