You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by eh...@apache.org on 2007/02/17 03:44:05 UTC
svn commit: r508697 - in /lucene/solr/trunk/client/ruby/solrb/solr:
solr/conf/schema.xml solr/conf/solrconfig.xml webapps/solr.war
Author: ehatcher
Date: Fri Feb 16 18:44:05 2007
New Revision: 508697
URL: http://svn.apache.org/viewvc?view=rev&rev=508697
Log:
upgrade solr, leverage new property substitution feature, adjusted basic tokenization settings
Modified:
lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/schema.xml
lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/solrconfig.xml
lucene/solr/trunk/client/ruby/solrb/solr/webapps/solr.war
Modified: lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/schema.xml?view=diff&rev=508697&r1=508696&r2=508697
==============================================================================
--- lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/schema.xml (original)
+++ lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/schema.xml Fri Feb 16 18:44:05 2007
@@ -133,33 +133,16 @@
</analyzer>
</fieldtype>
- <!-- A text field that uses WordDelimiterFilter to enable splitting and matching of
- words on case-change, alpha numeric boundaries, and non-alphanumeric chars,
- so that a query of "wifi" or "wi fi" could match a document containing "Wi-Fi".
- Synonyms and stopwords are customized by external files, and stemming is enabled.
- Duplicate tokens at the same position (which may result from Stemmed Synonyms or
- WordDelim parts) are removed.
- -->
<fieldtype name="text" class="solr.TextField" positionIncrementGap="100">
<analyzer type="index">
- <tokenizer class="solr.WhitespaceTokenizerFactory"/>
- <!-- in this example, we will only use synonyms at query time
- <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
- -->
- <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.StandardFilterFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
- <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
</analyzer>
<analyzer type="query">
- <tokenizer class="solr.WhitespaceTokenizerFactory"/>
- <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
- <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
+ <tokenizer class="solr.StandardTokenizerFactory"/>
+ <filter class="solr.StandardFilterFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
- <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
</analyzer>
</fieldtype>
Modified: lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/solrconfig.xml?view=diff&rev=508697&r1=508696&r2=508697
==============================================================================
--- lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/client/ruby/solrb/solr/solr/conf/solrconfig.xml Fri Feb 16 18:44:05 2007
@@ -21,9 +21,7 @@
<!-- Used to specify an alternate directory to hold all index data
other than the default ./data under the Solr home.
If replication is in use, this should match the replication configuration. -->
- <!--
- <dataDir>./solr/data</dataDir>
- -->
+ <dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
Modified: lucene/solr/trunk/client/ruby/solrb/solr/webapps/solr.war
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solrb/solr/webapps/solr.war?view=diff&rev=508697&r1=508696&r2=508697
==============================================================================
Binary files - no diff available.