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

diff --git a/conf/schema.xml b/conf/schema.xml
index df61c5e..17a6ad2 100644 (file)
--- a/conf/schema.xml
+++ b/conf/schema.xml
@@ -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="string" indexed="true" stored="false" multiValued="true" omitNorms="true" docValues="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"/>
@@ -529,7 +529,7 @@
    <field name="title-uniform-parts"    type="text"   indexed="true" multiValued="true" 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="false"/>
+   <field name="journal-title_exact"    type="string" indexed="true" multiValued="true"  stored="false" docValues="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/etc/solr4-devl.xml b/etc/solr4-devl.xml
index d546a3d..ae14da7 100644 (file)
--- a/etc/solr4-devl.xml
+++ b/etc/solr4-devl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Context 
-    docBase="/home/dennis/proj/lui-solr4/dist/solr-4.4.0.war" 
+   docBase="../solr-4.6.0.war" 
 >
-  <Environment name="solr/home" type="java.lang.String" value="/home/dennis/proj/lui-solr4" override="true"/>
+  <Environment name="solr/home" type="java.lang.String" value="lui-solr4" override="true"/>
 </Context>

diff --git a/zookeeper/webapps/solr.war b/zookeeper/webapps/solr.war
index 6d98814..a7ed5bd 120000 (symlink)
--- a/zookeeper/webapps/solr.war
+++ b/zookeeper/webapps/solr.war
@@ -1 +1 @@
-../../dist/solr-4.4.0.war
\ No newline at end of file
+../../dist/solr-4.6.0.war
\ No newline at end of file