updated and repatched search_api_solr module

no need for patch anymore
see https://www.drupal.org/node/1846860#comment-8137979

sites/all/modules/contrib/search/search_api_solr/CHANGELOG.txt

@@ -1,3 +1,35 @@
+Search API Solr search 1.6 (09/08/2014):
+----------------------------------------
+- #2050961 by das-peter, drunken monkey: Added proximity/distance information
+  to search results.
+- #2242073 by RaF: Fixed handling of custom negative filters in filter-only
+  searches.
+- #2290601 by drunken monkey: Fixed handling of complex keywords and OR facets.
+- #2083357 by drunken monkey: Added note that Solr 4.x server paths should be
+  specified with core.
+- #2270767 by RaF: Fixed search_api_solr_views_data_alter() not always
+  returning all virtual fields.
+
+Search API Solr search 1.5 (05/23/2014):
+----------------------------------------
+- #2216895 by das-peter: Added support for empty/non-empty conditions on
+  location field types.
+- #2162627 by drunken monkey: Removed Solr 1.4 support.
+- #2175829 by danquah, drunken monkey: Fixed error when admin interface is not
+  accessible.
+- #2222037 by drunken monkey: Fixed "Files" tab in Solr 4.7.
+- #2151719 by Derimagia, drunken monkey: Added an alter hook for multi-index
+  search results.
+- #1776534 by drunken monkey, e2thex: Added support for using a Solr server
+  with multiple sites.
+- #2152337 by drunken monkey: Removed confusing "multiple text fields" section
+  from README.txt.
+- #2099559 by drunken monkey: Made optimizing the Solr server optional.
+- #2146749 by drunken monkey: Added soft commits as the default for Solr 4.
+- #1773440 by drunken monkey: Added performance improvement for “filter
+  only” queries.
+- #2147573 by drunken monkey: Improved error handling.
+
 Search API Solr search 1.4 (12/25/2013):
 ----------------------------------------
 - #2157839 by drunken monkey, Nick_vh: Updated config files to the newest

sites/all/modules/contrib/search/search_api_solr/INSTALL.txt

@@ -19,25 +19,14 @@ somewhere outside of your web server's document tree.
 
 [3] http://www.apache.org/dyn/closer.cgi/lucene/solr/
 
-This module also supports Solr 1.4 and 3.x. For better performance and more
-features, 4.x should be used, though. 1.4 is discouraged altogether, as several
-features of the module don't work at all in 1.4.
+This module also supports Solr 3.x. For better performance and more features,
+4.x should be used, though.
 
 For small websites, using the example application, located in $SOLR/example/,
-usually suffices. In any case, you can use it for developing andd testing. The
+usually suffices. In any case, you can use it for developing and testing. The
 following instructions will assume you are using the example application,
 otherwise you should be able to substitute the corresponding paths.
 
-NOTE: The Solr 4.3+ example application is currently not completely supported
-with the configuration files included in this module, due to a slight change in
-directory structure. To fix this, simply copy, move or symlink the contrib/
-directory from the top level of the extracted Solr package one level down to
-example/.
-(For other directory structures: the contrib/ directory has to be in the
-directory two levels up from the one which includes the conf/ directory. For
-help, just start the Solr server and check the log files for WARN messages –
-they should state in which place Solr expects the directory to be.)
-
 CAUTION! For production sites, it is vital that you somehow prevent outside
 access to the Solr server. Otherwise, attackers could read, corrupt or delete
 all your indexed data. Using the example server WON'T prevent this by default.
@@ -69,7 +58,7 @@ java -jar start.jar &
 
 Afterwards, go to [4] in your web browser to ensure Solr is running correctly.
 
-[4] http://localhost:8983/solr/#/
+[4] http://localhost:8983/solr/
 
 You can then enable this module and create a new server, using the "Solr search"
 service class. Enter the hostname, port and path corresponding to your Solr
@@ -77,3 +66,7 @@ server in the appropriate fields. The default values already correspond to the
 example application, so you won't have to change the values if you use that.
 If you are using HTTP Authentication to protect your Solr server you also have
 to provide the appropriate user and password here.
+
+NOTE: For Solr 4.x, the server's path should also contain the Solr core name.
+E.g., when using the example application unchanged, set the path to
+"/solr/collection1" instead of "/solr".

sites/all/modules/contrib/search/search_api_solr/README.txt

@@ -59,8 +59,7 @@ Regarding third-party features, the following are supported:
 - search_api_data_type_location
   Introduced by module: search_api_location
   Lets you index, filter and sort on location fields. Note, however, that only
-  single-valued fields are currently supported for Solr 3.x, and that the option
-  isn't supported at all in Solr 1.4.
+  single-valued fields are currently supported for Solr 3.x.
 - search_api_grouping
   Introduced by module: search_api_grouping [5]
   Lets you group search results based on indexed fields. For further information
@@ -86,13 +85,6 @@ classic preprocessing tasks. Enabling the HTML filter can be useful, though, as
 the default config files included in this module don't handle stripping out HTML
 tags.
 
