From 7b3fce2368893433f94ece48272bc8d260d1cb03 Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew.a.dunlap@gmail.com>
Date: Thu, 20 Sep 2018 20:02:10 -0400
Subject: [PATCH 1/7] Move boost from spell to select #4938

---
 conf/solr/7.3.0/solrconfig.xml | 42 +++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/conf/solr/7.3.0/solrconfig.xml b/conf/solr/7.3.0/solrconfig.xml
index 599506fd454..0a342ed5157 100644
--- a/conf/solr/7.3.0/solrconfig.xml
+++ b/conf/solr/7.3.0/solrconfig.xml
@@ -693,6 +693,27 @@
     <lst name="defaults">
       <str name="echoParams">explicit</str>
       <int name="rows">10</int>
+      <str name="defType">edismax</str>
+<str name="qf">
+dvName^170
+dvSubject^160
+dvDescription^150
+dvAffiliation^140
+title^130
+subject^120
+keyword^110
+topicClassValue^100
+dsDescriptionValue^90
+authorName^80
+authorAffiliation^70
+publicationCitation^60
+producerName^50
+fileName^40
+fileDescription^30
+variableLabel^20
+variableName^10
+text^1.0
+</str>
       <!-- Default search field
          <str name="df">text</str> 
         -->
@@ -924,27 +945,6 @@
       <str name="spellcheck.collateExtendedResults">true</str>
       <str name="spellcheck.maxCollationTries">10</str>
       <str name="spellcheck.maxCollations">5</str>
-      <str name="defType">edismax</str>
-<str name="qf">
-dvName^170
-dvSubject^160
-dvDescription^150
-dvAffiliation^140
-title^130
-subject^120
-keyword^110
-topicClassValue^100
-dsDescriptionValue^90
-authorName^80
-authorAffiliation^70
-publicationCitation^60
-producerName^50
-fileName^40
-fileDescription^30
-variableLabel^20
-variableName^10
-text^1.0
-</str>
     </lst>
     <arr name="last-components">
       <str>spellcheck</str>

From f5f5dac9a7f51b110f961691ba64463f129ad283 Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew.a.dunlap@gmail.com>
Date: Fri, 21 Sep 2018 17:13:10 -0400
Subject: [PATCH 2/7] New boost larger spread #4938

---
 conf/solr/7.3.0/solrconfig.xml | 37 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/conf/solr/7.3.0/solrconfig.xml b/conf/solr/7.3.0/solrconfig.xml
index 0a342ed5157..8c00501947a 100644
--- a/conf/solr/7.3.0/solrconfig.xml
+++ b/conf/solr/7.3.0/solrconfig.xml
@@ -694,25 +694,26 @@
       <str name="echoParams">explicit</str>
       <int name="rows">10</int>
       <str name="defType">edismax</str>
+      <float name="tie">0.1</float>
 <str name="qf">
-dvName^170
-dvSubject^160
-dvDescription^150
-dvAffiliation^140
-title^130
-subject^120
-keyword^110
-topicClassValue^100
-dsDescriptionValue^90
-authorName^80
-authorAffiliation^70
-publicationCitation^60
-producerName^50
-fileName^40
-fileDescription^30
-variableLabel^20
-variableName^10
-text^1.0
+dvName^9500
+dvSubject^8500
+dvAffiliation^7500
+dvDescription^6500
+title^900
+subject^800
+keyword^750
+topicClassValue^700
+authorName^600
+authorAffiliation^600
+dsDescriptionValue^700
+publicationCitation^600
+producerName^550
+fileName^175
+fileDescription^100
+variableLabel^75
+variableName^75
+text^1
 </str>
       <!-- Default search field
          <str name="df">text</str> 

From 4a60546bdbba2bd3b64c6e333e15277eb743ef93 Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew.a.dunlap@gmail.com>
Date: Fri, 21 Sep 2018 17:20:54 -0400
Subject: [PATCH 3/7] Additional boost documentation #4938

---
 doc/sphinx-guides/source/installation/prerequisites.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst
index eda0f293e85..71a285dddc4 100644
--- a/doc/sphinx-guides/source/installation/prerequisites.rst
+++ b/doc/sphinx-guides/source/installation/prerequisites.rst
@@ -212,7 +212,7 @@ You should already have a "dvinstall.zip" file that you downloaded from https://
         cp /tmp/dvinstall/schema.xml /usr/local/solr/solr-7.3.0/server/solr/collection1/conf
         cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-7.3.0/server/solr/collection1/conf
 
