Speculative fix for APIX search results incorrectly being exported un…

…-embellished.
libris · Nov 16, 2023 · 10247be · 10247be
1 parent 0e24793
commit 10247be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/apix_server/src/main/java/whelk/apixserver/ApixSearchServlet.java b/apix_server/src/main/java/whelk/apixserver/ApixSearchServlet.java
@@ -27,14 +27,9 @@ public void doGet2(HttpServletRequest request, HttpServletResponse response) thr
     {
         Set<String> resultingIDs = search(request);
 
-        Map<String, Document> resultingDocumentsMap = Utils.s_whelk.bulkLoad(new ArrayList<>(resultingIDs));
-        List<Document> resultingDocuments = new ArrayList<>();
-        for (String key : resultingDocumentsMap.keySet())
-            resultingDocuments.add(resultingDocumentsMap.get(key));
-
         boolean includeHold = request.getParameter("x-holdings") != null && request.getParameter("x-holdings").equalsIgnoreCase("true");
 
-        Utils.send200Response(response, Xml.formatApixSearchResponse(resultingDocuments, includeHold, request.getParameterMap()));
+        Utils.send200Response(response, Xml.formatApixSearchResponse(new ArrayList<>(resultingIDs), includeHold, request.getParameterMap()));
     }
 
     private Set<String> search(HttpServletRequest request)

diff --git a/apix_server/src/main/java/whelk/apixserver/Xml.java b/apix_server/src/main/java/whelk/apixserver/Xml.java
@@ -113,7 +113,7 @@ public static String formatApixGetRecordResponse(String marcXmlString,
         return docToString(xmlDoc);
     }
 
-    public static String formatApixSearchResponse(List<whelk.Document> resultingDocuments,
+    public static String formatApixSearchResponse(List<String> resultingIDs,
                                                   boolean includeHold, Map<String, String[]> parameterMap)
             throws TransformerException, IOException, SAXException
     {
@@ -143,8 +143,9 @@ public static String formatApixSearchResponse(List<whelk.Document> resultingDocu
 
         Element records = xmlDoc.createElement("records");
         result.appendChild(records);
-        for (whelk.Document document : resultingDocuments)
+        for (String id : resultingIDs)
         {
+            whelk.Document document = Utils.s_whelk.loadEmbellished(id);
             Element record = xmlDoc.createElement("record");
             records.appendChild(record);