Merge tag 'vufind-9.1.1' of github.com:vufind-org/vufind-browse-handl…

…er into tuefind91
ubtue · Mar 5, 2024 · b7de51d · b7de51d
2 parents 752c1ee + a9fc247
commit b7de51d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/browse-handler/java/org/vufind/solr/handler/AuthDB.java b/browse-handler/java/org/vufind/solr/handler/AuthDB.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 
 import org.apache.lucene.document.Document;
+import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
@@ -61,7 +62,7 @@ public Document getAuthorityRecord(String heading)
                                            1));
 
         if (results.totalHits.value > 0) {
-            return searcher.getIndexReader().document(results.scoreDocs[0].doc);
+            return searcher.getIndexReader().storedFields().document(results.scoreDocs[0].doc);
         } else {
             return null;
         }
@@ -77,8 +78,9 @@ public List<Document> getPreferredHeadings(String heading)
 
         List<Document> result = new ArrayList<> ();
 
+        StoredFields storedFields = searcher.getIndexReader().storedFields();
         for (int i = 0; i < results.totalHits.value; i++) {
-            result.add(searcher.getIndexReader().document(results.scoreDocs[i].doc));
+            result.add(storedFields.document(results.scoreDocs[i].doc));
         }
 
         return result;

diff --git a/browse-handler/java/org/vufind/solr/handler/BibDB.java b/browse-handler/java/org/vufind/solr/handler/BibDB.java
@@ -259,7 +259,7 @@ public void collect(int docnum) {
 
                 int docid = docnum + context.docBase;
                 try {
-                    Document doc = db.getIndexReader().document(docid);
+                    Document doc = db.getIndexReader().storedFields().document(docid);
                     for (String bibField : bibExtras) {
                         String[] vals = doc.getValues(bibField);
                         if (vals.length > 0) {
@@ -367,7 +367,7 @@ public void collect(int docnum) {
 
                 int docid = docnum + context.docBase;
                 try {
-                    Document doc = db.getIndexReader().document(docid);
+                    Document doc = db.getIndexReader().storedFields().document(docid);
                     for (String bibField : bibExtras) {
                         for (String v : doc.getValues(bibField)) {
                             bibinfo.get(bibField).add(v);

diff --git a/browse-indexing/PrintBrowseHeadings.java b/browse-indexing/PrintBrowseHeadings.java
@@ -107,8 +107,9 @@ private boolean isLinkedFromBibData(String heading)
             }
         }
 
+        StoredFields storedFields = authSearcher.getIndexReader().storedFields();
         for (int i = 0; i < hits.scoreDocs.length; i++) {
-            Document doc = authSearcher.getIndexReader().document(hits.scoreDocs[i].doc);
+            Document doc = storedFields.document(hits.scoreDocs[i].doc);
 
             String[] preferred = doc.getValues(System.getProperty("field.preferred", "preferred"));
             if (preferred.length > 0) {

diff --git a/browse-indexing/StoredFieldLeech.java b/browse-indexing/StoredFieldLeech.java
@@ -48,7 +48,7 @@ public StoredFieldLeech (String indexPath, String field, String filter) throws E
     private void loadDocument(IndexReader reader, int docid)
     throws Exception
     {
-        Document doc = reader.document(currentDoc, fieldSelection);
+        Document doc = reader.storedFields().document(currentDoc, fieldSelection);
 
         String[] sort_key = doc.getValues (sortField);
         String[] value = doc.getValues (valueField);

diff --git a/build.xml b/build.xml
@@ -45,6 +45,9 @@
     <fileset erroronmissingdir="false" dir="${absolute.vufind.dir}/import/lib">
       <include name="**/*.jar"/>
     </fileset>
+    <fileset erroronmissingdir="false" dir="${absolute.vufind.dir}/import">
+      <include name="solrmarc_core_*.jar"/>
+    </fileset>
     <!-- Needed for building tests that invoke Solr -->
     <fileset erroronmissingdir="false" dir="${absolute.vufind.dir}/solr/vendor/server/lib">
       <include name="**/*.jar"/>

diff --git a/common/java/org/vufind/util/TitleNormalizer.java b/common/java/org/vufind/util/TitleNormalizer.java
@@ -0,0 +1,18 @@
+package org.vufind.util;
+
+import java.util.EnumSet;
+
+import org.solrmarc.index.extractor.formatter.FieldFormatter;
+import org.solrmarc.tools.DataUtil;
+
+public class TitleNormalizer implements Normalizer
+{
+    @Override
+    public byte[] normalize(String s)
+    {
+        EnumSet<FieldFormatter.eCleanVal> cleanValue = DataUtil.getCleanValForParam("titleSortLower");
+        String normalizedTitle = DataUtil.cleanByVal(s, cleanValue);
+        byte[] bytes = normalizedTitle == null ? null : normalizedTitle.getBytes();
+        return bytes;
+    }
+}