Changeset 23837 for main

Timestamp:

2011-03-30T16:01:27+13:00 (13 years ago)

Author:

sjm84

Message:

Fixed a mistake in Greenstone3's build.xml file that was preventing non-jni versions of Greenstone3 compiling successfully on Windows

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (1 diff)
• lib/jni/mgpassjni.dll (modified) ( previous)
• lib/jni/mgpppassjni.dll (modified) ( previous)
• src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (4 diffs)

main/trunk/greenstone3/build.xml

@@ -1651 +1651 @@
       <arg value="win32.mak"/>
       <arg value="install"/>
+      <arg value="GSDLHOME=${gs2build.home}"/>
       <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/>
-      <arg value="USE_SQLITE=0"/> <!-- why is this not on by default? -->
+      <arg value="ENABLE_MG=${gs2.windows.enablemg}"/>
+      <arg value="ENABLE_MGPP=${gs2.windows.enablemgpp}"/>
+      <arg value="USE_GDBM=${gs2.windows.usegdbm}"/>
+      <arg value="USE_SQLITE=${gs2.windows.usesqlite}"/>
+      <!--
+      <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/>
+      <arg value="USE_SQLITE=0"/>--> <!-- why is this not on by default? -->
     </exec>
 

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)
+     if(!allowsClientXSLT && currentInterface.equals("default"))
         config_params.put(GSConstants.INTERFACE_NAME, "traditional");
     
@@ -295 +297 @@
      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);
      
@@ -413 +414 @@
       if (collection == null) collection = "";
     }
-        
+
     String xslt_file = getXSLTFileName(action, subaction, collection);
     if (xslt_file==null) {
@@ -419 +420 @@
       return fileNotFoundErrorPage(xslt_file);
     }
-        
+
     Document style_doc = this.converter.getDOM(new File(xslt_file), "UTF-8");
     String errorPage = this.converter.getParseErrorMessage();