Merge pull request fcrepo3#4 from adam-vessey/more-parameters

Custom XSLT parameters.
adam-vessey · Dec 11, 2017 · 701400e · 701400e
2 parents b092bda + 193be31
commit 701400e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/FedoraGenericSearch/build.xml b/FedoraGenericSearch/build.xml
@@ -36,7 +36,7 @@
     <property name="javac.source"              value="1.6"/>
     <property name="javac.target"              value="1.6"/>
 
-    <property name="fedoragsearch.version" value="2.8.1"/>
+    <property name="fedoragsearch.version" value="2.9.0"/>
     <property name="fedora.version" value="3.7.1"/>
     <property name="solr.version" value="4.6.1"/>
 

diff --git a/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/server/Config.java b/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/server/Config.java
@@ -713,6 +713,7 @@ private void checkStylesheet(String configPath) {
 			transformer = tfactory.newTransformer(xslt);
 		} catch (TransformerConfigurationException e) {
             errors.append("\n*** Stylesheet "+configPath+" error:\n"+e.toString());
+            return;
 		}
         String testSource = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
         "<emptyTestDocumentRoot/>";

diff --git a/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/server/GTransformer.java b/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/server/GTransformer.java
@@ -14,6 +14,8 @@
 import java.net.URL;
 
 import java.util.Date;
+import java.util.Map;
+import java.util.Properties;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -52,6 +54,7 @@ public class GTransformer {
 
     private static final Logger logger =
         Logger.getLogger(GTransformer.class);
+
     int debuglength = 500;
 
     public GTransformer() {
@@ -175,6 +178,26 @@ public StringBuffer transform(String xsltName, Source sourceStream, URIResolver
             transformer.setParameter((String)params[i], value);
         }
         transformer.setParameter("DATETIME", new Date());
+
+        final Properties customProperties = new Properties();
+        try {
+            final String path = String.format("/%s/%s", (new File(xsltName)).getParent(), "custom_parameters.properties");
+            final InputStream customParameterStream = this.getClass().getResourceAsStream(path); 
+            if (customParameterStream == null) {
+                logger.debug(String.format("The %s file does not exist.", path));
+            }
+            else {
+                customProperties.load(customParameterStream);
+                for (final Map.Entry<Object, Object> i: customProperties.entrySet()) {
+                    final String name = (String) i.getKey();
+                    transformer.setParameter(name, i.getValue());
+                }
+            }
+        }
+        catch (IOException no_load) {
+            logger.debug("Failed to load custom_parameters.properties... It may either not exist or be unreadable.", no_load);
+        }
+
         StreamResult destStream = new StreamResult(new StringWriter());
         try {
             transformer.transform(sourceStream, destStream);

diff --git a/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/server/RESTImpl.java b/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/server/RESTImpl.java
@@ -24,6 +24,7 @@
 import org.apache.log4j.Appender;
 import org.apache.log4j.Logger;
 
+import dk.defxws.fedoragsearch.server.errors.ConfigException;
 import dk.defxws.fedoragsearch.server.errors.GenericSearchException;
 
 /**
@@ -110,12 +111,13 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
               logger.debug("logger appender name="+appender.getName());
     	  }
       }
+      StringBuffer resultXml = new StringBuffer("<resultPage/>");
+      try {
         config = Config.getCurrentConfig();
         if (configName!=null && !"configure".equals(operation)) {
         	// mainly for test purposes
         	config = Config.getConfig(configName);
         }
-        StringBuffer resultXml = new StringBuffer("<resultPage/>");
         repositoryName = request.getParameter(PARAM_REPOSITORYNAME);
         if (repositoryName==null) repositoryName="";
         indexName = request.getParameter(PARAM_INDEXNAME);
@@ -197,9 +199,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
 					resultXml, params,
 					getServletContext().getRealPath("/WEB-INF/classes"));
 		}
-//        if (logger.isDebugEnabled())
-//            logger.debug("after "+restXslt+" result=\n"+resultXml);
-
+        if (logger.isInfoEnabled())
+            logger.info("request="+request.getQueryString()+" timeusedms="+timeusedms);
         if (restXslt.indexOf(CONTENTTYPEHTML)>=0)
             response.setContentType("text/html; charset=UTF-8");
         else
@@ -209,8 +210,9 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
                         response.getOutputStream(), "UTF-8"));
         out.print(resultXml);
         out.close();
-        if (logger.isInfoEnabled())
-            logger.info("request="+request.getQueryString()+" timeusedms="+timeusedms);
+      } catch (ConfigException config_ex) {
+          response.sendError(500, config_ex.getMessage());
+      }
     }
 
     private String gfindObjects(HttpServletRequest request, HttpServletResponse response)