Changeset 27987

Timestamp:

2013-08-06T16:41:04+12:00 (11 years ago)

Author:

sjm84

Message:

If a file cannot be found in the given interface then check if it is in the base interface

File:

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

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

@@ -1 +1 @@
 package org.greenstone.gsdl3.core;
 
+import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -10 +13 @@
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -19 +23 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -49 +54 @@
     protected static final String ASSOCIATED_FILE_PATH = "/index/assoc/";
     protected static final String COLLECTION_FILE_PATH = "/collect/";
+    protected static final String INTERFACE_PATH = "/interfaces/";
 
     protected static final String SYSTEM_SUBACTION_CONFIGURE = "configure";
@@ -73 +79 @@
 
             String url = hRequest.getRequestURI().toString();
+            System.err.println("URL = " + url);
 
             if (isURLRestricted(url))
@@ -188 +195 @@
                         if (!found)
                         {
+                            return;
+                        }
+                    }
+                }
+            }
+            else if (url.contains(INTERFACE_PATH))
+            {
+                String fileURL = url.replace(request.getServletContext().getContextPath(), "");
+                File requestedFile = new File(request.getServletContext().getRealPath(fileURL));
+                if (!requestedFile.exists())
+                {
+                    int interfaceNameStart = fileURL.indexOf(INTERFACE_PATH) + INTERFACE_PATH.length();
+                    int interfaceNameEnd = fileURL.indexOf("/", interfaceNameStart);
+                    String interfaceName = fileURL.substring(interfaceNameStart, interfaceNameEnd);
+                    String interfacesDir = fileURL.substring(0, interfaceNameStart);
+                    File interfaceConfigFile = new File(request.getServletContext().getRealPath(interfacesDir + interfaceName + "/interfaceConfig.xml"));
+
+                    if (interfaceConfigFile.exists())
+                    {
+                        XMLConverter xmlC = new XMLConverter();
+                        Document interfaceConfigDoc = xmlC.getDOM(interfaceConfigFile);
+
+                        String baseInterface = interfaceConfigDoc.getDocumentElement().getAttribute("baseInterface");
+                        if (baseInterface.length() > 0)
+                        {
+                            File baseInterfaceFile = new File(request.getServletContext().getRealPath(fileURL.replace("/" + interfaceName + "/", "/" + baseInterface + "/")));
+                            if (baseInterfaceFile.exists())
+                            {
+                                ServletOutputStream out = response.getOutputStream();
+                                out.write(Files.readAllBytes(Paths.get(baseInterfaceFile.getAbsolutePath())));
+                            }
                             return;
                         }