updated to 7.x-1.4

This commit is contained in:
Bachir Soussi Chiadmi
2014-02-07 10:05:53 +01:00
parent 62b7436183
commit d7303905a0
18 changed files with 596 additions and 290 deletions

View File

@@ -70,8 +70,8 @@
so that range queries work correctly.
-->
<fieldType name="sint" class="solr.TrieIntField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="slong" class="solr.TrieFloatField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="sfloat" class="solr.TrieLongField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="sfloat" class="solr.TrieFloatField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="slong" class="solr.TrieLongField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="sdouble" class="solr.TrieDoubleField" sortMissingLast="true" omitNorms="true"/>
<!--

View File

@@ -10,7 +10,7 @@
http://wiki.apache.org/solr/SchemaXml
-->
<schema name="drupal-4.1-solr-3.x" version="1.3">
<schema name="drupal-4.2-solr-3.x" version="1.3">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.2" is Solr's version number for the schema syntax and semantics. It should
@@ -71,8 +71,8 @@
so that range queries work correctly.
-->
<fieldType name="sint" class="solr.TrieIntField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="slong" class="solr.TrieFloatField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="sfloat" class="solr.TrieLongField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="sfloat" class="solr.TrieFloatField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="slong" class="solr.TrieLongField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="sdouble" class="solr.TrieDoubleField" sortMissingLast="true" omitNorms="true"/>
<!--
@@ -181,7 +181,7 @@
catenateWords="1"
catenateNumbers="1"
catenateAll="0"
splitOnCaseChange="1"
splitOnCaseChange="0"
preserveOriginal="1"/>
<filter class="solr.LengthFilterFactory" min="2" max="100" />
<filter class="solr.LowerCaseFilterFactory"/>
@@ -204,7 +204,7 @@
catenateWords="0"
catenateNumbers="0"
catenateAll="0"
splitOnCaseChange="1"
splitOnCaseChange="0"
preserveOriginal="1"/>
<filter class="solr.LengthFilterFactory" min="2" max="100" />
<filter class="solr.LowerCaseFilterFactory"/>

View File

