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

diff --git a/IDMETA b/IDMETA
index e7a7247..a9f2738 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 NAME=masterkey-lui-solr
-VERSION=0.5.0
+VERSION=0.5.2
 DEBIAN_DIST="squeeze wheezy"
 UBUNTU_DIST=""

diff --git a/conf/schema.xml b/conf/schema.xml
index fe42fd1..df61c5e 100644 (file)
--- a/conf/schema.xml
+++ b/conf/schema.xml
@@ -471,8 +471,8 @@
 
    <field name="transactionId" type="long" indexed="true" stored="false"/>
 
-   <field name="author"       type="text"   indexed="true" stored="true"  multiValued="true"  omitNorms="true"/>
-   <field name="author_exact" type="facet"  indexed="true" stored="false" multiValued="true"  omitNorms="true"/>
+   <field name="author"       type="text"   indexed="true" stored="true"  multiValued="true" omitNorms="true"/>
+   <field name="author_exact" type="string" indexed="true" stored="false" multiValued="true" omitNorms="true" docValues="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"/>
 
@@ -499,7 +499,7 @@
    <field name="lccn" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
 
    <field name="medium"       type="text"  indexed="true" stored="true"  multiValued="true" omitNorms="true"/>
-   <field name="medium_exact" type="facet" indexed="true" stored="false" multiValued="true" omitNorms="true"/>
+   <field name="medium_exact" type="facet" indexed="true" stored="false" multiValued="true" omitNorms="true" />
 
    <field name="meeting-date"     type="text" indexed="true" stored="true" omitNorms="true"/>
    <field name="meeting-location" type="text" indexed="true" stored="true" omitNorms="true"/>
@@ -508,7 +508,7 @@
    <field name="series-title" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>
 
    <field name="subject"       type="text_ws" indexed="true" stored="true"  multiValued="true" omitNorms="true" />
-   <field name="subject_exact" type="facet"   indexed="true" stored="false" multiValued="true" omitNorms="true" />
+   <field name="subject_exact" type="string"  indexed="true" stored="false" multiValued="true" omitNorms="true" docValues="true" />
    <field name="subject-long"  type="text_ws" indexed="true" stored="true"  multiValued="true" omitNorms="true" />
 
    <field name="system-control-nr" type="text" indexed="true" stored="true" multiValued="true" omitNorms="true"/>

diff --git a/debian/changelog b/debian/changelog
index 93f27e1..fdee344 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+masterkey-lui-solr (0.5.2-1indexdata) unstable; urgency=low
+
+  * Upstream
+
+ -- Dennis Schafroth <dennis@indexdata.com>  Thu, 05 Sep 2013 10:51:12 +0200
+
+masterkey-lui-solr (0.5.1-1indexdata) unstable; urgency=low
+
+  * Upstream
+
+ -- Dennis Schafroth <dennis@indexdata.com>  Wed, 05 Sep 2013 10:35:52 +0200
+
 masterkey-lui-solr (0.5.0-1indexdata) unstable; urgency=low
 
   * Upstream

diff --git a/debian/rules b/debian/rules
index 4c7d85d..192226b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ DATA_SLAVE  = $(DATA)/slave
 
 LUI_SOLR_COMMON = $(BASE)-common
 LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON)
-LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war
+LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)
 
 LUI_SOLR_MASTER = $(BASE)-master
 LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
@@ -63,7 +63,8 @@ install-stamp: build
 
        # lui-solr-common. Install a Solr WAR.
        mkdir -p $(LUI_SOLR_COMMON_DIR)
-       cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)
+       mkdir -p $(LUI_SOLR_COMMON_DIR)/war
+       cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)/war/
        cp -rp scripts $(LUI_SOLR_COMMON_DIR)
 
        # lui-solr-master

diff --git a/etc/solr4-tomcat-context-master.xml b/etc/solr4-tomcat-context-master.xml
index c2b52f3..efe586d 100644 (file)
--- a/etc/solr4-tomcat-context-master.xml
+++ b/etc/solr4-tomcat-context-master.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Version 0.5.2. Adding comment to force config update  -->
 <Context 
     docBase="/usr/share/masterkey/lui/solr4/war/solr-4.4.0.war" 
     path="/solr4"

