? apachesolr_cck_fields_alter_notices.patch
? apachesolr_filters_notices.patch
? apachesolr_notices.patch
? apachesolr_operator_settings.patch
Index: Solr_Base_Query.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Solr_Base_Query.php,v
retrieving revision 1.1.4.40.2.9
diff -u -p -r1.1.4.40.2.9 Solr_Base_Query.php
--- Solr_Base_Query.php	18 Dec 2009 11:52:13 -0000	1.1.4.40.2.9
+++ Solr_Base_Query.php	26 Dec 2009 13:07:19 -0000
@@ -322,7 +322,7 @@ class Solr_Base_Query implements Drupal_
         $queryvalues['filters'] .= ' ' . implode(' ', $values);
       }
     }
-    $queryvalues['filters'] = trim($queryvalues['filters']);
+    $queryvalues['filters'] = isset($queryvalues['filters']) ? trim($queryvalues['filters']) : '';
     $solrsort = $this->solrsort;
     if ($solrsort && ($solrsort['#name'] != 'score' || $solrsort['#direction'] != 'asc')) {
       if (isset($this->field_map[$solrsort['#name']])) {
Index: apachesolr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v
retrieving revision 1.1.2.12.2.155.2.52
diff -u -p -r1.1.2.12.2.155.2.52 apachesolr.module
--- apachesolr.module	26 Dec 2009 12:48:54 -0000	1.1.2.12.2.155.2.52
+++ apachesolr.module	26 Dec 2009 13:07:19 -0000
@@ -747,7 +747,7 @@ function apachesolr_get_facet_definition
       foreach ($facets as $delta => $info) {
         $definitions[$module][$delta] = $info;
         if(isset($definitions[$module][$delta])) {
-          $definitions[$module][$delta]['operator'] = $operator_settings[$module][$delta];
+          $definitions[$module][$delta]['operator'] = isset($operator_settings[$module][$delta]) ? $operator_settings[$module][$delta] : 'AND';
         }
       }
     }
@@ -1563,6 +1563,7 @@ function apachesolr_cck_fields() {
         // Only deal with fields that have option widgets (facets don't make sense otherwise), or fields that have specific mappings.
         if ((isset($mappings[$row->field_type][$row->widget_type]) ||  isset($mappings['per-field'][$row->field_name]))) {
           if (isset($mappings['per-field'][$row->field_name])) {
+            $fields[$row->field_name] = $mappings['per-field'][$row->field_name];
             $row->index_type = $mappings['per-field'][$row->field_name]['index_type'];
             $row->indexing_callback = $mappings['per-field'][$row->field_name]['indexing callback'];
             $row->display_callback = $mappings['per-field'][$row->field_name]['display callback'];