From b002428eb482f7f1ef5a7fb246122d1bb307f957 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 27 Jun 2011 02:12:32 +0000
Subject: [PATCH] NIHVIVO-2459 Restore field types for search fields
 nameLowercase and nameUnstemmed from r8094. Add nameStemmed and nameUnstemmed
 to phrase query fields in solrconfig.xml.

---
 solr/exampleSolr/conf/schema.xml     | 17 ++++++-----------
 solr/exampleSolr/conf/solrconfig.xml |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/solr/exampleSolr/conf/schema.xml b/solr/exampleSolr/conf/schema.xml
index 8d1bdcf4e..23e6c2264 100644
--- a/solr/exampleSolr/conf/schema.xml
+++ b/solr/exampleSolr/conf/schema.xml
@@ -485,18 +485,13 @@
 <field name="URI" type="string" indexed="true" stored="true" multiValued="false" omitNorms="true"/>
 
 <field name="nameRaw" type="string" indexed="false" stored="true" multiValued="true"/>
-<!-- RY Not sure if we need to store nameLowercase -->
-<field name="nameLowercase" type="string" indexed="true" stored="true" multiValued="true"/>
+<!-- RY Not sure if we need to store nameLowercase. Is it ever displayed? -->
+<field name="nameLowercase" type="lowercase" indexed="true" stored="true" multiValued="true"/>
 <!-- A sortable version of nameLowercase -->
 <field name="nameLowercaseSingleValued" type="lowercase" indexed="true" stored="false" multiValued="false" /> 
-<field name="nameUnstemmed" type="lowercase" indexed="true" stored="false" multiValued="true"/>
+<field name="nameUnstemmed" type="textUnstemmed" indexed="true" stored="false" multiValued="true"/>
 <field name="nameStemmed" type="text" indexed="true" stored="false" multiValued="true"/>
 
-   <!--
-    <field name="prefixNameUnstemmed" type="prefixTextUnstemmed" indexed="true" stored="false" multiValued="true"/>
-    <field name="prefixNameStemmed" type="prefixText" indexed="true" stored="false" multiValued="true"/>
-   -->
-
 <field name="indexedTime" type="string" indexed="true" stored="true" multiValued="true"/>
 <field name="NAME_PHONETIC" type ="phonetic" indexed="true" stored="false" multiValued="true"/>
 
@@ -511,12 +506,12 @@
 <field name="PHI" type="float" indexed="true" stored="true" multiValued="false"/>
 <field name="ADJACENT_NODES" type="string" indexed="true" stored="true" multiValued="true"/> -->
 
-<field name="moniker" type="ignored" />
 <field name="modType" type="ignored"/>
 <field name="JCLASS" type="ignored"/>
 
- <!-- Copy nameLowercase to sortable field. -->
-    <copyField source="nameLowercase" dest="nameLowercaseSingleValued" />
+<!-- Copy nameLowercase to sortable field. -->
+<copyField source="nameLowercase" dest="nameLowercaseSingleValued" />
+   
 <!-- ****************************  End Vitro Fields *************************** -->
 
 
diff --git a/solr/exampleSolr/conf/solrconfig.xml b/solr/exampleSolr/conf/solrconfig.xml
index 449176dee..f1cf4e60f 100644
--- a/solr/exampleSolr/conf/solrconfig.xml
+++ b/solr/exampleSolr/conf/solrconfig.xml
@@ -709,7 +709,7 @@
      <lst name="defaults">
        <str name="defType">edismax</str>
        <str name="qf">nameRaw nameLowercase ALLTEXT ALLTEXTUNSTEMMED ALLTEXT_PHONETIC NAME_PHONETIC nameUnstemmed nameStemmed targetInfo</str>
-       <str name="pf">targetInfo</str>
+       <str name="pf">targetInfo nameStemmed nameUnstemmed</str>
        <str name="echoParams">explicit</str>
        <str name="ps">2</str>
        <str name="qs">2</str>