Changeset 38454 for gs3-installations/computing50/trunk/sites

Timestamp:

2023-11-30T15:08:02+13:00 (7 months ago)

Author:

davidb

Message:

Expanded for tbl-perevents

File:

• gs3-installations/computing50/trunk/sites/computing50/ConnectProxyServlet/src/main/java/org/greenstone/tabletop/ConnectProxyServlet.java (modified) (2 diffs)

gs3-installations/computing50/trunk/sites/computing50/ConnectProxyServlet/src/main/java/org/greenstone/tabletop/ConnectProxyServlet.java

@@ -233 +233 @@
         String converted_input_line1 = convertGS3Urls(input_line);
         String converted_input_line2 = converted_input_line1.replaceAll("<query id=\"classifiers\">","<query>");
-        String converted_input_line3 = converted_input_line2.replaceAll("<c/>","<c></c>");
+        String converted_input_line22 = converted_input_line2.replaceAll("<query id=\"tbl-eventtype\">","<query>");     
+        String converted_input_line222 = converted_input_line22.replaceAll("<query id=\"tbl-perevents\">","<query>");       
+        String converted_input_line3    = converted_input_line222.replaceAll("<c/>","<c></c>");
         String converted_input_line_final = converted_input_line3.replaceAll("<c />","<c></c>");
 
@@ -267 +269 @@
         String converted_input_line1 = convertGS3Urls(input_line);
         String converted_input_line2 = converted_input_line1.replaceAll("<query id=\"classifiers\">","<query>");
-        String converted_input_line22 = converted_input_line2.replaceAll("<query id=\"tbl-eventtype\">","<query>");
-        String converted_input_line3 = converted_input_line22.replaceAll("<c/>","<c></c>");
+        String converted_input_line3 = converted_input_line2.replaceAll("<c/>","<c></c>");
         String converted_input_line_final = converted_input_line3.replaceAll("<c />","<c></c>");