-Note: Dataverse has customized Solr to boost results that come from certain indexed elements inside Dataverse, for example results matching on the name of a dataset. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ``<str name="qf">`` element and its contents.
+Note: Dataverse has customized Solr to boost results that come from certain indexed elements inside Dataverse, for example prioritizing results from Dataverses over Datasets. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ``<str name="qf">`` element and its contents. If you have ideas about how this boosting could be improved, feel free to contact us through our Google Group https://groups.google.com/forum/#!forum/dataverse-dev .
 
 Dataverse requires a change to the ``jetty.xml`` file that ships with Solr. Edit ``/usr/local/solr/solr-7.3.0/server/etc/jetty.xml`` , increasing ``requestHeaderSize`` from ``8192`` to ``102400``
 

From d7eef188f7976c2e00112f412d5c8ec519b5ded0 Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew.a.dunlap@gmail.com>
Date: Mon, 1 Oct 2018 19:18:11 -0400
Subject: [PATCH 4/7] Reboosted with extra boost for phrase matching #4938

---
 conf/solr/7.3.0/solrconfig.xml | 107 ++++++++++++++++++++++++++-------
 1 file changed, 86 insertions(+), 21 deletions(-)

diff --git a/conf/solr/7.3.0/solrconfig.xml b/conf/solr/7.3.0/solrconfig.xml
index 8c00501947a..ff0f44f8806 100644
--- a/conf/solr/7.3.0/solrconfig.xml
+++ b/conf/solr/7.3.0/solrconfig.xml
@@ -694,27 +694,92 @@
       <str name="echoParams">explicit</str>
       <int name="rows">10</int>
       <str name="defType">edismax</str>
-      <float name="tie">0.1</float>
-<str name="qf">
-dvName^9500
-dvSubject^8500
-dvAffiliation^7500
-dvDescription^6500
-title^900
-subject^800
-keyword^750
-topicClassValue^700
-authorName^600
-authorAffiliation^600
-dsDescriptionValue^700
-publicationCitation^600
-producerName^550
-fileName^175
-fileDescription^100
-variableLabel^75
-variableName^75
-text^1
-</str>
+      <float name="tie">0.075</float>
+        <str name="qf">
+            dvName^200
+            dvSubject^190
+            dvDescription^180
+            dvAffiliation^170
+            title^130
+            authorName^120
+            subject^120
+            keyword^110
+            topicClassValue^100
+            dsDescriptionValue^90
+            authorAffiliation^80
+            publicationCitation^60
+            producerName^50
+            fileName^40
+            fileDescription^30
+            variableLabel^20
+            variableName^10
+            text^1.0
+        </str>
+        <str name="pf">
+            dvName^100
+            dvSubject^100
+            dvDescription^100
+            dvAffiliation^100
+            title^75
+            subject^75
+            keyword^75
+            topicClassValue^75
+            dsDescriptionValue^75
+            authorName^75
+            authorAffiliation^75
+            publicationCitation^75
+            producerName^75
+            fileName^50
+            fileDescription^50
+            variableLabel^40
+            variableName^40
+        </str>
+        
+
+<!--<str name="qf">
+dvName^170
+dvSubject^160
+dvDescription^150
+dvAffiliation^140
+title^130
+subject^120
+keyword^110
+topicClassValue^100
+dsDescriptionValue^90
+authorName^80
+authorAffiliation^70
+publicationCitation^60
+producerName^50
+fileName^40
+fileDescription^30
+variableLabel^20
+variableName^10
+text^1.0
+</str>-->
+<!--<str name="qf">
+dvName^1
+dvSubject^1
+dvDescription^1
+dvAffiliation^1
+title^1
+subject^1
+keyword^1
+topicClassValue^1
+dsDescriptionValue^1
+authorName^1
+authorAffiliation^1
+publicationCitation^1
+producerName^1
+fileName^1
+fileDescription^1
+variableLabel^1
+variableName^1
+text^1.0
+</str>-->
+
+
+
+
       <!-- Default search field
          <str name="df">text</str> 
         -->

From 81fd45f49f86ebd9a51018a26226e33ca04af54b Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew.a.dunlap@gmail.com>
Date: Wed, 3 Oct 2018 13:40:09 -0400
Subject: [PATCH 5/7] Boost non-harvested #4938

---
 conf/solr/7.3.0/solrconfig.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/solr/7.3.0/solrconfig.xml b/conf/solr/7.3.0/solrconfig.xml
index ff0f44f8806..fad1c2158bd 100644
--- a/conf/solr/7.3.0/solrconfig.xml
+++ b/conf/solr/7.3.0/solrconfig.xml
@@ -734,6 +734,10 @@
             variableLabel^40
             variableName^40
         </str>
