Changeset 23839 for main/trunk/greenstone3

Timestamp:

2011-03-30T16:11:40+13:00 (13 years ago)

Author:

sjm84

Message:

Restoring this file back to what it was after an accidental commit

File:

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

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

@@ -287 +287 @@
      boolean allowsClientXSLT = (Boolean)config_params.get(GSConstants.ALLOW_CLIENT_SIDE_XSLT);
      //System.out.println("Client side transforms allowed? " + allowsClientXSLT);
-
-     String currentInterface = (String)config_params.get(GSConstants.INTERFACE_NAME);
      
      // Force it back to traditional
-     if(!allowsClientXSLT && currentInterface.equals("default"))
+     if(!allowsClientXSLT)
         config_params.put(GSConstants.INTERFACE_NAME, "traditional");
     
@@ -297 +295 @@
      String output = request.getAttribute(GSXML.OUTPUT_ATT);    
      
+     String currentInterface = (String)config_params.get(GSConstants.INTERFACE_NAME);
      //System.out.println("Current output mode is: " + output + ", current interface name is: " + currentInterface);
      
@@ -414 +413 @@
       if (collection == null) collection = "";
     }
-
+        
     String xslt_file = getXSLTFileName(action, subaction, collection);
     if (xslt_file==null) {
@@ -420 +419 @@
       return fileNotFoundErrorPage(xslt_file);
     }
-
+        
     Document style_doc = this.converter.getDOM(new File(xslt_file), "UTF-8");
     String errorPage = this.converter.getParseErrorMessage();