Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/CVS: .svn
diff -urp sites/all/modules/apachesolr/CVS/Entries.Log /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/CVS/Entries.Log
--- sites/all/modules/apachesolr/CVS/Entries.Log	2008-07-07 08:15:57.000000000 -0500
+++ /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/CVS/Entries.Log	2008-06-17 14:25:10.000000000 -0500
@@ -1,5 +1,3 @@
 A D/SolrPhpClient////
 A D/contrib////
-A D/includes////
 A D/tests////
-R D/includes////
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/Apache: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/Apache/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/Apache/Solr: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/Apache/Solr/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/Apache/Solr/Service: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/Apache/Solr/Service/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/phpdocs: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/phpdocs/Apache: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/phpdocs/Apache/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/phpdocs/Apache/Solr: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/phpdocs/Apache/Solr/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/phpdocs/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/phpdocs/media: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/SolrPhpClient/phpdocs/media/CVS: .svn
diff -urp sites/all/modules/apachesolr/apachesolr.module /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/apachesolr.module
--- sites/all/modules/apachesolr/apachesolr.module	2008-04-20 09:14:45.000000000 -0500
+++ /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/apachesolr.module	2008-07-07 09:32:17.000000000 -0500
@@ -671,13 +671,15 @@ function apachesolr_cck_fields() {
 
       while ($row = db_fetch_object($result)) {
         // Only deal with fields that have options widgets (facets don't make sense otherwise), or fields that have specific mappings.
-        if (($row->type == 'text' && in_array($row->widget_type, array('options_select', 'options_buttons'))) || in_array($row->type, array_keys($mappings))) {
+        if (($row->type == 'text' && in_array($row->widget_type, array('options_select', 'options_buttons'))) || in_array($row->field_name, array_keys($mappings))) {
           $_fields[$row->field_name] = array(
             'name' => $row->field_name,
-            'multiple' => $row->multiple ? TRUE : FALSE,
+            'multiple' => ($mappings[$row->field_name]['multiple'])? TRUE : $row->multiple ? TRUE : FALSE,
             'field_type' => $row->type,
-            'index_type' => empty($mappings) ? 'string' : $mappings[$row->type]['index_type'],
-            'callback' => empty($mappings[$row->type]['callback']) ? NULL : $mappings[$row->type]['callback'],
+            'index_type' => empty($mappings) ? 'string' : $mappings[$row->field_name]['index_type'],
+            'callback' => empty($mappings[$row->field_name]['callback']) ? NULL : $mappings[$row->field_name]['callback'],
+            'facet' => (isset($mappings[$row->field_name]['facet']))? $mappings[$row->field_name]['facet'] : TRUE,
+            'facet_display' => (isset($mappings[$row->field_name]['facet_display']))? $mappings[$row->field_name]['facet_display'] : NULL,
           );
         }
       }
diff -urp sites/all/modules/apachesolr/apachesolr_search.module /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/apachesolr_search.module
--- sites/all/modules/apachesolr/apachesolr_search.module	2008-04-20 09:14:45.000000000 -0500
+++ /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/apachesolr_search.module	2008-07-07 09:32:35.000000000 -0500
@@ -41,15 +41,28 @@ function apachesolr_search_search($op = 
           'facet.mincount' => 1,
           'facet.sort' => 'true'
         );
+        
+        //Modules can override default parameters        
+        $params = module_invoke_all('apachesolr_search_params', $params);
+        
         if ($sort = check_plain($_GET['solrsort'])) {
           $params['sort'] = $sort;
         }
+        //Modules can provide CCK field info for indexing and custom facets
         if ($fields = apachesolr_cck_fields()) {
           foreach ($fields as $name => $field) {
             $index_key = apachesolr_index_key($field);
-            $params['facet.field'][] = $index_key;
+            if($field['facet'] == TRUE) {            
+              $params['facet.field'][] = $index_key;
+              if (isset($field['facet_display'])) {
+                foreach ($field['facet_display'] as $fparam => $fval) {
+                  $params['f.'. $index_key .'.'. $fparam] = $fval;
+                }
+              }
+            }
           }
         }
+        
         $params['start'] = $_GET['page'] * $params['rows'];
         $response = $solr->search($query->get_query(), $params['start'], $params['rows'], $params);
         apachesolr_has_searched(TRUE);
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/contrib: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/contrib/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/contrib: apachesolr_cite
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/contrib/apachesolr_image: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/contrib/apachesolr_image/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/tests: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr/tests/CVS: .svn
Only in /Users/chadfennell/dev/repo/drupal-5.x/sites/all/modules/apachesolr: todo.txt