@@ -20,7 +20,7 @@
For more details about configurations options that may appear in
this file, see http://wiki.apache.org/solr/SolrConfigXml.
-->
<config name="drupal-4.1-solr-3.x">
<config name="drupal-4.2-solr-3.x">
<!-- In all configuration below, a prefix of "solr." for class names
is an alias that causes solr to search appropriate packages,
including org.apache.solr.(search|update|request|core|analysis)
@@ -68,8 +68,9 @@
the classpath, this is useful for including all jars in a
directory.
-->
<lib dir="../../contrib/extraction/lib" />
<lib dir="../../contrib/clustering/lib/" />
<lib dir="${solr.contrib.dir:../../contrib}/extraction/lib" />
<lib dir="${solr.contrib.dir:../../contrib}/clustering/lib/" />
<!-- The velocity library has been known to crash Solr in some
instances when deployed as a war file to Tomcat. Therefore all
references have been removed from the default configuration.
@@ -1076,7 +1077,7 @@
<!-- Solr Replication
The SolrReplicationHandler supports replicating indexes from a
"master" used for indexing and "salves" used for queries.
"master" used for indexing and "slaves" used for queries.
http://wiki.apache.org/solr/SolrReplication
@@ -1084,19 +1085,19 @@
this is just a slave and remove the <lst name="slave"> section
if this is just a master.
-->
<requestHandler name="/replication" class="solr.ReplicationHandler" >
<lst name="master">
<str name="enable">${solr.replication.master:false}</str>
<str name="replicateAfter">commit</str>
<str name="replicateAfter">startup</str>
<str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
</lst>
<lst name="slave">
<str name="enable">${solr.replication.slave:false}</str>
<str name="masterUrl">${solr.replication.masterUrl:http://localhost:8983/solr}/replication</str>
<str name="pollInterval">${solr.replication.pollInterval:00:00:60}</str>
</lst>
</requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler" >
<lst name="master">
<str name="enable">${solr.replication.master:false}</str>
<str name="replicateAfter">commit</str>
<str name="replicateAfter">startup</str>
<str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
</lst>
<lst name="slave">
<str name="enable">${solr.replication.slave:false}</str>
<str name="masterUrl">${solr.replication.masterUrl:http://localhost:8983/solr}/replication</str>
<str name="pollInterval">${solr.replication.pollInterval:00:00:60}</str>
</lst>
</requestHandler>
<!-- Search Components
@@ -1595,6 +1596,7 @@
http://wiki.apache.org/solr/SpellCheckComponent
-->
<searchComponent name="spellcheck" class="solr.SpellCheckComponent">
<str name="queryAnalyzerFieldType">textSpell</str>
<!-- a spellchecker built from a field of the main index -->

View File

@@ -5,8 +5,12 @@ solr.replication.pollInterval=00:00:60
solr.replication.masterUrl=http://localhost:8983/solr
solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
solr.mlt.timeAllowed=2000
# You should not set your luceneVersion to anything lower then your Solr Version.
# You should not set your luceneMatchVersion to anything lower than your Solr
# Version.
solr.luceneMatchVersion=LUCENE_35
solr.pinkPony.timeAllowed=-1
# autoCommit after 10000 docs
solr.autoCommit.MaxDocs=10000
# autoCommit after 2 minutes
solr.autoCommit.MaxTime=120000
solr.contrib.dir=../../contrib

View File

@@ -1,4 +1,4 @@
# Contains words which shouldn't be indexed for fulltext fields, e.g., because
# they're to common. For documentation of the format, see
# they're too common. For documentation of the format, see
# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.StopFilterFactory
# (Lines starting with a pound character # are ignored.)

View File

@@ -10,7 +10,7 @@
http://wiki.apache.org/solr/SchemaXml
-->
<schema name="drupal-4.1-solr-4.x" version="1.3">
<schema name="drupal-4.2-solr-4.x" version="1.3">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.2" is Solr's version number for the schema syntax and semantics. It should
@@ -71,8 +71,8 @@
so that range queries work correctly.
-->
<fieldType name="sint" class="solr.TrieIntField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="slong" class="solr.TrieFloatField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="sfloat" class="solr.TrieLongField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="sfloat" class="solr.TrieFloatField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="slong" class="solr.TrieLongField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="sdouble" class="solr.TrieDoubleField" sortMissingLast="true" omitNorms="true"/>
<!--
@@ -181,7 +181,7 @@
catenateWords="1"
catenateNumbers="1"
catenateAll="0"
splitOnCaseChange="1"
splitOnCaseChange="0"
preserveOriginal="1"/>
<filter class="solr.LengthFilterFactory" min="2" max="100" />
<filter class="solr.LowerCaseFilterFactory"/>
@@ -204,7 +204,7 @@
catenateWords="0"
catenateNumbers="0"
catenateAll="0"
splitOnCaseChange="1"
splitOnCaseChange="0"
preserveOriginal="1"/>
<filter class="solr.LengthFilterFactory" min="2" max="100" />
<filter class="solr.LowerCaseFilterFactory"/>
@@ -363,6 +363,11 @@
-->
<field name="id" type="string" indexed="true" stored="true" required="true" />
<!-- Add Solr Cloud version field as mentioned in
http://wiki.apache.org/solr/SolrCloud#Required_Config
-->
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
<!-- Search Api specific fields -->
<!-- item_id contains the entity ID, e.g. a node's nid. -->
<field name="item_id" type="string" indexed="true" stored="true" />

View File

@@ -20,7 +20,7 @@
For more details about configurations options that may appear in
this file, see http://wiki.apache.org/solr/SolrConfigXml.
-->
<config name="drupal-4.1-solr-4.x" >
<config name="drupal-4.2-solr-4.x" >
<!-- In all configuration below, a prefix of "solr." for class names
is an alias that causes solr to search appropriate packages,
including org.apache.solr.(search|update|request|core|analysis)
@@ -68,8 +68,9 @@
the classpath, this is useful for including all jars in a
directory.
-->
<lib dir="../../contrib/extraction/lib" />
<lib dir="../../contrib/clustering/lib/" />
<lib dir="${solr.contrib.dir:../../../contrib}/extraction/lib" />
<lib dir="${solr.contrib.dir:../../../contrib}/clustering/lib/" />
<!-- The velocity library has been known to crash Solr in some
instances when deployed as a war file to Tomcat. Therefore all
references have been removed from the default configuration.
@@ -204,10 +205,6 @@
-->
<!-- <termIndexInterval>256</termIndexInterval> -->
<useCompoundFile>false</useCompoundFile>
<ramBufferSizeMB>32</ramBufferSizeMB>
<mergeFactor>10</mergeFactor>
<!-- Unlock On Startup
If true, unlock any held write or commit locks on startup.
@@ -306,6 +303,16 @@
<maxTime>${solr.autoCommit.MaxTime:120000}</maxTime>
</autoCommit>
<!-- softAutoCommit is like autoCommit except it causes a
'soft' commit which only ensures that changes are visible
but does not ensure that data is synced to disk. This is
faster and more near-realtime friendly than a hard commit.
-->
<autoSoftCommit>
<maxDocs>${solr.autoSoftCommit.MaxDocs:2000}</maxDocs>
<maxTime>${solr.autoSoftCommit.MaxTime:10000}</maxTime>
</autoSoftCommit>
<!-- Update Related Event Listeners
Various IndexWriter related events can trigger Listeners to
@@ -337,6 +344,17 @@
<arr name="env"> <str>MYVAR=val1</str> </arr>
</listener>
-->
<!-- Enables a transaction log, currently used for real-time get.
"dir" - the target directory for transaction logs, defaults to the
solr data directory. -->
<updateLog>
<str name="dir">${solr.data.dir:}</str>
<!-- if you want to take control of the synchronization you may specify
the syncLevel as one of the following where ''flush'' is the default.
Fsync will reduce throughput.
<str name="syncLevel">flush|fsync|none</str>
-->
</updateLog>
</updateHandler>
<!-- IndexReaderFactory
@@ -1022,8 +1040,7 @@
Admin Handlers - This will register all the standard admin
RequestHandlers.
-->
<requestHandler name="/admin/"
class="solr.admin.AdminHandlers" />
<requestHandler name="/admin/" class="solr.admin.AdminHandlers" />
<!-- This single handler is equivalent to the following... -->
<!--
<requestHandler name="/admin/luke" class="solr.admin.LukeRequestHandler" />
@@ -1068,7 +1085,7 @@
<!-- Solr Replication
The SolrReplicationHandler supports replicating indexes from a
"master" used for indexing and "salves" used for queries.
"master" used for indexing and "slaves" used for queries.
http://wiki.apache.org/solr/SolrReplication
@@ -1076,19 +1093,31 @@
this is just a slave and remove the <lst name="slave"> section
if this is just a master.
-->
<requestHandler name="/replication" class="solr.ReplicationHandler" >
<lst name="master">
<str name="enable">${solr.replication.master:false}</str>
<str name="replicateAfter">commit</str>
<str name="replicateAfter">startup</str>
<str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
</lst>
<lst name="slave">
<str name="enable">${solr.replication.slave:false}</str>
<str name="masterUrl">${solr.replication.masterUrl:http://localhost:8983/solr}/replication</str>
<str name="pollInterval">${solr.replication.pollInterval:00:00:60}</str>
</lst>
</requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler" >
<lst name="master">
<str name="enable">${solr.replication.master:false}</str>
<str name="replicateAfter">commit</str>
<str name="replicateAfter">startup</str>
<str name="confFiles">${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml}</str>
</lst>
<lst name="slave">
<str name="enable">${solr.replication.slave:false}</str>
<str name="masterUrl">${solr.replication.masterUrl:http://localhost:8983/solr}/replication</str>
<str name="pollInterval">${solr.replication.pollInterval:00:00:60}</str>
</lst>
</requestHandler>
<!-- Realtime get handler, guaranteed to return the latest stored fields of
any document, without the need to commit or open a new searcher. The
current implementation relies on the updateLog feature being enabled.
-->
<requestHandler name="/get" class="solr.RealTimeGetHandler">
<lst name="defaults">
<str name="omitHeader">true</str>
<str name="wt">json</str>
<str name="indent">true</str>
</lst>
</requestHandler>
<!-- Search Components
@@ -1587,6 +1616,7 @@
http://wiki.apache.org/solr/SpellCheckComponent
-->
<searchComponent name="spellcheck" class="solr.SpellCheckComponent">
<str name="queryAnalyzerFieldType">textSpell</str>
<!-- a spellchecker built from a field of the main index -->

View File

@@ -5,8 +5,16 @@ solr.replication.pollInterval=00:00:60
solr.replication.masterUrl=http://localhost:8983/solr
solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
solr.mlt.timeAllowed=2000
# You should not set your luceneVersion to anything lower then your Solr Version.
# You should not set your luceneMatchVersion to anything lower than your Solr
# Version.
solr.luceneMatchVersion=LUCENE_40
solr.pinkPony.timeAllowed=-1
# autoCommit after 10000 docs
solr.autoCommit.MaxDocs=10000
# autoCommit after 2 minutes
solr.autoCommit.MaxTime=120000
# autoSoftCommit after 2000 docs
solr.autoSoftCommit.MaxDocs=2000
# autoSoftCommit after 10 seconds
solr.autoSoftCommit.MaxTime=10000
solr.contrib.dir=../../../contrib