? .svn
? 258626_nov28_D6.patch
? add-back-341430-5.patch
? alpha5-apachesolr-342906-1.patch
? apachesolr334929.patch
? attachments-339776-11.patch
? cache-luke-341175-1.patch
? cache-luke-341175-2.patch
? cache-luke-341175-3.patch
? cck-fix-340222-10.patch
? cck-fix-340222-8.patch
? ctl-chars.diff
? dismax-323015-20.patch
? dismax-323015-22.patch
? form-alter-340813-1.patch
? nodeaccccess-idea-343252-1.patch
? re-use-339776-8.patch
? refactor-339776-10.patch
? sdo-solrfacet-xss-6x-1.patch
? sint-cck-340222-3a.patch
? sint-cck-340222-5.patch
? xml-changes.diff
? SolrPhpClient/.svn
? SolrPhpClient/Apache/.svn
? SolrPhpClient/Apache/Solr/.svn
? SolrPhpClient/Apache/Solr/Service/.svn
? contrib/.svn
? contrib/apachesolr_attachments/.svn
? contrib/apachesolr_image/.svn
? contrib/apachesolr_lang/.svn
? contrib/apachesolr_mlt/.svn
? contrib/apachesolr_multisitesearch/.svn
? contrib/apachesolr_nodeaccess/.svn
? contrib/apachesolr_nodeaccess/tests/.svn
? tests/.svn
Index: Solr_Base_Query.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Solr_Base_Query.php,v
retrieving revision 1.1.4.13
diff -u -p -r1.1.4.13 Solr_Base_Query.php
--- Solr_Base_Query.php 4 Dec 2008 17:04:43 -0000 1.1.4.13
+++ Solr_Base_Query.php 8 Dec 2008 04:23:01 -0000
@@ -11,15 +11,15 @@ class Solr_Base_Query {
*
* Extract a module-specific search option from a search query. e.g. 'type:book'
*/
- static function query_extract($keys, $option) {
+ static function query_extract($filters, $option) {
$pattern = '/(^| )'. $option .':(\"([^\"]*)\")/i';
- preg_match_all($pattern, $keys, $matches);
+ preg_match_all($pattern, $filters, $matches);
if (!empty($matches[2])) {
// The preg_replace removes beginning and trailing quotations.
return preg_replace('/^"|"$/', '', $matches[2]);
}
$pattern = '/(^| )'. $option .':([^ ]*)/i';
- if (preg_match_all($pattern, $keys, $matches)) {
+ if (preg_match_all($pattern, $filters, $matches)) {
if (!empty($matches[2])) {
return $matches[2];
}
@@ -27,18 +27,18 @@ class Solr_Base_Query {
}
/**
- * Replaces all occurances of $option in $keys.
+ * Replaces all occurances of $option in $filters.
*/
- static function query_replace($keys, $option) {
- $matches = Solr_Base_Query::query_extract($keys, $option);
+ static function query_replace($filters, $option) {
+ $matches = self::query_extract($filters, $option);
if (count($matches) > 0) {
foreach ($matches as $match) {
// TODO: Make some sort of name->value container object.
- $found = Solr_Base_Query::make_field(array('#name' => $option, '#value' => $match));
- $keys = str_replace($found, '', $keys);
+ $found = self::make_field(array('#name' => $option, '#value' => $match));
+ $filters = str_replace($found, '', $filters);
}
}
- return $keys;
+ return $filters;
}
/**
@@ -50,8 +50,8 @@ class Solr_Base_Query {
return implode(' ', array_filter(explode(' ', $values['#value']), 'trim'));
}
else {
- // if the field value has spaces in it, wrap it in double quotes.
- if (count(explode(' ', $values['#value'])) > 1) {
+ // if the field value has spaces, or : in it, wrap it in double quotes.
+ if (preg_match('/[ :]/', $values['#value'])) {
$values['#value'] = '"'. $values['#value']. '"';
}
return $values['#name']. ':'. $values['#value'];
@@ -62,23 +62,18 @@ class Solr_Base_Query {
* A keyed array where the key is a position integer and the value
* is an array with #name and #value properties.
*/
- private $_fields;
-
+ private $fields;
+ private $filters;
+
/**
* An array of subqueries.
*/
- private $_subqueries = array();
-
- /**
- * The query string.
- */
- private $_query;
+ private $subqueries = array();
/**
- * Should fields be AND'd or OR'd together?
+ * The query path (search keywords).
*/
- private $_field_operator;
-
+ private $querypath;
/**
* Apache_Solr_Service object
@@ -90,33 +85,31 @@ class Solr_Base_Query {
* An instantiated Apache_Solr_Service Object.
* Can be instantiated from apachesolr_get_solr.
*
- * @param $querystring
+ * @param $querypath
* The string that a user would type into the search box. Suitable input
* may come from search_get_keys()
+ * @param $filterstring
+ * Key and value pairs that are applied as a filter query
* @param $field_operator
* An object level operator. AND is the implicit default. All segments will
* be joined with this operator.
*/
- function __construct($solr, $querystring, $field_operator = "AND") {
+ function __construct($solr, $querypath, $filterstring, $sortstring) {
$this->solr = $solr;
- $this->set_field_operator($field_operator);
- $this->_query = trim($querystring);
+ $this->querypath = trim($querypath);
+ $this->filters = trim($filterstring);
+ $this->solrsort = trim($sortstring);
$this->parse_query();
}
- function set_field_operator($field_operator = "AND") {
- $this->_field_operator = $field_operator;
- }
-
function add_field($field, $value) {
// microtime guarantees that added fields come at the end of the query,
// in order.
- $this->_fields[microtime()] = array('#name' => $field, '#value' => trim($value));
- $this->rebuild_query();
+ $this->fields[microtime()] = array('#name' => $field, '#value' => trim($value));
}
public function get_fields() {
- return $this->_fields;
+ return $this->fields;
}
function remove_field($name, $value = NULL) {
@@ -125,24 +118,23 @@ class Solr_Base_Query {
return;
}
if (empty($value)) {
- foreach ($this->_fields as $pos => $values) {
+ foreach ($this->fields as $pos => $values) {
if ($values['#name'] == $name) {
- unset($this->_fields[$pos]);
+ unset($this->fields[$pos]);
}
}
}
else {
- foreach ($this->_fields as $pos => $values) {
+ foreach ($this->fields as $pos => $values) {
if ($values['#name'] == $name && $values['#value'] == $value) {
- unset($this->_fields[$pos]);
+ unset($this->fields[$pos]);
}
}
}
- $this->rebuild_query();
}
function has_field($name, $value) {
- foreach ($this->_fields as $pos => $values) {
+ foreach ($this->fields as $pos => $values) {
if (!empty($values['#name']) && !empty($values['#value']) && $values['#name'] == $name && $values['#value'] == $value) {
return TRUE;
}
@@ -162,20 +154,33 @@ class Solr_Base_Query {
* 'AND' or 'OR'
*/
function add_subquery(Solr_Base_Query $query, $operator = 'AND') {
- $this->_subqueries[$query->get_query_basic()] = array('#query' => $query, '#operator' => $operator);
+ $this->subqueries[$query->get_query_basic()] = array('#query' => $query, '#operator' => $operator);
}
function remove_subquery(Solr_Base_Query $query) {
- unset($this->_subqueries[$query->get_query_basic()]);
+ unset($this->subqueries[$query->get_query_basic()]);
}
function remove_subqueries() {
- $this->_subqueries = array();
+ $this->subqueries = array();
}
- function get_query() {
- $this->rebuild_query();
- return $this->_query;
+ /**
+ * Return filters and sort in a form suitable for a query param to url().
+ */
+ public function get_url_querystring() {
+ $querystring = '';
+ if ($fq = $this->get_fq()) {
+ $querystring = 'filters='. implode(' ', $fq);
+ }
+ if ($this->solrsort) {
+ $querystring .= ($querystring) ? '&' . $this->solrsort : $this->solrsort;
+ }
+ return $querystring;
+ }
+
+ function get_fq() {
+ return $this->rebuild_fq();
}
/**
@@ -183,12 +188,7 @@ class Solr_Base_Query {
* omitting any field:value portions.
*/
function get_query_basic() {
- $nonames = array_filter($this->_fields, create_function('$a', 'return empty($a[\'#name\']);'));
- $result = array();
- foreach ($nonames as $pos => $field) {
- $result[] = $field['#value'];
- }
- return implode(' ', $result);
+ return $this->rebuild_query();
}
function get_breadcrumb() {
@@ -197,22 +197,23 @@ class Solr_Base_Query {
$breadcrumb = menu_get_active_breadcrumb();
// double check that the fields are ordered by position.
- ksort($this->_fields);
+ ksort($this->fields);
$progressive_crumb = array();
// TODO: Don't know if hardcoding this is going to come back to bite.
- $base = 'search/'. arg(1). '/';
+ $base = 'search/'. arg(1) . '/' . $this->query;
- foreach ($this->_fields as $field) {
+ foreach ($this->fields as $field) {
$progressive_crumb[] = Solr_Base_Query::make_field($field);
+ $options = array('query' => 'filters=' . implode(' ', $progressive_crumb));
if (empty($field['#name'])) {
- $breadcrumb[] = l($field['#value'], $base. implode(' ', $progressive_crumb));
+ $breadcrumb[] = l($field['#value'], $base, $options);
}
else if ($themed = theme("apachesolr_breadcrumb_{$field['#name']}", $field['#value'])) {
- $breadcrumb[] = l($themed, $base. implode(' ', $progressive_crumb));
+ $breadcrumb[] = l($themed, $base, $options);
}
else {
- $breadcrumb[] = l($field['#value'], $base. implode(' ', $progressive_crumb));
+ $breadcrumb[] = l($field['#name'], $base, $options);
}
}
// the last breadcrumb is the current page, so it shouldn't be a link.
@@ -223,8 +224,8 @@ class Solr_Base_Query {
}
protected function parse_query() {
- $this->_fields = array();
- $_keys = $this->_query;
+ $this->fields = array();
+ $filters = $this->filters;
// Gets information about the fields already in solr index.
$index_fields = $this->solr->getFields();
@@ -234,46 +235,50 @@ class Solr_Base_Query {
do {
// save the strlen so we can detect if it has changed at the bottom
// of the do loop
- $a = (int)strlen($_keys);
+ $a = (int)strlen($filters);
// Get the values for $name
- $values = Solr_Base_Query::query_extract($_keys, $name);
+ $values = Solr_Base_Query::query_extract($filters, $name);
if (count($values) > 0) {
foreach ($values as $value) {
$found = Solr_Base_Query::make_field(array('#name' => $name, '#value' => $value));
- $pos = strpos($this->_query, $found);
+ $pos = strpos($this->filters, $found);
// $solr_keys and $solr_crumbs are keyed on $pos so that query order
// is maintained. This is important for breadcrumbs.
- $this->_fields[$pos] = array('#name' => $name, '#value' => trim($value));
+ $this->fields[$pos] = array('#name' => $name, '#value' => trim($value));
}
- // Update the local copy of $_keys by removing the key that was just found.
- $_keys = trim(Solr_Base_Query::query_replace($_keys, $name));
+ // Update the local copy of $filters by removing the key that was just found.
+ $filters = trim(Solr_Base_Query::query_replace($filters, $name));
}
// Take new strlen to compare with $a.
- $b = (int)strlen($_keys);
+ $b = (int)strlen($filters);
} while ($a !== $b);
-
- // Clean up by adding remaining keywords.
- if (!empty($_keys)) {
- $pos = strpos($this->_query, $_keys);
- $this->_fields[$pos] = array('#name' => '', '#value' => trim($_keys));
- }
}
// Even though the array has the right keys they are likely in the wrong
// order. ksort() sorts the array by key while maintaining the key.
- ksort($this->_fields);
+ ksort($this->fields);
}
-
- protected function rebuild_query() {
+ protected function rebuild_fq() {
$fields = array();
- foreach ($this->_fields as $pos => $values) {
+ foreach ($this->fields as $pos => $values) {
$fields[] = Solr_Base_Query::make_field($values);
}
- $join_delim = $this->_field_operator == 'AND' ? ' ' : ' OR ';
- $this->_query = trim(implode($join_delim, array_filter($fields, 'trim')));
- foreach ($this->_subqueries as $id => $data) {
+ $fq = array_filter($fields, 'trim');
+ foreach ($this->subqueries as $id => $data) {
+ $subfq = $data['#query']->get_fq();
+ if ($subfq) {
+ $fq = array_merge($this->fq, $subfq);
+ }
+ }
+ return $fq;
+ }
+
+ protected function rebuild_query() {
+ $query = $this->querypath;
+ foreach ($this->subqueries as $id => $data) {
$operator = $data['#operator'];
- $subquery = $data['#query']->get_query();
- $this->_query .= " {$operator} ({$subquery})";
+ $subquery = $data['#query']->get_query_basic();
+ $query .= " {$operator} ({$subquery})";
}
+ return $query;
}
}
Index: apachesolr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v
retrieving revision 1.1.2.12.2.69
diff -u -p -r1.1.2.12.2.69 apachesolr.module
--- apachesolr.module 6 Dec 2008 01:23:50 -0000 1.1.2.12.2.69
+++ apachesolr.module 8 Dec 2008 04:23:01 -0000
@@ -452,9 +452,10 @@ function apachesolr_node_to_document($ni
$node->body = drupal_render($node->content);
$node->title = apachesolr_clean_text($node->title);
- $text = check_plain($node->title) . ' ' . $node->body;
+ $text = $node->body;
// Fetch extra data normally not visible
+ // Includes comments.
$extra = node_invoke_nodeapi($node, 'update index');
$text .= implode(' ', $extra);
@@ -463,12 +464,11 @@ function apachesolr_node_to_document($ni
$document->site = url(NULL, array('absolute' => TRUE));
$document->hash = apachesolr_site_hash();
$document->url = url('node/' . $node->nid, array('absolute' => TRUE));
-
$document->nid = $node->nid;
+ $document->body = apachesolr_clean_text($text);
$document->status = $node->status;
$document->uid = $node->uid;
$document->title = $node->title;
- $document->body = apachesolr_clean_text($node->body);
$document->type = $node->type;
$document->changed = $node->changed;
$document->comment_count = $node->comment_count;
@@ -485,7 +485,6 @@ function apachesolr_node_to_document($ni
$output = drupal_get_path_alias($path, $language);
if ($output && $output != $path) {
$document->path = $output;
- $text .= ' ' . $output;
}
}
@@ -514,10 +513,6 @@ function apachesolr_node_to_document($ni
}
}
- // This is the string value of the title. Used for sorting.
- // TODO - use Solr copyfield directive.
- $document->stitle = $node->title;
-
if (is_array($node->taxonomy)) {
foreach ($node->taxonomy as $term) {
// Double indexing of tids lets us do effecient searches (on tid)
@@ -533,13 +528,11 @@ function apachesolr_node_to_document($ni
$document->setMultiValue('imfield_vid'. $ancestor->vid, $ancestor->tid);
$document->setMultiValue('vid', $ancestor->vid);
$document->setMultiValue('taxonomy_name', apachesolr_strip_ctl_chars($ancestor->name));
- $text .= ' ' . $ancestor->name;
- }
+ }
}
}
- $document->text = apachesolr_clean_text($text);
- // Let modules add to the document
+ // Let modules add to the document - TODO convert to drupal_alter().
foreach (module_implements('apachesolr_update_index') as $module) {
$function = $module .'_apachesolr_update_index';
$function($document, $node);
@@ -630,7 +623,7 @@ function apachesolr_block($op = 'list',
}
$sort_links = array();
- $path = 'search/' . arg(1) . '/' . $query->get_query();
+ $path = 'search/' . arg(1) . '/' . $query->get_query_basic();
foreach ($sorts as $type => $sort) {
$new_sort = isset($solrsorts[$type]) ? $solrsorts[$type] == 'asc' ? 'desc' : 'asc' : $sort['default'];
$sort_links[] = theme('apachesolr_sort_link', $sort['name'], $path, $type == "relevancy" ? '' : "solrsort={$type} {$new_sort}", isset($solrsorts[$type]) ? $solrsorts[$type] : '');
@@ -681,12 +674,14 @@ function apachesolr_facet_block($respons
$contains_active = TRUE;
$new_query->remove_field($delta, $facet);
// TODO: don't assume 'search' - find the real path.
- $path = 'search/'. arg(1) .'/'. $new_query->get_query();
- $unclick_link = theme('apachesolr_unclick_link', $path);
+ $path = 'search/'. arg(1) .'/'. $new_query->get_query_basic();
+ $querystring = $new_query->get_url_querystring();
+ $unclick_link = theme('apachesolr_unclick_link', $path, $querystring);
}
else {
$new_query->add_field($delta, $facet);
- $path = 'search/'. arg(1) .'/'. $new_query->get_query();
+ $path = 'search/'. arg(1) .'/'. $new_query->get_query_basic();
+ $querystring = $new_query->get_url_querystring();
}
$countsort = $count == 0 ? '' : 1 / $count;
// if numdocs == 1 and !active, don't add.
@@ -694,7 +689,7 @@ function apachesolr_facet_block($respons
// skip
}
else {
- $items[$active ? $countsort . $facet : 1 + $countsort . $facet] = theme('apachesolr_facet_item', $facet_text, $count, $path, $active, $unclick_link, $response->numFound);
+ $items[$active ? $countsort . $facet : 1 + $countsort . $facet] = theme('apachesolr_facet_item', $facet_text, $count, $path, $querystring, $active, $unclick_link, $response->numFound);
}
}
if (count($items) > 0) {
@@ -860,7 +855,7 @@ function apachesolr_static_response_cach
* programmatically you can pass in different keys. If you don't pass in
* any keys, search_get_keys() is used instead.
*/
-function apachesolr_drupal_query($keys = NULL, $reset = FALSE) {
+function apachesolr_drupal_query($keys = '', $filters = '', $solrsort = '', $reset = FALSE) {
static $_queries;
if ($reset) {
@@ -870,21 +865,27 @@ function apachesolr_drupal_query($keys =
if (empty($keys)) {
$keys = search_get_keys();
}
+ if (empty($filters) && !empty($_GET['filters'])) {
+ $filters = check_plain($_GET['filters']);
+ }
+ if (empty($solrsort) && !empty($_GET['solrsort'])) {
+ $solrsort = check_plain($_GET['solrsort']);
+ }
+ $index = $keys . '&filters=' . $filters .'&solrsort=' . $solrsort;
- if (empty($_queries) || empty($_queries[$keys])) {
+ if (empty($_queries) || empty($_queries[$index])) {
list($module, $class) = variable_get('apachesolr_query_class', array('apachesolr', 'Solr_Base_Query'));
include_once drupal_get_path('module', $module) .'/'. $class .'.php';
- $solr = apachesolr_get_solr();
try {
- $_queries[$keys] = new $class($solr, $keys);
+ $_queries[$index] = new $class(apachesolr_get_solr(), $keys, $filters, $solrsort);
}
catch (Exception $e) {
watchdog('Apache Solr', $e->getMessage(), NULL, WATCHDOG_ERROR);
return;
}
}
- return $_queries[$keys];
+ return $_queries[$index];
}
/**
@@ -962,10 +963,10 @@ function apachesolr_cck_fields() {
function apachesolr_theme() {
return array(
'apachesolr_facet_item' => array(
- 'arguments' => array('name' => NULL, 'count' => NULL, 'path' => NULL, 'active' => FALSE, 'unclick_link' => NULL),
+ 'arguments' => array('name' => NULL, 'count' => NULL, 'path' => NULL, 'querystring' => '', 'active' => FALSE, 'unclick_link' => NULL),
),
'apachesolr_unclick_link' => array(
- 'arguments' => array('url' => NULL),
+ 'arguments' => array('url' => NULL, 'querystring' => ''),
),
'apachesolr_facet_list' => array(
'arguments' => array('items' => NULL),
@@ -974,7 +975,7 @@ function apachesolr_theme() {
'arguments' => array('items' => NULL),
),
'apachesolr_sort_link' => array(
- 'arguments' => array('text' => NULL, 'path' => NULL, 'query' => NULL, 'direction' => NULL),
+ 'arguments' => array('text' => NULL, 'path' => NULL, 'querystring' => '', 'direction' => NULL),
),
'apachesolr_breadcrumb_type' => array(
'arguments' => array('type' => NULL),
@@ -982,7 +983,7 @@ function apachesolr_theme() {
);
}
-function theme_apachesolr_facet_item($name, $count, $path, $active = FALSE, $unclick_link = NULL, $num_found = NULL) {
+function theme_apachesolr_facet_item($name, $count, $path, $querystring = '', $active = FALSE, $unclick_link = NULL, $num_found = NULL) {
$attributes = array();
if ($active) {
$attributes['class'] = 'active';
@@ -991,20 +992,20 @@ function theme_apachesolr_facet_item($na
return $unclick_link . ' '. check_plain($name);
}
else {
- return l($name ." ($count)", $path, array('attributes' => $attributes, 'query' => isset($_GET['solrsort']) ? "solrsort=" . check_plain($_GET['solrsort']) : FALSE));
+ return l($name ." ($count)", $path, array('attributes' => $attributes, 'query' => $querystring));
}
}
-function theme_apachesolr_unclick_link($path) {
- return l("(-)", $path, array('query' => isset($_GET['solrsort']) ? "solrsort=" . check_plain($_GET['solrsort']) : FALSE));
+function theme_apachesolr_unclick_link($path, $querystring = '') {
+ return l("(-)", $path, array('query' => $querystring));
}
-function theme_apachesolr_sort_link($text, $path, $query, $direction = NULL) {
+function theme_apachesolr_sort_link($text, $path, $querystring = '', $direction = NULL) {
$icon = '';
if ($direction) {
$icon = theme('tablesort_indicator', $direction);
}
- return $icon . ' ' . l($text, $path, array('query' => $query));
+ return $icon . ' ' . l($text, $path, array('query' => $querystring));
}
function theme_apachesolr_facet_list($items) {
Index: apachesolr_search.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr_search.module,v
retrieving revision 1.1.2.6.2.40
diff -u -p -r1.1.2.6.2.40 apachesolr_search.module
--- apachesolr_search.module 6 Dec 2008 01:23:50 -0000 1.1.2.6.2.40
+++ apachesolr_search.module 8 Dec 2008 04:23:01 -0000
@@ -126,6 +126,7 @@ function apachesolr_search_search($op =
* }
*
*/
+ // TODO - convert to drupal_alter().
foreach (module_implements('apachesolr_modify_query') as $module) {
$function_name = "{$module}_apachesolr_modify_query";
$function_name($query, $params);
@@ -133,9 +134,11 @@ function apachesolr_search_search($op =
if (!$query) {
return array();
}
+ // An arry of fq parameters.
+ $params['fq'] = $query->get_fq();
// This is the object that does the communication with the solr server.
$solr = apachesolr_get_solr();
- $response = $solr->search($query->get_query(), $params['start'], $params['rows'], $params);
+ $response = $solr->search($query->get_query_basic(), $params['start'], $params['rows'], $params);
// The response is cached so that it is accessible to the blocks and anything
// else that needs it beyond the initial search.
apachesolr_static_response_cache($response);
@@ -175,7 +178,7 @@ function apachesolr_search_search($op =
} // try
catch (Exception $e) {
watchdog('Apache Solr', $e->getMessage(), NULL, WATCHDOG_ERROR);
- apachesolr_failure(t('Solr search'), is_null($query) ? $keys : $query->get_query());
+ apachesolr_failure(t('Solr search'), is_null($query) ? $keys : $query->get_query_basic());
}
break;
} // switch
@@ -239,12 +242,14 @@ function apachesolr_search_block($op = '
if ($active = $query->has_field('tid', $tid)) {
$contains_active = TRUE;
$new_query->remove_field('tid', $term->tid);
- $path = 'search/' . arg(1) . '/' . $new_query->get_query();
- $unclick_link = theme('apachesolr_unclick_link', $path);
+ $path = 'search/' . arg(1) . '/' . $new_query->get_query_basic();
+ $querystring = $new_query->get_url_querystring();
+ $unclick_link = theme('apachesolr_unclick_link', $path, $querystring);
}
else {
$new_query->add_field('tid', $term->tid);
- $path = 'search/' . arg(1) . '/' . $new_query->get_query();
+ $path = 'search/' . arg(1) . '/' . $new_query->get_query_basic();
+ $querystring = $new_query->get_url_querystring();
}
$countsort = $count == 0 ? '' : 1 / $count;
// if numdocs == 1 and !active, don't add.
@@ -253,7 +258,7 @@ function apachesolr_search_block($op = '
}
else {
$terms[$term->vid][$active ? $countsort . $term->name : 1 + $countsort . $term->name] =
- theme('apachesolr_facet_item', $term->name, $count, $path, $active, $unclick_link, $response->numFound);
+ theme('apachesolr_facet_item', $term->name, $count, $path, $querystring, $active, $unclick_link, $response->numFound);
}
}
}
@@ -280,16 +285,17 @@ function apachesolr_search_block($op = '
$new_query = clone $query;
if ($field['#name']) {
$new_query->remove_field($field['#name'], $field['#value']);
- $path = 'search/'. arg(1) .'/'. $new_query->get_query();
+ $path = 'search/'. arg(1) .'/'. $new_query->get_query_basic();
+ $querystring = $new_query->get_url_querystring();
} else {
- $query_without_keywords = preg_replace('/(^| )([a-z0-9][^:]+)($| )/i', ' ', $query->get_query());
- $path = 'search/'. arg(1) .'/'. $query_without_keywords;
+ $path = 'search/'. arg(1) .'/'. $query->get_query_basic();
+ $querystring = $query->get_url_querystring();
}
- $unclick_link = theme('apachesolr_unclick_link', $path);
+ $unclick_link = theme('apachesolr_unclick_link', $path, $querystring);
if (! $fielddisplay = theme("apachesolr_breadcrumb_". $field['#name'], $field['#value'])) {
$fielddisplay = $field['#value'];
}
- $links[] = theme('apachesolr_facet_item', $fielddisplay, $count, $path, $active, $unclick_link, $response->numFound);
+ $links[] = theme('apachesolr_facet_item', $fielddisplay, $count, $path, $querystring, $active, $unclick_link, $response->numFound);
}
$content = theme('apachesolr_currentsearch', $response->response->numFound, $links);
return array('subject' => $block_title,
@@ -313,12 +319,14 @@ function apachesolr_search_block($op = '
if ($active = $query->has_field($index_key, $facet)) {
$contains_active = TRUE;
$new_query->remove_field($index_key, $facet);
- $path = 'search/'. arg(1) .'/'. $new_query->get_query();
- $unclick_link = theme('apachesolr_unclick_link', $path);
+ $path = 'search/'. arg(1) .'/'. $new_query->get_query_basic();
+ $querystring = $new_query->get_url_querystring();
+ $unclick_link = theme('apachesolr_unclick_link', $path, $querystring);
}
else {
$new_query->add_field($index_key, $facet);
- $path = 'search/'. arg(1) .'/'. $new_query->get_query();
+ $path = 'search/'. arg(1) .'/'. $new_query->get_query_basic();
+ $querystring = $new_query->get_url_querystring();
}
$countsort = $count == 0 ? '' : 1 / $count;
// if numdocs == 1 and !active, don't add.
@@ -326,7 +334,7 @@ function apachesolr_search_block($op = '
// skip
}
else {
- $facets[$active ? $countsort . $facet : 1 + $countsort . $facet] = theme('apachesolr_facet_item', $facet, $count, $path, $active, $unclick_link, $response->numFound);
+ $facets[$active ? $countsort . $facet : 1 + $countsort . $facet] = theme('apachesolr_facet_item', $facet, $count, $path, $querystring, $active, $unclick_link, $response->numFound);
}
}
if (!empty($facets)) {
Index: schema.xml
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/schema.xml,v
retrieving revision 1.1.2.1.2.13
diff -u -p -r1.1.2.1.2.13 schema.xml
--- schema.xml 2 Dec 2008 01:53:17 -0000 1.1.2.1.2.13
+++ schema.xml 8 Dec 2008 04:23:01 -0000
@@ -254,7 +254,7 @@
-
+
@@ -266,12 +266,18 @@
-
-
-
+
+
+
+
+
+
+
+
+
@@ -283,7 +289,6 @@
Longer patterns will be matched first. if equal size patterns
both match, the first appearing in the schema will be used. -->
-
@@ -317,7 +322,7 @@
id
- text
+ body
Index: solrconfig.xml
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Attic/solrconfig.xml,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 solrconfig.xml
--- solrconfig.xml 30 Nov 2008 21:13:27 -0000 1.1.2.1
+++ solrconfig.xml 8 Dec 2008 04:23:02 -0000
@@ -357,7 +357,7 @@
If no qt is defined, the requestHandler that declares default="true"
will be used.
-->
-
+
explicit
@@ -380,38 +380,41 @@
dismax
explicit
+
+
+
+
+
+
+ dismax
+ all
0.01
- text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
+ body^0.5 title^10.0 name^2 taxonomy_name^2
- text^0.2 features^1.1 name^1.5 manu^1.4 manu_exact^1.9
-
-
- ord(popularity)^0.5 recip(rord(price),1,1000,1000)^0.3
-
-
- id,name,price,score
+ body^2.0 title^10.0
+ 100
- 2<-1 5<-2 6<90%
+ 2<-35%
- 100
- *:*
-
- text features name
-
- 0
-
- name
- regex
+
+
+ true
+ body
+ 3
+ true
+
+ body
+ 256
+ regex
-
dismax
@@ -643,8 +646,8 @@
- ]]>
- ]]>
+ ]]>
+ ]]>