Changeset 32083 for main

Timestamp:

2017-11-27T12:44:16+13:00 (6 years ago)

Author:

kjdon

Message:

getFacets now includes a lang arg, so we can get teh correct displayName for the facet. when we get a facet back, look for the display name in it.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

@@ -772 +772 @@
         if(does_faceting)
         {
-            ArrayList<FacetWrapper> facets = getFacets(query_result);
+          String lang = request.getAttribute(GSXML.LANG_ATT);
+          ArrayList<FacetWrapper> facets = getFacets(query_result, lang);
             if(facets != null)
             {
@@ -782 +783 @@
                     Element facet_elem = result_doc.createElement(GSXML.FACET_ELEM);
                     facet_elem.setAttribute(GSXML.NAME_ATT, currentFacet.getName());
+                    String display_name = currentFacet.getDisplayName();
+                    if (display_name != null && !display_name.equals("")) {
+                      facet_elem.appendChild(GSXML.createDisplayTextElement(result_doc, GSXML.DISPLAY_TEXT_NAME, display_name));
+                    }
                     facet_list.appendChild(facet_elem);
                     
@@ -824 +829 @@
     
     /** get the list of facets */
-    abstract protected ArrayList<FacetWrapper> getFacets(Object query_result);
+  abstract protected ArrayList<FacetWrapper> getFacets(Object query_result, String lang);
     
     /** get the map of highlighting snippets */