From 76d0932c582eccd65d7025c8d6b59b5dd7aa098e Mon Sep 17 00:00:00 2001
From: anupsawant <anupsawant@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 1 Jun 2011 05:30:53 +0000
Subject: [PATCH]

---
 solr/exampleSolr/conf/schema.xml                              | 4 ++--
 solr/exampleSolr/conf/solrconfig.xml                          | 3 ++-
 .../vitro/webapp/search/solr/IndividualToSolrDocument.java    | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/solr/exampleSolr/conf/schema.xml b/solr/exampleSolr/conf/schema.xml
index a1d82d8c4..f8844e04c 100644
--- a/solr/exampleSolr/conf/schema.xml
+++ b/solr/exampleSolr/conf/schema.xml
@@ -503,7 +503,7 @@
 <field name="THUMBNAIL" type="string" indexed="true" stored="true"/>
 
 <field name="targetInfo" type="text" indexed="true" stored="false" multiValued="true"/>
-<field name="BETA" type="float" indexed="true" stored="true" multiValued="false"/>
+<!-- <field name="BETA" type="float" indexed="true" stored="true" multiValued="false"/>
 <field name="PHI" type="float" indexed="true" stored="true" multiValued="false"/>
 <field name="ADJACENT_NODES" type="string" indexed="true" stored="true" multiValued="true"/> -->
 
@@ -582,7 +582,7 @@
  <uniqueKey>DocId</uniqueKey>
 
  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <defaultSearchField>ALLTEXT</defaultSearchField>
+<!-- <defaultSearchField>ALLTEXT</defaultSearchField> -->
 
  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
  <solrQueryParser defaultOperator="AND"/>
diff --git a/solr/exampleSolr/conf/solrconfig.xml b/solr/exampleSolr/conf/solrconfig.xml
index 03378f9d6..a8e7b22da 100644
--- a/solr/exampleSolr/conf/solrconfig.xml
+++ b/solr/exampleSolr/conf/solrconfig.xml
@@ -711,7 +711,8 @@
        <str name="qf">nameRaw nameLowercase ALLTEXT ALLTEXTUNSTEMMED ALLTEXT_PHONETIC NAME_PHONETIC nameUnstemmed nameStemmed targetInfo</str>
        <str name="pf">targetInfo</str>
        <str name="echoParams">explicit</str>
-       <str name="ps">1</str>
+       <str name="ps">2</str>
+       <str name="qs">2</str>
        <int name="rows">10</int>
      </lst>
     <!-- In addition to defaults, "appends" params can be specified
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java
index ff14f0b7f..c142f4542 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java
@@ -279,7 +279,7 @@ public class IndividualToSolrDocument implements Obj2DocIface {
         	String alltext = allTextValue.toString();
             doc.addField(term.ALLTEXT, alltext);
             doc.addField(term.ALLTEXTUNSTEMMED, alltext);
-            doc.addField(term.ALLTEXT_PHONETIC, alltext);
+            doc.addField(term.ALLTEXT_PHONETIC, alltext,PHONETIC_BOOST);
             
             //run the document modifiers
             if( documentModifiers != null ){
@@ -357,6 +357,7 @@ public class IndividualToSolrDocument implements Obj2DocIface {
         this.contextNodeClassNames.add("PostdoctoralPosition");
         this.contextNodeClassNames.add("AdvisingRelationship");
         this.contextNodeClassNames.add("Authorship");
+        this.contextNodeClassNames.add("AcademicDegree");
     }