diff --git a/schema.xml b/schema.xml
index 0971ef6..175dd77 100644
--- a/schema.xml
+++ b/schema.xml
@@ -1,5 +1,4 @@
-
-
+
-
-
-
+
+
@@ -200,14 +191,7 @@
words="stopwords.txt"
enablePositionIncrements="true"
/>-->
-
+
@@ -224,7 +208,7 @@
-
+
@@ -235,11 +219,11 @@
-
+
-
-
-
+
+
+
@@ -256,9 +240,9 @@
-
+
-
+
-
+
-
+
@@ -312,12 +296,12 @@
The format used is "$index_id-$item_id".
-->
-
-
-
+
+
+
-
+
@@ -346,35 +330,35 @@
-->
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
@@ -386,4 +370,4 @@
-
+
\ No newline at end of file
diff --git a/service.inc b/service.inc
index b5bb5d9..52891db 100644
--- a/service.inc
+++ b/service.inc
@@ -24,8 +24,8 @@ class SearchApiSolrService extends SearchApiAbstractService {
* @var array
*/
protected static $type_prefixes = array(
- 'text' => 't',
- 'tokens' => 't',
+ 'text' => 'tm',
+ 'tokens' => 'tm',
'string' => 's',
'integer' => 'i',
'decimal' => 'f',
@@ -33,6 +33,8 @@ class SearchApiSolrService extends SearchApiAbstractService {
'duration' => 'i',
'boolean' => 'b',
'uri' => 's',
+ 'location' => 'loc',
+ 'geohash' => 'geohash',
);
/**
@@ -227,6 +229,8 @@ class SearchApiSolrService extends SearchApiAbstractService {
'search_api_mlt',
'search_api_multi',
'search_api_spellcheck',
+ 'search_api_data_type_location',
+ 'search_api_data_type_geohash',
));
return isset($supported[$feature]);
}
@@ -366,7 +370,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
*
* @see SearchApiSolrService::search()
*/
- protected function getFieldNames(SearchApiIndex $index, $reset = FALSE) {
+ public function getFieldNames(SearchApiIndex $index, $reset = FALSE) {
if (!isset($this->fieldNames[$index->machine_name]) || $reset) {
// This array maps "local property name" => "solr doc property name".
$ret = array(
@@ -375,15 +379,24 @@ class SearchApiSolrService extends SearchApiAbstractService {
'search_api_item_id' => 'item_id',
);
- // Add the names of any "fields" configured on the index.
+ // Add the names of any fields configured on the index.
$fields = (isset($index->options['fields']) ? $index->options['fields'] : array());
foreach ($fields as $key => $field) {
// Generate a field name; this corresponds with naming conventions in
// our schema.xml
$type = $field['type'];
+
+ // use the real type of the field if the server supports this type
+ if (isset($field['real_type'])) {
+ $custom_type = search_api_extract_inner_type($field['real_type']);
+ if ($this->supportsFeature('search_api_data_type_' . $custom_type)) {
+ $type = $field['real_type'];
+ }
+ }
+
$inner_type = search_api_extract_inner_type($type);
$pref = isset(self::$type_prefixes[$inner_type]) ? self::$type_prefixes[$inner_type] : '';
- if ($pref != 't') {
+ if ($pref != 'tm') {
$pref .= $type == $inner_type ? 's' : 'm';
}
$name = $pref . '_' . $key;
@@ -510,9 +523,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
$qf = array();
foreach ($search_fields as $f) {
$boost = '';
- if ($this->request_handler != 'standard') {
- $boost = isset($index_fields[$f]['boost']) ? '^' . $index_fields[$f]['boost'] : '';
- }
+ $boost = isset($index_fields[$f]['boost']) ? '^' . $index_fields[$f]['boost'] : '';
$qf[] = $fields[$f] . $boost;
}
@@ -525,29 +536,35 @@ class SearchApiSolrService extends SearchApiAbstractService {
$sort = array();
foreach ($query->getSort() as $f => $order) {
$f = $fields[$f];
+ if (substr($f, 0, 3) == 'ss_') {
+ $f = 'sort_' . substr($f, 3);
+ }
$order = strtolower($order);
$sort[] = "$f $order";
}
// Get facet fields
- $facets = $query->getOption('search_api_facets') ? $query->getOption('search_api_facets') : array();
+ $facets = $query->getOption('search_api_facets', array());
$facet_params = $this->getFacetParams($facets, $fields, $fq);
// Handle highlighting
- if (!empty($this->options['excerpt'])) {
+ if (!empty($this->options['excerpt']) || !empty($this->options['highlight_data'])) {
$highlight_params['hl'] = 'true';
+ $highlight_params['hl.fl'] = 'spell';
+ $highlight_params['hl.simple.pre'] = '[HIGHLIGHT]';
+ $highlight_params['hl.simple.post'] = '[/HIGHLIGHT]';
$highlight_params['hl.snippets'] = 3;
+ $highlight_params['hl.fragsize'] = 70;
+ $highlight_params['hl.mergeContiguous'] = 'true';
}
if (!empty($this->options['highlight_data'])) {
- $excerpt = !empty($highlight_params);
- $highlight_params['hl'] = 'true';
$highlight_params['hl.fl'] = 't_*';
$highlight_params['hl.snippets'] = 1;
$highlight_params['hl.fragsize'] = 0;
- if ($excerpt) {
+ if (!empty($this->options['excerpt'])) {
// If we also generate a "normal" excerpt, set the settings for the
// "spell" field (which we use to generate the excerpt) back to the
- // default values from solrconfig.xml.
+ // above values.
$highlight_params['f.spell.hl.snippets'] = 3;
$highlight_params['f.spell.hl.fragsize'] = 70;
// It regrettably doesn't seem to be possible to set hl.fl to several
@@ -570,7 +587,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
}
}
$mlt_params['mlt.fl'] = implode(',', $mlt_fl);
- $keys = 'id:' . $index->machine_name . '-' . $mlt['id'];
+ $keys = 'id:' . SearchApiSolrConnection::phrase($this->createId($index->machine_name, $mlt['id']));
}
// Set defaults
@@ -582,9 +599,10 @@ class SearchApiSolrService extends SearchApiAbstractService {
// Collect parameters
$params = array(
+ 'fl' => 'item_id,score',
'qf' => $qf,
+ 'fq' => $fq,
);
- $params['fq'] = $fq;
if ($sort) {
$params['sort'] = implode(', ', $sort);
}
@@ -653,8 +671,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
return $results;
}
catch (Exception $e) {
- throw new SearchApiException(t('An error occurred while trying to search with Solr: @msg.',
- array('@msg' => $e->getMessage())));
+ throw new SearchApiException(t('An error occurred while trying to search with Solr: @msg.', array('@msg' => $e->getMessage())));
}
}
@@ -801,7 +818,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
$extract_facets = ($extract_facets ? $extract_facets : array());
foreach ($extract_facets as $delta => $info) {
- $field = $this->getFacetField($fields[$info['field']]);
+ $field = $fields[$info['field']];
if (!empty($facet_fields->$field)) {
$min_count = $info['min_count'];
$terms = $facet_fields->$field;
@@ -855,16 +872,6 @@ class SearchApiSolrService extends SearchApiAbstractService {
}
/**
- * Return the facet field corresponding to a normal Solr field name.
- *
- * In the default configuration, string fields have additional fields
- * specifically for facetting purposes, prefixed with an additional 'f_'.
- */
- protected function getFacetField($field) {
- return ($field[0] == 's') ? 'f_' . $field : $field;
- }
-
- /**
* Flatten a keys array into a single search string.
*
* @param array $keys
@@ -890,9 +897,6 @@ class SearchApiSolrService extends SearchApiAbstractService {
// If this is a negated OR expression, we can't just use nested keys
// as-is, but have to put them into parantheses.
if ($or && $neg) {
- if (empty($this->request_handler) || $this->request_handler == 'dismax') {
- $this->request_handler = 'standard';
- }
$subkeys = "($subkeys)";
}
$k[] = $subkeys;
@@ -908,19 +912,15 @@ class SearchApiSolrService extends SearchApiAbstractService {
return '';
}
- // Normally, we use the "dismax" request handler, as it yields the best
- // results for simple queries (only single terms, phrases or simple
- // negation). In more complex cases, we have to switch to the "standard"
- // handler, which offers complex syntax. This is guided by the "#negation"
- // and "#conjunction" settings. Results of the following form will be
- // returned:
+ // Formatting the keys into a Solr query can be a bit complex. The following
+ // code will produce that look like this:
//
- // #conjunction | #negation | handler | return value
+ // #conjunction | #negation | return value
// ----------------------------------------------------------------
- // AND | FALSE | dismax | A B C
- // AND | TRUE | standard | -(A B C)
- // OR | FALSE | standard | ((A) OR (B) OR (C))
- // OR | TRUE | dismax | -A -B -C
+ // AND | FALSE | A B C
+ // AND | TRUE | -(A B C)
+ // OR | FALSE | ((A) OR (B) OR (C))
+ // OR | TRUE | -A -B -C
// If there was just a single, unnested key, we can ignore all this.
if (count($k) == 1 && empty($nested_expressions)) {
@@ -928,10 +928,6 @@ class SearchApiSolrService extends SearchApiAbstractService {
return $neg ? "-$k" : $k;
}
- if ($or != $neg && (empty($this->request_handler) || $this->request_handler == 'dismax')) {
- $this->request_handler = 'standard';
- }
-
if ($or) {
if ($neg) {
return '-' . implode(' -', $k);
@@ -1038,7 +1034,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
continue;
}
// String fields have their own corresponding facet fields.
- $field = $this->getFacetField($fields[$info['field']]);
+ $field = $fields[$info['field']];
// Check for the "or" operator.
if (isset($info['operator']) && $info['operator'] === 'or') {
// Remember that filters for this field should be tagged.
@@ -1099,24 +1095,15 @@ class SearchApiSolrService extends SearchApiAbstractService {
* this method.
*/
protected function setRequestHandler($handler, array &$call_args) {
- if ($handler == 'dismax') {
- return TRUE;
- }
- if ($handler == 'standard') {
- $keys = &$call_args['query'];
- $params = &$call_args['params'];
- $params['qt'] = $handler;
- $k = $keys;
- $fields = $params['qf'];
- unset($params['qf']);
- $keys = implode(":($k) OR ", array_map(array('SearchApiSolrConnection', 'escapeFieldName'), $fields)) . ":($k)";
+ if ($handler == 'pinkPony') {
+ $call_args['params']['qt'] = $handler;
return TRUE;
}
return FALSE;
}
/**
- * Empty method to allow subclassed to apply custom changes before the query
+ * Empty method to allow subclasses to apply custom changes before the query
* is sent to Solr. Works exactly like hook_search_api_solr_query_alter().
*
* @param array $call_args
@@ -1436,6 +1423,9 @@ class SearchApiSolrService extends SearchApiAbstractService {
$sort = array();
foreach ($query->getSort() as $f => $order) {
$f = $solr_fields[$f];
+ if (substr($f, 0, 3) == 'ss_') {
+ $f = 'sort_' . substr($f, 3);
+ }
$order = strtolower($order);
$sort[] = "$f $order";
}
diff --git a/solr-conf/3.x/protwords.txt b/solr-conf/3.x/protwords.txt
new file mode 100644
index 0000000..cda8581
--- /dev/null
+++ b/solr-conf/3.x/protwords.txt
@@ -0,0 +1,7 @@
+#-----------------------------------------------------------------------
+# This file blocks words from being operated on by the stemmer and word delimiter.
+&
+<
+>
+'
+"
diff --git a/solr-conf/3.x/schema.xml b/solr-conf/3.x/schema.xml
new file mode 100644
index 0000000..dff885d
--- /dev/null
+++ b/solr-conf/3.x/schema.xml
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id
+
+
+ content
+
+
+
+
+
diff --git a/solr-conf/3.x/solrconfig.xml b/solr-conf/3.x/solrconfig.xml
new file mode 100644
index 0000000..841963d
--- /dev/null
+++ b/solr-conf/3.x/solrconfig.xml
@@ -0,0 +1,1645 @@
+
+
+
+
+
+
+
+
+ ${solr.abortOnConfigurationError:true}
+
+
+ ${luceneVersion:LUCENE_35}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+ 4
+
+ 32
+
+
+
+ 2147483647
+ 100000
+ 1000
+
+
+
+
+
+
+
+
+ single
+
+
+
+
+
+
+
+
+ false
+ 32
+ 10
+
+
+ false
+
+
+ true
+
+
+
+
+ 1
+
+ 0
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10000
+ 120000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1024
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+ 20
+
+
+ 200
+
+
+
+
+
+
+
+
+
+
+
+ solr rocks010
+
+
+
+
+
+ false
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ edismax
+ explicit
+ true
+ 0.01
+
+ ${pinkPony.timeAllowed:-1}
+ *:*
+
+
+ false
+
+ true
+ false
+
+ 1
+
+
+ spellcheck
+
+
+
+
+
+
+ 1
+ 1
+ 3
+ 15
+ 20
+ false
+
+ ${mlt.timeAllowed:2000}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text
+ true
+ ignored_
+
+
+ true
+ links
+ ignored_
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ pinkPony
+ solrpingquery
+
+
+ all
+
+
+
+
+
+
+ explicit
+ true
+
+
+
+
+
+
+ ${enable.master:false}
+ commit
+ startup
+ ${confFiles}
+
+
+ ${enable.slave:false}
+ ${masterCoreUrl}/replication
+ ${pollTime:00:00:60}
+
+
+
+
+
+
+
+
+ textSpell
+
+
+
+
+
+ default
+ name
+ spellchecker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ false
+ 1
+
+
+ spellcheck
+
+
+
+
+
+
+
+
+
+ true
+
+
+ tvComponent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ terms
+
+
+
+
+
+
+
+ string
+ elevate.xml
+
+
+
+
+
+ explicit
+
+
+ elevator
+
+
+
+
+
+
+
+
+
+
+ 100
+
+
+
+
+
+
+
+ 70
+
+ 0.5
+
+ [-\w ,/\n\"']{20,200}
+
+
+
+
+
+
+ ]]>
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ,,
+ ,,
+ ,,
+ ,,
+ ,]]>
+ ]]>
+
+
+
+
+
+ 10
+ .,!?
+
+
+
+
+
+
+ WORD
+
+
+ en
+ US
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain; charset=UTF-8
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+ *:*
+
+
+
+
+
+
diff --git a/solr-conf/3.x/solrcore.properties b/solr-conf/3.x/solrcore.properties
new file mode 100644
index 0000000..0f3933d
--- /dev/null
+++ b/solr-conf/3.x/solrcore.properties
@@ -0,0 +1,10 @@
+#solrcore.properties for this specific core
+enable.master=false
+enable.slave=false
+pollTime=00:00:60
+masterCoreUrl=http://localhost:8983/solr
+confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
+mlt.timeAllowed=2000
+# You should not set your luceneVersion to anything lower then your Solr Version
+luceneVersion=LUCENE_35
+pinkPony.timeAllowed=-1
diff --git a/solrconfig.xml b/solrconfig.xml
index 2c59ee2..b8e6a30 100644
--- a/solrconfig.xml
+++ b/solrconfig.xml
@@ -1,4 +1,4 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
dismax
explicit
@@ -898,7 +885,7 @@
The response format differs from solr1.1 formatting and returns a standard error code.
To enable solr1.1 behavior, remove the /update handler or change its path
-->
-
+
@@ -977,7 +964,7 @@
-->
-
+
@@ -1096,4 +1083,4 @@
-->
-
+
\ No newline at end of file