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

diff --git a/conf/solrconfig-devl.xml b/conf/solrconfig-devl.xml
index a828f63..4c847be 100644 (file)
--- a/conf/solrconfig-devl.xml
+++ b/conf/solrconfig-devl.xml
@@ -821,6 +821,7 @@
        <str name="echoParams">explicit</str>
        <int name="rows">10</int>
        <str name="df">text</str>
+       <str name="fl">*,score</str>
      </lst>
     <!-- In addition to defaults, "appends" params can be specified
          to identify values which should be appended to the list of

diff --git a/conf/solrconfig-master.xml b/conf/solrconfig-master.xml
index bb59a2c..ccde565 100644 (file)
--- a/conf/solrconfig-master.xml
+++ b/conf/solrconfig-master.xml
@@ -822,6 +822,7 @@
        <str name="echoParams">explicit</str>
        <int name="rows">10</int>
        <str name="df">text</str>
+       <str name="fl">*,score</str>
      </lst>
     <!-- In addition to defaults, "appends" params can be specified
          to identify values which should be appended to the list of

diff --git a/conf/solrconfig-slave.xml b/conf/solrconfig-slave.xml
index 2616aed..22cde8b 100644 (file)
--- a/conf/solrconfig-slave.xml
+++ b/conf/solrconfig-slave.xml
@@ -822,6 +822,7 @@
        <str name="echoParams">explicit</str>
        <int name="rows">10</int>
        <str name="df">text</str>
+       <str name="fl">*,score</str>
      </lst>
     <!-- In addition to defaults, "appends" params can be specified
          to identify values which should be appended to the list of

diff --git a/scripts/zookeeper.sh b/scripts/zookeeper.sh
old mode 100644 (file)
new mode 100755 (executable)
index 36ea6bb..8ff8bb4
--- a/scripts/zookeeper.sh
+++ b/scripts/zookeeper.sh
@@ -1,8 +1,28 @@
-cd example
-java -Dbootstrap_confdir=./solr/collection1/conf -Dcollection.configName=myconf -DzkRun -DzkHost=localhost:9983,localhost:8574,localhost:9900 -DnumShards=2 -jar start.jar > solr.log & 
-cd ../example2
-java -Djetty.port=7574 -DzkRun -DzkHost=localhost:9983,localhost:8574,localhost:9900 -jar start.jar > solr.log & 
-cd ../exampleB
-java -Djetty.port=8900 -DzkRun -DzkHost=localhost:9983,localhost:8574,localhost:9900 -jar start.jar > solr.log & 
-cd ../example2B
-java -Djetty.port=7500 -DzkHost=localhost:9983,localhost:8574,localhost:9900 -jar start.jar > solr.log & 
\ No newline at end of file
+#/bin/bash
+
+DIR=`dirname $0`
+PROG=`basename $0`
+
+cd $DIR
+OPTIONS="-Djetty.port=7500 -DzkHost=opencontent-solr.index:9983"
+if [ -f "options" ]; then 
+    source options
+else
+    echo "No options file. Using defaults: $OPTIONS"
+fi
+
+if [ "$1" = "start" ]; then 
+    if [ -f "${PROG}.pid" ] ; then 
+       echo "Pid file ${DIR}/${PROG}.pid exists. Already running?"
+       exit 1
+    fi
+    java $OPTIONS  -jar start.jar > solr.log & 
+    echo $$ > ${PROG}.pid
+elif [ "$1" = "stop" ]; then 
+    if [ -x "${PROG}.pid" ] ; then 
+       kill `echo ${PROG}.pid`
+       rm ${PROG}.pid
+    fi
+else
+       echo "$0 [start|stop]" 
+fi