? apachesolr_multisiteindex.admin.inc
? apachesolr_multisiteindex.info
? apachesolr_multisiteindex.module
Index: apachesolr_multisitesearch.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr_multisitesearch/apachesolr_multisitesearch.info,v
retrieving revision 1.1
diff -u -p -r1.1 apachesolr_multisitesearch.info
--- apachesolr_multisitesearch.info	23 Dec 2009 14:31:41 -0000	1.1
+++ apachesolr_multisitesearch.info	30 Nov 2010 17:06:32 -0000
@@ -3,5 +3,6 @@ name = Apache Solr Multisite Search
 description = Search across multiple sites with Solr
 dependencies[] = apachesolr
 dependencies[] = apachesolr_search
+dependencies[] = apachesolr_multisiteindex
 package = Apache Solr
 core = "6.x"
Index: apachesolr_multisitesearch.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr_multisitesearch/apachesolr_multisitesearch.module,v
retrieving revision 1.14
diff -u -p -r1.14 apachesolr_multisitesearch.module
--- apachesolr_multisitesearch.module	14 Oct 2010 17:10:46 -0000	1.14
+++ apachesolr_multisitesearch.module	30 Nov 2010 17:06:33 -0000
@@ -213,16 +213,6 @@ function apachesolr_multisitesearch_has_
   return $searched;
 }
 
-/**
- * Implementation of hook_apachesolr_modify_query().
- */
-function apachesolr_multisitesearch_apachesolr_modify_query(&$query, &$params, $caller) {
-  if (empty($query->multisite)) {
-    // Limit single site searchs via the site hash.
-    $query->add_filter('hash', apachesolr_site_hash());
-  }
-}
-
 function apachesolr_multisitesearch_basic_params($query) {
   $params = array(
     'fl' => 'id,nid,title,comment_count,type,type_name,entity,created,changed,score,url,uid,name,site,hash',
@@ -456,11 +446,3 @@ function theme_apachesolr_multisitesearc
 
   return $output;
 }
-
-/**
- * Implementation of hook_apachesolr_delete_index_alter()
- */
-function apachesolr_multisitesearch_apachesolr_delete_index_alter(&$query) {
-  // Limit to the current site.
-  $query = "($query) AND hash:" . apachesolr_site_hash();
-}