Changeset 23837

Show
Ignore:
Timestamp:
30.03.2011 16:01:27 (8 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:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r23809 r23837  
    16511651      <arg value="win32.mak"/> 
    16521652      <arg value="install"/> 
     1653      <arg value="GSDLHOME=${gs2build.home}"/> 
    16531654      <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/> 
    1654       <arg value="USE_SQLITE=0"/> <!-- why is this not on by default? --> 
     1655      <arg value="ENABLE_MG=${gs2.windows.enablemg}"/> 
     1656      <arg value="ENABLE_MGPP=${gs2.windows.enablemgpp}"/> 
     1657      <arg value="USE_GDBM=${gs2.windows.usegdbm}"/> 
     1658      <arg value="USE_SQLITE=${gs2.windows.usesqlite}"/> 
     1659      <!-- 
     1660      <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/> 
     1661      <arg value="USE_SQLITE=0"/>--> <!-- why is this not on by default? --> 
    16551662    </exec> 
    16561663 
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

    r23794 r23837  
    287287     boolean allowsClientXSLT = (Boolean)config_params.get(GSConstants.ALLOW_CLIENT_SIDE_XSLT); 
    288288     //System.out.println("Client side transforms allowed? " + allowsClientXSLT); 
     289 
     290     String currentInterface = (String)config_params.get(GSConstants.INTERFACE_NAME); 
    289291      
    290292     // Force it back to traditional 
    291      if(!allowsClientXSLT) 
     293     if(!allowsClientXSLT && currentInterface.equals("default")) 
    292294        config_params.put(GSConstants.INTERFACE_NAME, "traditional"); 
    293295     
     
    295297     String output = request.getAttribute(GSXML.OUTPUT_ATT);     
    296298      
    297      String currentInterface = (String)config_params.get(GSConstants.INTERFACE_NAME); 
    298299     //System.out.println("Current output mode is: " + output + ", current interface name is: " + currentInterface); 
    299300      
     
    413414      if (collection == null) collection = ""; 
    414415    } 
    415          
     416 
    416417    String xslt_file = getXSLTFileName(action, subaction, collection); 
    417418    if (xslt_file==null) { 
     
    419420      return fileNotFoundErrorPage(xslt_file); 
    420421    } 
    421          
     422 
    422423    Document style_doc = this.converter.getDOM(new File(xslt_file), "UTF-8"); 
    423424    String errorPage = this.converter.getParseErrorMessage();