From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 2 Jan 2014 10:47:01 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
X-Git-Tag: v0.6.2~3^2~1
X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=commitdiff_plain;h=667239393bb19f5cf9679eb9957b8a94a52af68d;hp=64856778c4faee2f754a5cd926c2e9c786350cce

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
--- 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
--- 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>