Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr

diff --git a/conf/schema.xml b/conf/schema.xml
index fd85cfa..5317066 100644 (file)
--- a/conf/schema.xml
+++ b/conf/schema.xml
@@ -468,9 +468,10 @@
 <!-- 
 -->
    <field name="id" type="string" indexed="true" stored="true" required="true" /> 
+   <field name="_version_" type="long" indexed="true" stored="true"/>
 
-   <field name="author"       type="text"   indexed="true" stored="true"  multiValued="true" compressed="false" omitNorms="true"/>
-   <field name="author_exact" type="facet" indexed="true" stored="true"  multiValued="true" compressed="false" omitNorms="true"/>
+   <field name="author"       type="text"   indexed="true" stored="true"  multiValued="true"  omitNorms="true"/>
+   <field name="author_exact" type="facet" indexed="true" stored="true"  multiValued="true"  omitNorms="true"/>
    <field name="author-date"  type="text"   indexed="true" stored="true"  multiValued="true" omitNorms="true"/>
    <field name="author-title" type="text"   indexed="true" stored="true"  multiValued="true" omitNorms="true"/>
 
@@ -479,17 +480,17 @@
    <field name="corporate-name"     type="text" indexed="true" stored="true" omitNorms="true"/>
 
    <field name="callnumber" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
-   <field name="citation"   type="text" indexed="true" stored="true" multiValued="true" compressed="true" omitNorms="true"/>
+   <field name="citation"   type="text" indexed="true" stored="true" multiValued="true"  omitNorms="true"/>
 
    <field name="date"        type="text"    indexed="true" stored="true" multiValued="true" omitNorms="true"/>
-   <field name="description" type="text_ws" indexed="true" stored="true" multiValued="true" compressed="true" omitNorms="true"/>
+   <field name="description" type="text_ws" indexed="true" stored="true" multiValued="true"  omitNorms="true"/>
 
    <field name="edition" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
 
    <field name="electronic-format-instruction" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
    <field name="electronic-format-type"        type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
-   <field name="electronic-note"               type="text" indexed="true" stored="true" multiValued="true" compressed="true" omitNorms="true"/>
-   <field name="electronic-text"               type="text" indexed="true" stored="true" multiValued="true" compressed="true" omitNorms="true"/>
+   <field name="electronic-note"               type="text" indexed="true" stored="true" multiValued="true"  omitNorms="true"/>
+   <field name="electronic-text"               type="text" indexed="true" stored="true" multiValued="true"  omitNorms="true"/>
    <field name="electronic-url"                type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
 
    <field name="isbn" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
@@ -513,8 +514,8 @@
 
    <field name="tech-rep-nr" type="text" indexed="true" multiValued="true" stored="true"/>
 
-   <field name="title"                  type="text"   indexed="true" multiValued="true" compressed="false" stored="true"/>
-   <field name="title-complete"         type="text"   indexed="true" multiValued="true" compressed="true"  stored="true"/>
+   <field name="title"                  type="text"   indexed="true" multiValued="true" stored="true"/>
+   <field name="title-complete"         type="text"   indexed="true" multiValued="true" stored="true"/>
    <field name="title-dates"            type="text"   indexed="true" multiValued="true" stored="true"/>
    <field name="title-medium"           type="text"   indexed="true" multiValued="true" stored="true"/>
    <field name="title-number-section"   type="text"   indexed="true" multiValued="true" stored="true"/>
@@ -526,8 +527,8 @@
    <field name="title-uniform-partname" type="text"   indexed="true" multiValued="true" stored="true"/>
    <field name="title-uniform-parts"    type="text"   indexed="true" multiValued="true" stored="true"/>
 
-   <field name="journal-title"          type="text" indexed="true" multiValued="true" compressed="false" stored="true"/>
-   <field name="journal-title_exact"    type="text" indexed="true" multiValued="true" compressed="false" stored="true"/>
+   <field name="journal-title"          type="text" indexed="true" multiValued="true"  stored="true"/>
+   <field name="journal-title_exact"    type="text" indexed="true" multiValued="true"  stored="true"/>
 
    <field name="physical-accomp"     type="text" indexed="true" stored="true" multiValued="true" />
    <field name="physical-dimensions" type="text" indexed="true" stored="true" multiValued="true" />

diff --git a/conf/solrconfig-devl.xml b/conf/solrconfig-devl.xml
index c2f2566..22fa0bd 100644 (file)
--- a/conf/solrconfig-devl.xml
+++ b/conf/solrconfig-devl.xml
@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_33</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <!-- lib directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/conf/solrconfig-master.xml b/conf/solrconfig-master.xml
index a150e3e..cb497bf 100644 (file)
--- a/conf/solrconfig-master.xml
+++ b/conf/solrconfig-master.xml
@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_33</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <!-- lib directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/conf/solrconfig-prod.xml b/conf/solrconfig-prod.xml
index 00e4214..fc978e7 100644 (file)
--- a/conf/solrconfig-prod.xml
+++ b/conf/solrconfig-prod.xml
@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_33</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <!-- lib directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/conf/solrconfig-slave.xml b/conf/solrconfig-slave.xml
index 74db562..dfcf2fa 100644 (file)
--- a/conf/solrconfig-slave.xml
+++ b/conf/solrconfig-slave.xml
@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_33</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <!-- lib directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/debian/rules b/debian/rules
index bdd61c0..afebfea 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ LUI_SOLR_SLAVE_TOMCAT = $(LUI)-slave-tomcat
 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
 #LUI_SOLR_SHARE = $(LUI_SLAVE_TOMCAT_ROOT)/usr/share/masterkey/$(LUI_SLAVE_TOMCAT)
 
-SOLR_VERSION=3.6.1
+SOLR_VERSION=4.3.1
 
 PACKAGE=$(shell dh_listpackages)
 

diff --git a/dist/solr-4.3.1.war b/dist/solr-4.3.1.war
new file mode 100644 (file)
index 0000000..dc796b8
Binary files /dev/null and b/dist/solr-4.3.1.war differ