-Also, due to the way Solr works, using a single field for fulltext searching
-will result in the smallest index size and best search performance, as well as
-possibly having other advantages, too. Therefore, if you don't need to search
-different sets of fields in different searches on an index, it is adviced that
-you collect all fields that should be searchable into a single field using the
-“Aggregated fields” data alteration.
-
 Clean field identifiers:
   If your Solr server was created in a module version prior to 1.2, you will get
   the option to switch the server to "Clean field identifiers" (which is default
@@ -130,6 +122,25 @@ Hidden variables
   The maximum number of bytes that can be handled as an HTTP GET query when
   HTTP method is AUTO. Typically Solr can handle up to 65355 bytes, but Tomcat
   and Jetty will error at slightly less than 4096 bytes.
+- search_api_solr_cron_action (default: "spellcheck")
+  The Search API Solr Search module can automatically execute some upkeep
+  operations daily during cron runs. This variable determines what particular
+  operation is carried out.
+  - spellcheck: The "default" spellcheck dictionary used by Solr will be rebuilt
+  so that spellchecking reflects the latest index state.
+  - optimize: An "optimize" operation [8] is executed on the Solr server. As a
+  result of this, all spellcheck dictionaries (that have "buildOnOptimize" set
+  to "true") will be rebuilt, too.
+  - none: No action is executed.
+  If an unknown setting is encountered, it is interpreted as "none".
+- search_api_solr_site_hash (default: random)
+  A unique hash specific to the local site, created the first time it is needed.
+  Only change this if you want to display another server's results and you know
+  what you are doing. Old indexed items will be lost when the hash is changed
+  and all items will have to be reindexed. Can only contain alphanumeric
+  characters.
+
+[8] http://wiki.apache.org/solr/UpdateXmlMessages#A.22commit.22_and_.22optimize.22
 
 Customizing your Solr server
 ----------------------------
@@ -138,11 +149,11 @@ The schema.xml and solrconfig.xml files contain extensive comments on how to
 add additional features or modify behaviour, e.g., for adding a language-
 specific stemmer or a stopword list.
 If you are interested in further customizing your Solr server to your needs,
-see the Solr wiki at [8] for documentation. When editing the schema.xml and
+see the Solr wiki at [9] for documentation. When editing the schema.xml and
 solrconfig.xml files, please only edit the copies in the Solr configuration
 directory, not directly the ones provided with this module.
 
-[8] http://wiki.apache.org/solr/
+[9] http://wiki.apache.org/solr/
 
 You'll have to restart your Solr server after making such changes, for them to
 take effect.

sites/all/modules/contrib/search/search_api_solr/includes/service.inc

@@ -79,19 +79,22 @@ class SearchApiSolrService extends SearchApiAbstractService {
       'excerpt' => FALSE,
       'retrieve_data' => FALSE,
       'highlight_data' => FALSE,
+      'skip_schema_check' => FALSE,
+      'solr_version' => '',
       'http_method' => 'AUTO',
       // Default to TRUE for new servers, but to FALSE for existing ones.
       'clean_ids' => $this->options ? FALSE : TRUE,
+      'site_hash' => $this->options ? FALSE : TRUE,
       'autocorrect_spell' => TRUE,
       'autocorrect_suggest_words' => TRUE,
     );
 
     if (!$options['clean_ids']) {
       if (module_exists('advanced_help')) {
-        $variables['@url']= url('help/search_api_solr/README.txt');
+        $variables['@url'] = url('help/search_api_solr/README.txt');
       }
       else {
-        $variables['@url']= url(drupal_get_path('module', 'search_api_solr') . '/README.txt');
+        $variables['@url'] = url(drupal_get_path('module', 'search_api_solr') . '/README.txt');
       }
       $description = t('Change Solr field names to be more compatible with advanced features. Doing this leads to re-indexing of all indexes on this server. See <a href="@url">README.txt</a> for details.', $variables);
       $form['clean_ids_form'] = array(
@@ -111,6 +114,25 @@ class SearchApiSolrService extends SearchApiAbstractService {
       '#value' => $options['clean_ids'],
     );
 
+    if (!$options['site_hash']) {
+      $description = t('If you want to index content from multiple sites on a single Solr server, you should enable the multi-site compatibility here. Note, however, that this will completely clear all search indexes (from this site) lying on this server. All content will have to be re-indexed.');
+      $form['site_hash_form'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Multi-site compatibility'),
+        '#description' => $description,
+        '#collapsible' => TRUE,
+      );
+      $form['site_hash_form']['submit'] = array(
+        '#type' => 'submit',
+        '#value' => t('Turn on multi-site compatibility and clear all indexes'),
+        '#submit' => array('_search_api_solr_switch_to_site_hash'),
+      );
+    }
+    $form['site_hash'] = array(
+      '#type' => 'value',
+      '#value' => $options['site_hash'],
+    );
+
     $form['scheme'] = array(
       '#type' => 'select',
       '#title' => t('HTTP protocol'),
@@ -139,7 +161,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
     $form['path'] = array(
       '#type' => 'textfield',
       '#title' => t('Solr path'),
-      '#description' => t('The path that identifies the Solr instance to use on the server.'),
+      '#description' => t('The path that identifies the Solr instance to use on the server. (For Solr 4.x servers, this should include the name of the core to use.)'),
       '#default_value' => $options['path'],
     );
 
@@ -188,6 +210,24 @@ class SearchApiSolrService extends SearchApiAbstractService {
       '#description' => t('When retrieving result data from the Solr server, try to highlight the search terms in the returned fulltext fields.'),
       '#default_value' => $options['highlight_data'],
     );
+    $form['advanced']['skip_schema_check'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Skip schema verification'),
+      '#description' => t('Skip the automatic check for schema-compatibillity. Use this override if you are seeing an error-message about an incompatible schema.xml configuration file, and you are sure the configuration is compatible.'),
+      '#default_value' => $options['skip_schema_check'],
+    );
+    $form['advanced']['solr_version'] = array(
+      '#type' => 'select',
+      '#title' => t('Solr version override'),
+      '#description' => t('Specify the Solr version manually in case it cannot be retrived automatically. The version can be found in the Solr admin interface under "Solr Specification Version" or "solr-spec"'),
+      '#options' => array(
+        '' => t('Determine automatically'),
+        '1' => '1.4',
+        '3' => '3.x',
+        '4' => '4.x',
+      ),
+      '#default_value' => $options['solr_version'],
+    );
     // Highlighting retrieved data only makes sense when we retrieve data.
     // (Actually, internally it doesn't really matter. However, from a user's
     // perspective, having to check both probably makes sense.)
@@ -382,15 +422,17 @@ class SearchApiSolrService extends SearchApiAbstractService {
             );
 
             $status = 'ok';
-            if (substr($stats_summary['@schema_version'], 0, 10) == 'search-api') {
-              drupal_set_message(t('Your schema.xml version is too old. Please replace all configuration files with the ones packaged with this module and re-index you data.'), 'error');
-              $status = 'error';
-            }
-            elseif (substr($stats_summary['@schema_version'], 0, 9) != 'drupal-4.') {
-              $variables['@url'] = url(drupal_get_path('module', 'search_api_solr') . '/INSTALL.txt');
-              $message = t('You are using an incompatible schema.xml configuration file. Please follow the instructions in the <a href="@url">INSTALL.txt</a> file for setting up Solr.', $variables);
-              drupal_set_message($message, 'error');
-              $status = 'error';
+            if (empty($this->options['skip_schema_check'])) {
+              if (substr($stats_summary['@schema_version'], 0, 10) == 'search-api') {
+                drupal_set_message(t('Your schema.xml version is too old. Please replace all configuration files with the ones packaged with this module and re-index you data.'), 'error');
+                $status = 'error';
+              }
+              elseif (substr($stats_summary['@schema_version'], 0, 9) != 'drupal-4.') {
+                $variables['@url'] = url(drupal_get_path('module', 'search_api_solr') . '/INSTALL.txt');
+                $message = t('You are using an incompatible schema.xml configuration file. Please follow the instructions in the <a href="@url">INSTALL.txt</a> file for setting up Solr.', $variables);
+                drupal_set_message($message, 'error');
+                $status = 'error';
+              }
             }
             $info[] = array(
               'label' => t('Schema'),
@@ -477,16 +519,21 @@ class SearchApiSolrService extends SearchApiAbstractService {
     if (module_exists('search_api_multi') && module_exists('search_api_views')) {
       views_invalidate_cache();
     }
-    $id = is_object($index) ? $index->machine_name : $index;
+    $index_id = is_object($index) ? $index->machine_name : $index;
     // Only delete the index's data if the index isn't read-only.
     if (!is_object($index) || empty($index->read_only)) {
       $this->connect();
-      try {
-        $this->solr->deleteByQuery("index_id:" . $this->getIndexId($id));
-      }
-      catch (Exception $e) {
-        throw new SearchApiException($e->getMessage());
+      $index_id = $this->getIndexId($index_id);
+      // Since the index ID we use for indexing can contain arbitrary
+      // prefixes, we have to escape it for use in the query.
+      $index_id = call_user_func(array($this->connection_class, 'phrase'), $index_id);
+      $query = "index_id:$index_id";
+      if (!empty($this->options['site_hash'])) {
+        // We don't need to escape the site hash, as that consists only of
+        // alphanumeric characters.
+        $query .= ' hash:' . search_api_solr_site_hash();
       }
+      $this->solr->deleteByQuery($query);
     }
   }
 
@@ -498,27 +545,53 @@ class SearchApiSolrService extends SearchApiAbstractService {
     $ret = array();
     $index_id = $this->getIndexId($index->machine_name);
     $fields = $this->getFieldNames($index);
+    $languages = language_list();
+    $base_urls = array();
 
     foreach ($items as $id => $item) {
-      try {
-        $doc = new SearchApiSolrDocument();
-        $doc->setField('id', $this->createId($index_id, $id));
-        $doc->setField('index_id', $index_id);
-        $doc->setField('item_id', $id);
-
-        foreach ($item as $key => $field) {
-          if (!isset($fields[$key])) {
-            throw new SearchApiException(t('Unknown field @field.', array('@field' => $key)));
+      $doc = new SearchApiSolrDocument();
+      $doc->setField('id', $this->createId($index_id, $id));
+      $doc->setField('index_id', $index_id);
+      $doc->setField('item_id', $id);
+
+      // If multi-site compatibility is enabled, add the site hash and
+      // language-specific base URL.
+      if (!empty($this->options['site_hash'])) {
+        $doc->setField('hash', search_api_solr_site_hash());
+        $lang = $item['search_api_language']['value'];
+        if (empty($base_urls[$lang])) {
+          $url_options = array('absolute' => TRUE);
+          if (isset($languages[$lang])) {
+            $url_options['language'] = $languages[$lang];
           }
-          $this->addIndexField($doc, $fields[$key], $field['value'], $field['type']);
+          $base_urls[$lang] = url(NULL, $url_options);
         }
+        $doc->setField('site', $base_urls[$lang]);
+      }
+
+      // Now add all fields contained in the item, with dynamic fields.
+      foreach ($item as $key => $field) {
+        // If the field is not known for the index, something weird has
+        // happened. We refuse to index the items and hope that the others are
+        // OK.
+        if (!isset($fields[$key])) {
+          $type = search_api_get_item_type_info($index->item_type);
+          $vars = array(
+            '@field' => $key,
+            '@type' => $type ? $type['name'] : $index->item_type,
+            '@id' => $id,
+          );
+          watchdog('search_api_solr', 'Error while indexing: Unknown field @field set for @type with ID @id.', $vars, WATCHDOG_WARNING);
+          $doc = NULL;
+          break;
+        }
+        $this->addIndexField($doc, $fields[$key], $field['value'], $field['type']);
+      }
 
+      if ($doc) {
         $documents[] = $doc;
         $ret[] = $id;
       }
-      catch (Exception $e) {
-        watchdog_exception('search_api_solr', $e, "%type while indexing @type with ID @id: !message in %function (line %line of %file).", array('@type' => $index->item_type, '@id' => $id), WATCHDOG_WARNING);
-      }
     }
 
     // Let other modules alter documents before sending them to solr.
@@ -545,10 +618,14 @@ class SearchApiSolrService extends SearchApiAbstractService {
   /**
    * Creates an ID used as the unique identifier at the Solr server.
    *
-   * This has to consist of both index and item ID.
+   * This has to consist of both index and item ID. Optionally, the site hash is
+   * also included.
+   *
+   * @see search_api_solr_site_hash()
    */
   protected function createId($index_id, $item_id) {
-    return "$index_id-$item_id";
+    $site_hash = !empty($this->options['site_hash']) ? search_api_solr_site_hash() . '-' : '';
+    return "$site_hash$index_id-$item_id";
   }
 
   /**
@@ -690,25 +767,30 @@ class SearchApiSolrService extends SearchApiAbstractService {
    */
   public function deleteItems($ids = 'all', SearchApiIndex $index = NULL) {
     $this->connect();
-    if ($index) {
+    if (is_array($ids)) {
       $index_id = $this->getIndexId($index->machine_name);
-      if (is_array($ids)) {
-        $solr_ids = array();
-        foreach ($ids as $id) {
-          $solr_ids[] = $this->createId($index_id, $id);
-        }
-        $this->solr->deleteByMultipleIds($solr_ids);
-      }
-      elseif ($ids == 'all') {
-        $this->solr->deleteByQuery("index_id:" . $index_id);
-      }
-      else {
-        $this->solr->deleteByQuery("index_id:" . $index_id . ' (' . $ids . ')');
+      $solr_ids = array();
+      foreach ($ids as $id) {
+        $solr_ids[] = $this->createId($index_id, $id);
       }
+      $this->solr->deleteByMultipleIds($solr_ids);
     }
     else {
-      $q = $ids == 'all' ? '*:*' : $ids;
-      $this->solr->deleteByQuery($q);
+      $query = array();
+      if ($index) {
+        $index_id = $this->getIndexId($index->machine_name);
+        $index_id = call_user_func(array($this->connection_class, 'phrase'), $index_id);
+        $query[] = "index_id:$index_id";
+      }
+      if (!empty($this->options['site_hash'])) {
+        // We don't need to escape the site hash, as that consists only of
+        // alphanumeric characters.
+        $query[] = 'hash:' . search_api_solr_site_hash();
+      }
+      if ($ids != 'all') {
+        $query[] = $query ? "($ids)" : $ids;
+      }
+      $this->solr->deleteByQuery($query ? implode(' ', $query) : '*:*');
     }
     $this->scheduleCommit();
   }
@@ -749,7 +831,12 @@ class SearchApiSolrService extends SearchApiAbstractService {
     // Extract filters.
     $filter = $query->getFilter();
     $fq = $this->createFilterQueries($filter, $fields, $index->options['fields']);
-    $fq[] = 'index_id:' . $index_id;
+    $fq[] = 'index_id:' . call_user_func(array($this->connection_class, 'phrase'), $index_id);
+    if (!empty($this->options['site_hash'])) {
+      // We don't need to escape the site hash, as that consists only of
+      // alphanumeric characters.
+      $fq[] = 'hash:' . search_api_solr_site_hash();
+    }
 
     // Extract sort.
     $sort = array();
@@ -855,6 +942,19 @@ class SearchApiSolrService extends SearchApiAbstractService {
           }
         }
 
+        // Add parameters to fetch distance, if requested.
+        if (!empty($spatial['distance']) && $version >= 4) {
+          if (strpos($field, ':') === FALSE) {
+            // Add pseudofield with the distance to the result items.
+            $location_fields[] = '_' . $field . '_distance_:geodist(' . $field . ',' . $point . ')';
+          }
+          else {
+            $link = l(t('edit server'), 'admin/config/search/search_api/server/' . $this->server->machine_name . '/edit');
+            watchdog('search_api_solr', "Location distance information can't be added because unclean field identifiers are used.", array(), WATCHDOG_WARNING, $link);
+          }
+        }
+
+
         // Change the facet parameters for spatial fields to return distance
         // facets.
         if (!empty($facets)) {
@@ -982,6 +1082,10 @@ class SearchApiSolrService extends SearchApiAbstractService {
     if (!empty($this->options['retrieve_data'])) {
       $params['fl'] = '*,score';
     }
+    if (!empty($location_fields)) {
+      $params['fl'] .= ',' . implode(',', $location_fields);
+    }
+
     // Retrieve http method from server options.
     $http_method = !empty($this->options['http_method']) ? $this->options['http_method'] : 'AUTO';
 
@@ -1051,6 +1155,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
     $index = $query->getIndex();
     $fields = $this->getFieldNames($index);
     $field_options = $index->options['fields'];
+    $version = $this->solr->getSolrVersion();
 
     // Set up the results array.
     $results = array();
@@ -1087,6 +1192,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
       $results['result count'] = $response->response->numFound;
       $docs = $response->response->docs;
     }
+    $spatials = $query->getOption('search_api_location');
 
     // Add each search result to the results array.
     foreach ($docs as $doc) {
@@ -1119,6 +1225,22 @@ class SearchApiSolrService extends SearchApiAbstractService {
       $result['id'] = $result['fields']['search_api_id'];
       $result['score'] = $result['fields']['search_api_relevance'];
 
+      // If location based search is enabled ensure the calculated distance is
+      // set to the appropriate field. If the calculation wasn't possible add
+      // the coordinates to allow calculation.
+      if ($spatials) {
+        foreach ($spatials as $spatial) {
+          if (isset($spatial['field']) && !empty($spatial['distance'])) {
+            if ($version >= 4) {
+              $doc_field = '_' . $fields[$spatial['field']] . '_distance_';
+              if (!empty($doc->{$doc_field})) {
+                $results['search_api_location'][$spatial['field']][$result['id']]['distance'] = $doc->{$doc_field};
+              }
+            }
+          }
+        }
+      }
+
       $index_id = $this->getIndexId($index->machine_name);
       $solr_id = $this->createId($index_id, $result['id']);
       $excerpt = $this->getExcerpt($response, $solr_id, $result['fields'], $fields);
@@ -1364,7 +1486,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
       }
       return '((' . implode(') OR (', $k) . '))';
     }
-    $k = implode($neg ? ' AND ' : ' ', $k);
+    $k = implode(' AND ', $k);
     return $neg ? "*:* AND -($k)" : $k;
   }
 
@@ -1384,7 +1506,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
           $fq[] = $this->createFilterQuery($solr_fields[$f[0]], $f[1], $f[2], $fields[$f[0]]);
         }
       }
-      else {
+      elseif ($f instanceof SearchApiQueryFilterInterface) {
         $q = $this->createFilterQueries($f, $solr_fields, $fields);
         if ($filter->getConjunction() != $f->getConjunction()) {
           // $or == TRUE means the nested filter has conjunction AND, and vice versa
@@ -1396,6 +1518,16 @@ class SearchApiSolrService extends SearchApiAbstractService {
         }
       }
     }
+    if (method_exists($filter, 'getTags')) {
+      foreach ($filter->getTags() as $tag) {
+        $tag = "{!tag=$tag}";
+        foreach ($fq as $i => $filter) {
+          $fq[$i] = $tag . $filter;
+        }
+        // We can only apply one tag per filter.
+        break;
+      }
+    }
     return ($or && count($fq) > 1) ? array('((' . implode(') OR (', $fq) . '))') : $fq;
   }
 
@@ -1405,6 +1537,16 @@ class SearchApiSolrService extends SearchApiAbstractService {
    */
   protected function createFilterQuery($field, $value, $operator, $field_info) {
     $field = call_user_func(array($this->connection_class, 'escapeFieldName'), $field);
+    // Special handling for location fields.
+    if (isset($field_info['real_type']) && $field_info['real_type'] == 'location') {
+      // Empty / non-empty comparison has to take place in one of the subfields
+      // of the location field type. These subfields are usually generated with
+      // the index and the field type as name suffix.
+      // @TODO Do we need to handle other operators / values too?
+      if ($value === NULL) {
+        $field .= '_0___tdouble';
+      }
+    }
     if ($value === NULL) {
       return ($operator == '=' ? '*:* AND -' : '') . "$field:[* TO *]";
     }
@@ -1458,7 +1600,6 @@ class SearchApiSolrService extends SearchApiAbstractService {
     $facet_params['facet.limit'] = 10;
     $facet_params['facet.mincount'] = 1;
     $facet_params['facet.missing'] = 'false';
-    $taggedFields = array();
     foreach ($facets as $info) {
       if (empty($fields[$info['field']])) {
         continue;
@@ -1468,10 +1609,9 @@ class SearchApiSolrService extends SearchApiAbstractService {
       // Check for the "or" operator.
       if (isset($info['operator']) && $info['operator'] === 'or') {
         // Remember that filters for this field should be tagged.
-        $escaped = call_user_func(array($this->connection_class, 'escapeFieldName'), $fields[$info['field']]);
-        $taggedFields[$escaped] = "{!tag=$escaped}";
+        $tag = 'facet:' . $info['field'];
         // Add the facet field.
-        $facet_params['facet.field'][] = "{!ex=$escaped}$field";
+        $facet_params['facet.field'][] = "{!ex=$tag}$field";
       }
       else {
         // Add the facet field.
@@ -1490,20 +1630,6 @@ class SearchApiSolrService extends SearchApiAbstractService {
         $facet_params["f.$field.facet.missing"] = 'true';
       }
     }
-    // Tag filters of fields with "OR" facets.
-    foreach ($taggedFields as $field => $tag) {
-      $regex = '#(?<![^( ])' . preg_quote($field, '#') . ':#';
-      foreach ($fq as $i => $filter) {
-        // Solr can't handle two tags on the same filter, so we don't add two.
-        // Another option here would even be to remove the other tag, too,
-        // since we can be pretty sure that this filter does not originate from
-        // a facet – however, wrong results would still be possible, and this is
-        // definitely an edge case, so don't bother.
-        if (preg_match($regex, $filter) && substr($filter, 0, 6) != '{!tag=') {
-          $fq[$i] = $tag . $filter;
-        }
-      }
-    }
 
     return $facet_params;
   }
@@ -1665,7 +1791,13 @@ class SearchApiSolrService extends SearchApiAbstractService {
 
     // Extract filters
     $fq = $this->createFilterQueries($query->getFilter(), $fields, $index->options['fields']);
-    $fq[] = 'index_id:' . $this->getIndexId($index->machine_name);
+    $index_id = $this->getIndexId($index->machine_name);
+    $fq[] = 'index_id:' . call_user_func(array($this->connection_class, 'phrase'), $index_id);
+    if (!empty($this->options['site_hash'])) {
+      // We don't need to escape the site hash, as that consists only of
+      // alphanumeric characters.
+      $fq[] = 'hash:' . search_api_solr_site_hash();
+    }
 
     // Autocomplete magic
     $facet_fields = array();
@@ -1867,6 +1999,11 @@ class SearchApiSolrService extends SearchApiAbstractService {
       $index_filter[] = 'index_id:' . call_user_func(array($this->connection_class, 'phrase'), $index_id);
     }
     $fq[] = implode(' OR ', $index_filter);
+    if (!empty($this->options['site_hash'])) {
+      // We don't need to escape the site hash, as that consists only of
+      // alphanumeric characters.
+      $fq[] = 'hash:' . search_api_solr_site_hash();
+    }
 
     // Extract sort
     $sort = array();
@@ -2015,6 +2152,8 @@ class SearchApiSolrService extends SearchApiAbstractService {
       }
     }
 
+    drupal_alter('search_api_solr_multi_search_results', $results, $query, $response);
+
     // Compute performance
     $time_end = microtime(TRUE);
     $results['performance'] = array(
@@ -2163,4 +2302,5 @@ class SearchApiSolrService extends SearchApiAbstractService {
     $id = variable_get('search_api_solr_index_prefix', '') . $id;
     return $id;
   }
+
 }

sites/all/modules/contrib/search/search_api_solr/includes/solr_connection.inc

@@ -182,11 +182,11 @@ class SearchApiSolrConnection implements SearchApiSolrConnectionInterface {
   /**
    * Flag that denotes whether to use soft commits for Solr 4.x.
    *
-   * Defaults to FALSE.
+   * Defaults to TRUE.
    *
    * @var bool
    */
-  protected $soft_commit = FALSE;
+  protected $soft_commit = TRUE;
 
   /**
    * Implements SearchApiSolrConnectionInterface::__construct().
@@ -384,6 +384,11 @@ class SearchApiSolrConnection implements SearchApiSolrConnectionInterface {
    * Implements SearchApiSolrConnectionInterface::getSolrVersion().
    */
   public function getSolrVersion() {
+    // Allow for overrides by the user.
+    if (!empty($this->options['solr_version'])) {
+      return $this->options['solr_version'];
+    }
+
     $system_info = $this->getSystemInfo();
     // Get our solr version number
     if (isset($system_info->lucene->{'solr-spec-version'})) {
@@ -856,7 +861,10 @@ class SearchApiSolrConnection implements SearchApiSolrConnectionInterface {
 
       // Recurse into children.
       if (is_array($value)) {
-        $params[] = $this->httpBuildQuery($value, $key);
+        $value = $this->httpBuildQuery($value, $key);
+        if ($value) {
+          $params[] = $value;
+        }
       }
       // If a query parameter value is NULL, only append its key.
       elseif (!isset($value)) {
@@ -882,10 +890,40 @@ class SearchApiSolrConnection implements SearchApiSolrConnectionInterface {
     $params += array(
       'json.nl' => self::NAMED_LIST_FORMAT,
     );
-    if ($query) {
+    if (isset($query)) {
       $params['q'] = $query;
     }
-    // PHP's built-in http_build_query() doesn't give us the format Solr wants.
+
+    // Carry out some performance improvements when no search keys are given.
+    if (!isset($params['q']) || !strlen($params['q'])) {
+      // Without search keys, the qf parameter is useless. We also remove empty
+      // search keys here. (With our normal service class, empty keys won't be
+      // set, but another module using this connection class might do that.)
+      unset($params['q'], $params['qf']);
+
+      // If we have filters set (which will nearly always be the case, since we
+      // have to filter by index), move them to the q.alt parameter where
+      // possible.
+      if (!empty($params['fq'])) {
+        $qalt = array();
+        foreach ($params['fq'] as $i => $fq) {
+          // Tagged and negative filters cannot be moved to q.alt.
+          if ($fq[0] !== '{' && $fq[0] !== '-') {
+            $qalt[] = "($fq)";
+            unset($params['fq'][$i]);
+          }
+        }
+        if ($qalt) {
+          $params['q.alt'] = implode(' ', $qalt);
+        }
+        if (empty($params['fq'])) {
+          unset($params['fq']);
+        }
+      }
+    }
+
+    // Build the HTTP query string. We have our own method for that since PHP's
+    // built-in http_build_query() doesn't give us the format Solr wants.
     $queryString = $this->httpBuildQuery($params);
 
     if ($method == 'GET' || $method == 'AUTO') {

sites/all/modules/contrib/search/search_api_solr/includes/solr_connection.interface.inc

@@ -129,7 +129,7 @@ interface SearchApiSolrConnectionInterface {
    * @return object
    *  The HTTP response object.
    *
-   * @throws Exception
+   * @throws SearchApiException
    */
   public function makeServletRequest($servlet, array $params = array(), array $options = array());
 
@@ -164,7 +164,7 @@ interface SearchApiSolrConnectionInterface {
    * @return object
    *   A response object.
    *
-   * @throws Exception
+   * @throws SearchApiException
    *   If an error occurs during the service call
    */
   public function update($rawPost, $timeout = FALSE);
@@ -185,7 +185,7 @@ interface SearchApiSolrConnectionInterface {
    * @return object
    *   A response object.
    *
-   * @throws Exception
+   * @throws SearchApiException
    *   If an error occurs during the service call.
    */
   public function addDocuments(array $documents, $overwrite = NULL, $commitWithin = NULL);
@@ -204,7 +204,7 @@ interface SearchApiSolrConnectionInterface {
    * @return object
    *   A response object.
    *
-   * @throws Exception
+   * @throws SearchApiException
    *   If an error occurs during the service call.
    */
   public function commit($waitSearcher = TRUE, $timeout = 3600);
@@ -221,7 +221,7 @@ interface SearchApiSolrConnectionInterface {
    * @return object
    *   A response object.
    *
-   * @throws Exception
+   * @throws SearchApiException
    *   If an error occurs during the service call.
    */
   public function deleteById($id, $timeout = 3600);
@@ -238,7 +238,7 @@ interface SearchApiSolrConnectionInterface {
    * @return object
    *   A response object.
    *
-   * @throws Exception
+   * @throws SearchApiException
    *   If an error occurs during the service call.
    */
   public function deleteByMultipleIds(array $ids, $timeout = 3600);
@@ -254,7 +254,7 @@ interface SearchApiSolrConnectionInterface {
    * @return object
    *   A response object.
    *
-   * @throws Exception
+   * @throws SearchApiException
    *   If an error occurs during the service call.
    */
   public function deleteByQuery($rawQuery, $timeout = 3600);
@@ -273,7 +273,7 @@ interface SearchApiSolrConnectionInterface {
    * @return object
    *   A response object.
    *
-   * @throws Exception
+   * @throws SearchApiException
    *   If an error occurs during the service call.
    */
   public function optimize($waitSearcher = TRUE, $timeout = 3600);
@@ -294,7 +294,7 @@ interface SearchApiSolrConnectionInterface {
    * @return object
    *   A response object.
    *
-   * @throws Exception
+   * @throws SearchApiException
    *   If an error occurs during the service call.
    */
   public function search($query = NULL, array $params = array(), $method = 'GET');

sites/all/modules/contrib/search/search_api_solr/search_api_solr.api.php

@@ -100,6 +100,22 @@ function hook_search_api_solr_multi_query_alter(array &$call_args, SearchApiMult
   }
 }
 
+/**
+ * Lets modules alter the search results returned from a multi-index search.
+ *
+ * @param array $results
+ *   The results array that will be returned for the search.
+ * @param SearchApiMultiQueryInterface $query
+ *   The executed multi-index search query.
+ * @param object $response
+ *   The Solr response object.
+ */
+function hook_search_api_solr_multi_search_results_alter(array &$results, SearchApiMultiQueryInterface $query, $response) {
+  if (isset($response->facet_counts->facet_fields->custom_field)) {
+    // Do something with $results.
+  }
+}
+
 /**
  * Provide Solr dynamic fields as Search API data types.
  *

sites/all/modules/contrib/search/search_api_solr/search_api_solr.info

@@ -11,9 +11,9 @@ files[] = includes/solr_connection.interface.inc
 files[] = includes/solr_field.inc
 files[] = includes/spellcheck.inc
 
-; Information added by Drupal.org packaging script on 2013-12-25
-version = "7.x-1.4"
+; Information added by Drupal.org packaging script on 2014-09-08
+version = "7.x-1.6"
 core = "7.x"
 project = "search_api_solr"
-datestamp = "1387970905"
+datestamp = "1410186051"
 

sites/all/modules/contrib/search/search_api_solr/search_api_solr.install

@@ -63,6 +63,8 @@ function search_api_solr_uninstall() {
   variable_del('search_api_solr_autocomplete_max_occurrences');
   variable_del('search_api_solr_index_prefix');
   variable_del('search_api_solr_http_get_max_length');
+  variable_del('search_api_solr_cron_action');
+  variable_del('search_api_solr_site_hash');
 }
 
 /**

sites/all/modules/contrib/search/search_api_solr/search_api_solr.module

@@ -71,17 +71,46 @@ function search_api_solr_help($path, array $arg = array()) {
  * day.
  */
 function search_api_solr_cron() {
-  if (REQUEST_TIME - variable_get('search_api_solr_last_optimize', 0) > 86400) {
+  $action = variable_get('search_api_solr_cron_action', 'spellcheck');
+  // We treat all unknown action settings as "none". However, we turn a blind
+  // eye for Britons and other people who can spell.
+  if (!in_array($action, array('spellcheck', 'optimize', 'optimise'))) {
+    return;
+  }
+  // 86400 seconds is one day. We use slightly less here to allow for some
+  // variation in the request time of the cron run, so that the time of day will
+  // (more or less) stay the same.
+  if (REQUEST_TIME - variable_get('search_api_solr_last_optimize', 0) > 86340) {
     variable_set('search_api_solr_last_optimize', REQUEST_TIME);
     $conditions = array('class' => 'search_api_solr_service', 'enabled' => TRUE);
+    $count = 0;
     foreach (search_api_server_load_multiple(FALSE, $conditions) as $server) {
       try {
-        $server->getSolrConnection()->optimize(FALSE);
+        $solr = $server->getSolrConnection();
+        if ($action != 'spellcheck') {
+          $solr->optimize(FALSE);
+        }
+        else {
+          $params['rows'] = 0;
+          $params['spellcheck'] = 'true';
+          $params['spellcheck.build'] = 'true';
+          $solr->search(NULL, $params);
+        }
+        ++$count;
       }
-      catch(Exception $e) {
+      catch(SearchApiException $e) {
         watchdog_exception('search_api_solr', $e, '%type while optimizing Solr server @server: !message in %function (line %line of %file).', array('@server' => $server->name));
       }
     }
+    if ($count) {
+      $vars['@count'] = $count;
+      if ($action != 'spellcheck') {
+        watchdog('search_api_solr', 'Optimized @count Solr server(s).', $vars, WATCHDOG_INFO);
+      }
+      else {
+        watchdog('search_api_solr', 'Rebuilt spellcheck dictionary on @count Solr server(s).', $vars, WATCHDOG_INFO);
+      }
+    }
   }
 }
 
@@ -206,6 +235,25 @@ function search_api_solr_get_data_type_info($type = NULL) {
   return $types;
 }
 
+/**
+ * Returns a unique hash for the current site.
+ *
+ * This is used to identify Solr documents from different sites within a single
+ * Solr server.
+ *
+ * @return string
+ *   A unique site hash, containing only alphanumeric characters.
+ */
+function search_api_solr_site_hash() {
+  // Copied from apachesolr_site_hash().
+  if (!($hash = variable_get('search_api_solr_site_hash', FALSE))) {
+    global $base_url;
+    $hash = substr(base_convert(sha1(uniqid($base_url, TRUE)), 16, 36), 0, 6);
+    variable_set('search_api_solr_site_hash', $hash);
+  }
+  return $hash;
+}
+
 /**
  * Retrieves a list of all config files of a server.
  *
@@ -229,9 +277,17 @@ function search_api_solr_server_get_files(SearchApiServer $server, $dir_name = N
   // Search for directories and recursively merge directory files.
   $files_data = json_decode($response->data, TRUE);
   $files_list = $files_data['files'];
+  $dir_length = strlen($dir_name) + 1;
   $result = array('' => array());
 
   foreach ($files_list as $file_name => $file_info) {
+    // Annoyingly, Solr 4.7 changed the way the admin/file handler returns
+    // the file names when listing directory contents: the returned name is now
+    // only the base name, not the complete path from the config root directory.
+    // We therefore have to check for this case.
+    if ($dir_name && substr($file_name, 0, $dir_length) !== "$dir_name/") {
+      $file_name = "$dir_name/" . $file_name;
+    }
     if (empty($file_info['directory'])) {
       $result[''][$file_name] = $file_info;
     }
@@ -315,3 +371,35 @@ function _search_api_solr_switch_to_clean_ids(array $form, array &$form_state) {
     drupal_set_message($msg);
   }
 }
+
+/**
+ * Switches a server to multi-site compatibility mode.
+ *
+ * Used as a submit callback in SearchApiSolrService::configurationForm().
+ */
+function _search_api_solr_switch_to_site_hash(array $form, array &$form_state) {
+  $server = $form_state['server'];
+
+  try {
+    $conditions['server'] = $server->machine_name;
+    $indexes = search_api_index_load_multiple(FALSE, $conditions);
+    if ($indexes) {
+      foreach ($indexes as $index) {
+        $index->reindex();
+      }
+      $msg = format_plural(count($indexes), '1 index was cleared.', '@count indexes were cleared.');
+      $server->deleteItems('index_id:(' . implode(' ', array_keys($indexes)) . ')');
+      drupal_set_message($msg);
+    }
+  }
+  catch (SearchApiException $e) {
+    $variables = array('@server' => $server->name);
+    watchdog_exception('search_api_solr', $e, '%type while attempting to enable multi-site compatibility mode for Solr server @server: !message in %function (line %line of %file).', $variables);
+    drupal_set_message(t('An error occured while attempting to enable multi-site compatibility mode for Solr server @server. Check the logs for details.', $variables), 'error');
+    return;
+  }
+
+  $server->options['site_hash'] = TRUE;
+  $server->save();
+  drupal_set_message(t('The Solr server was successfully switched to multi-site compatibility mode.'));
+}

sites/all/modules/contrib/search/search_api_solr/search_api_solr.views.inc

@@ -14,9 +14,16 @@
 function search_api_solr_views_data_alter(array &$data) {
   try {
     foreach (search_api_index_load_multiple(FALSE) as $index) {
-      $server = $index->server();
+      $server = NULL;
+
+      try {
+        $server = $index->server();
+      }
+      catch (SearchApiException $e) {
+        // Just ignore invalid servers and skip the index.
+      }
       if (!$server || empty($server->options['retrieve_data'])) {
-        return;
+        continue;
       }
       // Fill in base data.
       $key = 'search_api_index_' . $index->machine_name;

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/elevate.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
- This file allows you to boost certain search items to the top of search
- results. You can find out an item's ID by searching directly on the Solr
- server. The item IDs are in general constructed as follows:
-   Search API:
-     $document->id = $index_id . '-' . $item_id;
-   Apache Solr Search Integration:
-     $document->id = $site_hash . '/' . $entity_type . '/' . $entity->id;
-
- If you want this file to be automatically re-loaded when a Solr commit takes
- place (e.g., if you have an automatic script active which updates elevate.xml
- according to newly-indexed data), place it into Solr's data/ directory.
- Otherwise, place it with the other configuration files into the conf/
- directory.
-
- See http://wiki.apache.org/solr/QueryElevationComponent for more information.
--->
-
-<elevate>
-<!-- Example for ranking the node #1 first in searches for "example query": -->
-<!--
- <query text="example query">
-  <doc id="default_node_index-1" />
-  <doc id="7v3jsc/node/1" />
- </query>
--->
-<!-- Multiple <query> elements can be specified, contained in one <elevate>. -->
-<!-- <query text="...">...</query> -->
-</elevate>

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/mapping-ISOLatin1Accent.txt

@@ -1,14 +0,0 @@
-# This file contains character mappings for the default fulltext field type.
-# The source characters (on the left) will be replaced by the respective target
-# characters before any other processing takes place.
-# Lines starting with a pound character # are ignored.
-#
-# For sensible defaults, use the mapping-ISOLatin1Accent.txt file distributed
-# with the example application of your Solr version.
-#
-# Examples:
-#   "À" => "A"
-#   "\u00c4" => "A"
-#   "\u00c4" => "\u0041"
-#   "æ" => "ae"
-#   "\n" => " "

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/protwords.txt

@@ -1,7 +0,0 @@
-#-----------------------------------------------------------------------
-# This file blocks words from being operated on by the stemmer and word delimiter.
-&
-<
->
-'
-"

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/schema.xml

@@ -1,535 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
- This is the Solr schema file. This file should be named "schema.xml" and
- should be in the conf directory under the solr home
- (i.e. ./solr/conf/schema.xml by default)
- or located where the classloader for the Solr webapp can find it.
-
- For more information, on how to customize this file, please see
- http://wiki.apache.org/solr/SchemaXml
--->
-
-<schema name="drupal-4.1-solr-1.4" version="1.2">
-    <!-- attribute "name" is the name of this schema and is only used for display purposes.
-         Applications should change this to reflect the nature of the search collection.
-         version="1.2" is Solr's version number for the schema syntax and semantics.  It should
-         not normally be changed by applications.
-         1.0: multiValued attribute did not exist, all fields are multiValued by nature
-         1.1: multiValued attribute introduced, false by default
-         1.2: omitTermFreqAndPositions attribute introduced, true by default except for text fields.
-       -->
-  <types>
-    <!-- field type definitions. The "name" attribute is
-       just a label to be used by field definitions.  The "class"
-       attribute and any other attributes determine the real
-       behavior of the fieldType.
-         Class names starting with "solr" refer to java classes in the
-       org.apache.solr.analysis package.
-    -->
-
-    <!-- The StrField type is not analyzed, but indexed/stored verbatim.
-       - StrField and TextField support an optional compressThreshold which
-       limits compression (if enabled in the derived fields) to values which
-       exceed a certain size (in characters).
-    -->
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
-
-    <!-- boolean type: "true" or "false" -->
-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
-    <!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
-    <fieldtype name="binary" class="solr.BinaryField"/>
-
-    <!-- The optional sortMissingLast and sortMissingFirst attributes are
-         currently supported on types that are sorted internally as strings.
-       - If sortMissingLast="true", then a sort on this field will cause documents
-         without the field to come after documents with the field,
-         regardless of the requested sort order (asc or desc).
-       - If sortMissingFirst="true", then a sort on this field will cause documents
-         without the field to come before documents with the field,
-         regardless of the requested sort order.
-       - If sortMissingLast="false" and sortMissingFirst="false" (the default),
-         then default lucene sorting will be used which places docs without the
-         field first in an ascending sort and last in a descending sort.
-    -->
-
-    <!-- numeric field types that can be sorted, but are not optimized for range queries -->
-    <fieldType name="integer" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-
-    <!--
-      Note:
-      These should only be used for compatibility with existing indexes (created with older Solr versions)
-      or if "sortMissingFirst" or "sortMissingLast" functionality is needed. Use Trie based fields instead.
-
-      Numeric field types that manipulate the value into
-      a string value that isn't human-readable in its internal form,
-      but with a lexicographic ordering the same as the numeric ordering,
-      so that range queries work correctly.
-    -->
-    <fieldType name="sint" class="solr.TrieIntField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="sfloat" class="solr.TrieFloatField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="slong" class="solr.TrieLongField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="sdouble" class="solr.TrieDoubleField" sortMissingLast="true" omitNorms="true"/>
-
-    <!--
-     Numeric field types that index each value at various levels of precision
-     to accelerate range queries when the number of values between the range
-     endpoints is large. See the javadoc for NumericRangeQuery for internal
-     implementation details.
-
-     Smaller precisionStep values (specified in bits) will lead to more tokens
-     indexed per value, slightly larger index size, and faster range queries.
-     A precisionStep of 0 disables indexing at different precision levels.
-    -->
-    <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
-
-    <!--
-     The ExternalFileField type gets values from an external file instead of the
-     index. This is useful for data such as rankings that might change frequently
-     and require different update frequencies than the documents they are
-     associated with.
-    -->
-    <fieldType name="pfloat" class="solr.FloatField" omitNorms="true"/>
-    <fieldType name="file" keyField="id" defVal="1" stored="false" indexed="false" class="solr.ExternalFileField" valType="pfloat"/>
-
-    <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
-         is a more restricted form of the canonical representation of dateTime
-         http://www.w3.org/TR/xmlschema-2/#dateTime
-         The trailing "Z" designates UTC time and is mandatory.
-         Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
-         All other components are mandatory.
-
-         Expressions can also be used to denote calculations that should be
-         performed relative to "NOW" to determine the value, ie...
-
-               NOW/HOUR
-                  ... Round to the start of the current hour
-               NOW-1DAY
-                  ... Exactly 1 day prior to now
-               NOW/DAY+6MONTHS+3DAYS
-                  ... 6 months and 3 days in the future from the start of
-                      the current day
-
-         Consult the DateField javadocs for more information.
-      -->
-    <fieldType name="date" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
-
-    <!-- A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
-
-    <!-- solr.TextField allows the specification of custom text analyzers
-         specified as a tokenizer and a list of token filters. Different
-         analyzers may be specified for indexing and querying.
-
-         The optional positionIncrementGap puts space between multiple fields of
-         this type on the same document, with the purpose of preventing false phrase
-         matching across fields.
-
-         For more info on customizing your analyzer chain, please see
-         http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters
-     -->
-
-    <!-- One can also specify an existing Analyzer class that has a
-         default constructor via the class attribute on the analyzer element
-    <fieldType name="text_greek" class="solr.TextField">
-      <analyzer class="org.apache.lucene.analysis.el.GreekAnalyzer"/>
-    </fieldType>
-    -->
-
-    <!-- A text field that only splits on whitespace for exact matching of words -->
-    <fieldType name="text_ws" class="solr.TextField" omitNorms="true" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- A text field that uses WordDelimiterFilter to enable splitting and matching of
-        words on case-change, alpha numeric boundaries, and non-alphanumeric chars,
-        so that a query of "wifi" or "wi fi" could match a document containing "Wi-Fi".
-        Synonyms and stopwords are customized by external files, and stemming is enabled.
-        Duplicate tokens at the same position (which may result from Stemmed Synonyms or
-        WordDelim parts) are removed.
-        -->
-    <fieldType name="text" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <!-- in this example, we will only use synonyms at query time
-        <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-        -->
-        <!-- Case insensitive stop word removal.
-          add enablePositionIncrements=true in both the index and query
-          analyzers to leave a 'gap' for more accurate phrase queries.
-        -->
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-                enablePositionIncrements="true"
-                />
-        <filter class="solr.WordDelimiterFilterFactory"
-                protected="protwords.txt"
-                generateWordParts="1"
-                generateNumberParts="1"
-                catenateWords="1"
-                catenateNumbers="1"
-                catenateAll="0"
-                splitOnCaseChange="1"
-                preserveOriginal="1"/>
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-                enablePositionIncrements="true"
-                />
-        <filter class="solr.WordDelimiterFilterFactory"
-                protected="protwords.txt"
-                generateWordParts="1"
-                generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
-                splitOnCaseChange="1"
-                preserveOriginal="1"/>
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- An unstemmed text field - good if one does not know the language of the field -->
-    <fieldType name="text_und" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" enablePositionIncrements="true" />
-        <filter class="solr.WordDelimiterFilterFactory"
-                protected="protwords.txt"
-                generateWordParts="1"
-                generateNumberParts="1"
-                catenateWords="1"
-                catenateNumbers="1"
-                catenateAll="0"
-                splitOnCaseChange="0"/>
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-                enablePositionIncrements="true"
-                />
-        <filter class="solr.WordDelimiterFilterFactory"
-                protected="protwords.txt"
-                generateWordParts="1"
-                generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
-                splitOnCaseChange="0"/>
-        <filter class="solr.LengthFilterFactory" min="2" max="100" />
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Edge N gram type - for example for matching against queries with results
-        KeywordTokenizer leaves input string intact as a single term.
-        see: http://www.lucidimagination.com/blog/2009/09/08/auto-suggest-from-popular-queries-using-edgengrams/
-      -->
-    <fieldType name="edge_n2_kw_text" class="solr.TextField" omitNorms="true" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="25" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
-    <!--  Setup simple analysis for spell checking -->
-
-    <fieldType name="textSpell" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory" />
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.LengthFilterFactory" min="4" max="20" />
-        <filter class="solr.LowerCaseFilterFactory" />
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory" />
-      </analyzer>
-    </fieldType>
-
-    <!-- This is an example of using the KeywordTokenizer along
-         With various TokenFilterFactories to produce a sortable field
-         that does not include some properties of the source text
-      -->
-    <fieldType name="sortString" class="solr.TextField" sortMissingLast="true" omitNorms="true">
-      <analyzer>
-        <!-- KeywordTokenizer does no actual tokenizing, so the entire
-            input string is preserved as a single token
-          -->
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <!-- The LowerCase TokenFilter does what you expect, which can be
-            when you want your sorting to be case insensitive
-          -->
-        <filter class="solr.LowerCaseFilterFactory" />
-        <!-- The TrimFilter removes any leading or trailing whitespace -->
-        <filter class="solr.TrimFilterFactory" />
-        <!-- The PatternReplaceFilter gives you the flexibility to use
-            Java Regular expression to replace any sequence of characters
-            matching a pattern with an arbitrary replacement string,
-            which may include back refrences to portions of the orriginal
-            string matched by the pattern.
-
-            See the Java Regular Expression documentation for more
-            infomation on pattern and replacement string syntax.
-
-            http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
-
-        <filter class="solr.PatternReplaceFilterFactory"
-               pattern="(^\p{Punct}+)" replacement="" replace="all"
-        />
-        -->
-      </analyzer>
-    </fieldType>
-
-    <!-- A random sort type -->
-    <fieldType name="rand" class="solr.RandomSortField" indexed="true" />
-
-    <!-- since fields of this type are by default not stored or indexed, any data added to
-         them will be ignored outright
-      -->
-    <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" />
-
-  </types>
-
-  <!-- Following is a dynamic way to include other types, added by other contrib modules -->
-  <xi:include href="solr/conf/schema_extra_types.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <xi:fallback></xi:fallback>
-  </xi:include>
-
-
-  <fields>
-    <!-- Valid attributes for fields:
-      name: mandatory - the name for the field
-      type: mandatory - the name of a previously defined type from the <types> section
-      indexed: true if this field should be indexed (searchable or sortable)
-      stored: true if this field should be retrievable
-      compressed: [false] if this field should be stored using gzip compression
-       (this will only apply if the field type is compressable; among
-       the standard field types, only TextField and StrField are)
-      multiValued: true if this field may contain multiple values per document
-      omitNorms: (expert) set to true to omit the norms associated with
-       this field (this disables length normalization and index-time
-       boosting for the field, and saves some memory).  Only full-text
-       fields or fields that need an index-time boost need norms.
-    -->
-
-    <!-- The document id is usually derived from a site-spcific key (hash) and the
-      entity type and ID like:
-      Search Api :
-        The format used is $document->id = $index_id . '-' . $item_id
-      Apache Solr Search Integration
-        The format used is $document->id = $site_hash . '/' . $entity_type . '/' . $entity->id;
-    -->
-    <field name="id" type="string" indexed="true" stored="true" required="true" />
-
-    <!-- Search Api specific fields -->
-    <!-- item_id contains the entity ID, e.g. a node's nid. -->
-    <field name="item_id"  type="string" indexed="true" stored="true" />
-    <!-- index_id is the machine name of the search index this entry belongs to. -->
-    <field name="index_id" type="string" indexed="true" stored="true" />
-    <!-- Since sorting by ID is explicitly allowed, store item_id also in a sortable way. -->
-    <copyField source="item_id" dest="sort_search_api_id" />
-
-    <!-- Apache Solr Search Integration specific fields -->
-    <!-- entity_id is the numeric object ID, e.g. Node ID, File ID -->
-    <field name="entity_id"  type="long" indexed="true" stored="true" />
-    <!-- entity_type is 'node', 'file', 'user', or some other Drupal object type -->
-    <field name="entity_type" type="string" indexed="true" stored="true" />
-    <!-- bundle is a node type, or as appropriate for other entity types -->
-    <field name="bundle" type="string" indexed="true" stored="true"/>
-    <field name="bundle_name" type="string" indexed="true" stored="true"/>
-    <field name="site" type="string" indexed="true" stored="true"/>
-    <field name="hash" type="string" indexed="true" stored="true"/>
-    <field name="url" type="string" indexed="true" stored="true"/>
-    <!-- label is the default field for a human-readable string for this entity (e.g. the title of a node) -->
-    <field name="label" type="text" indexed="true" stored="true" termVectors="true" omitNorms="true"/>
-    <!-- The string version of the title is used for sorting -->
-    <copyField source="label" dest="sort_label"/>
-
-    <!-- content is the default field for full text search - dump crap here -->
-    <field name="content" type="text" indexed="true" stored="true" termVectors="true"/>
-    <field name="teaser" type="text" indexed="false" stored="true"/>
-    <field name="path" type="string" indexed="true" stored="true"/>
-    <field name="path_alias" type="text" indexed="true" stored="true" termVectors="true" omitNorms="true"/>
-
-    <!-- These are the fields that correspond to a Drupal node. The beauty of having
-      Lucene store title, body, type, etc., is that we retrieve them with the search
-      result set and don't need to go to the database with a node_load. -->
-    <field name="tid"  type="long" indexed="true" stored="true" multiValued="true"/>
-    <field name="taxonomy_names" type="text" indexed="true" stored="false" termVectors="true" multiValued="true" omitNorms="true"/>
-    <!-- Copy terms to a single field that contains all taxonomy term names -->
-    <copyField source="tm_vid_*" dest="taxonomy_names"/>
-
-    <!-- Here, default is used to create a "timestamp" field indicating
-         when each document was indexed.-->
-    <field name="timestamp" type="tdate" indexed="true" stored="true" default="NOW" multiValued="false"/>
-
-    <!-- This field is used to build the spellchecker index -->
-    <field name="spell" type="textSpell" indexed="true" stored="true" multiValued="true"/>
-
-    <!-- copyField commands copy one field to another at the time a document
-         is added to the index.  It's used either to index the same field differently,
-         or to add multiple fields to the same field for easier/faster searching.  -->
-    <copyField source="label" dest="spell"/>
-    <copyField source="content" dest="spell"/>
-
-    <copyField source="ts_*" dest="spell"/>
-    <copyField source="tm_*" dest="spell"/>
-
-    <!-- Dynamic field definitions.  If a field name is not found, dynamicFields
-         will be used if the name matches any of the patterns.
-         RESTRICTION: the glob-like pattern in the name attribute must have
-         a "*" only at the start or the end.
-         EXAMPLE:  name="*_i" will match any field ending in _i (like myid_i, z_i)
-         Longer patterns will be matched first.  if equal size patterns
-         both match, the first appearing in the schema will be used.  -->
-
-    <!-- A set of fields to contain text extracted from HTML tag contents which we
-         can boost at query time. -->
-    <dynamicField name="tags_*" type="text"   indexed="true" stored="false" omitNorms="true"/>
-
-    <!-- For 2 and 3 letter prefix dynamic fields, the 1st letter indicates the data type and
-         the last letter is 's' for single valued, 'm' for multi-valued -->
-
-    <!-- We use long for integer since 64 bit ints are now common in PHP. -->
-    <dynamicField name="is_*"  type="long"    indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="im_*"  type="long"    indexed="true"  stored="true" multiValued="true"/>
-    <!-- List of floats can be saved in a regular float field -->
-    <dynamicField name="fs_*"  type="float"   indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="fm_*"  type="float"   indexed="true"  stored="true" multiValued="true"/>
-    <!-- List of doubles can be saved in a regular double field -->
-    <dynamicField name="ps_*"  type="double"   indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="pm_*"  type="double"   indexed="true"  stored="true" multiValued="true"/>
-    <!-- List of booleans can be saved in a regular boolean field -->
-    <dynamicField name="bm_*"  type="boolean" indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="bs_*"  type="boolean" indexed="true"  stored="true" multiValued="false"/>
-    <!-- Regular text (without processing) can be stored in a string field-->
-    <dynamicField name="ss_*"  type="string"  indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="sm_*"  type="string"  indexed="true"  stored="true" multiValued="true"/>
-    <!-- Normal text fields are for full text - the relevance of a match depends on the length of the text -->
-    <dynamicField name="ts_*"  type="text"    indexed="true"  stored="true" multiValued="false" termVectors="true"/>
-    <dynamicField name="tm_*"  type="text"    indexed="true"  stored="true" multiValued="true" termVectors="true"/>
-    <!-- Unstemmed text fields for full text - the relevance of a match depends on the length of the text -->
-    <dynamicField name="tus_*" type="text_und" indexed="true"  stored="true" multiValued="false" termVectors="true"/>
-    <dynamicField name="tum_*" type="text_und" indexed="true"  stored="true" multiValued="true" termVectors="true"/>
-    <!-- These text fields omit norms - useful for extracted text like taxonomy_names -->
-    <dynamicField name="tos_*" type="text"    indexed="true"  stored="true" multiValued="false" termVectors="true" omitNorms="true"/>
-    <dynamicField name="tom_*" type="text"    indexed="true"  stored="true" multiValued="true" termVectors="true" omitNorms="true"/>
-    <!-- Special-purpose text fields -->
-    <dynamicField name="tes_*" type="edge_n2_kw_text" indexed="true" stored="true" multiValued="false" omitTermFreqAndPositions="true" />
-    <dynamicField name="tem_*" type="edge_n2_kw_text" indexed="true" stored="true" multiValued="true" omitTermFreqAndPositions="true" />
-    <dynamicField name="tws_*" type="text_ws" indexed="true" stored="true" multiValued="false"/>
-    <dynamicField name="twm_*" type="text_ws" indexed="true" stored="true" multiValued="true"/>
-
-    <!-- trie dates are preferred, so give them the 2 letter prefix -->
-    <dynamicField name="ds_*"  type="tdate"   indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="dm_*"  type="tdate"   indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="its_*" type="tlong"   indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="itm_*" type="tlong"   indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="fts_*" type="tfloat"  indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="ftm_*" type="tfloat"  indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="pts_*" type="tdouble" indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="ptm_*" type="tdouble" indexed="true"  stored="true" multiValued="true"/>
-    <!-- Binary fields can be populated using base64 encoded data. Useful e.g. for embedding
-         a small image in a search result using the data URI scheme -->
-    <dynamicField name="xs_*"  type="binary"  indexed="false" stored="true" multiValued="false"/>
-    <dynamicField name="xm_*"  type="binary"  indexed="false" stored="true" multiValued="true"/>
-    <!-- In rare cases a date rather than tdate is needed for sortMissingLast -->
-    <dynamicField name="dds_*" type="date"    indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="ddm_*" type="date"    indexed="true"  stored="true" multiValued="true"/>
-    <!-- Sortable fields, good for sortMissingLast support &
-         We use long for integer since 64 bit ints are now common in PHP. -->
-    <dynamicField name="iss_*" type="slong"   indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="ism_*" type="slong"   indexed="true"  stored="true" multiValued="true"/>
-    <!-- In rare cases a sfloat rather than tfloat is needed for sortMissingLast -->
-    <dynamicField name="fss_*" type="sfloat"  indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="fsm_*" type="sfloat"  indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="pss_*" type="sdouble" indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="psm_*" type="sdouble" indexed="true"  stored="true" multiValued="true"/>
-    <!-- In case a 32 bit int is really needed, we provide these fields. 'h' is mnemonic for 'half word', i.e. 32 bit on 64 arch -->
-    <dynamicField name="hs_*" type="integer" indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="hm_*" type="integer" indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="hss_*" type="sint"   indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="hsm_*" type="sint"   indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="hts_*" type="tint"   indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="htm_*" type="tint"   indexed="true"  stored="true" multiValued="true"/>
-
-    <!-- Unindexed string fields that can be used to store values that won't be searchable -->
-    <dynamicField name="zs_*" type="string"   indexed="false"  stored="true" multiValued="false"/>
-    <dynamicField name="zm_*" type="string"   indexed="false"  stored="true" multiValued="true"/>
-
-    <!-- Begin compatibility code for added fields in Solr 3.4+
-         http://wiki.apache.org/solr/SpatialSearch#geodist_-_The_distance_function -->
-    <dynamicField name="points_*" type="string" indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="pointm_*" type="string" indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="locs_*" type="string" indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="locm_*" type="string" indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="geos_*" type="string" indexed="true"  stored="true" multiValued="false"/>
-    <dynamicField name="geom_*" type="string" indexed="true"  stored="true" multiValued="true"/>
-
-    <!-- External file fields -->
-    <dynamicField name="eff_*" type="string"/>
-    <!-- End compatibility code -->
-
-    <!-- Sortable version of the dynamic string field -->
-    <dynamicField name="sort_*" type="sortString" indexed="true" stored="false"/>
-    <copyField source="ss_*" dest="sort_*"/>
-    <!-- A random sort field -->
-    <dynamicField name="random_*" type="rand" indexed="true" stored="true"/>
-    <!-- This field is used to store access information (e.g. node access grants), as opposed to field data -->
-    <dynamicField name="access_*" type="integer" indexed="true" stored="false" multiValued="true"/>
-
-    <!-- The following causes solr to ignore any fields that don't already match an existing
-         field name or dynamic field, rather than reporting them as an error.
-         Alternately, change the type="ignored" to some other type e.g. "text" if you want
-         unknown fields indexed and/or stored by default -->
-    <dynamicField name="*" type="ignored" multiValued="true" />
-
-  </fields>
-
-  <!-- Following is a dynamic way to include other fields, added by other contrib modules -->
-  <xi:include href="solr/conf/schema_extra_fields.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <xi:fallback></xi:fallback>
-  </xi:include>
-
-  <!-- Field to use to determine and enforce document uniqueness.
-       Unless this field is marked with required="false", it will be a required field
-    -->
-  <uniqueKey>id</uniqueKey>
-
-  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
-  <defaultSearchField>content</defaultSearchField>
-
-  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
-  <solrQueryParser defaultOperator="AND"/>
-
-</schema>

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/schema_extra_fields.xml

@@ -1,23 +0,0 @@
-<fields>
-<!--
-  Adding German dynamic field types to our Solr Schema
-  If you enable this, make sure you have a folder called lang with stopwords_de.txt
-  and synonyms_de.txt in there
-  This also requires to enable the content in schema_extra_types.xml
--->
-<!--
-   <field name="label_de" type="text_de" indexed="true" stored="true" termVectors="true" omitNorms="true"/>
-   <field name="content_de" type="text_de" indexed="true" stored="true" termVectors="true"/>
-   <field name="teaser_de" type="text_de" indexed="false" stored="true"/>
-   <field name="path_alias_de" type="text_de" indexed="true" stored="true" termVectors="true" omitNorms="true"/>
-   <field name="taxonomy_names_de" type="text_de" indexed="true" stored="false" termVectors="true" multiValued="true" omitNorms="true"/>
-   <field name="spell_de" type="text_de" indexed="true" stored="true" multiValued="true"/>
-   <copyField source="label_de" dest="spell_de"/>
-   <copyField source="content_de" dest="spell_de"/>
-   <dynamicField name="tags_de_*" type="text_de" indexed="true" stored="false" omitNorms="true"/>
-   <dynamicField name="ts_de_*" type="text_de" indexed="true" stored="true" multiValued="false" termVectors="true"/>
-   <dynamicField name="tm_de_*" type="text_de" indexed="true" stored="true" multiValued="true" termVectors="true"/>
-   <dynamicField name="tos_de_*" type="text_de" indexed="true" stored="true" multiValued="false" termVectors="true" omitNorms="true"/>
-   <dynamicField name="tom_de_*" type="text_de" indexed="true" stored="true" multiValued="true" termVectors="true" omitNorms="true"/>
--->
-</fields>

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/schema_extra_types.xml

@@ -1,30 +0,0 @@
-<types>
-<!--
-  Adding German language to our Solr Schema German
-  If you enable this, make sure you have a folder called lang with stopwords_de.txt
-  and synonyms_de.txt in there
--->
-<!--
-    <fieldType name="text_de" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory" words="lang/stopwords_de.txt" format="snowball" ignoreCase="true" enablePositionIncrements="true"/>
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" splitOnCaseChange="1" splitOnNumerics="1" catenateWords="1" catenateNumbers="1" catenateAll="0" protected="protwords.txt" preserveOriginal="1"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.GermanLightStemFilterFactory"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <charFilter class="solr.MappingCharFilterFactory" mapping="mapping-ISOLatin1Accent.txt"/>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="lang/synonyms_de.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory" words="lang/stopwords_de.txt" format="snowball" ignoreCase="true" enablePositionIncrements="true"/>
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" splitOnCaseChange="1" splitOnNumerics="1" catenateWords="0" catenateNumbers="0" catenateAll="0" protected="protwords.txt" preserveOriginal="1"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.GermanLightStemFilterFactory"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldType>
--->
-</types>

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/solrconfig.xml

@@ -1,1606 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-     For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml.
--->
-<config name="drupal-4.1-solr-3.x">
-  <!-- In all configuration below, a prefix of "solr." for class names
-       is an alias that causes solr to search appropriate packages,
-       including org.apache.solr.(search|update|request|core|analysis)
-
-       You may also specify a fully qualified Java classname if you
-       have your own custom plugins.
-    -->
-
-  <!-- Set this to 'false' if you want solr to continue working after
-       it has encountered an severe configuration error.  In a
-       production environment, you may want solr to keep working even
-       if one handler is mis-configured.
-
-       You may also set this to false using by setting the system
-       property:
-
-         -Dsolr.abortOnConfigurationError=false
-    -->
-  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-
-  <!-- lib directives can be used to instruct Solr to load an Jars
-       identified and use them to resolve any "plugins" specified in
-       your solrconfig.xml or schema.xml (ie: Analyzers, Request
-       Handlers, etc...).
-
-       All directories and paths are resolved relative to the
-       instanceDir.
-
-       If a "./lib" directory exists in your instanceDir, all files
-       found in it are included as if you had used the following
-       syntax...
-
-              <lib dir="./lib" />
-    -->
-
-  <!-- A dir option by itself adds any files found in the directory to
-       the classpath, this is useful for including all jars in a
-       directory.
-    -->
-  <lib dir="../../contrib/extraction/lib" />
-  <lib dir="../../contrib/clustering/lib/" />
-  <!-- The velocity library has been known to crash Solr in some
-       instances when deployed as a war file to Tomcat. Therefore all
-       references have been removed from the default configuration.
-       @see http://drupal.org/node/1612556
-  -->
-  <!-- <lib dir="../../contrib/velocity/lib" /> -->
-
-  <!-- When a regex is specified in addition to a directory, only the
-       files in that directory which completely match the regex
-       (anchored on both ends) will be included.
-    -->
-  <!--<lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />-->
-  <!--<lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" />-->
-  <!--<lib dir="../../dist/" regex="apache-solr-dataimporthandler-\d.*\.jar" />-->
-  <!--<lib dir="../../dist/" regex="apache-solr-langid-\d.*\.jar" />-->
-  <!-- <lib dir="../../dist/" regex="apache-solr-velocity-\d.*\.jar" /> -->
-
-  <!-- If a dir option (with or without a regex) is used and nothing
-       is found that matches, it will be ignored
-    -->
-  <!--<lib dir="../../contrib/clustering/lib/" />-->
-  <!--<lib dir="/total/crap/dir/ignored" />-->
-
-  <!-- an exact path can be used to specify a specific file.  This
-       will cause a serious error to be logged if it can't be loaded.
-    -->
-  <!--
-  <lib path="../a-jar-that-does-not-exist.jar" />
-  -->
-
-  <!-- Data Directory
-
-       Used to specify an alternate directory to hold all index data
-       other than the default ./data under the Solr home.  If
-       replication is in use, this should match the replication
-       configuration.
-    -->
-  <!-- <dataDir>${solr.data.dir:}</dataDir> -->
-
-
-  <!-- The DirectoryFactory to use for indexes.
-
-       solr.StandardDirectoryFactory, the default, is filesystem
-       based and tries to pick the best implementation for the current
-       JVM and platform.  One can force a particular implementation
-       via solr.MMapDirectoryFactory, solr.NIOFSDirectoryFactory, or
-       solr.SimpleFSDirectoryFactory.
-
-       solr.RAMDirectoryFactory is memory based, not
-       persistent, and doesn't work with replication.
-    -->
-  <directoryFactory name="DirectoryFactory"
-                    class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
-
-  <!-- Index Defaults
-
-       Values here affect all index writers and act as a default
-       unless overridden.
-
-       WARNING: See also the <mainIndex> section below for parameters
-       that overfor Solr's main Lucene index.
-    -->
-  <indexDefaults>
-
-    <useCompoundFile>false</useCompoundFile>
-
-    <mergeFactor>4</mergeFactor>
-    <!-- Sets the amount of RAM that may be used by Lucene indexing
-         for buffering added documents and deletions before they are
-         flushed to the Directory.  -->
-    <ramBufferSizeMB>32</ramBufferSizeMB>
-    <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.
-      -->
-    <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
-
-    <maxMergeDocs>2147483647</maxMergeDocs>
-    <maxFieldLength>100000</maxFieldLength>
-    <writeLockTimeout>1000</writeLockTimeout>
-
-    <!-- Expert: Merge Policy
-
-         The Merge Policy in Lucene controls how merging is handled by
-         Lucene.  The default in Solr 3.3 is TieredMergePolicy.
-
-         The default in 2.3 was the LogByteSizeMergePolicy,
-         previous versions used LogDocMergePolicy.
-
-         LogByteSizeMergePolicy chooses segments to merge based on
-         their size.  The Lucene 2.2 default, LogDocMergePolicy chose
-         when to merge based on number of documents
-
-         Other implementations of MergePolicy must have a no-argument
-         constructor
-      -->
-    <mergePolicy class="org.apache.lucene.index.LogByteSizeMergePolicy"/>
-
-    <!-- Expert: Merge Scheduler
-
-         The Merge Scheduler in Lucene controls how merges are
-         performed.  The ConcurrentMergeScheduler (Lucene 2.3 default)
-         can perform merges in the background using separate threads.
-         The SerialMergeScheduler (Lucene 2.2 default) does not.
-     -->
-    <!--
-       <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
-       -->
-
-    <!-- LockFactory
-
-         This option specifies which Lucene LockFactory implementation
-         to use.
-
-         single = SingleInstanceLockFactory - suggested for a
-                  read-only index or when there is no possibility of
-                  another process trying to modify the index.
-         native = NativeFSLockFactory - uses OS native file locking.
-                  Do not use when multiple solr webapps in the same
-                  JVM are attempting to share a single index.
-         simple = SimpleFSLockFactory  - uses a plain file for locking
-
-         (For backwards compatibility with Solr 1.2, 'simple' is the
-         default if not specified.)
-
-         More details on the nuances of each LockFactory...
-         http://wiki.apache.org/lucene-java/AvailableLockFactories
-    -->
-    <lockType>single</lockType>
-
-    <!-- Expert: Controls how often Lucene loads terms into memory
-         Default is 128 and is likely good for most everyone.
-      -->
-    <!-- <termIndexInterval>256</termIndexInterval> -->
-  </indexDefaults>
-
-  <!-- Main Index
-
-       Values here override the values in the <indexDefaults> section
-       for the main on disk index.
-    -->
-  <mainIndex>
-
-    <useCompoundFile>false</useCompoundFile>
-    <ramBufferSizeMB>32</ramBufferSizeMB>
-    <mergeFactor>10</mergeFactor>
-
-    <!-- Unlock On Startup
-
-         If true, unlock any held write or commit locks on startup.
-         This defeats the locking mechanism that allows multiple
-         processes to safely access a lucene index, and should be used
-         with care.
-
-         This is not needed if lock type is 'none' or 'single'
-     -->
-    <unlockOnStartup>false</unlockOnStartup>
-
-    <!-- If true, IndexReaders will be reopened (often more efficient)
-         instead of closed and then opened.
-      -->
-    <reopenReaders>true</reopenReaders>
-
-    <!-- Commit Deletion Policy
-
-         Custom deletion policies can specified here. The class must
-         implement org.apache.lucene.index.IndexDeletionPolicy.
-
-         http://lucene.apache.org/java/2_9_1/api/all/org/apache/lucene/index/IndexDeletionPolicy.html
-
-         The standard Solr IndexDeletionPolicy implementation supports
-         deleting index commit points on number of commits, age of
-         commit point and optimized status.
-
-         The latest commit point should always be preserved regardless
-         of the criteria.
-    -->
-    <deletionPolicy class="solr.SolrDeletionPolicy">
-      <!-- The number of commit points to be kept -->
-      <str name="maxCommitsToKeep">1</str>
-      <!-- The number of optimized commit points to be kept -->
-      <str name="maxOptimizedCommitsToKeep">0</str>
-      <!--
-          Delete all commit points once they have reached the given age.
-          Supports DateMathParser syntax e.g.
-        -->
-      <!--
-         <str name="maxCommitAge">30MINUTES</str>
-         <str name="maxCommitAge">1DAY</str>
-      -->
-    </deletionPolicy>
-
-    <!-- Lucene Infostream
-
-         To aid in advanced debugging, Lucene provides an "InfoStream"
-         of detailed information when indexing.
-
-         Setting The value to true will instruct the underlying Lucene
-         IndexWriter to write its debugging info the specified file
-      -->
-     <infoStream file="INFOSTREAM.txt">false</infoStream>
-
-  </mainIndex>
-
-  <!-- JMX
-
-       This example enables JMX if and only if an existing MBeanServer
-       is found, use this if you want to configure JMX through JVM
-       parameters. Remove this to disable exposing Solr configuration
-       and statistics to JMX.
-
-       For more details see http://wiki.apache.org/solr/SolrJmx
-    -->
-  <!-- <jmx /> -->
-  <!-- If you want to connect to a particular server, specify the
-       agentId
-    -->
-  <!-- <jmx agentId="myAgent" /> -->
-  <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
-  <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/>
-    -->
-
-  <!-- The default high-performance update handler -->
-  <updateHandler class="solr.DirectUpdateHandler2">
-
-    <!-- AutoCommit
-
-         Perform a <commit/> automatically under certain conditions.
-         Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents.
-
-         http://wiki.apache.org/solr/UpdateXmlMessages
-
-         maxDocs - Maximum number of documents to add since the last
-                   commit before automatically triggering a new commit.
-
-         maxTime - Maximum amount of time that is allowed to pass
-                   since a document was added before automaticly
-                   triggering a new commit.
-      -->
-    <autoCommit>
-      <maxDocs>${solr.autoCommit.MaxDocs:10000}</maxDocs>
-      <maxTime>${solr.autoCommit.MaxTime:120000}</maxTime>
-    </autoCommit>
-
-    <!-- Update Related Event Listeners
-
-         Various IndexWriter related events can trigger Listeners to
-         take actions.
-
-         postCommit - fired after every commit or optimize command
-         postOptimize - fired after every optimize command
-      -->
-    <!-- The RunExecutableListener executes an external command from a
-         hook such as postCommit or postOptimize.
-
-         exe - the name of the executable to run
-         dir - dir to use as the current working directory. (default=".")
-         wait - the calling thread waits until the executable returns.
-                (default="true")
-         args - the arguments to pass to the program.  (default is none)
-         env - environment variables to set.  (default is none)
-      -->
-    <!-- This example shows how RunExecutableListener could be used
-         with the script based replication...
-         http://wiki.apache.org/solr/CollectionDistribution
-      -->
-    <!--
-       <listener event="postCommit" class="solr.RunExecutableListener">
-         <str name="exe">solr/bin/snapshooter</str>
-         <str name="dir">.</str>
-         <bool name="wait">true</bool>
-         <arr name="args"> <str>arg1</str> <str>arg2</str> </arr>
-         <arr name="env"> <str>MYVAR=val1</str> </arr>
-       </listener>
-      -->
-  </updateHandler>
-
-  <!-- IndexReaderFactory
-
-       Use the following format to specify a custom IndexReaderFactory,
-       which allows for alternate IndexReader implementations.
-
-       ** Experimental Feature **
-
-       Please note - Using a custom IndexReaderFactory may prevent
-       certain other features from working. The API to
-       IndexReaderFactory may change without warning or may even be
-       removed from future releases if the problems cannot be
-       resolved.
-
-
-       ** Features that may not work with custom IndexReaderFactory **
-
-       The ReplicationHandler assumes a disk-resident index. Using a
-       custom IndexReader implementation may cause incompatibility
-       with ReplicationHandler and may cause replication to not work
-       correctly. See SOLR-1366 for details.
-
-    -->
-  <!--
-  <indexReaderFactory name="IndexReaderFactory" class="package.class">
-    <str name="someArg">Some Value</str>
-  </indexReaderFactory >
-  -->
-  <!-- By explicitly declaring the Factory, the termIndexDivisor can
-       be specified.
-    -->
-  <!--
-     <indexReaderFactory name="IndexReaderFactory"
-                         class="solr.StandardIndexReaderFactory">
-       <int name="setTermIndexDivisor">12</int>
-     </indexReaderFactory >
-    -->
-
-
-  <query>
-    <!-- Max Boolean Clauses
-
-         Maximum number of clauses in each BooleanQuery,  an exception
-         is thrown if exceeded.
-
-         ** WARNING **
-
-         This option actually modifies a global Lucene property that
-         will affect all SolrCores.  If multiple solrconfig.xml files
-         disagree on this property, the value at any given moment will
-         be based on the last SolrCore to be initialized.
-
-      -->
-    <maxBooleanClauses>1024</maxBooleanClauses>
-
-
-    <!-- Solr Internal Query Caches
-
-         There are two implementations of cache available for Solr,
-         LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.
-
-         FastLRUCache has faster gets and slower puts in single
-         threaded operation and thus is generally faster than LRUCache
-         when the hit ratio of the cache is high (> 75%), and may be
-         faster under other scenarios on multi-cpu systems.
-    -->
-
-    <!-- Filter Cache
-
-         Cache used by SolrIndexSearcher for filters (DocSets),
-         unordered sets of *all* documents that match a query.  When a
-         new searcher is opened, its caches may be prepopulated or
-         "autowarmed" using data from caches in the old searcher.
-         autowarmCount is the number of items to prepopulate.  For
-         LRUCache, the autowarmed items will be the most recently
-         accessed items.
-
-         Parameters:
-           class - the SolrCache implementation LRUCache or
-               (LRUCache or FastLRUCache)
-           size - the maximum number of entries in the cache
-           initialSize - the initial capacity (number of entries) of
-               the cache.  (see java.util.HashMap)
-           autowarmCount - the number of entries to prepopulate from
-               and old cache.
-      -->
-    <filterCache class="solr.FastLRUCache"
-                 size="512"
-                 initialSize="512"
-                 autowarmCount="0"/>
-
-    <!-- Query Result Cache
-
-         Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.
-      -->
-    <queryResultCache class="solr.LRUCache"
-                     size="512"
-                     initialSize="512"
-                     autowarmCount="32"/>
-
-    <!-- Document Cache
-
-         Caches Lucene Document objects (the stored fields for each
-         document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.
-      -->
-    <documentCache class="solr.LRUCache"
-                   size="512"
-                   initialSize="512"
-                   autowarmCount="0"/>
-
-    <!-- Field Value Cache
-
-         Cache used to hold field values that are quickly accessible
-         by document id.  The fieldValueCache is created by default
-         even if not configured here.
-      -->
-    <!--
-       <fieldValueCache class="solr.FastLRUCache"
-                        size="512"
-                        autowarmCount="128"
-                        showItems="32" />
-      -->
-
-    <!-- Custom Cache
-
-         Example of a generic cache.  These caches may be accessed by
-         name through SolrIndexSearcher.getCache(),cacheLookup(), and
-         cacheInsert().  The purpose is to enable easy caching of
-         user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator
-         if autowarming is desired.
-      -->
-    <!--
-       <cache name="myUserCache"
-              class="solr.LRUCache"
-              size="4096"
-              initialSize="1024"
-              autowarmCount="1024"
-              regenerator="com.mycompany.MyRegenerator"
-              />
-      -->
-
-
-    <!-- Lazy Field Loading
-
-         If true, stored fields that are not requested will be loaded
-         lazily.  This can result in a significant speed improvement
-         if the usual case is to not load all stored fields,
-         especially if the skipped fields are large compressed text
-         fields.
-    -->
-    <enableLazyFieldLoading>true</enableLazyFieldLoading>
-
-   <!-- Use Filter For Sorted Query
-
-        A possible optimization that attempts to use a filter to
-        satisfy a search.  If the requested sort does not include
-        score, then the filterCache will be checked for a filter
-        matching the query. If found, the filter will be used as the
-        source of document ids, and then the sort will be applied to
-        that.
-
-        For most situations, this will not be useful unless you
-        frequently get the same search repeatedly with different sort
-        options, and none of them ever use "score"
-     -->
-   <!--
-      <useFilterForSortedQuery>true</useFilterForSortedQuery>
-     -->
-
-   <!-- Result Window Size
-
-        An optimization for use with the queryResultCache.  When a search
-        is requested, a superset of the requested number of document ids
-        are collected.  For example, if a search for a particular query
-        requests matching documents 10 through 19, and queryWindowSize is 50,
-        then documents 0 through 49 will be collected and cached.  Any further
-        requests in that range can be satisfied via the cache.
-     -->
-   <queryResultWindowSize>20</queryResultWindowSize>
-
-   <!-- Maximum number of documents to cache for any entry in the
-        queryResultCache.
-     -->
-   <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-
-   <!-- Query Related Event Listeners
-
-        Various IndexSearcher related events can trigger Listeners to
-        take actions.
-
-        newSearcher - fired whenever a new searcher is being prepared
-        and there is a current searcher handling requests (aka
-        registered).  It can be used to prime certain caches to
-        prevent long request times for certain requests.
-
-        firstSearcher - fired whenever a new searcher is being
-        prepared but there is no current registered searcher to handle
-        requests or to gain autowarming data from.
-
-
-     -->
-    <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence.
-      -->
-    <listener event="newSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <!--
-           <lst><str name="q">solr</str><str name="sort">price asc</str></lst>
-           <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst>
-          -->
-      </arr>
-    </listener>
-    <listener event="firstSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <lst>
-          <str name="q">solr rocks</str><str name="start">0</str><str name="rows">10</str>
-        </lst>
-      </arr>
-    </listener>
-
-    <!-- Use Cold Searcher
-
-         If a search request comes in and there is no current
-         registered searcher, then immediately register the still
-         warming searcher and use it.  If "false" then all requests
-         will block until the first searcher is done warming.
-      -->
-    <useColdSearcher>false</useColdSearcher>
-
-    <!-- Max Warming Searchers
-
-         Maximum number of searchers that may be warming in the
-         background concurrently.  An error is returned if this limit
-         is exceeded.
-
-         Recommend values of 1-2 for read-only slaves, higher for
-         masters w/o cache warming.
-      -->
-    <maxWarmingSearchers>2</maxWarmingSearchers>
-
-  </query>
-
-
-  <!-- Request Dispatcher
-
-       This section contains instructions for how the SolrDispatchFilter
-       should behave when processing requests for this SolrCore.
-
-       handleSelect affects the behavior of requests such as /select?qt=XXX
-
-       handleSelect="true" will cause the SolrDispatchFilter to process
-       the request and will result in consistent error handling and
-       formatting for all types of requests.
-
-       handleSelect="false" will cause the SolrDispatchFilter to
-       ignore "/select" requests and fallback to using the legacy
-       SolrServlet and it's Solr 1.1 style error formatting
-    -->
-  <requestDispatcher handleSelect="true" >
-    <!-- Request Parsing
-
-         These settings indicate how Solr Requests may be parsed, and
-         what restrictions may be placed on the ContentStreams from
-         those requests
-
-         enableRemoteStreaming - enables use of the stream.file
-         and stream.url parameters for specifying remote streams.
-
-         multipartUploadLimitInKB - specifies the max size of
-         Multipart File Uploads that Solr will allow in a Request.
-
-         *** WARNING ***
-         The settings below authorize Solr to fetch remote files, You
-         should make sure your system has some authentication before
-         using enableRemoteStreaming="true"
-
-      -->
-    <requestParsers enableRemoteStreaming="true"
-                    multipartUploadLimitInKB="2048000" />
-
-    <!-- HTTP Caching
-
-         Set HTTP caching related parameters (for proxy caches and clients).
-
-         The options below instruct Solr not to output any HTTP Caching
-         related headers
-      -->
-    <httpCaching never304="true" />
-    <!-- If you include a <cacheControl> directive, it will be used to
-         generate a Cache-Control header (as well as an Expires header
-         if the value contains "max-age=")
-
-         By default, no Cache-Control header is generated.
-
-         You can use the <cacheControl> option even if you have set
-         never304="true"
-      -->
-    <!--
-       <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-    <!-- To enable Solr to respond with automatically generated HTTP
-         Caching headers, and to response to Cache Validation requests
-         correctly, set the value of never304="false"
-
-         This will cause Solr to generate Last-Modified and ETag
-         headers based on the properties of the Index.
-
-         The following options can also be specified to affect the
-         values of these headers...
-
-         lastModFrom - the default value is "openTime" which means the
-         Last-Modified value (and validation against If-Modified-Since
-         requests) will all be relative to when the current Searcher
-         was opened.  You can change it to lastModFrom="dirLastMod" if
-         you want the value to exactly correspond to when the physical
-         index was last modified.
-
-         etagSeed="..." is an option you can change to force the ETag
-         header (and validation against If-None-Match requests) to be
-         different even if the index has not changed (ie: when making
-         significant changes to your config file)
-
-         (lastModifiedFrom and etagSeed are both ignored if you use
-         the never304="true" option)
-      -->
-    <!--
-       <httpCaching lastModifiedFrom="openTime"
-                    etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl>
-       </httpCaching>
-      -->
-  </requestDispatcher>
-
-  <!-- Request Handlers
-
-       http://wiki.apache.org/solr/SolrRequestHandler
-
-       incoming queries will be dispatched to the correct handler
-       based on the path or the qt (query type) param.
-
-       Names starting with a '/' are accessed with the a path equal to
-       the registered name.  Names without a leading '/' are accessed
-       with: http://host/app/[core/]select?qt=name
-
-       If a /select request is processed with out a qt param
-       specified, the requestHandler that declares default="true" will
-       be used.
-
-       If a Request Handler is declared with startup="lazy", then it will
-       not be initialized until the first request that uses it.
-
-    -->
-  <!-- SearchHandler
-
-       http://wiki.apache.org/solr/SearchHandler
-
-       For processing Search Queries, the primary Request Handler
-       provided with Solr is "SearchHandler" It delegates to a sequent
-       of SearchComponents (see below) and supports distributed
-       queries across multiple shards
-    -->
-  <!--<requestHandler name="search" class="solr.SearchHandler" default="true">-->
-    <!-- default values for query parameters can be specified, these
-         will be overridden by parameters in the request
-      -->
-     <!--<lst name="defaults">
-       <str name="echoParams">explicit</str>
-       <int name="rows">10</int>
-     </lst>-->
-    <!-- In addition to defaults, "appends" params can be specified
-         to identify values which should be appended to the list of
-         multi-val params from the query (or the existing "defaults").
-      -->
-    <!-- In this example, the param "fq=instock:true" would be appended to
-         any query time fq params the user may specify, as a mechanism for
-         partitioning the index, independent of any user selected filtering
-         that may also be desired (perhaps as a result of faceted searching).
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "appends" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="appends">
-         <str name="fq">inStock:true</str>
-       </lst>
-      -->
-    <!-- "invariants" are a way of letting the Solr maintainer lock down
-         the options available to Solr clients.  Any params values
-         specified here are used regardless of what values may be specified
-         in either the query, the "defaults", or the "appends" params.
-
-         In this example, the facet.field and facet.query params would
-         be fixed, limiting the facets clients can use.  Faceting is
-         not turned on by default - but if the client does specify
-         facet=true in the request, these are the only facets they
-         will be able to see counts for; regardless of what other
-         facet.field or facet.query params they may specify.
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "invariants" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="invariants">
-         <str name="facet.field">cat</str>
-         <str name="facet.field">manu_exact</str>
-         <str name="facet.query">price:[* TO 500]</str>
-         <str name="facet.query">price:[500 TO *]</str>
-       </lst>
-      -->
-    <!-- If the default list of SearchComponents is not desired, that
-         list can either be overridden completely, or components can be
-         prepended or appended to the default list.  (see below)
-      -->
-    <!--
-       <arr name="components">
-         <str>nameOfCustomComponent1</str>
-         <str>nameOfCustomComponent2</str>
-       </arr>
-      -->
-    <!--</requestHandler>-->
-
-  <!-- A Robust Example
-
-       This example SearchHandler declaration shows off usage of the
-       SearchHandler with many defaults declared
-
-       Note that multiple instances of the same Request Handler
-       (SearchHandler) can be registered multiple times with different
-       names (and different init parameters)
-    -->
-  <!--
-  <requestHandler name="/browse" class="solr.SearchHandler">
-     <lst name="defaults">
-       <str name="echoParams">explicit</str>-->
-
-       <!-- VelocityResponseWriter settings -->
-       <!--<str name="wt">velocity</str>
-
-       <str name="v.template">browse</str>
-       <str name="v.layout">layout</str>
-       <str name="title">Solritas</str>
-
-       <str name="defType">dismax</str>
-       <str name="q.alt">*:*</str>
-       <str name="rows">10</str>
-       <str name="fl">*,score</str>
-       <str name="mlt.qf">
-         text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
-       </str>
-       <str name="mlt.fl">text,features,name,sku,id,manu,cat</str>
-       <int name="mlt.count">3</int>
-
-       <str name="qf">
-          text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
-       </str>
-
-       <str name="facet">on</str>
-       <str name="facet.field">cat</str>
-       <str name="facet.field">manu_exact</str>
-       <str name="facet.query">ipod</str>
-       <str name="facet.query">GB</str>
-       <str name="facet.mincount">1</str>
-       <str name="facet.pivot">cat,inStock</str>
-       <str name="facet.range.other">after</str>
-       <str name="facet.range">price</str>
-       <int name="f.price.facet.range.start">0</int>
-       <int name="f.price.facet.range.end">600</int>
-       <int name="f.price.facet.range.gap">50</int>
-       <str name="facet.range">popularity</str>
-       <int name="f.popularity.facet.range.start">0</int>
-       <int name="f.popularity.facet.range.end">10</int>
-       <int name="f.popularity.facet.range.gap">3</int>
-       <str name="facet.range">manufacturedate_dt</str>
-       <str name="f.manufacturedate_dt.facet.range.start">NOW/YEAR-10YEARS</str>
-       <str name="f.manufacturedate_dt.facet.range.end">NOW</str>
-       <str name="f.manufacturedate_dt.facet.range.gap">+1YEAR</str>
-       <str name="f.manufacturedate_dt.facet.range.other">before</str>
-       <str name="f.manufacturedate_dt.facet.range.other">after</str>-->
-
-
-       <!-- Highlighting defaults -->
-       <!--<str name="hl">on</str>
-       <str name="hl.fl">text features name</str>
-       <str name="f.name.hl.fragsize">0</str>
-       <str name="f.name.hl.alternateField">name</str>
-     </lst>
-     <arr name="last-components">
-       <str>spellcheck</str>
-     </arr>-->
-     <!--
-     <str name="url-scheme">httpx</str>
-     -->
-  <!--</requestHandler>-->
-  <!-- trivia: the name pinkPony requestHandler was an agreement between the Search API and the
-    apachesolr maintainers. The decision was taken during the Drupalcon Munich codesprint.
-    -->
-  <requestHandler name="pinkPony" class="solr.SearchHandler" default="true">
-    <lst name="defaults">
-      <str name="defType">dismax</str>
-      <str name="echoParams">explicit</str>
-      <bool name="omitHeader">true</bool>
-      <float name="tie">0.01</float>
-      <!-- Don't abort searches for the pinkPony request handler (set in solrcore.properties) -->
-      <int name="timeAllowed">${solr.pinkPony.timeAllowed:-1}</int>
-      <str name="q.alt">*:*</str>
-
-      <!-- By default, don't spell check -->
-      <str name="spellcheck">false</str>
-      <!-- Defaults for the spell checker when used -->
-      <str name="spellcheck.onlyMorePopular">true</str>
-      <str name="spellcheck.extendedResults">false</str>
-      <!--  The number of suggestions to return -->
-      <str name="spellcheck.count">1</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <!-- The more like this handler offers many advantages over the standard handler,
-     when performing moreLikeThis requests.-->
-  <requestHandler name="mlt" class="solr.MoreLikeThisHandler">
-    <lst name="defaults">
-      <str name="mlt.mintf">1</str>
-      <str name="mlt.mindf">1</str>
-      <str name="mlt.minwl">3</str>
-      <str name="mlt.maxwl">15</str>
-      <str name="mlt.maxqt">20</str>
-      <str name="mlt.match.include">false</str>
-      <!-- Abort any searches longer than 2 seconds (set in solrcore.properties) -->
-      <int name="timeAllowed">${solr.mlt.timeAllowed:2000}</int>
-    </lst>
-  </requestHandler>
-
-  <!-- A minimal query type for doing luene queries -->
-  <requestHandler name="standard" class="solr.SearchHandler">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-      <bool name="omitHeader">true</bool>
-    </lst>
-  </requestHandler>
-
-  <!-- XML Update Request Handler.
-
-       http://wiki.apache.org/solr/UpdateXmlMessages
-
-       The canonical Request Handler for Modifying the Index through
-       commands specified using XML.
-
-       Note: Since solr1.1 requestHandlers requires a valid content
-       type header if posted in the body. For example, curl now
-       requires: -H 'Content-type:text/xml; charset=utf-8'
-    -->
-  <requestHandler name="/update"
-                  class="solr.XmlUpdateRequestHandler">
-    <!-- See below for information on defining
-         updateRequestProcessorChains that can be used by name
-         on each Update Request
-      -->
-    <!--
-       <lst name="defaults">
-         <str name="update.chain">dedupe</str>
-       </lst>
-       -->
-    </requestHandler>
-  <!-- Binary Update Request Handler
-       http://wiki.apache.org/solr/javabin
-    -->
-  <requestHandler name="/update/javabin"
-                  class="solr.BinaryUpdateRequestHandler" />
-
-  <!-- CSV Update Request Handler
-       http://wiki.apache.org/solr/UpdateCSV
-    -->
-  <requestHandler name="/update/csv"
-                  class="solr.CSVRequestHandler"
-                  startup="lazy" />
-
-  <!-- JSON Update Request Handler
-       http://wiki.apache.org/solr/UpdateJSON
-    -->
-  <requestHandler name="/update/json"
-                  class="solr.JsonUpdateRequestHandler"
-                  startup="lazy" />
-
-  <!-- Solr Cell Update Request Handler
-
-       http://wiki.apache.org/solr/ExtractingRequestHandler
-
-    -->
-  <requestHandler name="/update/extract"
-                  startup="lazy"
-                  class="solr.extraction.ExtractingRequestHandler" >
-    <lst name="defaults">
-      <!-- All the main content goes into "text"... if you need to return
-           the extracted text or do highlighting, use a stored field. -->
-      <str name="fmap.content">text</str>
-      <str name="lowernames">true</str>
-      <str name="uprefix">ignored_</str>
-
-      <!-- capture link hrefs but ignore div attributes -->
-      <str name="captureAttr">true</str>
-      <str name="fmap.a">links</str>
-      <str name="fmap.div">ignored_</str>
-    </lst>
-  </requestHandler>
-
-  <!-- XSLT Update Request Handler
-       Transforms incoming XML with stylesheet identified by tr=
-  -->
-  <requestHandler name="/update/xslt"
-                   startup="lazy"
-                   class="solr.XsltUpdateRequestHandler"/>
-
-  <!-- Field Analysis Request Handler
-
-       RequestHandler that provides much the same functionality as
-       analysis.jsp. Provides the ability to specify multiple field
-       types and field names in the same request and outputs
-       index-time and query-time analysis for each of them.
-
-       Request parameters are:
-       analysis.fieldname - field name whose analyzers are to be used
-
-       analysis.fieldtype - field type whose analyzers are to be used
-       analysis.fieldvalue - text for index-time analysis
-       q (or analysis.q) - text for query time analysis
-       analysis.showmatch (true|false) - When set to true and when
-           query analysis is performed, the produced tokens of the
-           field value analysis will be marked as "matched" for every
-           token that is produces by the query analysis
-   -->
-  <requestHandler name="/analysis/field"
-                  startup="lazy"
-                  class="solr.FieldAnalysisRequestHandler" />
-
-
-  <!-- Document Analysis Handler
-
-       http://wiki.apache.org/solr/AnalysisRequestHandler
-
-       An analysis handler that provides a breakdown of the analysis
-       process of provided docuemnts. This handler expects a (single)
-       content stream with the following format:
-
-       <docs>
-         <doc>
-           <field name="id">1</field>
-           <field name="name">The Name</field>
-           <field name="text">The Text Value</field>
-         </doc>
-         <doc>...</doc>
-         <doc>...</doc>
-         ...
-       </docs>
-
-    Note: Each document must contain a field which serves as the
-    unique key. This key is used in the returned response to associate
-    an analysis breakdown to the analyzed document.
-
-    Like the FieldAnalysisRequestHandler, this handler also supports
-    query analysis by sending either an "analysis.query" or "q"
-    request parameter that holds the query text to be analyzed. It
-    also supports the "analysis.showmatch" parameter which when set to
-    true, all field tokens that match the query tokens will be marked
-    as a "match".
-  -->
-  <requestHandler name="/analysis/document"
-                  class="solr.DocumentAnalysisRequestHandler"
-                  startup="lazy" />
-
-  <!-- Admin Handlers
-
-       Admin Handlers - This will register all the standard admin
-       RequestHandlers.
-    -->
-  <requestHandler name="/admin/"
-                  class="solr.admin.AdminHandlers" />
-  <!-- This single handler is equivalent to the following... -->
-  <!--
-     <requestHandler name="/admin/luke"       class="solr.admin.LukeRequestHandler" />
-     <requestHandler name="/admin/system"     class="solr.admin.SystemInfoHandler" />
-     <requestHandler name="/admin/plugins"    class="solr.admin.PluginInfoHandler" />
-     <requestHandler name="/admin/threads"    class="solr.admin.ThreadDumpHandler" />
-     <requestHandler name="/admin/properties" class="solr.admin.PropertiesRequestHandler" />
-     <requestHandler name="/admin/file"       class="solr.admin.ShowFileRequestHandler" >
-    -->
-  <!-- If you wish to hide files under ${solr.home}/conf, explicitly
-       register the ShowFileRequestHandler using:
-    -->
-  <!--
-     <requestHandler name="/admin/file"
-                     class="solr.admin.ShowFileRequestHandler" >
-       <lst name="invariants">
-         <str name="hidden">synonyms.txt</str>
-         <str name="hidden">anotherfile.txt</str>
-       </lst>
-     </requestHandler>
-    -->
-
-  <!-- ping/healthcheck -->
-  <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
-    <lst name="invariants">
-      <str name="qt">pinkPony</str>
-      <str name="q">solrpingquery</str>
-    </lst>
-    <lst name="defaults">
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-
-  <!-- Echo the request contents back to the client -->
-  <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
-    <lst name="defaults">
-     <str name="echoParams">explicit</str>
-     <str name="echoHandler">true</str>
-    </lst>
-  </requestHandler>
-
-  <!-- Solr Replication
-
-       The SolrReplicationHandler supports replicating indexes from a
-       "master" used for indexing and "salves" used for queries.
-
-       http://wiki.apache.org/solr/SolrReplication
-
-       In the example below, remove the <lst name="master"> section if
-       this is just a slave and remove  the <lst name="slave"> section
-       if this is just a master.
-    -->
-     <requestHandler name="/replication" class="solr.ReplicationHandler" >
-       <lst name="master">
-         <str name="enable">${solr.replication.master:false}</str>
-         <str name="replicateAfter">commit</str>
-         <str name="replicateAfter">startup</str>
-         <str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
-       </lst>
-       <lst name="slave">
-         <str name="enable">${solr.replication.slave:false}</str>
-         <str name="masterUrl">${solr.replication.masterUrl:http://localhost:8983/solr}/replication</str>
-         <str name="pollInterval">${solr.replication.pollInterval:00:00:60}</str>
-       </lst>
-     </requestHandler>
-
-  <!-- Search Components
-
-       Search components are registered to SolrCore and used by
-       instances of SearchHandler (which can access them by name)
-
-       By default, the following components are available:
-
-       <searchComponent name="query"     class="solr.QueryComponent" />
-       <searchComponent name="facet"     class="solr.FacetComponent" />
-       <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
-       <searchComponent name="highlight" class="solr.HighlightComponent" />
-       <searchComponent name="stats"     class="solr.StatsComponent" />
-       <searchComponent name="debug"     class="solr.DebugComponent" />
-
-       Default configuration in a requestHandler would look like:
-
-       <arr name="components">
-         <str>query</str>
-         <str>facet</str>
-         <str>mlt</str>
-         <str>highlight</str>
-         <str>stats</str>
-         <str>debug</str>
-       </arr>
-
-       If you register a searchComponent to one of the standard names,
-       that will be used instead of the default.
-
-       To insert components before or after the 'standard' components, use:
-
-       <arr name="first-components">
-         <str>myFirstComponentName</str>
-       </arr>
-
-       <arr name="last-components">
-         <str>myLastComponentName</str>
-       </arr>
-
-       NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components"
-
-     -->
-
-  <!-- A request handler for demonstrating the spellcheck component.
-
-       NOTE: This is purely as an example.  The whole purpose of the
-       SpellCheckComponent is to hook it into the request handler that
-       handles your normal user queries so that a separate request is
-       not needed to get suggestions.
-
-       IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
-       NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-
-       See http://wiki.apache.org/solr/SpellCheckComponent for details
-       on the request parameters.
-    -->
-  <requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <str name="spellcheck.onlyMorePopular">false</str>
-      <str name="spellcheck.extendedResults">false</str>
-      <str name="spellcheck.count">1</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Term Vector Component
-
-       http://wiki.apache.org/solr/TermVectorComponent
-    -->
-  <searchComponent name="tvComponent" class="solr.TermVectorComponent"/>
-
-  <!-- A request handler for demonstrating the term vector component
-
-       This is purely as an example.
-
-       In reality you will likely want to add the component to your
-       already specified request handlers.
-    -->
-  <requestHandler name="tvrh" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <bool name="tv">true</bool>
-    </lst>
-    <arr name="last-components">
-      <str>tvComponent</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Clustering Component
-
-       http://wiki.apache.org/solr/ClusteringComponent
-
-       This relies on third party jars which are notincluded in the
-       release.  To use this component (and the "/clustering" handler)
-       Those jars will need to be downloaded, and you'll need to set
-       the solr.cluster.enabled system property when running solr...
-
-          java -Dsolr.clustering.enabled=true -jar start.jar
-    -->
-  <!-- <searchComponent name="clustering"
-                   enable="${solr.clustering.enabled:false}"
-                   class="solr.clustering.ClusteringComponent" > -->
-    <!-- Declare an engine -->
-    <!--<lst name="engine">-->
-      <!-- The name, only one can be named "default" -->
-      <!--<str name="name">default</str>-->
-
-      <!-- Class name of Carrot2 clustering algorithm.
-
-           Currently available algorithms are:
-
-           * org.carrot2.clustering.lingo.LingoClusteringAlgorithm
-           * org.carrot2.clustering.stc.STCClusteringAlgorithm
-           * org.carrot2.clustering.kmeans.BisectingKMeansClusteringAlgorithm
-
-           See http://project.carrot2.org/algorithms.html for the
-           algorithm's characteristics.
-        -->
-      <!--<str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>-->
-
-      <!-- Overriding values for Carrot2 default algorithm attributes.
-
-           For a description of all available attributes, see:
-           http://download.carrot2.org/stable/manual/#chapter.components.
-           Use attribute key as name attribute of str elements
-           below. These can be further overridden for individual
-           requests by specifying attribute key as request parameter
-           name and attribute value as parameter value.
-        -->
-      <!--<str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>-->
-
-      <!-- Location of Carrot2 lexical resources.
-
-           A directory from which to load Carrot2-specific stop words
-           and stop labels. Absolute or relative to Solr config directory.
-           If a specific resource (e.g. stopwords.en) is present in the
-           specified dir, it will completely override the corresponding
-           default one that ships with Carrot2.
-
-           For an overview of Carrot2 lexical resources, see:
-           http://download.carrot2.org/head/manual/#chapter.lexical-resources
-        -->
-      <!--<str name="carrot.lexicalResourcesDir">clustering/carrot2</str>-->
-
-      <!-- The language to assume for the documents.
-
-           For a list of allowed values, see:
-           http://download.carrot2.org/stable/manual/#section.attribute.lingo.MultilingualClustering.defaultLanguage
-       -->
-      <!--<str name="MultilingualClustering.defaultLanguage">ENGLISH</str>
-    </lst>
-    <lst name="engine">
-      <str name="name">stc</str>
-      <str name="carrot.algorithm">org.carrot2.clustering.stc.STCClusteringAlgorithm</str>
-    </lst>
-  </searchComponent>-->
-
-  <!-- A request handler for demonstrating the clustering component
-
-       This is purely as an example.
-
-       In reality you will likely want to add the component to your
-       already specified request handlers.
-    -->
-  <!--<requestHandler name="/clustering"
-                  startup="lazy"
-                  enable="${solr.clustering.enabled:false}"
-                  class="solr.SearchHandler">
-    <lst name="defaults">
-      <bool name="clustering">true</bool>
-      <str name="clustering.engine">default</str>
-      <bool name="clustering.results">true</bool>-->
-      <!-- The title field -->
-      <!--<str name="carrot.title">name</str>-->
-      <!--<str name="carrot.url">id</str>-->
-      <!-- The field to cluster on -->
-       <!--<str name="carrot.snippet">features</str>-->
-       <!-- produce summaries -->
-       <!--<bool name="carrot.produceSummary">true</bool>-->
-       <!-- the maximum number of labels per cluster -->
-       <!--<int name="carrot.numDescriptions">5</int>-->
-       <!-- produce sub clusters -->
-       <!--<bool name="carrot.outputSubClusters">false</bool>-->
-
-       <!--<str name="defType">dismax</str>
-       <str name="qf">
-          text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
-       </str>
-       <str name="q.alt">*:*</str>
-       <str name="rows">10</str>
-       <str name="fl">*,score</str>
-    </lst>
-    <arr name="last-components">
-      <str>clustering</str>
-    </arr>
-  </requestHandler>-->
-
-  <!-- Terms Component
-
-       http://wiki.apache.org/solr/TermsComponent
-
-       A component to return terms and document frequency of those
-       terms
-    -->
-  <searchComponent name="terms" class="solr.TermsComponent"/>
-
-  <!-- A request handler for demonstrating the terms component -->
-  <requestHandler name="/terms" class="solr.SearchHandler" startup="lazy">
-     <lst name="defaults">
-      <bool name="terms">true</bool>
-    </lst>
-    <arr name="components">
-      <str>terms</str>
-    </arr>
-  </requestHandler>
-
-
-  <!-- Query Elevation Component
-
-       http://wiki.apache.org/solr/QueryElevationComponent
-
-       a search component that enables you to configure the top
-       results for a given query regardless of the normal lucene
-       scoring.
-    -->
-  <searchComponent name="elevator" class="solr.QueryElevationComponent" >
-    <!-- pick a fieldType to analyze queries -->
-    <str name="queryFieldType">string</str>
-    <str name="config-file">elevate.xml</str>
-  </searchComponent>
-
-  <!-- A request handler for demonstrating the elevator component -->
-  <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-    <arr name="last-components">
-      <str>elevator</str>
-    </arr>
-  </requestHandler>
-
-  <!-- Highlighting Component
-
-       http://wiki.apache.org/solr/HighlightingParameters
-    -->
-  <searchComponent class="solr.HighlightComponent" name="highlight">
-    <highlighting>
-      <!-- Configure the standard fragmenter -->
-      <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap"
-                  default="true"
-                  class="solr.highlight.GapFragmenter">
-        <lst name="defaults">
-          <int name="hl.fragsize">100</int>
-        </lst>
-      </fragmenter>
-
-      <!-- A regular-expression-based fragmenter
-           (for sentence extraction)
-        -->
-      <fragmenter name="regex"
-                  class="solr.highlight.RegexFragmenter">
-        <lst name="defaults">
-          <!-- slightly smaller fragsizes work better because of slop -->
-          <int name="hl.fragsize">70</int>
-          <!-- allow 50% slop on fragment sizes -->
-          <float name="hl.regex.slop">0.5</float>
-          <!-- a basic sentence pattern -->
-          <str name="hl.regex.pattern">[-\w ,/\n\&quot;&apos;]{20,200}</str>
-        </lst>
-      </fragmenter>
-
-      <!-- Configure the standard formatter -->
-      <formatter name="html"
-                 default="true"
-                 class="solr.highlight.HtmlFormatter">
-        <lst name="defaults">
-          <str name="hl.simple.pre"><![CDATA[<strong>]]></str>
-          <str name="hl.simple.post"><![CDATA[</strong>]]></str>
-        </lst>
-      </formatter>
-
-      <!-- Configure the standard encoder -->
-      <encoder name="html"
-               class="solr.highlight.HtmlEncoder" />
-
-      <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple"
-                       default="true"
-                       class="solr.highlight.SimpleFragListBuilder"/>
-
-      <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single"
-                       class="solr.highlight.SingleFragListBuilder"/>
-
-      <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default"
-                        default="true"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!--
-        <lst name="defaults">
-          <str name="hl.multiValuedSeparatorChar">/</str>
-        </lst>
-        -->
-      </fragmentsBuilder>
-
-      <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored"
-                        class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <lst name="defaults">
-          <str name="hl.tag.pre"><![CDATA[
-               <b style="background:yellow">,<b style="background:lawgreen">,
-               <b style="background:aquamarine">,<b style="background:magenta">,
-               <b style="background:palegreen">,<b style="background:coral">,
-               <b style="background:wheat">,<b style="background:khaki">,
-               <b style="background:lime">,<b style="background:deepskyblue">]]></str>
-          <str name="hl.tag.post"><![CDATA[</b>]]></str>
-        </lst>
-      </fragmentsBuilder>
-
-      <boundaryScanner name="default"
-                       default="true"
-                       class="solr.highlight.SimpleBoundaryScanner">
-        <lst name="defaults">
-          <str name="hl.bs.maxScan">10</str>
-          <str name="hl.bs.chars">.,!? &#9;&#10;&#13;</str>
-        </lst>
-      </boundaryScanner>
-
-      <boundaryScanner name="breakIterator"
-                       class="solr.highlight.BreakIteratorBoundaryScanner">
-        <lst name="defaults">
-          <!-- type should be one of CHARACTER, WORD(default), LINE and SENTENCE -->
-          <str name="hl.bs.type">WORD</str>
-          <!-- language and country are used when constructing Locale object.  -->
-          <!-- And the Locale object will be used when getting instance of BreakIterator -->
-          <str name="hl.bs.language">en</str>
-          <str name="hl.bs.country">US</str>
-        </lst>
-      </boundaryScanner>
-    </highlighting>
-  </searchComponent>
-
-  <!-- Update Processors
-
-       Chains of Update Processor Factories for dealing with Update
-       Requests can be declared, and then used by name in Update
-       Request Processors
-
-       http://wiki.apache.org/solr/UpdateRequestProcessor
-
-    -->
-  <!-- Deduplication
-
-       An example dedup update processor that creates the "id" field
-       on the fly based on the hash code of some other fields.  This
-       example has overwriteDupes set to false since we are using the
-       id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.
-
-    -->
-  <!--
-     <updateRequestProcessorChain name="dedupe">
-       <processor class="solr.processor.SignatureUpdateProcessorFactory">
-         <bool name="enabled">true</bool>
-         <str name="signatureField">id</str>
-         <bool name="overwriteDupes">false</bool>
-         <str name="fields">name,features,cat</str>
-         <str name="signatureClass">solr.processor.Lookup3Signature</str>
-       </processor>
-       <processor class="solr.LogUpdateProcessorFactory" />
-       <processor class="solr.RunUpdateProcessorFactory" />
-     </updateRequestProcessorChain>
-    -->
-
-    <!--
-       This example update chain identifies the language of the incoming
-       documents using the langid contrib. The detected language is
-       written to field language_s. No field name mapping is done.
-       The fields used for detection are text, title, subject and description,
-       making this example suitable for detecting languages form full-text
-       rich documents injected via ExtractingRequestHandler.
-       See more about langId at http://wiki.apache.org/solr/LanguageDetection
-    -->
-    <!--
-     <updateRequestProcessorChain name="langid">
-       <processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory">
-         <str name="langid.fl">text,title,subject,description</str>
-         <str name="langid.langField">language_s</str>
-         <str name="langid.fallback">en</str>
-       </processor>
-       <processor class="solr.LogUpdateProcessorFactory" />
-       <processor class="solr.RunUpdateProcessorFactory" />
-     </updateRequestProcessorChain>
-    -->
-
-  <!-- Response Writers
-
-       http://wiki.apache.org/solr/QueryResponseWriter
-
-       Request responses will be written using the writer specified by
-       the 'wt' request parameter matching the name of a registered
-       writer.
-
-       The "default" writer is the default and will be used if 'wt' is
-       not specified in the request.
-    -->
-  <!-- The following response writers are implicitly configured unless
-       overridden...
-    -->
-  <!--
-     <queryResponseWriter name="xml"
-                          default="true"
-                          class="solr.XMLResponseWriter" />
-     <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
-     <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
-     <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
-     <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
-     <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/>
-     <queryResponseWriter name="csv" class="solr.CSVResponseWriter"/>
-    -->
-
-  <queryResponseWriter name="json" class="solr.JSONResponseWriter">
-     <!-- For the purposes of the tutorial, JSON responses are written as
-      plain text so that they are easy to read in *any* browser.
-      If you expect a MIME type of "application/json" just remove this override.
-     -->
-    <str name="content-type">text/plain; charset=UTF-8</str>
-  </queryResponseWriter>
-
-  <!--
-     Custom response writers can be declared as needed...
-    -->
-    <!-- The solr.velocity.enabled flag is used by Solr's test cases so that this response writer is not
-         loaded (causing an error if contrib/velocity has not been built fully) -->
-    <!-- <queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" enable="${solr.velocity.enabled:true}"/> -->
-
-
-  <!-- XSLT response writer transforms the XML output by any xslt file found
-       in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.
-    -->
-  <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
-    <int name="xsltCacheLifetimeSeconds">5</int>
-  </queryResponseWriter>
-
-  <!-- Query Parsers
-
-       http://wiki.apache.org/solr/SolrQuerySyntax
-
-       Multiple QParserPlugins can be registered by name, and then
-       used in either the "defType" param for the QueryComponent (used
-       by SearchHandler) or in LocalParams
-    -->
-  <!-- example of registering a query parser -->
-  <!--
-     <queryParser name="myparser" class="com.mycompany.MyQParserPlugin"/>
-    -->
-
-  <!-- Function Parsers
-
-       http://wiki.apache.org/solr/FunctionQuery
-
-       Multiple ValueSourceParsers can be registered by name, and then
-       used as function names when using the "func" QParser.
-    -->
-  <!-- example of registering a custom function parser  -->
-  <!--
-     <valueSourceParser name="myfunc"
-                        class="com.mycompany.MyValueSourceParser" />
-    -->
-
-  <!-- Legacy config for the admin interface -->
-  <admin>
-    <defaultQuery>*:*</defaultQuery>
-
-    <!-- configure a healthcheck file for servers behind a
-         loadbalancer
-      -->
-    <!--
-       <healthcheck type="file">server-enabled</healthcheck>
-      -->
-  </admin>
-
-  <queryConverter name="queryConverter" class="solr.SpellingQueryConverter"/>
-
-  <!-- Following is a dynamic way to include other components or any customized solrconfig.xml stuff, added by other contrib modules -->
-  <xi:include href="solr/conf/solrconfig_extra.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <xi:fallback>
-      <!-- Spell Check
-
-          The spell check component can return a list of alternative spelling
-          suggestions. This component must be defined in
-          solrconfig_extra.xml if present, since it's used in the search handler.
-
-          http://wiki.apache.org/solr/SpellCheckComponent
-       -->
-      <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-        <str name="queryAnalyzerFieldType">textSpell</str>
-
-        <!-- a spellchecker built from a field of the main index -->
-        <lst name="spellchecker">
-          <str name="name">default</str>
-          <str name="field">spell</str>
-          <str name="spellcheckIndexDir">spellchecker</str>
-          <str name="buildOnOptimize">true</str>
-        </lst>
-      </searchComponent>
-    </xi:fallback>
-  </xi:include>
-
-</config>

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/solrconfig_extra.xml

@@ -1,80 +0,0 @@
-<!-- Spell Check
-
-    The spell check component can return a list of alternative spelling
-    suggestions.
-
-    http://wiki.apache.org/solr/SpellCheckComponent
- -->
-<searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-<str name="queryAnalyzerFieldType">textSpell</str>
-
-<!-- Multiple "Spell Checkers" can be declared and used by this
-     component
-  -->
-
-<!-- a spellchecker built from a field of the main index, and
-     written to disk
-  -->
-<lst name="spellchecker">
-  <str name="name">default</str>
-  <str name="field">spell</str>
-  <str name="spellcheckIndexDir">spellchecker</str>
-  <str name="buildOnOptimize">true</str>
-  <!-- uncomment this to require terms to occur in 1% of the documents in order to be included in the dictionary
-    <float name="thresholdTokenFrequency">.01</float>
-  -->
-</lst>
-
-<!--
-  Adding German spellhecker index to our Solr index
-  This also requires to enable the content in schema_extra_types.xml and schema_extra_fields.xml
--->
-<!--
-<lst name="spellchecker">
-  <str name="name">spellchecker_de</str>
-  <str name="field">spell_de</str>
-  <str name="spellcheckIndexDir">./spellchecker_de</str>
-  <str name="buildOnOptimize">true</str>
-</lst>
--->
-
-<!-- a spellchecker that uses a different distance measure -->
-<!--
-   <lst name="spellchecker">
-     <str name="name">jarowinkler</str>
-     <str name="field">spell</str>
-     <str name="distanceMeasure">
-       org.apache.lucene.search.spell.JaroWinklerDistance
-     </str>
-     <str name="spellcheckIndexDir">spellcheckerJaro</str>
-   </lst>
- -->
-
-<!-- a spellchecker that use an alternate comparator
-
-     comparatorClass be one of:
-      1. score (default)
-      2. freq (Frequency first, then score)
-      3. A fully qualified class name
-  -->
-<!--
-   <lst name="spellchecker">
-     <str name="name">freq</str>
-     <str name="field">lowerfilt</str>
-     <str name="spellcheckIndexDir">spellcheckerFreq</str>
-     <str name="comparatorClass">freq</str>
-     <str name="buildOnCommit">true</str>
-  -->
-
-<!-- A spellchecker that reads the list of words from a file -->
-<!--
-   <lst name="spellchecker">
-     <str name="classname">solr.FileBasedSpellChecker</str>
-     <str name="name">file</str>
-     <str name="sourceLocation">spellings.txt</str>
-     <str name="characterEncoding">UTF-8</str>
-     <str name="spellcheckIndexDir">spellcheckerFile</str>
-   </lst>
-  -->
-</searchComponent>

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/solrcore.properties

@@ -1,10 +0,0 @@
-# Defines Solr properties for this specific core.
-solr.replication.master=false
-solr.replication.slave=false
-solr.replication.pollInterval=00:00:60
-solr.replication.masterUrl=http://localhost:8983/solr
-solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
-solr.mlt.timeAllowed=2000
-solr.pinkPony.timeAllowed=-1
-solr.autoCommit.MaxDocs=10000
-solr.autoCommit.MaxTime=120000

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/stopwords.txt

@@ -1,4 +0,0 @@
-# Contains words which shouldn't be indexed for fulltext fields, e.g., because
-# they're to common. For documentation of the format, see
-# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.StopFilterFactory
-# (Lines starting with a pound character # are ignored.)

sites/all/modules/contrib/search/search_api_solr/solr-conf/1.4/synonyms.txt

@@ -1,3 +0,0 @@
-# Contains synonyms to use for your index. For the format used, see
-# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.SynonymFilterFactory
-# (Lines starting with a pound character # are ignored.)