Add db_rewrite_sql to apachesolr_get_nodes_to_index

Should db_rewrite_sql also the queries in apachesolr_index_status()

I did it and it seems to work fine.

Mmmh... also in the hook_enable of apachesolr.install. Btw, shouldn't be hook_disable() to implement too? Like, to empty the apachesolr_search_node. Or it'll trigger the full reindex?

Another one: the "select count(*)" in apachesolr_search_search

I see your point. The problem is that we have many sites with one big shared node table. We do not use node_access to route content visibility (because the setup is greatly complex), but instead we use our system (similar, just another table - something like the domain module). Long story short: we rely all over on db_rewrite_sql to let A SITE (and its users) see only ITS nodes (users are also shared, but this is another story).

If you do not add the db_rewrites, no problem... we still continue to patch the modules ourselves :)

Attached is the patch we use.

Thank you

Sorry, that patch is all wrong.

Better one, this time :)

Yes, I have that too (and it works).
The rewrite are needed when the module looks for available nodes to index.

if (module_exists('apachesolr')) {
  /* Modify the delete index Solr query to add the site hash */
  function rrsearch_apachesolr_delete_index_alter(&$query) {
    if ('*:*' == $query)
      $query = 'hash:' . apachesolr_site_hash();
    else
      $query .= ' hash:' . apachesolr_site_hash();
  }
  
  function rrsearch_apachesolr_modify_query(&$query, &$params) {
    $query->add_field("hash", apachesolr_site_hash());
  }
  
  function rrsearch_menu_alter(&$callbacks) {
    $callbacks['search/node/%menu_tail']['access callback'] = FALSE;
    # Apache solr search tab label is not configurable, so we hijack the callback
    $callbacks['search/apachesolr_search/%menu_tail']['title callback'] = 'rrsearch_apachesolr_name';
  }
  
  function rrsearch_apachesolr_name() {
    return t('Content');
  }
}