Changeset 38110 for gs3-installations

Timestamp:

2023-09-13T16:19:24+12:00 (9 months ago)

Author:

davidb

Message:

Changes made during testing

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

@@ -182 +182 @@
     throws MalformedURLException, IOException
     {
-    URL dl_url = new URL("http://localhost:8383/greenstone3/library/collection/staff-photos/browse/CL1?sa=tabletop&excerptid=classifiers");
+    URL dl_url = new URL("http://localhost:8383/greenstone3/library/collection/computing-50-tabletop/browse/CL1?sa=tabletop&excerptid=classifiers");
 
     
@@ -257 +257 @@
         if (export_filename.equals("Tbl_People.xml")) {
             doTblPeople(request,response);
-
-            /*
-            export_filename = "Waikato_" + export_filename;
-
+        }
+        else {
+
+            String waikato_export_filename = "Waikato_" + export_filename;
+            File waikato_src_file = new File(__dirname + "/" + waikato_export_filename);
+
+            File srcFile = null;
+            if (waikato_src_file.exists()) {
+            logger.info("Detected Waikato version of: " + export_filename);
+            srcFile = waikato_src_file;
+            }
+            else {
+            srcFile = new File(__dirname + "/" + export_filename);
+            }
+            
             response.setHeader("Content-type", "text/xml");
             response.setCharacterEncoding("UTF-8");
             
-            File srcFile = new File(__dirname + "/" + export_filename);
-            FileUtils.copyFile(srcFile, response.getOutputStream());
-            */
-        }
-        else {
-                    
-            response.setHeader("Content-type", "text/xml");
-            //response.setCharacterEncoding("UTF-8");
-            
-            File srcFile = new File(__dirname + "/" + export_filename);
             FileUtils.copyFile(srcFile, response.getOutputStream());
         }