Changeset 37098

Timestamp:

2023-01-04T21:04:04+13:00 (16 months ago)

Author:

davidb

Message:

Addition clause/case added in to handle 'excerptid-text' CGI arg

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -343 +343 @@
         // if the user has specified they want only a part of the full page then subdivide it
         boolean subdivide = false;
-        String excerptID = null;
-        String excerptTag = null;
+        String excerptID     = null;
+        String excerptIDText = null;
+        String excerptTag    = null;
         Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+
+        // **** Now that the number of cases handled has risen to 3, the following would be worth refactoring ****
         if (cgi_param_list != null)
         {
@@ -353 +356 @@
                 subdivide = true;
             }
+            if ((excerptIDText = (String) params.get(GSParams.EXCERPT_ID_TEXT)) != null)
+            {
+                subdivide = true;
+            }
             if ((excerptTag = (String) params.get(GSParams.EXCERPT_TAG)) != null)
             {
@@ -361 +368 @@
         if (subdivide)
         {
-            Node subdivided_page = subdivide(transformed_page, excerptID, excerptTag);
+                Node subdivided_page = subdivide(transformed_page, excerptID, excerptIDText, excerptTag);
             if (subdivided_page != null)
             {
@@ -372 +379 @@
     }
 
-    protected Node subdivide(Node transformed_page, String excerptID, String excerptTag)
+        protected Node subdivide(Node transformed_page, String excerptID, String excerptIDText, String excerptTag)
     {
         if (excerptID != null)
@@ -379 +386 @@
             modifyNodesByTagRecursive(selectedElement, "a");
             return selectedElement;
+        }
+        if (excerptIDText != null)
+        {
+            Node selectedElement = getNodeByIdRecursive(transformed_page, excerptIDText);
+
+            String selectedTextString = selectedElement.getTextContent();
+            Document forexcerptid_doc = XMLConverter.newDOM();
+            Node selectedElementChildTextNode = forexcerptid_doc.createTextNode(selectedTextString);
+
+            return selectedElementChildTextNode;
         }
         else if (excerptTag != null)