Index: apachesolr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v
retrieving revision 1.1.2.12.2.79
diff -u -p -r1.1.2.12.2.79 apachesolr.module
--- apachesolr.module 18 Dec 2008 14:11:54 -0000 1.1.2.12.2.79
+++ apachesolr.module 18 Dec 2008 22:34:16 -0000
@@ -859,6 +859,27 @@ function apachesolr_facetcount_save($del
}
/**
+ * This hook allows modules to modify the query and params objects.
+ *
+ * Example:
+ *
+ *
+ * function my_module_apachesolr_modify_query(&$query, &$params) {
+ * // I only want to see articles by the admin!
+ * $query->add_field("uid", 1);
+ *
+ * }
+ *
+ */
+function apachesolr_modify_query(&$query, &$params, $invoked_by = '', $handler = 'standard') {
+
+ foreach (module_implements('apachesolr_modify_query') as $module) {
+ $function_name = "{$module}_apachesolr_modify_query";
+ $function_name($query, $params, $invoked_by, $handler);
+ }
+}
+
+/**
* Semaphore that indicates whether a search has been done. Blocks use this
* later to decide whether they should load or not.
*
Index: apachesolr_search.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Attic/apachesolr_search.admin.inc,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 apachesolr_search.admin.inc
--- apachesolr_search.admin.inc 16 Dec 2008 15:52:41 -0000 1.1.2.6
+++ apachesolr_search.admin.inc 18 Dec 2008 22:34:16 -0000
@@ -31,21 +31,21 @@ function apachesolr_search_settings_page
*/
function apachesolr_search_bias_form($form_state) {
- $date_settings = variable_get('apacehsolr_search_date_boost', '4:3.0');
- $comment_settings = variable_get('apacehsolr_search_comment_boost', '4:3.0');
+ $date_settings = variable_get('apacehsolr_search_date_boost', '4:200.0');
+ $comment_settings = variable_get('apacehsolr_search_comment_boost', '4:200.0');
$options = array(
'0:0' => t('Omit'),
- '1:1.0' => '1',
- '2:1.0' => '2',
- '2:2.0' => '3',
- '4:2.0' => '4',
- '4:3.0' => '5',
- '4:5.0' => '6',
- '8:8.0' => '7',
- '8:13.0' => '8',
- '8:34.0' => '9',
- '10:100.0' => '10'
+ '1:100.0' => '1',
+ '2:100.0' => '2',
+ '2:150.0' => '3',
+ '4:150.0' => '4',
+ '4:200.0' => '5',
+ '4:300.0' => '6',
+ '8:500.0' => '7',
+ '8:700.0' => '8',
+ '8:1000.0' => '9',
+ '10:2000.0' => '10'
);
$form['biasing'] = array(
Index: apachesolr_search.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr_search.module,v
retrieving revision 1.1.2.6.2.51
diff -u -p -r1.1.2.6.2.51 apachesolr_search.module
--- apachesolr_search.module 18 Dec 2008 10:41:16 -0000 1.1.2.6.2.51
+++ apachesolr_search.module 18 Dec 2008 22:34:16 -0000
@@ -71,7 +71,6 @@ function apachesolr_search_search($op =
return apachesolr_index_status('apachesolr_search');
case 'search':
- global $pager_total;
try {
// This is the object that knows about the query coming from the user.
@@ -159,6 +158,10 @@ function apachesolr_search_search($op =
if ($qf && $fields) {
foreach ($fields as $field_name => $field) {
if (!empty($qf[$field_name])) {
+ if ($field_name == 'body') {
+ // Body is the only normed field.
+ $qf[$field_name] *= 40.0;
+ }
$params['qf'][] = $field_name . '^'. $qf[$field_name];
}
}
@@ -171,7 +174,7 @@ function apachesolr_search_search($op =
else {
$total = db_result(db_query("SELECT COUNT(nid) FROM {node}"));
}
- $date_settings = variable_get('apacehsolr_search_date_boost', '4:3.0');
+ $date_settings = variable_get('apacehsolr_search_date_boost', '4:200.0');
list($date_steepness, $date_boost) = explode(':', $date_settings);
// Default date-biasing function, as suggested (but steeper) at
// http://wiki.apache.org/solr/DisMaxRequestHandler
@@ -180,7 +183,7 @@ function apachesolr_search_search($op =
if ($date_boost) {
$params['bf'][] = "recip(rord(changed),$date_steepness,$total,$total)^$date_boost";
}
- $comment_settings = variable_get('apacehsolr_search_comment_boost', '4:3.0');
+ $comment_settings = variable_get('apacehsolr_search_comment_boost', '4:200.0');
list($comment_steepness, $comment_boost) = explode(':', $comment_settings);
// Default date-biasing function, as suggested (but steeper) at
// http://wiki.apache.org/solr/DisMaxRequestHandler
@@ -189,24 +192,8 @@ function apachesolr_search_search($op =
if ($comment_boost) {
$params['bf'][] = "recip(rord(comment_count),$comment_steepness,$total,$total)^$comment_boost";
}
- /**
- * This hook allows modules to modify the query are params objects.
- *
- * Example:
- *
- *
- * function my_module_apachesolr_modify_query(&$query, &$params) {
- * // I only want to see articles by the admin!
- * $query->add_field("uid", 1);
- *
- * }
- *
- */
- // TODO - convert to drupal_alter().
- foreach (module_implements('apachesolr_modify_query') as $module) {
- $function_name = "{$module}_apachesolr_modify_query";
- $function_name($query, $params);
- }
+ // This hook allows modules to modify the query and params objects.
+ apachesolr_modify_query($query, $params, 'apachesolr_search');
if (!$query) {
return array();
}
@@ -224,8 +211,8 @@ function apachesolr_search_search($op =
apachesolr_has_searched(TRUE);
pager_query("SELECT %d", $params['rows'], 0, NULL, $total);
if ($total > 0) {
- $extra = array();
foreach ($response->response->docs as $doc) {
+ $extra = array();
$snippet = isset($response->highlighting->{$doc->id}->$hl_fl) ? theme('apachesolr_snippets', $doc, $response->highlighting->{$doc->id}->$hl_fl) : '';
if (!isset($doc->body)) {
$doc->body = $snippet;
Index: solrconfig.xml
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Attic/solrconfig.xml,v
retrieving revision 1.1.2.9
diff -u -p -r1.1.2.9 solrconfig.xml
--- solrconfig.xml 16 Dec 2008 15:52:41 -0000 1.1.2.9
+++ solrconfig.xml 18 Dec 2008 22:34:16 -0000
@@ -402,6 +402,7 @@
2<-35%
+ *:*
true