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

Timestamp:

2023-12-01T10:46:04+13:00 (7 months ago)

Author:

davidb

Message:

Tbl-acknowledgements added in; code fix for per_events

Location:

gs3-installations/computing50/trunk/sites/computing50

Files:

• ConnectProxyServlet/src/main/java/org/greenstone/tabletop/ConnectProxyServlet.java (modified) (2 diffs)
• ConnectProxyServlet/src/main/webapp/WEB-INF/web.xml.in (modified) (1 diff)
• collect/computing-50-tabletop/transform/pages/about.xsl (modified) (1 diff)

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

@@ -235 +235 @@
         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_line2222 = converted_input_line222.replaceAll("<query id=\"tbl-acknowledgements\">","<query>");      
+        String converted_input_line3     = converted_input_line2222.replaceAll("<c/>","<c></c>");
         String converted_input_line_final = converted_input_line3.replaceAll("<c />","<c></c>");
 
@@ -334 +335 @@
             doTableOutput(request,response,"Tbl_EventType");
         }
-        else if (export_filename.equals("Tbl_PerEvents.xml")) {
-            doTableOutput(request,response,"Tbl_PerEvents");
+        else if (export_filename.equals("Tbl_Per_Events.xml")) {
+            doTableOutput(request,response,"Tbl_Per_Events");
+        }
+        else if (export_filename.equals("Tbl_Acknowledgements.xml")) {
+            doTableOutput(request,response,"Tbl_Acknowledgements");
         }
         else {

gs3-installations/computing50/trunk/sites/computing50/ConnectProxyServlet/src/main/webapp/WEB-INF/web.xml.in

@@ -86 +86 @@
                   <param-value>/collection/computing-50-tabletop/page/about/?sa=tabletop&amp;excerptid=tbl-perevents</param-value>
                 </init-param>
+        <init-param>
+          <param-name>Tbl_Acknowledgements</param-name>
+                  <param-value>/collection/computing-50-tabletop/page/about/?sa=tabletop&amp;excerptid=tbl-acknowledgements</param-value>
+                </init-param>
         
 <!--

gs3-installations/computing50/trunk/sites/computing50/collect/computing-50-tabletop/transform/pages/about.xsl

@@ -72 +72 @@
       </query>
     </pre>
+
+
+    <!-- ID, Order, Title, Pictures -->
+
+    <query id="tbl-acknowledgements">
+      <r>
+    <c>1</c>
+    <c>1</c>
+    <c>PARTNERSHIP</c>
+    <c>/greenstone3/library/sites/computing50/collect/computing-50-tabletop/images/greenstone-mua-partnership-logos.png</c>
+      </r>
+    </query>
+
     
     <xsl:apply-templates select="serviceCluster"/>