+        <!-- Even though this number is huge it only seems to apply a boost of ~3x to final result -MAD 4.9.3 -->
+        <str name="bq">
+            isHarvested:false^100000
+        </str>
         
 
 <!--<str name="qf">

From f6252d572cdab87bd1dd83e467955899d7cccc98 Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew.a.dunlap@gmail.com>
Date: Wed, 3 Oct 2018 16:48:01 -0400
Subject: [PATCH 6/7] More boost tweaks #4938

---
 conf/solr/7.3.0/solrconfig.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/conf/solr/7.3.0/solrconfig.xml b/conf/solr/7.3.0/solrconfig.xml
index fad1c2158bd..a7f1221d044 100644
--- a/conf/solr/7.3.0/solrconfig.xml
+++ b/conf/solr/7.3.0/solrconfig.xml
@@ -696,12 +696,12 @@
       <str name="defType">edismax</str>
       <float name="tie">0.075</float>
         <str name="qf">
-            dvName^200
+            dvName^400
+            authorName^180
             dvSubject^190
             dvDescription^180
             dvAffiliation^170
             title^130
-            authorName^120
             subject^120
             keyword^110
             topicClassValue^100
@@ -709,14 +709,15 @@
             authorAffiliation^80
             publicationCitation^60
             producerName^50
-            fileName^40
+            fileName^30
             fileDescription^30
             variableLabel^20
             variableName^10
             text^1.0
         </str>
         <str name="pf">
-            dvName^100
+            dvName^200
+            authorName^100
             dvSubject^100
             dvDescription^100
             dvAffiliation^100
@@ -725,18 +726,13 @@
             keyword^75
             topicClassValue^75
             dsDescriptionValue^75
-            authorName^75
             authorAffiliation^75
             publicationCitation^75
             producerName^75
-            fileName^50
-            fileDescription^50
-            variableLabel^40
-            variableName^40
         </str>
-        <!-- Even though this number is huge it only seems to apply a boost of ~3x to final result -MAD 4.9.3 -->
+        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
         <str name="bq">
-            isHarvested:false^100000
+            isHarvested:false^25000
         </str>
         
 

From f7cf14ecce3c861706132084202de79dee4b10a4 Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew.a.dunlap@gmail.com>
Date: Wed, 3 Oct 2018 17:30:05 -0400
Subject: [PATCH 7/7] Cleanup, update docker solrconfig.xml #4938

---
 conf/docker/solr/solrconfig_master.xml | 65 +++++++++++++++++---------
 conf/docker/solr/solrconfig_slave.xml  | 65 +++++++++++++++++---------
 conf/solr/7.3.0/solrconfig.xml         | 45 ------------------
 3 files changed, 86 insertions(+), 89 deletions(-)

diff --git a/conf/docker/solr/solrconfig_master.xml b/conf/docker/solr/solrconfig_master.xml
index ee348b9d9f7..3c2460fa6fb 100644
--- a/conf/docker/solr/solrconfig_master.xml
+++ b/conf/docker/solr/solrconfig_master.xml
@@ -686,13 +686,55 @@
        of SearchComponents (see below) and supports distributed
        queries across multiple shards
     -->
-  <requestHandler name="/select" class="solr.SearchHandler">
+   <requestHandler name="/select" class="solr.SearchHandler">
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request
       -->
     <lst name="defaults">
       <str name="echoParams">explicit</str>
       <int name="rows">10</int>
+      <str name="defType">edismax</str>
+      <float name="tie">0.075</float>
+        <str name="qf">
+            dvName^400
+            authorName^180
+            dvSubject^190
+            dvDescription^180
+            dvAffiliation^170
+            title^130
+            subject^120
+            keyword^110
+            topicClassValue^100
+            dsDescriptionValue^90
+            authorAffiliation^80
+            publicationCitation^60
+            producerName^50
+            fileName^30
+            fileDescription^30
+            variableLabel^20
+            variableName^10
+            text^1.0
+        </str>
+        <str name="pf">
+            dvName^200
+            authorName^100
+            dvSubject^100
+            dvDescription^100
+            dvAffiliation^100
+            title^75
+            subject^75
+            keyword^75
+            topicClassValue^75
+            dsDescriptionValue^75
+            authorAffiliation^75
+            publicationCitation^75
+            producerName^75
+        </str>
+        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
+        <str name="bq">
+            isHarvested:false^25000
+        </str>
+
       <!-- Default search field
          <str name="df">text</str> 
         -->