diff --git a/etc/solr4-tomcat-context-slave.xml b/etc/solr4-tomcat-context-slave.xml
index de2b171..01c1bd3 100644 (file)
--- a/etc/solr4-tomcat-context-slave.xml
+++ b/etc/solr4-tomcat-context-slave.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Version 0.5.2. Adding comment to force check -->
 <Context 
     docBase="/usr/share/masterkey/lui/solr4/war/solr-4.4.0.war" 
     path="/solr4-slave"

diff --git a/scripts/commit_solr.sh b/scripts/commit_solr.sh
index 6e3dff2..df587ab 100644 (file)
--- a/scripts/commit_solr.sh
+++ b/scripts/commit_solr.sh
@@ -5,13 +5,13 @@ if [ "$2" != "" ] ; then
     HOST_PORT="$2"
 fi
 
-PATH=solr4
+SOLR_PATH=solr4
 if [ "$2" != "" ] ; then 
-    PATH="$2"
+    SOLR_PATH="$2"
 fi
 
 if [ "$1" == "-h" ] ; then 
-    echo "$0 [[HOST:PORT] PATH] (default $HOST_PORT/$PATH)"
+    echo "$0 [[HOST:PORT] SOLR_PATH] (default $HOST_PORT/$SOLR_PATH)"
 fi
 
-curl http://$HOST:$PORT/$PATH/update -H "Content-Type: text/xml" --data-binary '<commit waitFlush="false" waitSearcher="false" expungeDeletes="true"/>'
\ No newline at end of file
+curl http://$HOST:$PORT/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary '<commit waitFlush="false" waitSearcher="false" expungeDeletes="true"/>'
\ No newline at end of file

diff --git a/scripts/delete_solr.sh b/scripts/delete_solr.sh
index c5f9f85..6c51408 100755 (executable)
--- a/scripts/delete_solr.sh
+++ b/scripts/delete_solr.sh
@@ -6,9 +6,9 @@ if [ "$2" != "" ] ; then
     HOST_PORT="$2"
 fi 
 
-PATH=solr4
+SOLR_PATH=solr4
 if [ "$3" != "" ] ; then 
-    PATH="$3"
+    SOLR_PATH="$3"
 fi
 
 if [ "$1" == "" ] ; then 
@@ -16,5 +16,5 @@ if [ "$1" == "" ] ; then
     exit 1 ; 
 fi  
 
-curl http://${HOST_PORT}/$PATH/update -H "Content-Type: text/xml" --data-binary "<delete><query>database:$1</query></delete>"
-curl http://${HOST_PORT}/$PATH/update -H "Content-Type: text/xml" --data-binary '<commit waitFlush="false" waitSearcher="false"/>'
+curl http://${HOST_PORT}/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary "<delete><query>database:$1</query></delete>"
+curl http://${HOST_PORT}/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary '<commit waitFlush="false" waitSearcher="false"/>'

diff --git a/scripts/optimize_solr.sh b/scripts/optimize_solr.sh
index d608b4a..83e4219 100755 (executable)
--- a/scripts/optimize_solr.sh
+++ b/scripts/optimize_solr.sh
@@ -6,15 +6,15 @@ if [ "$2" != "" ] ; then
     HOST_PORT="$2"
 fi
 
-PATH=solr4
+SOLR_PATH=solr4
 if [ "$3" != "" ] ; then 
-    PATH="$3"
+    SOLR_PATH="$3"
 fi
 
 if [ "$1" != "YES" ] ; then 
-    echo "$0 YES [[HOST:PORT] PATH] (default $HOST_PORT/$PATH)"
+    echo "$0 YES [[HOST:PORT] SOLR_PATH] (default $HOST_PORT/$SOLR_PATH)"
     exit 1 ; 
 fi  
 
 
-curl http://${HOST_PORT}/$PATH/update -H "Content-Type: text/xml" --data-binary '<optimize waitSearcher="false" expungeDeletes="true" />'
+curl http://${HOST_PORT}/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary '<optimize waitSearcher="false" expungeDeletes="true" />'