From eb9565464218275d651694ff3064174d3f51eb51 Mon Sep 17 00:00:00 2001
From: Wayne Schneider <wayne@indexdata.com>
Date: Wed, 29 Jun 2016 14:50:00 -0500
Subject: [PATCH] Update schema to version 1.6. Remove deprecated
 defaultSearchField and solrQueryParser elements from schema
 (now configured in solrconfig.xml).

---
 conf/schema.xml            |    6 +-----
 conf/solrconfig-master.xml |    2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/conf/schema.xml b/conf/schema.xml
index 30f35c9..3fb78e7 100644
--- a/conf/schema.xml
+++ b/conf/schema.xml
@@ -8,7 +8,7 @@
  Schema Design section of the Solr Reference Guide.
 -->
 
-<schema name="Local Unified Index" version="1.2">
+<schema name="Local Unified Index" version="1.6">
   <types>
     <!-- stock Solr field types from the dist schema.xml -->
     <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
@@ -264,10 +264,6 @@
 
  <uniqueKey>id</uniqueKey>
 
- <defaultSearchField>text</defaultSearchField>
-
- <solrQueryParser defaultOperator="AND"/>
-
  <!-- copyField commands -->
  <copyField source="author"  dest="author_exact"/>
  <copyField source="subject" dest="subject_exact"/>
diff --git a/conf/solrconfig-master.xml b/conf/solrconfig-master.xml
index 86e9e9e..23caef4 100644
--- a/conf/solrconfig-master.xml
+++ b/conf/solrconfig-master.xml
@@ -823,6 +823,7 @@
        <int name="rows">10</int>
        <str name="df">text</str>
        <str name="fl">*,score</str>
+       <str name="q.op">AND</str>
      </lst>
     <!-- In addition to defaults, "appends" params can be specified
          to identify values which should be appended to the list of
@@ -885,6 +886,7 @@
        <str name="wt">json</str>
        <str name="indent">true</str>
        <str name="df">text</str>
+       <str name="q.op">AND</str>
      </lst>
   </requestHandler>
 
-- 
1.7.10.4