@@ -924,27 +966,6 @@
       <str name="spellcheck.collateExtendedResults">true</str>
       <str name="spellcheck.maxCollationTries">10</str>
       <str name="spellcheck.maxCollations">5</str>
-      <str name="defType">edismax</str>
-<str name="qf">
-dvName^170
-dvSubject^160
-dvDescription^150
-dvAffiliation^140
-title^130
-subject^120
-keyword^110
-topicClassValue^100
-dsDescriptionValue^90
-authorName^80
-authorAffiliation^70
-publicationCitation^60
-producerName^50
-fileName^40
-fileDescription^30
-variableLabel^20
-variableName^10
-text^1.0
-</str>
     </lst>
     <arr name="last-components">
       <str>spellcheck</str>
diff --git a/conf/docker/solr/solrconfig_slave.xml b/conf/docker/solr/solrconfig_slave.xml
index ac5e5124efb..ac10cc995a3 100644
--- a/conf/docker/solr/solrconfig_slave.xml
+++ b/conf/docker/solr/solrconfig_slave.xml
@@ -686,13 +686,55 @@
        of SearchComponents (see below) and supports distributed
        queries across multiple shards
     -->
-  <requestHandler name="/select" class="solr.SearchHandler">
+   <requestHandler name="/select" class="solr.SearchHandler">
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request
       -->
     <lst name="defaults">
       <str name="echoParams">explicit</str>
       <int name="rows">10</int>
+      <str name="defType">edismax</str>
+      <float name="tie">0.075</float>
+        <str name="qf">
+            dvName^400
+            authorName^180
+            dvSubject^190
+            dvDescription^180
+            dvAffiliation^170
+            title^130
+            subject^120
+            keyword^110
+            topicClassValue^100
+            dsDescriptionValue^90
+            authorAffiliation^80
+            publicationCitation^60
+            producerName^50
+            fileName^30
+            fileDescription^30
+            variableLabel^20
+            variableName^10
+            text^1.0
+        </str>
+        <str name="pf">
+            dvName^200
+            authorName^100
+            dvSubject^100
+            dvDescription^100
+            dvAffiliation^100
+            title^75
+            subject^75
+            keyword^75
+            topicClassValue^75
+            dsDescriptionValue^75
+            authorAffiliation^75
+            publicationCitation^75
+            producerName^75
+        </str>
+        <!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
+        <str name="bq">
+            isHarvested:false^25000
+        </str>
+
       <!-- Default search field
          <str name="df">text</str> 
         -->
@@ -924,27 +966,6 @@
       <str name="spellcheck.collateExtendedResults">true</str>
       <str name="spellcheck.maxCollationTries">10</str>
       <str name="spellcheck.maxCollations">5</str>
-      <str name="defType">edismax</str>
-<str name="qf">
-dvName^170
-dvSubject^160
-dvDescription^150
-dvAffiliation^140
-title^130
-subject^120
-keyword^110
-topicClassValue^100
-dsDescriptionValue^90
-authorName^80
-authorAffiliation^70
-publicationCitation^60
-producerName^50
-fileName^40
-fileDescription^30
-variableLabel^20
-variableName^10
-text^1.0
-</str>
     </lst>
     <arr name="last-components">
       <str>spellcheck</str>
diff --git a/conf/solr/7.3.0/solrconfig.xml b/conf/solr/7.3.0/solrconfig.xml
index a7f1221d044..161dddca8cb 100644
--- a/conf/solr/7.3.0/solrconfig.xml
+++ b/conf/solr/7.3.0/solrconfig.xml
@@ -734,51 +734,6 @@
         <str name="bq">
             isHarvested:false^25000
         </str>
-        
-
-<!--<str name="qf">
-dvName^170
-dvSubject^160
-dvDescription^150
-dvAffiliation^140
-title^130
-subject^120
-keyword^110
-topicClassValue^100
-dsDescriptionValue^90
-authorName^80
-authorAffiliation^70
-publicationCitation^60
-producerName^50
-fileName^40
-fileDescription^30
-variableLabel^20
-variableName^10
-text^1.0
-</str>-->
-<!--<str name="qf">
-dvName^1
-dvSubject^1
-dvDescription^1
-dvAffiliation^1
-title^1
-subject^1
-keyword^1
-topicClassValue^1
-dsDescriptionValue^1
-authorName^1
-authorAffiliation^1
-publicationCitation^1
-producerName^1
-fileName^1
-fileDescription^1
-variableLabel^1
-variableName^1
-text^1.0
-</str>-->
-
-
-
 
       <!-- Default search field
          <str name="df">text</str>