From 1cd46fc8da47d9bd3d33fd5d2182c4aefcfb388b Mon Sep 17 00:00:00 2001
From: Dennis Schafroth <dennis@schafroth.com>
Date: Fri, 29 Nov 2013 16:02:57 +0100
Subject: [PATCH] Align with master

---
 zookeeper/solr/collection1/conf/solrconfig.xml |   27 ++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/zookeeper/solr/collection1/conf/solrconfig.xml b/zookeeper/solr/collection1/conf/solrconfig.xml
index 156314d..3dfc0c3 100644
--- a/zookeeper/solr/collection1/conf/solrconfig.xml
+++ b/zookeeper/solr/collection1/conf/solrconfig.xml
@@ -72,6 +72,7 @@
        The examples below can be used to load some solr-contribs along 
        with their external dependencies.
     -->
+<!--
   <lib dir="../../../contrib/extraction/lib" regex=".*\.jar" />
   <lib dir="../../../dist/" regex="solr-cell-\d.*\.jar" />
 
@@ -83,7 +84,7 @@
 
   <lib dir="../../../contrib/velocity/lib" regex=".*\.jar" />
   <lib dir="../../../dist/" regex="solr-velocity-\d.*\.jar" />
-
+-->
   <!-- an exact 'path' can be used instead of a 'dir' to specify a 
        specific jar file.  This will cause a serious error to be logged 
        if it can't be loaded.
@@ -625,16 +626,29 @@
       -->
     <listener event="newSearcher" class="solr.QuerySenderListener">
       <arr name="queries">
-        <!--
-           <lst><str name="q">solr</str><str name="sort">price asc</str></lst>
-           <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst>
-          -->
+        <lst>
+	  <str name="q">database:*</str>
+	  <str name="facet">true</str>
+	  <str name="facet.mincount">1</str>
+	  <str name="facet.field">author_exact</str>
+	  <str name="facet.field">subject_exact</str>
+	  <str name="facet.field">medium_exact</str>
+	  <str name="facet.field">date</str>
+	  <str name="facet.field">database</str>
+        </lst>
       </arr>
     </listener>
     <listener event="firstSearcher" class="solr.QuerySenderListener">
       <arr name="queries">
         <lst>
-          <str name="q">static firstSearcher warming in solrconfig.xml</str>
+	  <str name="q">database:*</str>
+	  <str name="facet">true</str>
+	  <str name="facet.mincount">1</str>
+	  <str name="facet.field">author_exact</str>
+	  <str name="facet.field">subject_exact</str>
+	  <str name="facet.field">medium_exact</str>
+	  <str name="facet.field">date</str>
+	  <str name="facet.field">database</str>
         </lst>
       </arr>
     </listener>
@@ -808,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
-- 
1.7.10.4