Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2724 Removed defaultSearchField and defaultOperator from schema.xml as they are deprecated. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1306159 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Wayne Smiley 2012-03-28 04:43:55 +00:00
parent 461e7884c6
commit 264f63036c
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/CHANGES.txt
View File

@ -503,6 +503,10 @@ Upgrading from Solr 3.5
* SOLR-3161: Don't use the 'qt' parameter with a leading '/'. It probably won't work in 4.0 * SOLR-3161: Don't use the 'qt' parameter with a leading '/'. It probably won't work in 4.0
and it's now limited in 3.6 to SearchHandler subclasses that aren't lazy-loaded. and it's now limited in 3.6 to SearchHandler subclasses that aren't lazy-loaded.
* SOLR-2724: Specifying <defaultSearchField> and <solrQueryParser defaultOperator="..."/> in
schema.xml is now considered deprecated. Instead you are encouraged to specify these via the "df"
and "q.op" parameters in your request handler definition. (David Smiley)
New Features New Features
---------------------- ----------------------
* SOLR-2854: Now load URL content stream data (via stream.url) when called for during request handling, * SOLR-2854: Now load URL content stream data (via stream.url) when called for during request handling,

4
solr/core/src/java/org/apache/solr/schema/IndexSchema.java
View File

@ -438,7 +438,7 @@ public final class IndexSchema {
node = (Node) xpath.evaluate("/schema/defaultSearchField/text()", document, XPathConstants.NODE); node = (Node) xpath.evaluate("/schema/defaultSearchField/text()", document, XPathConstants.NODE);
if (node==null) { if (node==null) {
log.warn("no default search field specified in schema."); log.debug("no default search field specified in schema.");
} else { } else {
defaultSearchFieldName=node.getNodeValue().trim(); defaultSearchFieldName=node.getNodeValue().trim();
// throw exception if specified, but not found or not indexed // throw exception if specified, but not found or not indexed
@ -449,7 +449,7 @@ public final class IndexSchema {
throw new SolrException( SolrException.ErrorCode.SERVER_ERROR, msg ); throw new SolrException( SolrException.ErrorCode.SERVER_ERROR, msg );
} }
} }
log.info("default search field is "+defaultSearchFieldName); log.info("default search field in schema is "+defaultSearchFieldName);
} }
node = (Node) xpath.evaluate("/schema/solrQueryParser/@defaultOperator", document, XPathConstants.NODE); node = (Node) xpath.evaluate("/schema/solrQueryParser/@defaultOperator", document, XPathConstants.NODE);

2
solr/core/src/java/org/apache/solr/search/SolrQueryParser.java
View File

@ -133,7 +133,7 @@ public class SolrQueryParser extends QueryParser {
if (field == null && defaultField == null) { if (field == null && defaultField == null) {
throw new SolrException throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST, (SolrException.ErrorCode.BAD_REQUEST,
"no field name specified in query and no defaultSearchField defined in schema.xml"); "no field name specified in query and no default specified via 'df' param");
} }
} }

6
solr/example/solr/conf/schema.xml
View File

@ -987,12 +987,6 @@
--> -->
<uniqueKey>id</uniqueKey> <uniqueKey>id</uniqueKey>
<!-- field for the QueryParser to use when an explicit fieldname is absent -->
<defaultSearchField>text</defaultSearchField>
<!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
<solrQueryParser defaultOperator="OR"/>
<!-- copyField commands copy one field to another at the time a document <!-- copyField commands copy one field to another at the time a document
is added to the index. It's used either to index the same field differently, is added to the index. It's used either to index the same field differently,
or to add multiple fields to the same field for easier/faster searching. --> or to add multiple fields to the same field for easier/faster searching. -->

1
solr/example/solr/conf/solrconfig.xml
View File

@ -734,6 +734,7 @@
<lst name="defaults"> <lst name="defaults">
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>
<int name="rows">10</int> <int name="rows">10</int>
<str name="df">text</str>
</lst> </lst>
<!-- In addition to defaults, "appends" params can be specified <!-- In addition to defaults, "appends" params can be specified
to identify values which should be appended to the list of to identify values which should be appended to the list of