Changeset 9874

trunk/greenstone3-extensions/gsdl-as/build.xml

-              r8738
+              r9874
 -->
+  <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
+  <taskdef name="list"    classname="org.apache.catalina.ant.ListTask"/>
+  <taskdef name="reload"  classname="org.apache.catalina.ant.ReloadTask"/>
+  <taskdef name="remove"  classname="org.apache.catalina.ant.RemoveTask"/>
+  <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  <taskdef name="list"    classname="org.apache.catalina.ant.ListTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  <taskdef name="reload"  classname="org.apache.catalina.ant.ReloadTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  <taskdef name="remove"  classname="org.apache.catalina.ant.RemoveTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
 …
         <include name="*.jar"/>
     </fileset>
+    <!-- include greenstone files -->
+    <fileset dir="../../lib/java">
+      <include name="*.jar"/>
+    </fileset>
     <!-- Include all elements that Tomcat exposes to applications -->
     <pathelement location="${catalina.home}/common/classes"/>

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/AlertingService.java

r8888	r9874
86	86	String title = "Unknown action";
87	87	String message = "I don't know how to " + action;
88		String details = "The only actions I know are " + Arrays.toString(actions);
	88	String details = "The only actions I know are " + ArrayHelper.toString(actions);
89	89	return showError(context, message, details);
90	90	}

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/EventStore.java

-              r8888
+              r9874
      */
     private String encodeSpecialChars(String string) {
         String encodedString = string.replace("&", "&amp;");
         encodedString = encodedString.replace("<", "&lt;");
         encodedString = encodedString.replace(">", "&gt;");
         encodedString = encodedString.replace("'", "&apos;");
         encodedString = encodedString.replace("\"", "&quot;");
+        String encodedString = string.replaceAll("&", "&amp;");
+        encodedString = encodedString.replaceAll("<", "&lt;");
+        encodedString = encodedString.replaceAll(">", "&gt;");
+        encodedString = encodedString.replaceAll("\'", "&apos;");
+        encodedString = encodedString.replaceAll("\"", "&quot;");
         return encodedString;
+    }

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/GreenstoneCommunicator.java

-              r8874
+              r9874
 import org.w3c.dom.*;
+import org.greenstone.gsdlas.util.ArrayHelper;
 /**
 …
+        }
         System.out.println(Arrays.toString(result));
+    System.out.println(ArrayHelper.toString(result));
         return result;

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/NotificationStore.java

-              r8738
+              r9874
             String key = (String) iter.next();
             String value = (String) event.get(key);
             String encodedValue = value.replace("&", "&amp;");
             encodedValue = encodedValue.replace("<", "&lt;");
             encodedValue = encodedValue.replace(">", "&gt;");
             encodedValue = encodedValue.replace("'", "&apos;");
             encodedValue = encodedValue.replace("\"", "&quot;");
+            String encodedValue = value.replaceAll("&", "&amp;");
+            encodedValue = encodedValue.replaceAll("<", "&lt;");
+            encodedValue = encodedValue.replaceAll(">", "&gt;");
+            encodedValue = encodedValue.replaceAll("\'", "&apos;");
+            encodedValue = encodedValue.replaceAll("\"", "&quot;");
             event.put(key, encodedValue);

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/util/ArrayHelper.java

-              r8775
+              r9874
         return index > -1 && index <= array.length;
+    }
+    static public String toString(String [] array) {
+    StringBuffer buffer = new StringBuffer();
+    buffer.append("[");
+    for (int i=0; i<array.length; i++) {
+        buffer.append((String)array[i]);
+        buffer.append(",");
+    }
+    buffer.append("]");
+    return buffer.toString();
+    }
+}

trunk/greenstone3-extensions/vishnu/README

-              r8412
+              r9874
 If you want to run it standalone:
+The environment variable JAVA_HOME needs to be set.
+You need to have Java 1.4 or higher and Ant installed. The environment variable JAVA_HOME needs to be set.
 You need to have MG installed - this should be the version from Greenstone, and you need the mg.jar file in your CLASSPATH and the libmgjni.so in your LD_LIBRARY_PATH.
 You need the lucene 1.4 or higher jar file in your CLASSPATH.
 Other jar files needed in CLASSPATH: xercesImpl.jar, servlet.jar.
+Other jar files needed in CLASSPATH: xercesImpl.jar, servlet-api.jar.
 These jar files all come as part of the Greenstone download. Some in gsdl3/lib/java, and servlet.jar in gsdl3/comms/jakarta/tomcat/lib (when unpacked).
 Edit the src/vishnu Makefile/winMake.bat and uncomment the prefix for stand-alone vishnu.
+Edit the build.xml file and change the prefix property to be the current directory.
+Then run the following (on both linux or windows)
+make
+make install
+Then run 'ant' (or "ant all').
 …
 We have provided an example configuration for use with Tomcat (version 4.1).
-Set the prefix in the src/vishnu Makefile to be ../.., then the servlet class and jar files will be installed in the correct places.
 The vishnu/web directory is setup to be the context directory for vishnu in Tomcat.
 You need to edit Tomcat's conf/server.xml file, and add in the context for vishnu. Add the following element after the tomcat root context element:

trunk/gsdl3/README.txt

-              r8428
+              r9874
 This is free software, and you are welcome to redistribute it
+|--------|
+| Linux: |
+|--------|
+Installing Greenstone from a binary distribution:
+-------------------------------------------------
+Installing Greenstone from a binary distribution (Linux):
+---------------------------------------------------------
 Download the gsdl3-x.xx-linux executable file, and run it. Follow the instructions given.
 Installing Greenstone from a CVS checkout:
 ------------------------------------------
+Installing Greenstone from a binary distribution (Windows):
+-----------------------------------------------------------
+(cvs co gsdl3) (if not already done)
+cd gsdl3
+./gs3-install.sh
+Download the gsdl3-x.xx-win32.exe executable file, and double click on it.
+Follow the instructions given.
-If you change the source and want to compile it again later, you can run 'make' then 'make install' from this directory.
+If you want to compile the test servlet, (useful is you are unsure whether Tomcat is working properly), go to gsdl3/web/WEB-INF/classes, and run 'javac TestServlet.java'.
+Installing Greenstone from a CVS checkout (Linux and Windows):
+--------------------------------------------------------------
+Greenstone requires Java 1.4.
+Checkout the code:
+cvs -d :pserver:[email protected]:2402/usr/local/global-cvs/gsdl-src co gsdl3
+Build and install:
+Greenstone is built and installed using Ant (Apache's Java based build tool,
+http://ant.apache.org). You will need a Java Development
+Environment (1.4 or higher), and Ant installed to use Greenstone. You can download Ant from http://ant.apache.org/bindownload.cgi.
+In the gsdl3 directory, you can run 'ant' which will give you a help message.
+Running 'ant -projecthelp' gives a list of the targets that you can run - these
+do various things like compile the source code, startup the server etc.
+For a first time install, run 'ant install'.
+The file build.properties contains various parameters that can be set by the user. Please check these settings before running 'ant install'. The install process will ask you if you accept the properties before starting.
+For a  non-interactive version of the install, run
+ant -Dproperties.accepted=yes install
+To log the output in build.log, run
+ant -Dproperties.accepted=yes -logfile build.log install
+Under Linux, Java and C/C++ compilation is carried out. For windows, since Visual Studio is not a standard component, only Java compilation is carried out. Pre-compiled binaries are provided for the C/C++ components (packages and Greenstone 2 style building). If you have Visual Studio installed (version 6), you can run the compile-windows-c++ targets to compile the code locally. (Don't forget to setup the Visual Studio environment first, by running, e.g. C:/Program Files/Microsoft Visual Studio/VC98/Bin/VCVARS32.BAT or equivalent.)
 Running Greenstone:
 -------------------
+Run the script gs3-launch.sh from the gsdl3 directory. This starts up a Tomcat web server and a mysql database server. To shutdown, run gs3-launch.sh -shutdown
+To startup the servers, run 'ant start'. 'ant restart' and 'ant stop' restarts and shuts down the servers. To start or stop just Tomcat or MYSQL, use the start-tomcat, start-mysql, stop-tomcat, stop-mysql targets.
+Using SOAP:
+------------
+On Windows, if you have installed a binary version, you can also start Greenstone by selecting Greenstone 3 Digital Library from the Start menu.
+Greenstone comes setup to use SOAP. SOAP runs as a servlet inside Tomcat, and is disabled by default. To enable it, run
+./gs3-enable-soap.sh
+Then re-launch Greenstone:
+./gs3-launch.sh -shutdown
+./gs3-launch.sh
+Greenstone will be available in a browser at "http://localhost:8080/gsdl3".
+A SOAP server for localsite comes predeployed.
+You should be able to see all localsite's collections through the gateway servlet.
+Using SOAP (Linux and Windows):
+-------------------------------
+Greenstone comes with Apache Axis installed as a webapp in Tomcat.  A SOAP server on localsite is deployed during installation. You should be able to see all localsite's collections through the gateway servlet.
 To set up a SOAP server on a new site, run
+gs3-soap-deploy-site.sh <sitename> <siteURI>
+where the sitename is the directory name of the site, and siteURI is a unique
+identifier for the sites 'web service'.
+ant soap-deploy-site
+This will prompt you for the sitename (the directory name), and the site uri - this should be a unique identifier for the site's web service.
+For a non-interactive version, run
+ant -Daxis.sitename=xxx -Daxis.siteuri=yyy soap-deploy-site
+Building Collections:
+-----------------------
+|----------|
+| Windows: |
+|----------|
+You can build collections using either Greenstone 2 style building, or native Greenstone 3 style.
+Installing Greenstone from a binary distribution:
+-------------------------------------------------
+Greenstone 2:
+Download the gsdl3-x.xx-win32.exe executable file, and double click on it.
+You need to have Perl installed and on your PATH.
+run  'ant gli", or cd to gsdl3/gli and run gli4gs3.sh/bat. This is a graphical tool for building collections.
+To run Greenstone, select Greenstone 3 Digital Library from the Start menu.
+Greenstone 3:
+Installing Greenstone from a CVS checkout:
+------------------------------------------
+In the gsdl3 directory, run: 'source gs3-setup.sh' (linux) or 'gs3-setup' (windows).
+To create a new collection, run 'gs3-mkcol.sh/bat <sitename> <collname>'
+Put documents in the import directory (gsdl3/web/sites/<sitename>/collect/<collname>/import), edit the collection configuration file (gsdl3/web/sites/<sitename>/collect/<collname>/etc/collectionConfig.xml), and run 'gs3-build.sh <sitename> <collname>'
+Rename the building directory to index (in gsdl3/web/sites/<sitename>/collect/<collname>) and reload the collection in Tomcat (?a=s&sa=a&st=collection&sn=<collname>), or restart Tomcat.
+(cvs co gsdl3) (if not already done)
+cd gsdl3
+gs3-install
+See the manual for more details about both styles of collection building.
+To run Greenstone, run
+gs3-launch
+This starts up the Tomcat web server and mysql database server.
+Using SOAP:
+------------
+Greenstone comes setup to use SOAP. SOAP runs as a servlet inside Tomcat, and is disabled by default. To enable it, run
+gs3-enable-soap
+Then shutdown and restart Greenstone.
+A SOAP server for localsite comes predeployed.
+You should be able to see all localsite's collections through the gateway servlet.
+To set up a SOAP server on a new site, run
+gs3-soap-deploy-site <sitename> <siteURI>
+where the sitename is the directory name of the site, and siteURI is a unique
+identifier for the sites 'web service'.
+|--------------|
+| Other notes: |
+|--------------|
+Other Notes:
+---------------
 See gsdl3/docs/manual/manual.pdf for more details about the software and installation etc.
+Under Linux, Tomcat logs output in gsdl3/comms/jakarta/tomcat/logs/catalina.out.
 To prevent Tomcat showing directory listings, edit the gsdl3/comms/jakarta/tomcat/conf/web.xml file and set the value of the "listings" servlet parameter to false.
+ant can't seem to do cvs using authenticated cvs on windows:
+there were some classes missing - www.ibiblio.org/maven/jsch/jars/jsch-0.1.17.jar
+many ssh processes seemed to be started up - all waiting in the background for password??
+So should only use anonymous cvs.

trunk/gsdl3/bin/script/convert_coll_from_gs2.pl

-              r8967
+              r9874
     my $buildwriter = new XML::Writer(OUTPUT => $buildoutput, NEWLINES => 1);
     $buildwriter->startTag('buildConfig', 'xmlns:gsf'=>"http://www.greenstone.org/configformat");
+    $buildwriter->startTag('buildConfig', 'xmlns:gsf'=>"http://www.greenstone.org/greenstone3/schema/ConfigFormat");
     my $colloutput = new IO::File(">$colloutfile");
     my $collwriter = new XML::Writer(OUTPUT => $colloutput, NEWLINES => 1);
     $collwriter->startTag('collectionConfig', 'xmlns:gsf'=>"http://www.greenstone.org/configformat", 'xmlns:xsl'=>'http://www.w3.org/1999/XSL/Transform');
+    $collwriter->startTag('collectionConfig', 'xmlns:gsf'=>"http://www.greenstone.org/greenstone3/schema/ConfigFormat", 'xmlns:xsl'=>'http://www.w3.org/1999/XSL/Transform');
     #output the collection metadata to the collectionConfig file

trunk/gsdl3/build.xml

-              r8424
+              r9874
 <?xml version="1.0"?>
 <!-- ======================================================================
      Oct 11, 2004 1:54:59 AM
      GSDL3 build script for rebuilding gsdl3.jar
+     March 2005
+     GSDL3 build and install script
      schweer
+     kjdon
      ====================================================================== -->
+<project name="gsdl3" default="build">
+    <property name="src" value="src/java"/>
+    <property name="build" value="classes"/>
+    <property name="lib" value="lib/java"/>
+    <property name="weblib" value="web/lib"/>
+    <property name="javadocs" value="docs/javadoc"/>
+    <description>
+        GSDL3 build script for rebuilding gsdl3.jar
+    </description>
+    <target name="init">
+        <tstamp/>
+        <mkdir dir="${build}"/>
+    </target>
+    <target name="build" depends="init" description="build the java code">
+        <javac debug="true" destdir="${build}" extdirs="${lib}:comms/jakarta/tomcat/common/lib/servlet.jar" optimize="false" srcdir="${src}" excludes="org/greenstone/testing/** org/greenstone/applet/** "/>
+    </target>
+    <target name="jar" depends="build" description="re-create gsdl3.jar">
+        <jar destfile="${lib}/gsdl3.jar">
+            <fileset dir="${build}" excludes="org/greenstone/testing/**" />
+            <manifest>
+                <attribute name="Built-By" value="${user.name}" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="install" depends="jar" description="copy gsdl3.jar to where it's supposed to be">
+        <copy file="${lib}/gsdl3.jar" todir="${weblib}"/>
+    </target>
+    <target name="javadocs" depends="init" description="create javadocs">
+        <javadoc author="true" destdir="${javadocs}" extdirs="${lib}" failonerror="true" private="true" source="1.4" sourcepath="${src}" version="true">
+            <packageset dir="${src}" excludes="org/greenstone/testing/** org/greenstone/applet/** org/greenstone/gdbm/**"/>
+        </javadoc>
+    </target>
+<project name="gsdl3" default="usage" basedir=".">
+ <!-- ============ self defined tasks =================== -->
+  <taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpath="${basedir}/lib/java/anttasks.jar"/>
+  <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpath="${basedir}/lib/java/anttasks.jar"/>
+<!-- ===================== Property Definitions =========================== -->
+<!--
+  Each of the following properties are used in the build script.
+  Values for these properties are set by the first place they are
+  defined, from the following list:
+  * Definitions on the "ant" command line (ant -Dfoo=bar compile).
+  * Definitions from a "build.properties" file in the top level
+    source directory of this application.
+  * Definitions from a "build.properties" file in the user's
+    home directory.
+  * Default definitions in this build.xml file.
+  You will note below that property values can be composed based on the
+  contents of previously defined properties.  This is a powerful technique
+  that helps you minimize the number of changes required when your development
+  environment is modified.  Note that property composition is allowed within
+  "build.properties" files as well as in the "build.xml" script.
+-->
+  <property file="build.properties"/>
+  <property file="${user.home}/build.properties"/>
+  <!-- get properties from the environment -->
+  <property environment="env"/>
+  <property name="src.home" value="${basedir}/src/java"/>
+  <property name="build.home" value="${basedir}/build"/>
+  <property name="packages.home" value="${basedir}/packages"/>
+  <property name="javalib" value="${basedir}/lib/java"/>
+  <property name="web.home" value="${basedir}/web"/>
+  <property name="web.lib" value="${web.home}/lib"/>
+  <property name="web.classes" value="${web.home}/WEB-INF/classes"/>
+  <property name="javadocs" value="${basedir}/docs/javadoc"/>
+  <property name="app.name"      value="gsdl3"/>
+  <property name="app.path"      value="/${app.name}"/>
+  <property name="app.version"   value="3.00alpha"/>
+  <property name="catalina.home" value="${basedir}/comms/jakarta/tomcat"/>
+  <property name="os.linux" value="Linux"/> <!-- mac??-->
+  <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows XP, Windows NT,Windows ME"/> <!-- check this!!!-->
+  <condition property="current.os.islinux">
+    <os family="unix"/>
+  </condition>
+  <condition property="current.os.iswindows">
+    <os family="windows"/>
+  </condition>
+  <!-- ============= Base dirs for each package and component ============ -->
+  <property name="applet.home" value="${src.home}/org/greenstone/applet"/>
+  <property name="gsdl3.home" value="${src.home}/org/greenstone/gsdl3"/>
+  <property name="anttasks.home" value="${src.home}/org/greenstone/anttasks"/>
+  <property name="gs2build.home" value="${basedir}/gs2build"/>
+  <property name="gli.home" value="${basedir}/gli"/>
+  <property name="vishnu.home" value="${packages.home}/vishnu"/>
+  <property name="mg.home" value="${packages.home}/mg"/>
+  <property name="mgpp.home" value="${packages.home}/mgpp"/>
+  <property name="mysql.home" value="${packages.home}/mysql"/>
+  <property name="gsdl-as.home" value="${packages.home}/gsdl-as"/>
+<!--  ==================== Compilation Control Options ==================== -->
+<!--
+  These properties control option settings on the Javac compiler when it
+  is invoked using the <javac> task.
+  compile.debug        Should compilation include the debug option?
+  compile.deprecation  Should compilation include the deprecation option?
+  compile.optimize     Should compilation include the optimize option?
+-->
+  <property name="compile.debug"       value="true"/>
+  <property name="compile.deprecation" value="true"/>
+  <property name="compile.optimize"    value="true"/>
+<!--
+  Rather than relying on the CLASSPATH environment variable, Ant includes
+  features that makes it easy to dynamically construct the classpath you
+  need for each compilation.  The example below constructs the compile
+  classpath to include the servlet.jar file, as well as the other components
+  that Tomcat makes available to web applications automatically, plus anything
+  that you explicitly added.
+-->
+  <path id="compile.classpath">
+    <!-- Include all jar files in our lib directory -->
+    <pathelement location="${javalib}"/>
+    <fileset dir="${javalib}">
+      <include name="*.jar"/>
+    </fileset>
+    <!-- Include the resources directory -->
+    <pathelement location="${basedir}/resources/java"/>
+    <pathelement location="${basedir}/resources/dtd"/>
+    <!-- Include the axis jar files -->
+    <fileset dir="${basedir}/comms/soap/axis/lib">
+      <include name="*.jar"/>
+    </fileset>
+    <!-- include the jar files from the packages -->
+    <!-- mg and mgpp get installed into lib/java but they may not be there yet -->
+    <pathelement location="${javalib}/mg.jar"/>
+    <pathelement location="${javalib}/mgpp.jar"/>
+    <pathelement location="${vishnu.home}/build/vishnu.jar"/>
+    <!-- Include all elements that Tomcat exposes to applications -->
+    <pathelement location="${catalina.home}/common/classes"/>
+    <fileset dir="${catalina.home}/common/endorsed">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="${catalina.home}/common/lib">
+      <include name="*.jar"/>
+    </fileset>
+    <pathelement location="${catalina.home}/shared/classes"/>
+    <fileset dir="${catalina.home}/shared/lib">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+  <path id="running.path">
+    <pathelement location="${mysql.home}/bin"/>
+    <pathelement location="${basedir}/bin/script"/>
+    <pathelement location="${basedir}/bin"/>
+    <pathelement location="${basedir}/lib"/>
+    <pathelement path="${env.PATH}"/>
+    <pathelement path="${env.Path}"/>
+  </path>
+  <path id="ld.library.path">
+    <pathelement path="${env.LD_LIBRARY_PATH}"/>
+    <pathelement location="${basedir}/lib"/>
+    <pathelement location="${mysql.home}/lib/mysql"/>
+  </path>
+<!-- ==================== Primary and Global Targets ============================= -->
+  <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
+  <target name="install" depends="accept-properties,init,prepare,cvsupdate,configure,clean,compile,deploy-localsite"
+    description="Install Greenstone 3. Use this when you first checkout the code. Also running this target later on will reinstall Greenstone. Most things will be reset back to their defaults, except for code changes."/>
+  <target name="prepare" depends="init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-collections,prepare-extra"/>
+  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building"
+    description="Do a cvs update for all sources. Doesn't reompile the code."/>
+    <target name="configure" depends="init,configure-tomcat,configure-files,configure-packages,configure-core,configure-gs2building"
+    description="Configure the installation. Includes setting up config files and configuring the C/C++ packages. This is called from install and update. Should be re-run if you change the build.properties file."/>
+  <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building"
+    description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
+  <target name="clean-windows-c++" depends="init,clean-windows-c++-gs2building,clean-windows-c++-packages"
+    description="Remove C++ compiled code for Windows. Requires Microsoft Visual Studio"/>
+  <target name="compile" depends="init,compile-extra,compile-packages,compile-core,compile-gs2building"
+    description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
+  <target name="compile-windows-c++" depends="init,compile-windows-c++-gs2building,compile-windows-c++-packages"
+    description="Compile the C/C++ code for Windows. Requires Microsoft Visual Studio"/>
+  <target name="update" depends="init,update-packages,update-core,update-gs2building"
+    description="Update (thru CVS) all the source (including core, packages and gs2building) and recompile. Similar to install but doesn't reinstall components such as Tomcat and axis."/>
+  <target name="start" depends="init,start-mysql,start-tomcat"
+    description="Startup the (local) Greenstone servers (tomcat,mysql...)" />
+  <target name="stop" depends="init,stop-tomcat,stop-mysql"
+    description="Shutdown the (local) Greenstone servers."/>
+  <target name="restart" description="Shutdown and restart the Greenstone servers" depends="init,stop,start"/>
+<!-- =========== Help targets ===================================  -->
+  <target name="usage" description="Print a help message">
+    <echo message="  Execute 'ant -projecthelp' for a list of targets."/>
+    <echo message="  Execute 'ant -help' for Ant help."/>
+    <echo>To install Greenstone, run 'ant [options] install'.
+There are properties defined in build.properties. The install process will ask you if these properties are set correctly. To avoid this prompt, use the '-Dproperties.accepted=yes' option.
+To log the output, use the '-logfile build.log' option.
+    </echo>
+  </target>
+  <target name="help" depends="usage" description="Print a help message"/>
+  <target name="debug" depends="init" description="Display all the currently used properties">
+    <echoproperties/>
+  </target>
+<!-- ====== initialization and setup targets ================== -->
+  <target name="accept-properties" unless="properties.accepted">
+    <input addproperty="properties.ok" validargs="y,n">The following properties (among others) are being used from a build.properties file found in this directory:
+tomcat.server=${tomcat.server}
+tomcat.port=${tomcat.port}
+tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed)
+gsdl2.installed.path=${gsdl2.installed.path} (this is the location of Greenstone 2 if you have it)
+proxy.host=${proxy.host}
+proxy.port=${proxy.port}
+mysql.installed.path=${mysql.installed.path} (this is the location of mysql if it is already installed)
+mysql.admin.user=${mysql.admin.user}
+mysql.port=${mysql.port}
+If these are not acceptable, please change them and rerun this target. Continue [y/n]?" />
+    </input>
+    <condition property="do.abort">
+      <equals arg1="n" arg2="${properties.ok}"/>
+    </condition>
+    <fail if="do.abort">Build aborted by user. Please change your properties settings and re-run the target</fail>
+  </target>
+  <target name="check-cvsroot">
+    <condition property="cvsroot.notset">
+      <or>
+    <not>
+      <isset property="env.CVSROOT"/>
+    </not>
+    <equals arg1="" arg2="${env.CVSROOT}"/>
+      </or>
+    </condition>
+    <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/>
+  </target>
+  <!-- this sets up some initial properties -->
+  <target name="init">
+    <condition property="java.too.old">
+      <or>
+    <equals arg1="1.1" arg2="${ant.java.version}"/>
+    <equals arg1="1.2" arg2="${ant.java.version}"/>
+    <equals arg1="1.3" arg2="${ant.java.version}"/>
+      </or>
+    </condition>
+    <fail if="java.too.old" message="You need Java 1.4 or greater to run Greenstone 3"/>
+    <available file="${basedir}/packages/mgpp/text" property="mgpp.present"/>
+    <available file="${basedir}/packages/mysql/bin" property="mysql.present"/>
+    <available file="${basedir}/gli" property="gli.present"/>
+    <available file="${basedir}/gs2build" property="gs2build.present"/>
+    <available file="${basedir}/comms/soap/axis" property="axis.present"/>
+    <available file="${basedir}/comms/jakarta/tomcat/webapps/axis" property="axis.installed"/>
+    <condition property="gsdl2.islocal">
+      <or>
+    <not>
+      <isset property="gsdl2.installed.path"/>
+    </not>
+    <equals arg1="" arg2="${gsdl2.installed.path}"/>
+      </or>
+    </condition>
+    <condition property="mysql.islocal">
+      <or>
+    <not>
+      <isset property="mysql.installed.path"/>
+    </not>
+    <equals arg1="" arg2="${mysql.installed.path}"/>
+      </or>
+    </condition>
+    <condition property="tomcat.islocal">
+      <or>
+    <not>
+      <isset property="tomcat.installed.path"/>
+    </not>
+    <equals arg1="" arg2="${tomcat.installed.path}"/>
+      </or>
+    </condition>
+      <echo>tomcat.port:${tomcat.port}, gli.present:${gli.present} gsdlislocal=${gsdl2.islocal} gs2build.present=${gs2build.present} gsdl2.installed.path = ${gsdl2.installed.path}</echo>
+    <condition property="proxy.present">
+      <and>
+    <isset property="proxy.host"/>
+    <not>
+      <equals arg1="" arg2="${proxy.host}"/>
+    </not>
+      </and>
+    </condition>
+  </target>
+  <target name="setup-proxy" depends="init" if="proxy.present">
+    <condition property="ask.user">
+      <or>
+    <equals arg1="" arg2="${proxy.user}"/>
+    <equals arg1="" arg2="${proxy.password}"/>
+      </or>
+    </condition>
+    <getuserandpassword message="Using proxy: ${proxy.host}:${proxy.port}" if="ask.user" username="${proxy.user}"/>
+    <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.user}" proxypassword="${proxy.password}"/>
+  </target>
+ <!-- ========== Miscellaneous Targets ================================ -->
+  <target name="prepare-collections">
+    <property name="collect.dir" value="${basedir}/web/sites/localsite/collect"/>
+    <!-- gs3mgdemo -->
+    <unzip src="${collect.dir}/gs3mgdemo/import.zip"
+      dest="${collect.dir}/gs3mgdemo"/>
+    <unzip src="${collect.dir}/gs3mgdemo/archives.zip"
+      dest="${collect.dir}/gs3mgdemo"/>
+    <unzip src="${collect.dir}/gs3mgdemo/index/index.zip"
+      dest="${collect.dir}/gs3mgdemo/index"/>
+    <!-- gs2mgdemo -->
+    <unzip src="${collect.dir}/gs2mgdemo/import.zip"
+      dest="${collect.dir}/gs2mgdemo"/>
+    <unzip src="${collect.dir}/gs2mgdemo/metadata.zip"
+      dest="${collect.dir}/gs2mgdemo"/>
+    <unzip src="${collect.dir}/gs2mgdemo/index/index.zip"
+      dest="${collect.dir}/gs2mgdemo/index"/>
+    <!-- gs2mgppdemo -->
+    <unzip src="${collect.dir}/gs2mgppdemo/import.zip"
+      dest="${collect.dir}/gs2mgppdemo"/>
+    <unzip src="${collect.dir}/gs2mgppdemo/metadata.zip"
+      dest="${collect.dir}/gs2mgppdemo"/>
+    <unzip src="${collect.dir}/gs2mgppdemo/index/index.zip"
+      dest="${collect.dir}/gs2mgppdemo/index"/>
+    <!-- gberg -->
+    <unzip src="${collect.dir}/gberg/index/index.zip"
+      dest="${collect.dir}/gberg/index"/>
+  </target>
+  <target name="prepare-extra" depends="init">
+    <!--  copy some jar files to web/lib for the phind applet -->
+    <copy file="${catalina.home}/common/endorsed/xml-apis.jar"
+      tofile="${basedir}/web/lib/xml-apis.jar"/>
+    <copy file="${catalina.home}/common/endorsed/xercesImpl.jar"
+      tofile="${basedir}/web/lib/xercesImpl.jar"/>
+  </target>
+  <target name="configure-files" depends="configure-files-gsdl3,configure-files-server"/>
+  <target name="configure-files-gsdl3" depends="init">
+    <filter token="gsdl3home" value="${basedir}"/>
+    <copy file="${basedir}/web/WEB-INF/web.xml.in" tofile="${basedir}/web/WEB-INF/web.xml" filtering="true"/>
+    <copy file="${basedir}/resources/java/SOAPServer.cfg.in" tofile="${basedir}/resources/java/SOAPServer.cfg" filtering="true"/>
+  </target>
+  <target name="configure-files-server" depends="init">
+    <filter token="port" value="${tomcat.port}"/>
+    <filter token="hostname" value="${tomcat.server}"/>
+    <copy file="${basedir}/web/sites/localsite/siteConfig.xml.in" tofile="${basedir}/web/sites/localsite/siteConfig.xml" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/web/sites/gateway/siteConfig.xml.in" tofile="${basedir}/web/sites/gateway/siteConfig.xml" filtering="true" overwrite="true"/>
+  </target>
+   <target name="compile-extra" depends="init">
+    <javac srcdir="${web.home}/WEB-INF/classes"
+      destdir="${web.home}/WEB-INF/classes"
+      debug="${compile.debug}"
+      deprecation="${compile.deprecation}"
+      optimize="${compile.optimize}">
+      <classpath>
+    <path refid="compile.classpath"/>
+      </classpath>
+    </javac>
+  </target>
+<!-- ======================= Tomcat Targets ========================== -->
+  <!-- this target sets up tomcat for the first time, or resets it any subsequent times -->
+  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal">
+    <get src="http://www.greenstone.org/gs3files/jakarta-tomcat-5.5.7.zip"
+      dest="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7.zip"
+      usetimestamp="true"/>
+    <delete dir="${basedir}/comms/jakarta/tomcat.bak"/>
+    <move todir="${basedir}/comms/jakarta/tomcat.bak" failonerror="false">
+      <fileset dir="${basedir}/comms/jakarta/tomcat"/>
+    </move>
+    <unzip src="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7.zip"
+      dest="${basedir}/comms/jakarta"/>
+    <condition property="need.tomcat.compat">
+      <equals arg1="1.4" arg2="${ant.java.version}"/>
+    </condition>
+    <antcall target="prepare-tomcat-compat"/>
+    <move todir="${basedir}/comms/jakarta/tomcat">
+      <fileset dir="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7"/>
+    </move>
+    <!-- make sure we have execute permission for the .sh files -->
+    <chmod dir="${basedir}/comms/jakarta/tomcat/bin" perm="ugo+rx"
+      includes="*.sh"/>
+    <copy file="${basedir}/comms/jakarta/setclasspath.bat"
+      tofile="${basedir}/comms/jakarta/tomcat/bin/setclasspath.bat"
+      overwrite="true"/>
+  </target>
+  <target name="prepare-tomcat-compat" if="need.tomcat.compat">
+    <get src="http://www.greenstone.org/gs3files/jakarta-tomcat-5.5.7-compat.zip"
+      dest="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7-compat.zip"
+      usetimestamp="true"/>
+    <unzip src="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7-compat.zip"
+      dest="${basedir}/comms/jakarta"/>
+  </target>
+  <target name="configure-tomcat" depends="init" if="tomcat.islocal">
+    <!-- re-setup the server.xml file -->
+    <copy file="${basedir}/comms/jakarta/server.xml.in" tofile="${basedir}/comms/jakarta/tomcat/conf/server.xml" overwrite="true">
+      <filterset>
+    <filter token="port" value="${tomcat.port}"/>
+    <filter token="gsdl3home" value="${basedir}"/>
+      </filterset>
+    </copy>
+  </target>
+  <target name="reload" description="Reload web application"
+          depends="init,setup-catalina-ant-tasks">
+    <reload  url="http://kanuka:7070/manager" username="admin" password="admin"
+            path="/gsdl3"/>
+  </target>
+  <target name="start-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal">
+    <property name="tomcat.classpath" refid="compile.classpath"/>
+    <property name="tomcat.path" refid="running.path"/>
+    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
+    <exec executable="${catalina.home}/bin/startup.sh" os="${os.linux}" dir="${catalina.home}/bin" spawn="false">
+      <env key="GSDLOS" value="linux"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+      <env key="PATH" path="${tomcat.path}"/>
+      <env key="CATALINA_OPTS" value="${catalina.opts}"/>
+      <env key="CATALINA_HOME" value="${catalina.home}"/>
+      <env key="CLASSPATH" path="${tomcat.classpath}"/>
+      <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${basedir}/lib:${mysql.home}/lib/mysql"/>
+    </exec>
+    <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true">
+      <env key="GSDLOS" value="windows"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+      <env key="Path" path="${tomcat.path}"/>
+      <env key="PATH" path="${tomcat.path}"/>
+      <env key="CATALINA_OPTS" value="${catalina.opts}"/>
+      <env key="CLASSPATH" path="${tomcat.classpath}"/>
+    </exec>
+    <!-- wait for the server to startup in case other targets need it running -->
+    <waitfor maxwait="5" maxwaitunit="second">
+      <and>
+    <socket server="${tomcat.server}" port="${tomcat.port}"/>
+    <http url="http://${tomcat.server}:${tomcat.port}/gsdl3/index.html"/>
+      </and>
+    </waitfor>
+  </target>
+  <!-- windows: do we want to launch a webrowser?? -->
+  <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
+    <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.linux}" dir="${catalina.home}/bin" spawn="false">
+      <env key="CATALINA_HOME" value="${catalina.home}"/>
+    </exec>
+    <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false"/>
+  </target>
+  <target name="restart-tomcat" description="Shutdown and restart only Tomcat" depends="init,stop-tomcat,start-tomcat"/>
+  <target name="setup-catalina-ant-tasks">
+    <!-- Configure the custom Ant tasks for the Tomcat Manager application -->
+    <taskdef name="deploy"    classname="org.apache.catalina.ant.DeployTask"
+      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="list"      classname="org.apache.catalina.ant.ListTask"
+      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="reload"    classname="org.apache.catalina.ant.ReloadTask"
+      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="resources" classname="org.apache.catalina.ant.ResourcesTask"
+      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="roles"     classname="org.apache.catalina.ant.RolesTask"
+      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="start"     classname="org.apache.catalina.ant.StartTask"
+      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="stop"      classname="org.apache.catalina.ant.StopTask"
+      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+    <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask"
+      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  </target>
+<!-- ======================= Mysql Targets =========================== -->
+  <!-- this is one target that we only want to run once. -->
+  <target name="prepare-mysql" depends="init,init-mysql-vars,install-mysql,start-mysql,setup-mysql,stop-mysql"/>
+  <target name="init-mysql-vars">
+    <condition property="mysql.islocal.linux">
+      <and>
+    <isset property="mysql.islocal"/>
+    <isset property="current.os.islinux"/>
+      </and>
+    </condition>
+    <condition property="mysql.islocal.windows">
+      <and>
+    <isset property="mysql.islocal"/>
+    <isset property="current.os.iswindows"/>
+      </and>
+    </condition>
+   </target>
+ <target name="install-mysql" depends="init,init-mysql-vars,install-mysql-linux,install-mysql-windows"/>
+  <!-- install and set up the database -->
+  <target name="install-mysql-linux" depends="init,init-mysql-vars" if="mysql.islocal.linux" unless="mysql.present">
+    <get src="http://www.greenstone.org/gs3files/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
+      dest="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
+      usetimestamp="true"/>
+    <untar src="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"
+      dest="${packages.home}"
+      compression="gzip"/>
+    <move todir="${packages.home}/mysql">
+      <fileset dir="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686"/>
+    </move>
+    <!-- file permissions are screwed up, so make executables executable -->
+    <chmod file="${mysql.home}/scripts/mysql_install_db" perm="a+x"/>
+    <chmod perm="a+x">
+      <fileset dir="${mysql.home}/bin" />
+    </chmod>
+    <mkdir dir="${mysql.home}/var/"/>
+    <mkdir dir="${mysql.home}/var/log/"/>
+    <chmod file="${mysql.home}/var/" perm="777"/>
+    <chmod file="${mysql.home}/var/log/" perm="777"/>
+    <exec executable="${mysql.home}/scripts/mysql_install_db" dir="${mysql.home}">
+      <arg value="--datadir=./data"/>
+      <arg value="--basedir=."/>
+      <arg value="--user=root"/>
+      <arg value="--force"/>
+    </exec>
+  </target>
+  <target name="install-mysql-windows" depends="init,init-mysql-vars" if="mysql.islocal.windows" unless="mysql.present">
+    <get src="http://www.greenstone.org/gs3files/mysql-noinstall-4.1.11-win32.zip"
+      dest="${packages.home}/mysql-noinstall-4.1.11-win32.zip"
+      usetimestamp="true"/>
+    <!-- can we run the installer?? -->
+    <unzip src="${packages.home}/mysql-noinstall-4.1.11-win32.zip"
+      dest="${packages.home}"/>
+    <move todir="${packages.home}/mysql">
+      <fileset dir="${packages.home}/mysql-4.1.11-win32"/>
+    </move>
+  </target>
+  <!-- is this just linux or both??. also we probably need to do this for external mysql -->
+  <!-- had unless mysql.present -->
+  <target name="setup-mysql" depends="init,init-mysql-vars" if="mysql.islocal">
+    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
+      <arg value="--user=root"/>
+      <arg value="--execute=GRANT SELECT,INSERT,DELETE,UPDATE,DROP,CREATE ON *.* TO gsdl3admin@localhost;"/>
+    </exec>
+    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
+      <arg value="--user=root"/>
+      <arg value="--execute=GRANT SELECT,INSERT,DELETE,UPDATE,DROP,CREATE ON *.* TO gsdl3admin@'%'"/>
+    </exec>
+    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
+      <arg value="--user=root"/>
+      <arg value="--execute=GRANT SELECT ON *.* TO gsdl3reader@localhost;"/>
+    </exec>
+    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
+      <arg value="--user=root"/>
+      <arg value="--execute=create database localsite_gs3mgdemo;"/>
+    </exec>
+    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}"
+      input="${basedir}/web/sites/localsite/collect/gs3mgdemo/mysqldatadump.sql">
+      <arg value="--user=root"/>
+      <arg value="localsite_gs3mgdemo"/>
+    </exec>
+  </target>
+  <target name="start-mysql" depends="init,init-mysql-vars" if="mysql.islocal"
+    description="Startup only mysql">
+    <exec executable="${mysql.home}/bin/mysqld_safe" dir="${mysql.home}"
+      spawn="true" os="${os.linux}">
+      <arg value="--user=root"/>
+      <arg value="--datadir=./data"/>
+      <arg value="--basedir=."/>
+      <arg value="--pid_file=gsdl3.pid"/>
+      <arg value="--socket=/tmp/mysql.sock"/>
+      <arg value="--err-log=./var/log/mysql.log"/>
+    </exec>
+   <exec executable="${mysql.home}/bin/mysqld" dir="${mysql.home}" spawn="true" os="${os.windows}">
+    </exec>
+    <sleep seconds="2"/>
+    <!-- need to test that the server has started up -->
+    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}"
+      failonerror="true" outputproperty="throw.away">
+      <arg value="--user=root"/>
+      <arg value="--execute=show databases;"/>
+    </exec>
+    <echo>MYSQL database server started successfully</echo>
+  </target>
+    <target name="stop-mysql" depends="init" if="mysql.islocal"
+    description="Shutdown only mysql">
+    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
+      failonerror="true" os="${os.linux}">
+      <arg value="--user=root"/>
+      <arg value="--socket=/tmp/mysql.sock"/>
+      <arg value="shutdown"/>
+    </exec>
+    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
+      failonerror="true" os="${os.windows}">
+      <arg value="--user=root"/>
+      <arg value="shutdown"/>
+    </exec>
+    <echo>MYSQL database server shutdown successfully</echo>
+  </target>
+  <target name="restart-mysql" description="Shutdown and restart only mysql" depends="init,stop-mysql,start-mysql"/>
+<!-- ======================= Axis Targets ============================ -->
+  <target name="prepare-axis" depends="init">
+    <mkdir dir="${basedir}/comms/soap"/>
+    <get src="http://www.greenstone.org/gs3files/axis-1_1.zip"
+      dest="${basedir}/comms/soap/axis-1_1.zip"
+      usetimestamp="true"/>
+    <delete dir="${basedir}/comms/soap/axis.bak"/>
+    <move todir="${basedir}/comms/soap/axis.bak"  failonerror="false">
+      <fileset dir="${basedir}/comms/soap/axis"/>
+    </move>
+    <unzip src="${basedir}/comms/soap/axis-1_1.zip"
+      dest="${basedir}/comms/soap/"/>
+    <move todir="${basedir}/comms/soap/axis">
+      <fileset dir="${basedir}/comms/soap/axis-1_1"/>
+    </move>
+    <!-- install the webapp into tomcat -->
+    <copy todir="${basedir}/comms/jakarta/tomcat/webapps/axis">
+      <fileset dir="${basedir}/comms/soap/axis/webapps/axis"/>
+    </copy>
+  </target>
+  <target name="soap-deploy-site" depends="get-sitename,get-siteuri,create-deployment-files,restart-tomcat"
+    description="Deploy a SOAP web service for a local Greenstone site">
+    <java classname="org.apache.axis.client.AdminClient">
+      <classpath refid="compile.classpath"/>
+      <arg value="-p"/>
+      <arg value="${tomcat.port}"/>
+      <arg file="${basedir}/resources/soap/${axis.sitename}.wsdd"/>
+    </java>
+  </target>
+  <target name="soap-undeploy-site" depends="get-sitename"
+    description="Undeploy a SOAP web service for a local Greenstone site">
+    <java classname="org.apache.axis.client.AdminClient">
+      <classpath refid="compile.classpath"/>
+      <arg value="-p"/>
+      <arg value="${tomcat.port}"/>
+      <arg file="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"/>
+    </java>
+  </target>
+  <target name="deploy-localsite" depends="init">
+    <antcall target="start-tomcat"/>
+    <antcall target="soap-deploy-site">
+      <param name="axis.sitename" value="localsite"/>
+      <param name="axis.siteuri" value="localsite"/>
+    </antcall>
+    <antcall target="stop-tomcat"/>
+  </target>
+  <target name="get-sitename" unless="axis.sitename">
+    <input addproperty="axis.sitename" message="What site? (press enter for default:localsite)" defaultvalue="localsite"/>
+  </target>
+  <target name="get-siteuri" depends="get-sitename" unless="axis.siteuri">
+    <input addproperty="axis.siteuri" message="What name do you want the service to have? (press enter for default:${axis.sitename})" defaultvalue="${axis.sitename}"/>
+    <echo>${axis.sitename}, ${axis.siteuri}</echo>
+  </target>
+  <target name="check-deployment-files" depends="get-sitename">
+    <condition property="deploy.exists">
+      <available file="${basedir}/resources/soap/${axis.sitename}.wsdd"/>
+    </condition>
+    <condition property="undeploy.exists">
+      <available file="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"/>
+    </condition>
+    <echo>${axis.sitename}, ${deploy.exists}, ${undeploy.exists}</echo>
+  </target>
+  <target name="create-deployment-files" depends="get-sitename,check-deployment-files"
+    if="axis.sitename" unless="deploy.exists">
+    <filter token="sitename" value="${axis.sitename}"/>
+    <filter token="siteuri" value="${axis.siteuri}"/>
+    <copy file="${basedir}/resources/soap/site.wsdd.template"
+      tofile="${basedir}/resources/soap/${axis.sitename}.wsdd"
+      filtering="true"/>
+     <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template"
+      tofile="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"
+      filtering="true"/>
+    <!-- create the java files and compile them -->
+    <copy file="${gsdl3.home}/SOAPServer.java.in"
+      tofile="${gsdl3.home}/SOAPServer${axis.sitename}.java"
+      filtering="true"/>
+    <javac srcdir="${src.home}"
+      destdir="${build.home}"
+      debug="${compile.debug}"
+      deprecation="${compile.deprecation}"
+      optimize="${compile.optimize}">
+      <classpath refid="compile.classpath"/>
+      <include name="org/greenstone/gsdl3/SOAPServer${axis.sitename}.java" />
+    </javac>
+    <jar destfile="${build.home}/gsdl3.jar">
+      <fileset dir="${build.home}">
+    <include name="org/greenstone/gsdl3/**"/>
+    <exclude name="**/Test.class"/>
+      </fileset>
+      <manifest>
+    <attribute name="Built-By" value="${user.name}" />
+      </manifest>
+    </jar>
+    <copy file="${build.home}/gsdl3.jar" todir="${javalib}"/>
+    <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
+  </target>
+<!-- ====================== Core targets ============================== -->
+<!-- core targets refer to the core gsdl3 java src -->
+  <target name="prepare-core">
+    <!-- just get rid of empty directories-->
+    <cvs command="update -P"/>
+  </target>
+  <target name="configure-core"/>
+  <target name="update-core" depends="init,cvsupdate-core,clean-core,compile-core"
+    description="Update only the Greenstone core" />
+  <target name="cvsupdate-core">
+    <cvs command="update -l"/>
+    <cvs command="update -dP bin comms dist-resources docs interfaces lib resources src web winutil"/>
+  </target>
+  <target name="clean-core"
+    description="Clean only the Greenstone core">
+    <delete dir="${build.home}"/>
+  </target>
+   <target name="compile-core"
+    description="Compile only the Greenstone core">
+    <mkdir dir="${build.home}"/>
+    <javac srcdir="${src.home}"
+      destdir="${build.home}"
+      debug="${compile.debug}"
+      deprecation="${compile.deprecation}"
+      optimize="${compile.optimize}">
+      <classpath>
+    <path refid="compile.classpath"/>
+      </classpath>
+    </javac>
+    <jar destfile="${build.home}/gsdl3.jar">
+      <fileset dir="${build.home}">
+    <include name="org/greenstone/gsdl3/**"/>
+    <exclude name="**/Test.class"/>
+      </fileset>
+      <manifest>
+    <attribute name="Built-By" value="${user.name}" />
+      </manifest>
+    </jar>
+    <copy file="${build.home}/gsdl3.jar" todir="${javalib}"/>
+    <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
+    <mkdir dir="${web.classes}/org/greenstone/gsdl3"/>
+    <copy file="${build.home}/org/greenstone/gsdl3/LibraryServlet.class"
+      todir="${web.classes}/org/greenstone/gsdl3"/>
+    <jar destfile="${build.home}/phind.jar">
+      <fileset dir="${build.home}">
+    <include name="org/greenstone/applet/phind/**"/>
+      </fileset>
+      <manifest>
+    <attribute name="Built-By" value="${user.name}" />
+      </manifest>
+    </jar>
+    <copy file="${build.home}/phind.jar" todir="${javalib}"/>
+    <copy file="${build.home}/phind.jar" todir="${web.lib}"/>
+    <jar destfile="${build.home}/anttasks.jar">
+      <fileset dir="${build.home}">
+    <include name="org/greenstone/anttasks/**"/>
+      </fileset>
+      <manifest>
+    <attribute name="Built-By" value="${user.name}" />
+      </manifest>
+    </jar>
+    <copy file="${build.home}/anttasks.jar" todir="${javalib}"/>
+    <jar destfile="${build.home}/gsdl3test.jar">
+      <fileset dir="${build.home}">
+    <include name="org/greenstone/gsdl3/**/*Test.class"/>
+    <include name="org/greenstone/testing/**"/>
+      </fileset>
+      <manifest>
+    <attribute name="Built-By" value="${user.name}" />
+      </manifest>
+    </jar>
+  </target>
+<!-- ================== Packages targets ================================ -->
+  <!-- these targets refer to the greenstone packages - these need updating
+  less often, so are in  separate targets to the core -->
+  <target name="prepare-packages" depends="init,prepare-mgpp,prepare-windows"/>
+  <target name="prepare-windows" depends="init" if="current.os.iswindows">
+    <!-- need to download precompiled binaries for mg and mgpp -->
+  </target>
+  <target name="prepare-mgpp" depends="check-cvsroot,init" unless="mgpp.present">
+    <cvs command="checkout -P" package="mgpp" dest="${basedir}/packages/"/>
+  </target>
+  <target name="update-packages" depends="init,cvsupdate-packages,configure-packages,clean-packages,compile-packages"
+    description="Update only the packages"/>
+  <target name="cvsupdate-packages">
+    <cvs command="update -dP" dest="${packages.home}"/>
+  </target>
+  <target name="configure-packages" description="Configure only the packages.">
+    <echo>
+      Configuring MG
+    </echo>
+    <exec executable="configure" os="${os.linux}"
+      dir="${mg.home}">
+      <arg value="--prefix=${basedir}"/>
+    </exec>
+    <echo>
+      Configuring MGPP
+    </echo>
+    <exec executable="configure" os="${os.linux}"
+      dir="${mgpp.home}">
+      <arg value="--prefix=${basedir}"/>
+    </exec>
+  </target>
+  <target name="clean-packages"
+    description="Clean only the packages">
+    <!-- mg : just call the make target -->
+    <exec executable="make" os="${os.linux}"
+      dir="${mg.home}">
+      <arg value="clean"/>
+    </exec>
+    <!-- mgpp -->
+    <exec executable="make" os="${os.linux}"
+      dir="${mg.home}">
+      <arg value="clean"/>
+    </exec>
+    <!-- vishnu : just call the ant target -->
+    <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
+      inheritall="false" target="clean"/>
+    <!-- gsdl-as : just call the ant target-->
+    <ant antfile="${gsdl-as.home}/build.xml" dir="${gsdl-as.home}"
+      inheritall="false" target="clean"/>
+  </target>
+  <target name="clean-windows-c++-packages" depends="init" if="current.os.iswindows"
+    description="Clean only the C/C++ packages">
+    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
+      <arg value="clean"/>
+    </exec>
+    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
+      <arg value="clean"/>
+    </exec>
+  </target>
+  <target name="compile-packages"
+    description="Compile only the packages">
+    <echo>Compiling MG</echo>
+    <exec executable="make" os="${os.linux}"
+       dir="${mg.home}">
+    </exec>
+    <exec executable="make" os="${os.linux}"
+      dir="${mg.home}">
+      <arg value="install"/>
+    </exec>
+    <!-- windows: just the java stuff. -->
+    <exec executable="${mg.home}/winMake.bat" os="${os.windows}"
+      dir="${mg.home}">
+      <arg value="compile"/>
+      <arg value="javaonly"/>
+    </exec>
+    <exec executable="${mg.home}/winMake.bat" os="${os.windows}"
+      dir="${mg.home}">
+      <arg value="install"/>
+      <arg value="javaonly"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+    </exec>
+    <!-- mgpp -->
+    <echo>Compiling MGPP</echo>
+    <exec executable="make" os="${os.linux}"
+       dir="${mgpp.home}">
+    </exec>
+    <exec executable="make" os="${os.linux}"
+      dir="${mgpp.home}">
+      <arg value="install"/>
+    </exec>
+    <!-- windows: just the java stuff. -->
+    <exec executable="${mgpp.home}/winMake.bat" os="${os.windows}"
+      dir="${mgpp.home}">
+      <arg value="compile"/>
+      <arg value="javaonly"/>
+    </exec>
+    <exec executable="${mgpp.home}/winMake.bat" os="${os.windows}"
+      dir="${mgpp.home}">
+      <arg value="install"/>
+      <arg value="javaonly"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+    </exec>
+    <!-- vishnu -->
+    <echo>Compiling Vishnu</echo>
+    <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
+      inheritall="false" target="compile"/>
+    <!-- gsdl-as -->
+    <echo>Compiling GSDL-AS</echo>
+    <ant antfile="${gsdl-as.home}/build.xml" dir="${gsdl-as.home}"
+      inheritall="false" target="compile"/>
+  </target>
+  <target name="compile-windows-c++-packages" depends="init" if="current.os.iswindows"
+    description="Compile only the C/C++ packages">
+    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}"/>
+    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
+      <arg value="install"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+    </exec>
+   <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}"/>
+    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
+      <arg value="install"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+    </exec>
+  </target>
+  <!-- ================== gs2building targets ===============-->
+  <target name="update-gs2building" if="gsdl2.islocal"
+    depends="init,cvsupdate-gs2building,configure-gs2building,clean-gs2building,compile-gs2building"
+    description="Update only the Greenstone 2 building components"/>
+  <target name="cvsupdate-gs2building" if="gsdl2.islocal" depends="init">
+    <cvs command="update -dP" dest="${gli.home}"/>
+    <!-- Note: can't do a -d update here cos it will get all of gsdl
+     also, an update doesn't get new files, so we do a checkout instead. -->
+    <cvs command="co gs2build" dest="${basedir}"/>
+    <!-- rename the .gs2build files - we may have gotten changes to the main
+    gsdl versions - make sure they are set back to the gs2build versions -->
+    <antcall target="rename-gs2build-files"/>
+  </target>
+  <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="gsdl2.islocal">
+    <echo>checking out gs2 building stuff</echo>
+  </target>
+  <target name="prepare-gs2build" depends="check-cvsroot,init" if="gsdl2.islocal" unless="gs2build.present">
+    <echo>checking out gs2build</echo>
+    <cvs command="checkout -P" package="gs2build"/>
+    <!-- rename the .gs2build files -->
+    <antcall target="rename-gs2build-files"/>
+    <antcall target="unzip-windows-packages"/>
+    <antcall target="get-windows-binaries"/>
+  </target>
+  <target name="get-windows-binaries" depends="init" if="current.os.iswindows">
+     <cvs command="checkout -P" package="winbin"/>
+     <copy todir="${basedir}/bin">
+       <fileset dir="${basedir}/winbin/bin" includes="mg*.exe"/>
+     </copy>
+     <move todir="${gs2build.home}/bin/windows" failonerror="false">
+      <fileset dir="${basedir}/winbin/bin"/>
+    </move>
+    <delete dir="${basedir}/winbin"/>
+   </target>
+ <target name="unzip-windows-packages" depends="init">
+    <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip"
+    dest="${gs2build.home}/packages/windows/gdbm"/>
+   <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip"
+    dest="${gs2build.home}/packages/windows/crypt"/>
+       <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"
+    dest="${gs2build.home}/packages/windows/expat"/>
+   </target>
+  <target name="rename-gs2build-files" depends="rename-gs2build-files-linux,rename-gs2build-files-windows"/>
+  <target name="rename-gs2build-files-windows" if="current.os.iswindows">
+    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
+   <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>
+   <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/>
+   <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat">
+     <filterset>
+       <filter token="gsdlhome" value="${gs2build.home}"/>
+     </filterset>
+    </copy>
+  </target>
+  <target name="rename-gs2build-files-linux" if="current.os.islinux">
+    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
+    <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/>
+    <chmod file="${gs2build.home}/configure" perm="a+x"/>
+    <copy file="${gs2build-extra.home}/configure.in" tofile="${gs2build.home}/configure.in"/>
+    <copy file="${gs2build-extra.home}/Makefile.in" tofile="${gs2build.home}/Makefile.in"/>
+    <copy file="${gs2build-extra.home}/packages.configure" tofile="${gs2build.home}/packages/configure"/>
+    <chmod file="${gs2build.home}/packages/configure" perm="a+x"/>
+    <copy file="${gs2build-extra.home}/packages.Makefile" tofile="${gs2build.home}/packages/Makefile"/>
+    <copy file="${gs2build-extra.home}/lib.Makefile.in" tofile="${gs2build.home}/lib/Makefile.in"/>
+  </target>
+  <target name="prepare-gli" depends="check-cvsroot,init" if="gsdl2.islocal" unless="gli.present">
+    <echo>checking out gli</echo>
+    <cvs command="checkout -P" package="gli"/>
+  </target>
+  <target name="configure-gs2building" depends="init" if="gsdl2.islocal"
+    description="Configure only the Greenstone 2 building components">
+    <exec executable="${gs2build.home}/configure" os="${os.linux}"
+      dir="${gs2build.home}">
+      <arg value="--prefix=${gs2build.home}"/>
+    </exec>
+  </target>
+  <target name="clean-gs2building" depends="init" if="gsdl2.islocal"
+    description="Clean only the Greenstone 2 building components">
+    <!-- gli -->
+    <property name="gli.home" value="${basedir}/gli"/>
+    <!-- linux -->
+    <exec executable="clean.sh" os="${os.linux}" dir="${gli.home}"
+      resolveExecutable="true"/>
+    <!-- windows -->
+    <exec executable="clean.bat" os="${os.windows}" dir="${gli.home}"
+      resolveExecutable="true"/>
+    <!-- gs2build -->
+    <!--linux:  -->
+    <exec executable="make" os="${os.linux}" dir="${gs2build.home}">
+      <arg value="clean"/>
+    </exec>
+    <!-- windows: -->
+  </target>
+  <target name="clean-windows-c++-gs2building" depends="init" if="current.os.iswindows"
+    description="remove all object files and executables">
+    <!-- run the setup script -->
+    <exec executable="${compile.windows.c++.setup}"/>
+    <exec executable="nmake" dir="${gs2build.home}">
+     <arg value="/f"/>
+     <arg value="win32.mak"/>
+     <arg value="clean"/>
+    </exec>
+  </target>
+  <target name="compile-gs2building" depends="init" if="gsdl2.islocal"
+    description="Compile only the Greenstone 2 building components">
+    <!-- gli -->
+    <property name="gli.home" value="${basedir}/gli"/>
+    <!-- linux -->
+    <exec executable="makegli.sh" os="${os.linux}" dir="${gli.home}"
+      resolveExecutable="true"/>
+    <!-- windows -->
+    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}"
+      resolveExecutable="true"/>
+    <!-- gs2build -->
+    <!--linux: make, make install -->
+    <exec executable="make" os="${os.linux}" dir="${gs2build.home}">
+    </exec>
+    <exec executable="make" os="${os.linux}" dir="${gs2build.home}">
+      <arg value="install"/>
+    </exec>
+  </target>
+    <!-- windows: -->
+   <target name="compile-windows-c++-gs2building" depends="init" if="current.os.iswindows"
+    description="Use this if you want to compile the C++ code for the gs2build package">
+    <!-- run the setup script -->
+    <exec executable="${compile.windows.c++.setup}"/>
+    <exec executable="nmake" dir="${gs2build.home}">
+     <arg value="/f"/>
+     <arg value="win32.mak"/>
+    </exec>
+  </target>
+  <target name="gli" description="Run the Greenstone Librarian Interface" depends="gli-local,gli-external">
+    <echo>Running GLI from Ant means that you don't get to see any of the terminal output. If you have problems with GLI and want to see the output, please run the script gli4gs3.sh/bat from the gsdl3/gli directory.
+    </echo>
+  </target>
+  <target name="gli-local" depends="init" if="gsdl2.islocal">
+    <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux}" dir="${basedir}/gli" spawn="true">
+      <env key="GSDLHOME" path="${basedir}/gs2build"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+    </exec>
+    <exec executable="${basedir}/gli/gli4gs3.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true">
+      <env key="GSDLHOME" value="${basedir}/gs2build"/>
+      <env key="GSDL3HOME" value="${basedir}"/>
+    </exec>
+  </target>
+  <target name="gli-external" depends="init" unless="gsdl2.islocal">
+    <exec executable="${gsdl2.installed.path}/gli/gli4gs3.sh" os="${os.linux}" dir="${gsdl2.installed.path}/gli"/>
+    <exec executable="${gsdl2.installed.path}/gli/gli4gs3.bat" os="${os.windows}" dir="${gsdl2.installed.path}/gli"/>
+  </target>
+<!-- ======================== TESTING Targets ========================= -->
+  <target name="test" description="Run the (incomplete) JUnit test suite "
+    depends="init">
+    <mkdir dir="${basedir}/test"/>
+    <junit printsummary="withOutAndErr"
+      errorproperty="test.failed"
+      failureproperty="test.failed"
+      fork="${junit.fork}">
+      <formatter type="plain"/>
+      <classpath>
+    <pathelement location="${build.home}/gsdl3test.jar"/>
+    <path refid="compile.classpath"/>
+      </classpath>
+      <test name="${testcase}" if="testcase"/>
+      <batchtest todir="${basedir}/test" unless="testcase">
+    <fileset dir="${build.home}"
+      includes="**/*Test.class"
+      />
+      </batchtest>
+    </junit>
+    <echo>
+      *********************************************
+       Test output can be found in directory 'test'
+      *********************************************
+    </echo>
+  </target>
+  <target name="reconfigure-server-settings" depends="init,configure-tomcat,configure-files-server"
+    description="If you have changed any of the Tomcat properties in the build.properties file, run this target to update the Tomcat configuration, and any Greenstone configuration files that specify the server address">
+  </target>
 </project>

trunk/gsdl3/comms/jakarta/server.xml.in

-              r7971
+              r9874
 <!-- Alternate Example-less Configuration File -->
+<!-- Example Server Configuration File -->
 <!-- Note that component elements are nested corresponding to their
      parent-child relationships with each other -->
 …
  -->
+<Server port="8005" shutdown="SHUTDOWN" debug="0">
+  <!-- Uncomment this entry to enable JMX MBeans support -->
+<!--
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
+                debug="0" port="-1" login="admin" password="admin"/>
+-->
+<Server port="8005" shutdown="SHUTDOWN">
+  <!-- Comment these entries out to disable JMX MBeans support used for the
+       administration web application -->
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
+  <!-- Global JNDI resources -->
+  <GlobalNamingResources>
+    <!-- Test entry for demonstration purposes -->
+    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+       description="User database that can be updated and saved"
+           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+          pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
   <!-- A "Service" is a collection of one or more "Connectors" that share
 …
   <!-- Define the Tomcat Stand-Alone Service -->
   <Service name="Tomcat-Standalone">
+  <Service name="Catalina">
     <!-- A "Connector" represents an endpoint by which requests are received
 …
          following the instructions below and uncommenting the second Connector
          entry.  SSL support requires the following steps (see the SSL Config
          HOWTO in the Tomcat 4.0 documentation bundle for more detailed
+         HOWTO in the Tomcat 5 documentation bundle for more detailed
          instructions):
          * Download and install JSSE 1.0.2 or later, and put the JAR files
            into "$JAVA_HOME/jre/lib/ext".
+         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
+           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
          * Execute:
              %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
 …
     <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
+    <Connector className="org.apache.catalina.connector.http.HttpConnector"
+               port="8080" minProcessors="5" maxProcessors="75"
+               enableLookups="true" redirectPort="8443"
+               acceptCount="10" debug="0" connectionTimeout="60000"/>
+    <!-- Note : To disable connection timeouts, set connectionTimeout value
+     to -1 -->
+    <!-- Define an SSL HTTP/1.1 Connector on port 8443 -->
+    <Connector port="@port@"
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" redirectPort="8443" acceptCount="100"
+               connectionTimeout="20000" disableUploadTimeout="true" />
+    <!-- Note : To disable connection timeouts, set connectionTimeout value
+     to 0 -->
+    <!-- Note : To use gzip compression you could set the following properties :
+               compression="on"
+               compressionMinSize="2048"
+               noCompressionUserAgents="gozilla, traviata"
+               compressableMimeType="text/html,text/xml"
+    -->
+    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
     <!--
+    <Connector className="org.apache.catalina.connector.http.HttpConnector"
+               port="8443" minProcessors="5" maxProcessors="75"
+               enableLookups="true"
+           acceptCount="10" debug="0" scheme="https" secure="true">
+      <Factory className="org.apache.catalina.net.SSLServerSocketFactory"
+               clientAuth="false" protocol="TLS"/>
+    </Connector>
+    <Connector port="8443"
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" disableUploadTimeout="true"
+               acceptCount="100" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
     -->
     <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!--
+    <Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
+               port="8009" minProcessors="5" maxProcessors="75"
+               acceptCount="10" debug="0"/>
+    -->
+    <!-- Define a Proxied HTTP/1.1 Connector on port 8081 -->
+    <Connector port="8009"
+               enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
+    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
     <!-- See proxy documentation for more information about using this. -->
     <!--
+    <Connector className="org.apache.catalina.connector.http.HttpConnector"
+               port="8081" minProcessors="5" maxProcessors="75"
+               enableLookups="true"
+               acceptCount="10" debug="0" connectionTimeout="60000"
+               proxyPort="80"/>
+    -->
+    <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8082 -->
+    <!--
+    <Connector className="org.apache.catalina.connector.http10.HttpConnector"
+               port="8082" minProcessors="5" maxProcessors="75"
+               enableLookups="true" redirectPort="8443"
+               acceptCount="10" debug="0"/>
+    <Connector port="8082"
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" acceptCount="100" connectionTimeout="20000"
+               proxyPort="80" disableUploadTimeout="true" />
     -->
 …
          on to the appropriate Host (virtual host). -->
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
+    -->
     <!-- Define the top level container in our container hierarchy -->
     <Engine name="Standalone" defaultHost="localhost" debug="0">
+    <Engine name="Catalina" defaultHost="localhost">
       <!-- The request dumper valve dumps useful debugging information about
 …
            element inside the corresponding <Host> or <Context> entry instead.
            For a similar mechanism that is portable to all Servlet 2.3
+           For a similar mechanism that is portable to all Servlet 2.4
            containers, check out the "RequestDumperFilter" Filter in the
            example application (the source for this filter may be found in
 …
       -->
-      <!-- Global logger unless overridden at lower levels -->
-      <Logger className="org.apache.catalina.logger.FileLogger"
-              prefix="catalina_log." suffix=".txt"
-              timestamp="true"/>
       <!-- Because this Realm is here, an instance will be shared globally -->
+      <!-- This Realm uses the UserDatabase configured in the global JNDI
+           resources under the key "UserDatabase".  Any edits
+           that are performed against this UserDatabase are immediately
+           available for use by the Realm.  -->
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             resourceName="UserDatabase"/>
+      <!-- Comment out the old realm but leave here for now in case we
+           need to go back quickly -->
+      <!--
       <Realm className="org.apache.catalina.realm.MemoryRealm" />
+      -->
       <!-- Replace the above Realm with one of the following to get a Realm
 …
       <!--
       <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
+      <Realm  className="org.apache.catalina.realm.JDBCRealm"
              driverName="org.gjt.mm.mysql.Driver"
           connectionURL="jdbc:mysql://localhost/authority"
 …
       <!--
       <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
+      <Realm  className="org.apache.catalina.realm.JDBCRealm"
              driverName="oracle.jdbc.driver.OracleDriver"
           connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
 …
       <!--
       <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
+      <Realm  className="org.apache.catalina.realm.JDBCRealm"
              driverName="sun.jdbc.odbc.JdbcOdbcDriver"
           connectionURL="jdbc:odbc:CATALINA"
 …
       -->
+      <!-- Define the default virtual host -->
+      <Host name="localhost" debug="0" appBase="webapps"
+       unpackWARs="true" autoDeploy="true">
+      <!-- Define the default virtual host
+           Note: XML Schema validation will not work with Xerces 2.2.
+       -->
+      <Host name="localhost" appBase="webapps"
+       unpackWARs="true" autoDeploy="true"
+       xmlValidation="false" xmlNamespaceAware="false">
+    <!-- GSDL3 Service -->
+    <Context path="/gsdl3" docBase="@gsdl3home@/web" debug="1" reloadable="true"><Resources allowLinking='true'/></Context>
+        <!-- Defines a cluster for this node,
+             By defining this element, means that every manager will be changed.
+             So when running a cluster, only make sure that you have webapps in there
+             that need to be clustered and remove the other ones.
+             A cluster has the following parameters:
+             className = the fully qualified name of the cluster class
+             name = a descriptive name for your cluster, can be anything
+             mcastAddr = the multicast address, has to be the same for all the nodes
+             mcastPort = the multicast port, has to be the same for all the nodes
+             mcastBindAddr = bind the multicast socket to a specific address
+             mcastTTL = the multicast TTL if you want to limit your broadcast
+             mcastSoTimeout = the multicast readtimeout
+             mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
+             mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
+             tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes
+             tcpListenAddress = the listen address (bind address) for TCP cluster request on this host,
+                                in case of multiple ethernet cards.
+                                auto means that address becomes
+                                InetAddress.getLocalHost().getHostAddress()
+             tcpListenPort = the tcp listen port
+             tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
+                                  has a wakup bug in java.nio. Set to 0 for no timeout
+             printToScreen = true means that managers will also print to std.out
+             expireSessionsOnShutdown = true means that
+             useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
+                            false means to replicate the session after each request.
+                            false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager)
+                            <%
+                            HashMap map = (HashMap)session.getAttribute("map");
+                            map.put("key","value");
+                            %>
+             replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
+                               * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
+                               * Synchronous means that the thread that executes the request, is also the
+                               thread the replicates the data to the other nodes, and will not return until all
+                               nodes have received the information.
+                               * Asynchronous means that there is a specific 'sender' thread for each cluster node,
+                               so the request thread will queue the replication request into a "smart" queue,
+                               and then return to the client.
+                               The "smart" queue is a queue where when a session is added to the queue, and the same session
+                               already exists in the queue from a previous request, that session will be replaced
+                               in the queue instead of replicating two requests. This almost never happens, unless there is a
+                               large network delay.
+        -->
+        <!--
+            When configuring for clustering, you also add in a valve to catch all the requests
+            coming in, at the end of the request, the session may or may not be replicated.
+            A session is replicated if and only if all the conditions are met:
+. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
+. a session exists (has been created)
+. the request is not trapped by the "filter" attribute
+            The filter attribute is to filter out requests that could not modify the session,
+            hence we don't replicate the session after the end of this request.
+            The filter is negative, ie, anything you put in the filter, you mean to filter out,
+            ie, no replication will be done on requests that match one of the filters.
+            The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
+            filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
+            ending with .gif and .js are intercepted.
+            The deployer element can be used to deploy apps cluster wide.
+            Currently the deployment only deploys/undeploys to working members in the cluster
+            so no WARs are copied upons startup of a broken node.
+            The deployer watches a directory (watchDir) for WAR files when watchEnabled="true"
+            When a new war file is added the war gets deployed to the local instance,
+            and then deployed to the other instances in the cluster.
+            When a war file is deleted from the watchDir the war is undeployed locally
+            and cluster wide
+        -->
+        <!--
+        <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
+                 managerClassName="org.apache.catalina.cluster.session.DeltaManager"
+                 expireSessionsOnShutdown="false"
+                 useDirtyFlag="true"
+                 notifyListenersOnReplication="true">
+            <Membership
+                className="org.apache.catalina.cluster.mcast.McastService"
+                mcastAddr="228.0.0.4"
+                mcastPort="45564"
+                mcastFrequency="500"
+                mcastDropTime="3000"/>
+            <Receiver
+                className="org.apache.catalina.cluster.tcp.ReplicationListener"
+                tcpListenAddress="auto"
+                tcpListenPort="4001"
+                tcpSelectorTimeout="100"
+                tcpThreadCount="6"/>
+            <Sender
+                className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
+                replicationMode="pooled"
+                ackTimeout="15000"/>
+            <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
+                   filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
+            <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
+                      tempDir="/tmp/war-temp/"
+                      deployDir="/tmp/war-deploy/"
+                      watchDir="/tmp/war-listen/"
+                      watchEnabled="false"/>
+        </Cluster>
+        -->
         <!-- Normally, users must authenticate themselves to each web app
 …
              in this virtual host. -->
         <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn"
+                   debug="0"/>
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
         -->
 …
              (to $CATALINA_HOME) or absolute path to the desired directory.
         -->
+        <!--
         <Valve className="org.apache.catalina.valves.AccessLogValve"
                  directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common"/>
+        <!-- Logger shared by all Contexts related to this virtual host.  By
+             default (when using FileLogger), log files are created in the "logs"
+             directory relative to $CATALINA_HOME.  If you wish, you can specify
+             a different directory with the "directory" attribute.  Specify either a
+             relative (to $CATALINA_HOME) or absolute path to the desired
+             directory.-->
+        <Logger className="org.apache.catalina.logger.FileLogger"
+                 directory="logs"  prefix="localhost_log." suffix=".txt"
+            timestamp="true"/>
+        <!-- Define properties for each web application.  This is only needed
+             if you want to set non-default properties, or have web application
+             document roots in places other than the virtual host's appBase
+             directory.  -->
+        <!-- Tomcat Root Context -->
+        <!--
+          <Context path="" docBase="ROOT" debug="0"/>
+        -->
+    <!-- GSDL3 Service -->
+        <Context path="/gsdl3" docBase="@gsdl3home@/web" debug="1" reloadable="true">
+      <Resources allowLinking='true'/>
+        </Context>
+    <!-- SOAP Service -->
+    <Context path="/soap" docBase="@gsdl3home@/comms/soap/soap/webapps/soap" debug="1" reloadable="true"/>
+                 pattern="common" resolveHosts="false"/>
+        -->
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+             This access log implementation is optimized for maximum performance,
+             but is hardcoded to support only the "common" and "combined" patterns.
+        -->
+        <!--
+        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common" resolveHosts="false"/>
+        -->
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+             This access log implementation is optimized for maximum performance,
+             but is hardcoded to support only the "common" and "combined" patterns.
+             This valve use NIO direct Byte Buffer to asynchornously store the
+             log.
+        -->
+        <!--
+        <Valve className="org.apache.catalina.valves.ByteBufferAccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common" resolveHosts="false"/>
+        -->
       </Host>
 …
   </Service>
-  <!-- The MOD_WEBAPP connector is used to connect Apache 1.3 with Tomcat 4.0
-       as its servlet container. Please read the README.txt file coming with
-       the WebApp Module distribution on how to build it.
-       (Or check out the "jakarta-tomcat-connectors/webapp" CVS repository)
-       To configure the Apache side, you must ensure that you have the
-       "ServerName" and "Port" directives defined in "httpd.conf".  Then,
-       lines like these to the bottom of your "httpd.conf" file:
-         LoadModule webapp_module libexec/mod_webapp.so
-         WebAppConnection warpConnection warp localhost:8008
-         WebAppDeploy examples warpConnection /examples/
-       The next time you restart Apache (after restarting Tomcat, if needed)
-       the connection will be established, and all applications you make
-       visible via "WebAppDeploy" directives can be accessed through Apache.
-  -->
-  <!-- Define an Apache-Connector Service -->
-  <Service name="Tomcat-Apache">
-    <Connector className="org.apache.catalina.connector.warp.WarpConnector"
-     port="8008" minProcessors="5" maxProcessors="75"
-     enableLookups="true"
-     acceptCount="10" debug="0"/>
-    <!-- Replace "localhost" with what your Apache "ServerName" is set to -->
-    <Engine className="org.apache.catalina.connector.warp.WarpEngine"
-     name="Apache" debug="0" appBase="webapps">
-      <!-- Global logger unless overridden at lower levels -->
-      <Logger className="org.apache.catalina.logger.FileLogger"
-              prefix="apache_log." suffix=".txt"
-              timestamp="true"/>
-      <!-- Because this Realm is here, an instance will be shared globally -->
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-    </Engine>
-  </Service>
 </Server>

trunk/gsdl3/docs/manual/manual.tex

-              r9445
+              r9874
 This section covers where to get \gsiii\  from, how to install it and how to run it. The standard method of running \gsiii\  is as a Java servlet. We provide the Tomcat servlet container to run the servlet. Standard web servers may  be able to be configured to provide servlet support, and thereby remove the need to use Tomcat. Please see your web server documentation for this. This documentation assumes that you are using Tomcat. To access \gsiii, Tomcat must be started up, and then it can be accessed via a web browser.
+Ant (Java's XML based build tool) is used for compilation, installation and running Greenstone. The build.xml file is the configuration file for the Greenstone project, and build.properties contains parameters that can be altered by the user.
 \subsection{Get and install \gs\ }
 …
 \subsubsection{Linux}
 Download the latest version of the installer, \gst{gsdl3-x.xx-linux}, and run it in a shell (\gst{./gsdl3-x.xx-linux}). The installation process will prompt you for the installation directory, the name of your computer and what port to run Tomcat on (the defaults being \gst{localhost} and \gst{8080}).  Once \gsiii\  has been installed, you can start the library  by running \gst{.gs3-launch.sh} from the gsdl3 directory, and opening up a browser pointing to \gst{http://localhost:8080/gsdl3} (substituting your chosen name and port if necessary).
+Download the latest version of the installer, \gst{gsdl3-x.xx-linux}, and run it in a shell (\gst{./gsdl3-x.xx-linux}). The installation process will prompt you for the installation directory, the name of your computer and what port to run Tomcat on (defaults are \gst{localhost} and \gst{8080}). Once \gsiii\  has been installed, you can start the library by running \gst{ant start} from the gsdl3 directory, and opening up a browser pointing to \gst{http://localhost:8080/gsdl3} (substituting your chosen name and port if necessary).
 \subsubsection{Windows}
 Download the latest Windows installer, \gst{gsdl3-x.xx-win32.exe}, and double click it to start the installation. You will be prompted for the installation directory, installation type, your computer name and the port number to run Tomcat on (defaults are \gst{localhost} and \gst{8080}). Once \gsiii\  is installed, you can access the library by selecting \gst{Greenstone Digital Library 3} in the Start menu.
+Download the latest Windows installer, \gst{gsdl3-x.xx-win32.exe}, and double click it to start the installation. You will be prompted for the installation directory, installation type, your computer name and the port number to run Tomcat on (defaults are \gst{localhost} and \gst{8080}). Once \gsiii\  is installed, you can access the library by selecting \gst{Greenstone Digital Library 3} in the Start menu (or by running \gst{ant start} in the gsdl3 directory).
 \subsubsection{Accessing the library in a browser}\label{sec:browser-access}
 …
 \subsubsection{Restarting the library}
 The library program (actually Tomcat) can be restarted in Windows by closing the window, and restarting it from the Start menu. In Linux, you need to go to the gsdl3 directory, and run \gst{./gs3-launch.sh -shutdown}, then \gst{./gs3-launch.sh}.
+The library program (actually Tomcat) can be restarted in Windows by closing the window, and restarting it from the Start menu. In Linux, you need to go to the gsdl3 directory, and run \gst{ant restart}.
 …
 \begin{figure}[h]
   \centering
   \includegraphics[width=4in]{pagebanner} %5.8
+  \includegraphics[width=4in]{pagebanner.ps} %5.8
   \caption{A sample collection page banner}
   \label{fig:page-banner}
 …
 To create the director
 Building native \gsiii\  collections is done using the \gst{gs3-build.sh} script, with the \gst{collectionConfig.xml} file controlling how the building is done.  There are a number of considerations in building a collection:  what documents appear in the collection, how they are indexed for searching, which classifications are used for browsing, etc.
+Building native \gsiii\  collections is done using the \gst{gs3-build.sh/bat} script, with the \gst{collectionConfig.xml} file controlling how the building is done.  There are a number of considerations in building a collection:  what documents appear in the collection, how they are indexed for searching, which classifications are used for browsing, etc.
 Firstly, the documents that comprise the collection should be placed in the import subdirectory.  At present, only documents in this directory will appear in the collection. Documents can be organised into sub folders inside the import directory.
 …
 The collectionConfig.xml file controls the all of these options for collection building, and the format is described in Section~\ref{sec:collconfig}.
 To build a collection, place the source documents and optional metadata.xml file(s) in the import directory, place the \gst{collectionConfig.xml} file in the etc directory, and execute \gst{gs3build.sh/bat sitename collectionname}.  The process will run, placing the new indexes in the \gst{building} subdirectory of the collection's directory. You must have mysql running before you start building---running \gst{gs3-launch.sh/bat} will start up the MySQL server as well as tomcat.
+To build a collection, place the source documents and optional metadata.xml file(s) in the import directory, place the \gst{collectionConfig.xml} file in the etc directory, and execute \gst{gs3build.sh/bat sitename collectionname}.  The process will run, placing the new indexes in the \gst{building} subdirectory of the collection's directory. You must have mysql running before you start building---running \gst{ant start} will start up the MySQL server as well as tomcat.
 Once the build process is complete, the building directory should be renamed to index (after deleting or renaming the existing index directory, if any), and Tomcat prompted to reload the collection---either by restarting the server, or by sending an activate collection command to the library servlet.
 …
 \begin{figure}[t]
   \centering
   \includegraphics[width=4in]{newlocal} %5.8
+  \includegraphics[width=4in]{local} %5.8
   \caption{A simple stand-alone site.}
   \label{fig:local}
 …
 \end{figure}
 We have used Apache SOAP for Java. This is run as a servlet in Tomcat. Tomcat in Greenstone comes set up to use SOAP, but it is not enabled. To enable it, run \gst{gs3-enable-soap.sh/bat}. For more details about SOAP in Greenstone, see Appendix~\ref{app:soap}. Debugging soap is described in Appendix~\ref{app:soap-debug}.
+We have used Apache Axis SOAP implementation. This is run as a servlet in Tomcat. Axis is setup during installation of Greenstone. For more details about SOAP in Greenstone, see Appendix~\ref{app:soap}. Debugging soap is described in Appendix~\ref{app:soap-debug}.
 \subsection{Serving a site using soap}
+A script has been created to setup a SOAP server for a site. On Linux, from the gsdl3 directory, run
+\gst{./gs3-soap-deploy-site.sh <sitename> <siteuri>}
+Sitename is the name of the site's directory, e.g. localsite. The siteuri is the identifier that will be used for the SOAP resource, e.g. org.greenstone.localsite. It should be a unique name amongst all the SOAP services that you want to connect to.
+The script  deploys the service for the site specified. A resource file (\gst{sitename.xml}) is created which is used to specify the service. It can be found in \gst{gsdl3/resources/soap}, and is generated from \gst{site.xml.in}.
+A webs service for localsite comes predeployed, but if you want to setup a service for another site, run \gst{ant soap-deploy-site}. This will prompt you for the sitename (its directory name), and a siteuri - a unique identifier for the web service.
+The ant target deploys the service for the site specified. A resource file (\gst{<sitename>.wsdd}) is created which is used to specify the service. It can be found in \gst{gsdl3/resources/soap}, and is generated from \gst{site.wsdd.template}.
 To get siteA to talk to siteB, you need to deploy a SOAP server on siteB, then add a \gst{<site>} element to the \gst{<siteList>} of siteA's \gst{siteConfig.xml} file (in \gst{gsdl3/web/sites/siteA/siteConfig.xml}).
 …
 \begin{gsc}\begin{verbatim}
 <site name="siteAuri"
   address="http://localhost:8080/soap/servlet/rpcrouter"
+  address="http://localhost:8080/axis/services/siteAuri"
   type="soap"/>
 \end{verbatim}\end{gsc}
 …
 \gsiii\  is also available via CVS. You can download the latest version of the code. This is not guaranteed to be stable, in fact it is likely to be unstable. The advantage of using CVS is that you can update the code and get the latest fixes.
 Note that you will need the Java 2 SDK, version 1.4.0 or higher.
+Note that you will need the Java 2 SDK, version 1.4.0 or higher, and Ant (Apache's Java based build tool, http://ant.apache.org) installed.
 To check out the \gs\  code, use:
 …
 If you need it, the password for anonymous CVS access is \gst{anonymous}. Note that some older versions of CVS have trouble accessing this repository due to the port number being present. We are using version 1.11.1p1.
+The software needs to be compiled and installed. The installation procedure uses a shell script or batch file. The most up to date instructions may be found in the README.txt file in the top level gsdl3 directory.
+To install Greenstone once you have checked it out of CVS, do the following (alternatives for Linux or Windows):
+Greenstone is built and installed using Ant (Apache's Java based build tool,
+http://ant.apache.org). You will need a Java Development
+Environment (1.4 or higher), and Ant installed to use Greenstone. You can download Ant from http://ant.apache.org/bindownload.cgi.
+In the gsdl3 directory, you can run 'ant' which will give you a help message.
+Running 'ant -projecthelp' gives a list of the targets that you can run - these
+do various things like compile the source code, startup the server etc.
+For a first time install, run 'ant install'.
+The file build.properties contains various parameters that can be set by the user. Please check these settings before running 'ant install'. The install process will ask you if you accept the properties before starting.
+For a  non-interactive version of the install, run
+ant -Dproperties.accepted=yes install
+To log the output in build.log, run
+ant -Dproperties.accepted=yes -logfile build.log install
+Under Linux, Java and C/C++ compilation is carried out. For windows, since Visual Studio is not a standard component, only Java compilation is carried out. Pre-compiled binaries are provided for the C/C++ components (packages and Greenstone 2 style building). If you have Visual Studio installed (version 6), you can run the compile-windows-c++ targets to compile the code locally. (Don't forget to setup the Visual Studio environment first, by running, e.g. C:/Program Files/Microsoft Visual Studio/VC98/Bin/VCVARS32.BAT or equivalent.)
+Note: \gst{gs3-setup} sets the environment variables \gst{CLASSPATH, PATH, JAVA\_HOME} and needs to be done in a shell before doing collection building etc.
+To startup or shutdown the library (includes the Tomcat server and MYSQL server), the commands are (run from the gsdl3 directory):
 \begin{quote}\begin{gsc}
+cd gsdl3\\
+./gs3-install.sh or gs3-install\\
+source gs3-setup.sh or gs3-setup
+ant start \\
+ant stop
 \end{gsc}\end{quote}
+To recompile the code at any stage, you can use
+\begin{quote}\begin{gsc}
+source gs3-setup.sh or gs3-setup\\
+make\\
+make install\\
+\end{gsc}\end{quote}
+Note: \gst{gs3-setup} sets the environment variables \gst{CLASSPATH, PATH, JAVA\_HOME} and needs to be done in a shell before doing collection building etc.
+To startup or shutdown the library (includes the Tomcat server and MYSQL server), the commands are (run from the gsdl3 directory):
+\begin{quote}\begin{gsc}
+./gs3-launch.sh or gs3-launch \\
+./gs3-launch.sh -shutdown or close the window
+\end{gsc}\end{quote}
+If you want to restart only Tomcat, run \gst{ant restart-tomcat}.
 \newpage
 \section{Tomcat}\label{app:tomcat}
 Tomcat is a servlet container. It is used to serve a \gs\  site using a servlet.
+Tomcat is a servlet container, and Greenstone 3 runs as a servlet inside it.
 The file \gst{\gsdlhome/comms/jakarta/tomcat/conf/server.xml} is the Tomcat configuration file. The installation process adds a context for \gsiii\  servlets (\gst{\gsdlhome/web})---this tells Tomcat where to find the web.xml file, and what URL (\gst{/gsdl3}) to give it. Anything inside the context directory is accessible via Tomcat\footnote{can we use .htaccess files to restrict access??}. For example, the index.html file that lives in \gst{\gsdlhome/web} can be accessed through the URL \gst{localhost:8080/gsdl3/index.html}. The demo collection's images can be accessed through \\
 …
+Tomcat runs by default on port 8080---this can be changed in server.xml, in the \begin{quote}\begin{gsc}
+<!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->\\
+<Connector>
+\end{gsc}\end{quote}
+ element.  The siteConfig files also need changing if Tomcat's port is changed: \gst{<httpAddress>} for the site, and \gst{<address>} for a remote site both use this.
+Grenstone sets up Tomcat to run on port 8080 by default. To change this, you can edit the tomcat.port property in build.properties. If you do this before installing Greenstone, then running 'ant install' will use the new port number. If you want to change it later on, shutdown tomcat, run 'ant reconfigure-server-settings', then when you restart tomcat it will use the new port.
 Note: Tomcat must be shutdown and restarted any time you make changes in the following for those changes to take effect:
 …
 \begin{gsc}
 \item \gsdlhome/web/WEB-INF/web.xml
 \item \gsdlhome/comms/jakarta/tomcat-tomcat-4.0.1/conf/server.xml
+\item \gsdlhome/comms/jakarta/tomcat/conf/server.xml
 \end{gsc}
 \item any classes or jar files used by the servlets
 \end{bulletedlist}
 \noindent Note: stdin and stdout for the servlets both go to\\
+\noindent Note: stdin and stdout for the servlets (on linux) both go to\\
 \gst{\gsdlhome/comms/jakarta/tomcat/logs/catalina.out}
 …
 \end{gsc}\end{quote}
+We have set up Tomcat to disallow directory listings for everything in the docBase directory.  To turn this back on, you need to edit Tomcat's default web.xml file (\gst{\$GSDL3HOME/comms/jakarta/tomcat/conf/web.xml}):
+In the default servlet definition, change the 'listings' parameter to true.
+By default, Tomcat allows directory listings. To disable this, change the 'listings' paramter to false in the default servlet definition, in Tomcat's web.xml file (\gst{\$GSDL3HOME/comms/jakarta/tomcat/conf/web.xml}):
 Tomcat uses a Manager to handle HTTP session information. This may be stored between restarts if possible. To use a persistent session handling manager, uncomment the \gst{<Manager>} element in \\
 …
 \section{SOAP}\label{app:soap}
+Grenstone uses Apache SOAP for distributed communications. This runs as a servlet inside Tomcat, and services can be deployed by the servlet. The SOAP servlet comes ready to run, but not enabled. To enable it, run:
+\begin{quote}\begin{gsc}
+gs3-enable-soap.[sh/bat]
+\end{gsc}\end{quote}
+All this does is to rename the SOAP web.xml.disabled file to web.xml.
+The SOAP service for localsite comes pre-deployed. To get the gateway servlet talking to the localsite SOAP server, you need to shutdown and restart Tomcat. You should now see more collections when you run the gateway servlet.
+To deploy a SOAP service for other sites, run
+\begin{quote}\begin{gsc}
+gs3-soap-deploy-site.[sh/bat] <sitename> <siteURI>
+\end{gsc}\end{quote}
+This creates a new SOAPServer class for the site \\(\gst{\$GSDL3HOME/src/java/org/greenstone/gsdl3/SOAPServer<sitename>.java}), creates a resource file for deployment (\gst{\$GSDL3HOME/resources/soap/<sitename>.xml}), and then tries to deploy the service. If the deployment doesn't work, you can run it from the command line like:
+\begin{gsc}\begin{verbatim}
+java org.apache.soap.server.ServiceManagerClient
+  http://localhost:8080/soap/servlet/rpcrouter deploy
+  resources/soap/<sitename>.xml
+\end{verbatim}\end{gsc}
+You can also deploy a service through the website.  If Tomcat is not running, start it up.
+The SOAP servlet can be accessed at \begin{gsc}{\tt http://localhost:8080/soap}\end{gsc}. You should see a welcome page. Click on ``Run the admin client''. This enables you to list, deploy and undeploy SOAP services.
+To deploy the SOAPServer for siteX:
+Click on ``deploy'' and edit the following fields in the deploy form:
+\begin{tabular}{ll}
+ID: & <URI for siteX>\\
+Scope: (choose Session  & Request---new instantiation for each request\\
+  or Application)   &    Session---same instantiation across a session\\
+        &    Application---only uses one instantiation\\
+Methods: &process\\
+Java Provider / Provider Class: & org.greenstone.gsdl3.SOAPServersiteX\\
+\end{tabular}
+Now click the ``deploy'' button at the bottom of the page. If the service has been deployed, it should appear when you click on the left hand ``List'' button.
+Information about deployed services is maintained between Tomcat sessions---you only need to deploy it once.
+Grenstone uses the Apache Axis SOAP implementation for distributed communications. Axis runs as a servlet inside Tomcat, and SOAP web services can be deployed by this Axis servlet. The Greenstone installation process sets up Axis for Tomcat, and predeploys the localsite web service.
+To deploy a SOAP service for other sites, run \gst{ant soap-deploy-site}
+This will prompt you for the sitename (the site's directory name), and a unique URI for the site. It creates a new SOAPServer class for the site \\(\gst{\$GSDL3HOME/src/java/org/greenstone/gsdl3/SOAPServer<sitename>.java}), creates a resource file for deployment (\gst{\$GSDL3HOME/resources/soap/<sitename>.wsdd}), and then tries to deploy the service.
+Information about deployed services is maintained between Tomcat sessions---you only need to deploy something once. To undeploy a site, use \gst{ant undeploy-soap-site}.
+The axis servlet can be accessed at \gst{localhost:8080/axis}.
 \subsection{Debugging SOAP}\label{app:soap-debug}
 If you need to debug the SOAP stuff for some reason, or just want to look at the SOAP messages that are being passed back and forth, use a program called TcpTunnelGui. This intercepts messages coming in to one port, displays them, and passes them to another port.
+If you need to debug the SOAP stuff for some reason, or just want to look at the SOAP messages that are being passed back and forth, you can use the TCP monitor. This intercepts messages coming in to one port, displays them, and passes them to another port.
 To run it, type:
+\begin{quote}\gst{java org.apache.soap.util.net.TcpTunnelGui 8070 localhost 8080}
+\begin{quote}\gst{java -cp <path to gsdl3>/comms/soap/axis/lib/axis.jar \\
+org.apache.axis.utils.tcpmon}
 \end{quote}
+is the port that TcpTunnelGui listens on, and 8080 is the port that it sends the messages onto---the port that Tomcat is using. You need to modify \gs\  to talk to port 8070 when it wants to talk to Tomcat, so that the messages go through TcpTunnelGui. This is specified in the \gst{<site>} element of the gateway site configuration file (\gst{\gsdlhome/web/sites/gateway/siteConfig.xml}).
+\begin{quote}\begin{gsc}\begin{verbatim}
+<site name="org.greenstone.localsite"
+      address="http://localhost:8080/soap/servlet/rpcrouter"
+      type="soap"/>
+\end{verbatim}\end{gsc}\end{quote}
+Note that \gst{http://localhost:8080/soap/servlet/rpcrouter} is the
+address for talking to the Tomcat SOAP servlet services.
+The listen port is the port that you want the monitor to be listening on. It should 'act as' a Listener, with target hostname 127.0.0.1 (localhost), and target port the port that Tomcat is running on (8080). You need to modify the address used to talk to the SOAP service. For example, if you want to monitor traffic between the gateway site and the localsite SOAP server, you will need to edit gateway's siteConfig.xml file and change the port number (in the site element) to whatever you have chosen as the listen port.
 \newpage

trunk/gsdl3/extensions/gsdl-as/build.xml

-              r8738
+              r9874
 -->
+  <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
+  <taskdef name="list"    classname="org.apache.catalina.ant.ListTask"/>
+  <taskdef name="reload"  classname="org.apache.catalina.ant.ReloadTask"/>
+  <taskdef name="remove"  classname="org.apache.catalina.ant.RemoveTask"/>
+  <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  <taskdef name="list"    classname="org.apache.catalina.ant.ListTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  <taskdef name="reload"  classname="org.apache.catalina.ant.ReloadTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  <taskdef name="remove"  classname="org.apache.catalina.ant.RemoveTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
 …
         <include name="*.jar"/>
     </fileset>
+    <!-- include greenstone files -->
+    <fileset dir="../../lib/java">
+      <include name="*.jar"/>
+    </fileset>
     <!-- Include all elements that Tomcat exposes to applications -->
     <pathelement location="${catalina.home}/common/classes"/>

trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/AlertingService.java

r8888	r9874
86	86	String title = "Unknown action";
87	87	String message = "I don't know how to " + action;
88		String details = "The only actions I know are " + Arrays.toString(actions);
	88	String details = "The only actions I know are " + ArrayHelper.toString(actions);
89	89	return showError(context, message, details);
90	90	}

trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/EventStore.java

-              r8888
+              r9874
      */
     private String encodeSpecialChars(String string) {
         String encodedString = string.replace("&", "&amp;");
         encodedString = encodedString.replace("<", "&lt;");
         encodedString = encodedString.replace(">", "&gt;");
         encodedString = encodedString.replace("'", "&apos;");
         encodedString = encodedString.replace("\"", "&quot;");
+        String encodedString = string.replaceAll("&", "&amp;");
+        encodedString = encodedString.replaceAll("<", "&lt;");
+        encodedString = encodedString.replaceAll(">", "&gt;");
+        encodedString = encodedString.replaceAll("\'", "&apos;");
+        encodedString = encodedString.replaceAll("\"", "&quot;");
         return encodedString;
+    }

trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/GreenstoneCommunicator.java

-              r8874
+              r9874
 import org.w3c.dom.*;
+import org.greenstone.gsdlas.util.ArrayHelper;
 /**
 …
+        }
         System.out.println(Arrays.toString(result));
+    System.out.println(ArrayHelper.toString(result));
         return result;

trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/NotificationStore.java

-              r8738
+              r9874
             String key = (String) iter.next();
             String value = (String) event.get(key);
             String encodedValue = value.replace("&", "&amp;");
             encodedValue = encodedValue.replace("<", "&lt;");
             encodedValue = encodedValue.replace(">", "&gt;");
             encodedValue = encodedValue.replace("'", "&apos;");
             encodedValue = encodedValue.replace("\"", "&quot;");
+            String encodedValue = value.replaceAll("&", "&amp;");
+            encodedValue = encodedValue.replaceAll("<", "&lt;");
+            encodedValue = encodedValue.replaceAll(">", "&gt;");
+            encodedValue = encodedValue.replaceAll("\'", "&apos;");
+            encodedValue = encodedValue.replaceAll("\"", "&quot;");
             event.put(key, encodedValue);

trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/util/ArrayHelper.java

-              r8775
+              r9874
         return index > -1 && index <= array.length;
+    }
+    static public String toString(String [] array) {
+    StringBuffer buffer = new StringBuffer();
+    buffer.append("[");
+    for (int i=0; i<array.length; i++) {
+        buffer.append((String)array[i]);
+        buffer.append(",");
+    }
+    buffer.append("]");
+    return buffer.toString();
+    }
+}

trunk/gsdl3/extensions/vishnu/README

-              r8412
+              r9874
 If you want to run it standalone:
+The environment variable JAVA_HOME needs to be set.
+You need to have Java 1.4 or higher and Ant installed. The environment variable JAVA_HOME needs to be set.
 You need to have MG installed - this should be the version from Greenstone, and you need the mg.jar file in your CLASSPATH and the libmgjni.so in your LD_LIBRARY_PATH.
 You need the lucene 1.4 or higher jar file in your CLASSPATH.
 Other jar files needed in CLASSPATH: xercesImpl.jar, servlet.jar.
+Other jar files needed in CLASSPATH: xercesImpl.jar, servlet-api.jar.
 These jar files all come as part of the Greenstone download. Some in gsdl3/lib/java, and servlet.jar in gsdl3/comms/jakarta/tomcat/lib (when unpacked).
 Edit the src/vishnu Makefile/winMake.bat and uncomment the prefix for stand-alone vishnu.
+Edit the build.xml file and change the prefix property to be the current directory.
+Then run the following (on both linux or windows)
+make
+make install
+Then run 'ant' (or "ant all').
 …
 We have provided an example configuration for use with Tomcat (version 4.1).
-Set the prefix in the src/vishnu Makefile to be ../.., then the servlet class and jar files will be installed in the correct places.
 The vishnu/web directory is setup to be the context directory for vishnu in Tomcat.
 You need to edit Tomcat's conf/server.xml file, and add in the context for vishnu. Add the following element after the tomcat root context element:

trunk/gsdl3/gs3-setup.sh

-              r8067
+              r9874
 export MANPATH
 CLASSPATH=$GSDL3HOME/resources/java:$GSDL3HOME/resources/dtd:$GSDL3HOME/src/java:$GSDL3HOME/comms/jakarta/tomcat/common/lib/servlet.jar:$GSDL3HOME/lib/java
+CLASSPATH=$GSDL3HOME/resources/java:$GSDL3HOME/resources/dtd:$GSDL3HOME/src/java:$GSDL3HOME/comms/jakarta/tomcat/common/lib/servlet-api.jar:$GSDL3HOME/lib/java
 for JARFILE in  $GSDL3HOME/lib/java/*.jar; do
     CLASSPATH=$CLASSPATH:$JARFILE
 done
+for JARFILE in $GSDL3HOME/comms/soap/axis/lib/*.jar; do
+    CLASSPATH=$CLASSPATH:$JARFILE
+done
 export CLASSPATH

trunk/gsdl3/packages/gsdl-as/build.xml

-              r8738
+              r9874
 -->
+  <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
+  <taskdef name="list"    classname="org.apache.catalina.ant.ListTask"/>
+  <taskdef name="reload"  classname="org.apache.catalina.ant.ReloadTask"/>
+  <taskdef name="remove"  classname="org.apache.catalina.ant.RemoveTask"/>
+  <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  <taskdef name="list"    classname="org.apache.catalina.ant.ListTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  <taskdef name="reload"  classname="org.apache.catalina.ant.ReloadTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
+  <taskdef name="remove"  classname="org.apache.catalina.ant.RemoveTask"
+    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
 …
         <include name="*.jar"/>
     </fileset>
+    <!-- include greenstone files -->
+    <fileset dir="../../lib/java">
+      <include name="*.jar"/>
+    </fileset>
     <!-- Include all elements that Tomcat exposes to applications -->
     <pathelement location="${catalina.home}/common/classes"/>

trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/AlertingService.java

r8888	r9874
86	86	String title = "Unknown action";
87	87	String message = "I don't know how to " + action;
88		String details = "The only actions I know are " + Arrays.toString(actions);
	88	String details = "The only actions I know are " + ArrayHelper.toString(actions);
89	89	return showError(context, message, details);
90	90	}

trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/EventStore.java

-              r8888
+              r9874
      */
     private String encodeSpecialChars(String string) {
         String encodedString = string.replace("&", "&amp;");
         encodedString = encodedString.replace("<", "&lt;");
         encodedString = encodedString.replace(">", "&gt;");
         encodedString = encodedString.replace("'", "&apos;");
         encodedString = encodedString.replace("\"", "&quot;");
+        String encodedString = string.replaceAll("&", "&amp;");
+        encodedString = encodedString.replaceAll("<", "&lt;");
+        encodedString = encodedString.replaceAll(">", "&gt;");
+        encodedString = encodedString.replaceAll("\'", "&apos;");
+        encodedString = encodedString.replaceAll("\"", "&quot;");
         return encodedString;
+    }

trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/GreenstoneCommunicator.java

-              r8874
+              r9874
 import org.w3c.dom.*;
+import org.greenstone.gsdlas.util.ArrayHelper;
 /**
 …
+        }
         System.out.println(Arrays.toString(result));
+    System.out.println(ArrayHelper.toString(result));
         return result;

trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/NotificationStore.java

-              r8738
+              r9874
             String key = (String) iter.next();
             String value = (String) event.get(key);
             String encodedValue = value.replace("&", "&amp;");
             encodedValue = encodedValue.replace("<", "&lt;");
             encodedValue = encodedValue.replace(">", "&gt;");
             encodedValue = encodedValue.replace("'", "&apos;");
             encodedValue = encodedValue.replace("\"", "&quot;");
+            String encodedValue = value.replaceAll("&", "&amp;");
+            encodedValue = encodedValue.replaceAll("<", "&lt;");
+            encodedValue = encodedValue.replaceAll(">", "&gt;");
+            encodedValue = encodedValue.replaceAll("\'", "&apos;");
+            encodedValue = encodedValue.replaceAll("\"", "&quot;");
             event.put(key, encodedValue);

trunk/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/util/ArrayHelper.java

-              r8775
+              r9874
         return index > -1 && index <= array.length;
+    }
+    static public String toString(String [] array) {
+    StringBuffer buffer = new StringBuffer();
+    buffer.append("[");
+    for (int i=0; i<array.length; i++) {
+        buffer.append((String)array[i]);
+        buffer.append(",");
+    }
+    buffer.append("]");
+    return buffer.toString();
+    }
+}

trunk/gsdl3/packages/mg/java/org/greenstone/mg/MGQueryResult.java

-              r3794
+              r9874
+    }
+    public boolean isClear() {
+    return (total_num_docs_ == 0 && docs_.isEmpty() && terms_.isEmpty());
+    }
     /** returns the result as a String - useful for printing out results */

trunk/gsdl3/packages/mg/jni/MGWrapperImpl.c

-              r8920
+              r9874
   /* Check that the index was loaded successfully */
+  assert(qd != NULL);
+  if (qd==NULL) {
+    return NULL;
+  }
+  /*assert(qd != NULL);*/
   /* Get the document position and length in the text file */
 …
   jthrowable exc;
+  /* Make sure an index has been specified */
+  index_path = data->queryInfo->index;
+  assert(index_path != NULL);
+  /* Obtain C versions of the two string parameters */
+  base_dir = (*j_env)->GetStringUTFChars(j_env, j_base_dir, NULL);
+  if (base_dir == NULL) {
+    return;
+  }
+  text_path = (*j_env)->GetStringUTFChars(j_env, j_text_path, NULL);
+  if (text_path == NULL) {
+    (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+    return;
+  }
+  /* Load the appropriate index for satisfying this request */
+  qd = loadIndexData((char*) base_dir, (char*) index_path, (char*) text_path);
+  /* The C text strings are no longer needed */
+  (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+  (*j_env)->ReleaseStringUTFChars(j_env, j_text_path, text_path);
+  /* Check that the index was loaded successfully */
+  assert(qd != NULL);
+  /* Remove anything hanging around from last time */
+  FreeQueryDocs(qd);
+  /* First of all, clear the previous result */
   /* The result to write to */
   result_ptr = (*j_env)->GetObjectField(j_env, j_obj, FID_query_result);
 …
     return;
+  }
+  /* Make sure an index has been specified */
+  index_path = data->queryInfo->index;
+  assert(index_path != NULL);
+  /* Obtain C versions of the two string parameters */
+  base_dir = (*j_env)->GetStringUTFChars(j_env, j_base_dir, NULL);
+  if (base_dir == NULL) {
+    return;
+  }
+  text_path = (*j_env)->GetStringUTFChars(j_env, j_text_path, NULL);
+  if (text_path == NULL) {
+    (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+    return;
+  }
+  /* Load the appropriate index for satisfying this request */
+  qd = loadIndexData((char*) base_dir, (char*) index_path, (char*) text_path);
+  /* The C text strings are no longer needed */
+  (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+  (*j_env)->ReleaseStringUTFChars(j_env, j_text_path, text_path);
+  /* Check that the index was loaded successfully */
+  if (qd == NULL) {
+    return;
+  }
+  /*assert(qd != NULL);*/
+  /* Remove anything hanging around from last time */
+  FreeQueryDocs(qd);
   /* Obtain a C version of the query string */

trunk/gsdl3/packages/mg/src/images/WIN32.MAK

-              r3921
+              r9874
 mostlyclean:
+    rm -f *$o _*.c _*.o *._c *._o core core.*
+    if exist *$o del *$o
+    if exist  _*.c del  _*.c
+    if exist _*.o  del  _*.o
+    if exist *._c  del *._c
+    if exist *._o  del *._o
+    if exist core  del  core
+    if exist core.* del  core.*
 clean: mostlyclean
     rm -f $(EXEC)
+    if exist *$e del *$e
 distclean: clean
+    rm -f ansi2knr
+    rm -f Makefile
+    del ansi2knr
 maintainer-clean: distclean
     @echo "This command is intended only for maintainers to use;"

trunk/gsdl3/packages/mg/src/text/win32.mak

r7585	r9874
237	237	clean:
238	238	if exist $o del $o
239		if exist ~~$(EXEC) del $(EXEC)~~
	239	if exist $e del $e
240	240	if exist libmgtextin.lib del libmgtextin.lib
241	241	if exist libmgpass.lib del libmgpass.lib

trunk/gsdl3/packages/mg/winMake.bat

-              r6416
+              r9874
     cd ..\..
+    cd java\org\greenstone\mg
+    call winMake.bat %1
+    cd ..\..\..\..
     cd jni
     %MAKE% %MAKE_OPTIONS% win32.mak %1
 …
 :done

trunk/gsdl3/packages/vishnu/README

-              r8412
+              r9874
 If you want to run it standalone:
+The environment variable JAVA_HOME needs to be set.
+You need to have Java 1.4 or higher and Ant installed. The environment variable JAVA_HOME needs to be set.
 You need to have MG installed - this should be the version from Greenstone, and you need the mg.jar file in your CLASSPATH and the libmgjni.so in your LD_LIBRARY_PATH.
 You need the lucene 1.4 or higher jar file in your CLASSPATH.
 Other jar files needed in CLASSPATH: xercesImpl.jar, servlet.jar.
+Other jar files needed in CLASSPATH: xercesImpl.jar, servlet-api.jar.
 These jar files all come as part of the Greenstone download. Some in gsdl3/lib/java, and servlet.jar in gsdl3/comms/jakarta/tomcat/lib (when unpacked).
 Edit the src/vishnu Makefile/winMake.bat and uncomment the prefix for stand-alone vishnu.
+Edit the build.xml file and change the prefix property to be the current directory.
+Then run the following (on both linux or windows)
+make
+make install
+Then run 'ant' (or "ant all').
 …
 We have provided an example configuration for use with Tomcat (version 4.1).
-Set the prefix in the src/vishnu Makefile to be ../.., then the servlet class and jar files will be installed in the correct places.
 The vishnu/web directory is setup to be the context directory for vishnu in Tomcat.
 You need to edit Tomcat's conf/server.xml file, and add in the context for vishnu. Add the following element after the tomcat root context element:

trunk/gsdl3/src/java/org/greenstone/gsdl3/SOAPServer.java.in

-              r8081
+              r9874
  *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 package org.greenstone.gsdl3;
 import org.greenstone.gsdl3.core.*;
+import org.greenstone.gsdl3.util.GSXML;
 import org.w3c.dom.Element;
 import java.io.File;
 …
+ *
  * @author <a href="mailto:[email protected]">Katherine Don</a>
- * @version $Revision$
  * @see <a href="http://www.w3.org/TR/SOAP/">Simple Object Access Protocol (SOAP) 1.1 </a>
  */
+public class SOAPServer
+    implements ModuleInterface {
+public class SOAPServerlocalsite
+{
     private String config_file_name = "SOAPServer.cfg";
 …
   /** The no-args constructor */
     public SOAPServer() {
+    public SOAPServer@sitename@() {
     // find out gsdl3home
     URL url = ClassLoader.getSystemResource(config_file_name);
 …
         return;
+    }
     String site_home=gsdl3_home+File.separator+"web"+File.separator+"sites"+File.separator+"@sitename@";
+    String site_home=gsdl3_home+File.separator+"web"+File.separator+"sites"+File.separator+"localsite";
     File site_file = new File(site_home);
 …
+    }
+    /** Process a String request */
+    public String process(String xml_in) {
+    return mr_.process(xml_in);
+    }
+    /** Process an Element request  */
+    public Element process(Element xml_in) {
+    return mr_.process(xml_in);
+    public Element [] process (Element [] xml_in) {
+    Element [] result = new Element[xml_in.length];
+    for (int i=0; i<xml_in.length; i++) {
+        Element req = xml_in[i];
+        // get rid of the obligatory namespace that axis needs
+        String tag_name = req.getTagName();
+        String namespace="";
+        if (tag_name.indexOf(':')!= -1) {
+        namespace = tag_name.substring(0, tag_name.indexOf(':'));
+        tag_name = tag_name.substring(tag_name.indexOf(':')+1);
+        }
+        Element new_req = GSXML.duplicateWithNewName(req.getOwnerDocument(), req, tag_name, true);
+        Element r = mr_.process(new_req);
+        // add the namespace back on
+        //Element new_res = r;
+        //if (!namespace.equals("")) {
+        //  new_res = GSXML.duplicateWithNewName(r.getOwnerDocument(), r, namespace+r.getTagName(), true);
+        //}
+        result[i] = r;
+    }
+    return result;
+    }
 …
     return null;
+    }
+}

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/Action.java

-              r8832
+              r9874
     public String process(String xml_in) {
+    Element message = this.converter.getDOM(xml_in).getDocumentElement();
+    Element result = process(message);
+    Document message_doc = this.converter.getDOM(xml_in);
+    if (message_doc == null) {
+        System.err.println("Action.process(String) Error: Couldn't parse request");
+        System.err.println(xml_in);
+        return null;
+    }
+    Element result = process(message_doc.getDocumentElement());
     return this.converter.getString(result);
+    }
 …
+    }
+    protected boolean processErrorElements(Element message, Element page) {
+    NodeList error_nodes = message.getElementsByTagName(GSXML.ERROR_ELEM);
+    if (error_nodes.getLength()==0) {
+        return false;
+    }
+    Document owner = page.getOwnerDocument();
+    for (int i=0; i<error_nodes.getLength(); i++) {
+        page.appendChild(owner.importNode(error_nodes.item(i), true));
+    }
+    return true;
+    }
+}

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

-              r9007
+              r9874
         // Process the document structure retrieve message
         Element ds_response_message = (Element) this.mr.process(ds_message);
+        if (processErrorElements(ds_response_message, page_response)) {
+        return result;
+        }
         // get the info and print out
         String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
 …
     doc_list.appendChild(doc_node);
     Element dm_response_message = (Element) this.mr.process(dm_message);
+    if (processErrorElements(dm_response_message, page_response)) {
+        return result;
+    }
     String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
 …
     System.err.println("request = "+converter.getString(dc_message));
     Element dc_response_message = (Element) this.mr.process(dc_message);
+    if (processErrorElements(dc_response_message, page_response)) {
+        return result;
+    }
     Element dc_response_doc_list = (Element) GSXML.getNodeByPath(dc_response_message, path);
 …
     HashMap params = GSXML.extractParams(cgi_param_list, false);
+    String service_name = (String)((HashMap)params.get("p")).get(GSParams.SERVICE);
+    HashMap previous_params = (HashMap)params.get("p");
+    if (previous_params == null) {
+        return dc_response_doc_content;
+    }
+        String service_name = (String)previous_params.get(GSParams.SERVICE);
     if (service_name == null || !service_name.endsWith("Query")) { // hack for now - we only do highlighting if we were in a query last - ie not if we were in a browse thingy
         System.err.println("DocumentAction: invalid service, not doing highlighting");

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java

-              r8575
+              r9874
         horizontal_at_top = true;
+    }
+    if (top_id.equals(classifier_node) && horizontal_at_top) {
+    // *** TODO need to fix this
+    //if (top_id.equals(classifier_node) && horizontal_at_top) {
         // we have asked for a top node - if the first list is horizontal, we will select the first element of that list
         // this is a hack. also it craps out if the classifier really isn't horizontalAtTop.
         classifier_node = classifier_node+".1";
+        // this is a hack. also it craps out if the classifier really isn't horizontalAtTop. -
+        //classifier_node = classifier_node+".1";
+    }
+    //}
     // get the browse structure for the selected node

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java

-              r9264
+              r9874
     String to = GSPath.appendLink(collection, service_name);
+    // part of the response is the service description
+    // for now get this again from the service.
+    // this will probably need to be cached somehow later on.
+    Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+    Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  to, lang, uid);
+    mr_info_message.appendChild(mr_info_request);
+    if (request_type.indexOf("d")!=-1) {
+        // we have been asked for the service description
+        Element mr_info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Element mr_info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  to, lang, uid);
+        mr_info_message.appendChild(mr_info_request);
+        // process the message
+        Element mr_info_response = (Element) this.mr.process(mr_info_message);
+        // the response
+        Element service_response = (Element)GSXML.getChildByTagName(mr_info_response, GSXML.RESPONSE_ELEM);
+        Element service_description = (Element)this.doc.importNode(GSXML.getChildByTagName(service_response, GSXML.SERVICE_ELEM), true);
+        page_response.appendChild(service_description);
+    }
+    if (request_type.indexOf("r") == -1) {
+        // just a display request, no actual processing to do
+        return page_response;
+    }
+    // check that we have some service params
+    HashMap service_params = (HashMap)params.get("s1");
+    if (service_params == null) { // no query
+        return page_response;
+    }
+    // create the query request
+    Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+    Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
+    mr_query_message.appendChild(mr_query_request);
+    Element query_param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+    GSXML.addParametersToList(this.doc, query_param_list, service_params);
+    mr_query_request.appendChild(query_param_list);
     // also get the format stuff now if there is some
     Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang, uid);
+    mr_info_message.appendChild(format_request);
+    // process the messages
+    Element mr_info_response = (Element) this.mr.process(mr_info_message);
+    // the two responses
+    NodeList responses = mr_info_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
+    Element service_response = (Element)responses.item(0);
+    Element format_response = (Element)responses.item(1);
+    Element service_description = (Element)this.doc.importNode(GSXML.getChildByTagName(service_response, GSXML.SERVICE_ELEM), true);
+    page_response.appendChild(service_description);
+    if (request_type.equals("d")) {// just a display request
+        return page_response;
+    }
+    mr_query_message.appendChild(format_request);
+    // do the query
+        Element mr_query_response = (Element)this.mr.process(mr_query_message);
+    // check for errors
+    if (processErrorElements(mr_query_response, page_response)) {
+        return page_response;
+    }
+    NodeList responses = mr_query_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
+    Element query_response = (Element) responses.item(0);
+    Element format_response = (Element) responses.item(1);
+    Element query_result_metadata_list = (Element) GSXML.getChildByTagName(query_response, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+    if (query_result_metadata_list == null) {
+        System.err.println("QueryAction: Warning: No query result metadata.\n");
+    } else { // add it into the page response
+        page_response.appendChild(this.doc.importNode(query_result_metadata_list, true));
+    }
+    Element query_term_info_list = (Element) GSXML.getChildByTagName(query_response, GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
+    if (query_term_info_list == null) {
+        System.err.println("QueryAction: Warning: No query term information.\n");
+    } else { // add it into the page response
+        page_response.appendChild(this.doc.importNode(query_term_info_list, true));
+    }
+    // check that there are some documents - for now check the list, but later should use a numdocs metadata elem
+    Element document_list = (Element)GSXML.getChildByTagName(query_response, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    // documentList not present if no docs found
+    if (document_list == null) {
+        return page_response;
+    }
+    // now we check to see if there is metadata already - some search services return predefined metadata. if there is some, don't do a metadata request
+    NodeList doc_metadata = document_list.getElementsByTagName(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+    if (doc_metadata.getLength()>0) {
+        System.err.println("have already found metadata!");
+        // append the doc list to the result
+        page_response.appendChild(this.doc.importNode(document_list, true));
+        return page_response;
+    }
+    // get the metadata elements needed from the format statement if any
     HashSet metadata_names = new HashSet();
     metadata_names.add("Title");
 …
         extractMetadataNames(format_elem, metadata_names);
+    }
-    // do the query
-    Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element mr_query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
-    mr_query_message.appendChild(mr_query_request);
-    // paramList
-    HashMap service_params = (HashMap)params.get("s1");
-    if (service_params == null) { // no query
-        return page_response;
+    }
-    Element query_param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
-    GSXML.addParametersToList(this.doc, query_param_list, service_params);
-    ///ystem.out.println("service params are "+this.converter.getString(query_param_list));
-    mr_query_request.appendChild(query_param_list);
-    // do the query
-        Element mr_query_response = (Element)this.mr.process(mr_query_message);
-    //. check for errors
-    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.ERROR_ELEM);
-    Element error_elem = (Element) GSXML.getNodeByPath(mr_query_response, path);
-    if (error_elem != null) {
-        // should we continue?? perhaps have a kind of error - information vs fatal??
-        System.err.println("found an error elem");
-        page_response.appendChild(this.doc.importNode(error_elem, true));
-        return page_response;
+    }
-    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
-    Element query_result_metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, path);
-    if (query_result_metadata_list == null) {
-        System.err.println("QueryAction: Warning: No query result metadata.\n");
-    } else { // add it into the page response
-        page_response.appendChild(this.doc.importNode(query_result_metadata_list, true));
+    }
-    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
-    Element query_term_info_list = (Element) GSXML.getNodeByPath(mr_query_response, path);
-    if (query_term_info_list == null) {
-        System.err.println("QueryAction: Warning: No query term information.\n");
-    } else { // add it into the page response
-        page_response.appendChild(this.doc.importNode(query_term_info_list, true));
+    }
-    // check that there are some documents - for now check the list, but later should use a numdocs metadata elem
-    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
-    Element document_list = (Element)GSXML.getNodeByPath(mr_query_response,
-                                 path);
-    // documentList not present if no docs found
-    if (document_list == null) {
-        return page_response;
+    }
     // paging of the results is done here - we filter the list to remove unwanted entries before retrieving metadata
+    Element filtered_doc_list = filterDocList(params, service_description, document_list);
+    // now we check to see if there is metadata already - some search services return predefined metadata. if there is some, don't do a metadata request
+    NodeList doc_metadata = document_list.getElementsByTagName(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+    if (doc_metadata.getLength()>0) {
+        System.err.println("have already found metadata!");
+        // append the doc list to the result
+        page_response.appendChild(this.doc.importNode(document_list, true));
+        return page_response;
+    }
+    Element filtered_doc_list = filterDocList(params, service_params, document_list);
     // do the metadata request on the filtered list
     Element mr_metadata_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
 …
     mr_metadata_request.appendChild(dm_param_list);
     // add in the doc node list too
     mr_metadata_request.appendChild(filtered_doc_list);
     Element mr_metadata_response = (Element) this.mr.process(mr_metadata_message);
+    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    Element query_result_document_list = (Element) GSXML.getNodeByPath(mr_metadata_response, path);
+    // check for errors
+    processErrorElements(mr_metadata_response, page_response);
+    Element metadata_response = (Element) GSXML.getChildByTagName(mr_metadata_response, GSXML.RESPONSE_ELEM);
+    Element query_result_document_list = (Element) GSXML.getChildByTagName(metadata_response, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (query_result_document_list != null) {
         page_response.appendChild(this.doc.importNode(query_result_document_list, true));
+    }
     System.out.println("Query page:\n" + this.converter.getPrettyString(page_response));
+    ///ystem.out.println("Query page:\n" + this.converter.getPrettyString(page_response));
     return page_response;
+    }
     /** this filters out some of the doc results for result paging */
+    protected Element filterDocList(HashMap params, Element service_description, Element orig_doc_list) {
+    // check in the service descripiton to see if hitsPerpage is a param
+    Element service_p_list = (Element)GSXML.getChildByTagName(service_description, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    Element hits_param = GSXML.getNamedElement(service_p_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, "hitsPerPage");
+    boolean service_paging = false;
+    if (hits_param != null) {
+        service_paging = true;
+    }
+    if (service_paging) {
+        // the service is doing the paging, so we want to display all of teh returned docs
+    protected Element filterDocList(HashMap params, HashMap service_params, Element orig_doc_list) {
+    // check the hits_per_page param - is it a service param??
+    String hits_pp = (String) service_params.get("hitsPerPage");
+    if (hits_pp != null) {
+        // the service is doing the paging, so we want to display all of the returned docs
         return (Element)this.doc.importNode(orig_doc_list, true);
+    }
     String hits_pp = (String)params.get("hitsPerPage");
+    hits_pp = (String)params.get("hitsPerPage");
     int hits = 20;
     if (hits_pp != null && !hits_pp.equals("")) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/Collection.java

-              r5403
+              r9874
+    }
     // get the xml for both files
+    Element coll_config_elem = this.converter.getDOM(coll_config_file, CONFIG_ENCODING).getDocumentElement();
+    Document coll_config_doc = this.converter.getDOM(coll_config_file, CONFIG_ENCODING);
+    Element coll_config_elem = null;
+    if (coll_config_doc != null) {
+        coll_config_elem = coll_config_doc.getDocumentElement();
+    }
     return coll_config_elem;
 …
         return null;
+    }
+    Element build_config_elem = this.converter.getDOM(build_config_file, CONFIG_ENCODING).getDocumentElement();
+    Document build_config_doc = this.converter.getDOM(build_config_file, CONFIG_ENCODING);
+    Element build_config_elem = null;
+    if (build_config_doc != null) {
+        build_config_elem = build_config_doc.getDocumentElement();
+    }
     return build_config_elem;
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

-              r9433
+              r9874
 import java.io.File;
 import java.util.HashMap;
+import java.util.Iterator;
 /* ServiceCluster - a groups of services that are related in some way
 …
+    }
+    public void cleanUp() {
+    Iterator i = this.service_map.values().iterator();
+    while (i.hasNext()) {
+        ServiceRack s = (ServiceRack)i.next();
+        s.cleanUp();
+    }
+    }
     public void setClusterName(String name) {
     this.cluster_name = name;
 …
     Document doc = this.converter.getDOM(config_file, CONFIG_ENCODING);
+    if (doc == null) {
+        System.err.println("ServiceCluster: couldn't parse config file "+config_file.getPath());
+        return false;
+    }
     // get the appropriate service cluster element
 …
     return this.configure(sc);
+    }
     public boolean configure(Element service_cluster_info) {
 …
+        }
+    }
     // get the display info
     Element display_list = (Element) GSXML.getChildByTagName(service_cluster_info, GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER);
 …
+    }
+    Element site_config_elem  = this.converter.getDOM(configFile).getDocumentElement();
+    Document site_config_doc  = this.converter.getDOM(configFile);
+    if (site_config_doc == null) {
+        System.err.println("ServiceCluster: could not read in site config file: "+configFile.getPath());
+        return false;
+    }
+    Element site_config_elem = site_config_doc.getDocumentElement();
     Element cluster_config_elem = GSXML.getNamedElement((Element)GSXML.getChildByTagName(site_config_elem, GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER), GSXML.CLUSTER_ELEM, GSXML.NAME_ATT, this.cluster_name);
     if (cluster_config_elem == null) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/comms/Communicator.java

r4035	r9874
48	48	converter_ = new XMLConverter();
49	49	}
	50	public void cleanUp() {}
50	51
51	52	public void setLocalSiteName(String name) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/comms/SOAPCommunicator.java

-              r4035
+              r9874
 import java.net.MalformedURLException;
 import java.util.Vector;
+import org.apache.soap.SOAPException;
+import org.apache.soap.Fault;
+import org.apache.soap.Constants;
+import org.apache.soap.rpc.Call;
+import org.apache.soap.rpc.Parameter;
+import org.apache.soap.rpc.Response;
+// import org.apache.soap.SOAPException;
+// import org.apache.soap.Fault;
+// import org.apache.soap.Constants;
+// import org.apache.soap.rpc.Call;
+// import org.apache.soap.rpc.Parameter;
+// import org.apache.soap.rpc.Response;
+import org.apache.axis.client.Call;
+import org.apache.axis.client.Service;
+import org.apache.axis.message.SOAPBodyElement;
+import javax.xml.namespace.QName;
 import org.w3c.dom.Node;
 …
     public SOAPCommunicator() {
+    call_ = new Call();
     // Set Encoding Style to standard SOAP encoding
     //call_.setEncodingStyleURI(Constants.NS_URI_SOAP_ENC);
     // set Encoding Style to use literal XML
     call_.setEncodingStyleURI(Constants.NS_URI_LITERAL_XML);
+    //call_.setEncodingStyleURI(Constants.NS_URI_LITERAL_XML);
+    }
     public boolean configure(Element site_elem) {
     String type = site_elem.getAttribute(GSXML.TYPE_ATT);
     if (!type.equals(GSXML.COMM_TYPE_SOAP_JAVA)) {
 …
         return false;
+    }
+    call_.setTargetObjectURI(remote_site_name_);
+    call_.setMethodName("process");
+    try {
+        Service service = new Service();
+        call_ = (Call) service.createCall();
+        //call_.setTargetObjectURI(remote_site_name_);
+        //call_.setMethodName("process");
+        call_.setTargetEndpointAddress( new java.net.URL(remote_site_address_) );
+        //      call_.setOperationStyle(org.apache.axis.enum.Style.MESSAGE_STR);
+        //call_.setOperationUse(org.apache.axis.enum.Use.LITERAL_STR);
+        //call_.setOperationName(new QName("http://soapinterop.org/", "process"));
+    } catch (Exception e) {
+        System.err.println("SOAPCommunicator.configure() Error: Exception occurred "+e);
+        return false;
+    }
     return true;
+    }
     public Element process(Element message) {
     NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);
     if (requests.getLength()==0) {
 …
         return null;
+    }
     // if the communicator is part of a site, it needs to edit the to and from fields, otherwise it just passes the message on, as is
     // for now, use local_site_name_ as the flag.
 …
+        }
+    }
+    // else do nothing to the requests, just pass it on
+    // the soap impl needs a namespace for the top level element
+    Element message_to_send = message;
+    if (message.getNamespaceURI() == null) {
+        message_to_send = GSXML.duplicateWithNewNameNS(message.getOwnerDocument(), message, "gs3:"+message.getTagName(), "urn:foo", true);
+        //System.err.println("**"+new XMLConverter().getPrettyString(new_message));
+    }
+    // do the soap query
+    Element result = null;
+    try {
+        SOAPBodyElement[] input = new SOAPBodyElement[1];
+        input[0] = new SOAPBodyElement(message_to_send);
+        Vector output = (Vector) call_.invoke( input );
+        SOAPBodyElement elem = (SOAPBodyElement) output.get(0);
+        result = elem.getAsDOM();
+    } catch (Exception e) {
+        e.printStackTrace();
+        return null;
+    }
+    if (local_site_name_ != null) {// have to modify the from field
+        NodeList responses = result.getElementsByTagName(GSXML.RESPONSE_ELEM);
+        for (int i=0;i<responses.getLength(); i++) {
+        Element e = (Element)responses.item(i);
+        String from = e.getAttribute(GSXML.FROM_ATT);
+        from = GSPath.prependLink(from, remote_site_name_);
+        e.setAttribute(GSXML.FROM_ATT, from);
+        }
+    } // else return as is
+    return result;
+    }
+    public static void main (String [] args) {
+    SOAPCommunicator comm = new SOAPCommunicator();
+    XMLConverter converter = new XMLConverter();
+    String message = "<site name=\"localsite\" address=\"http://kanuka.cs.waikato.ac.nz:7070/axis/services/localsite\" type=\"soap\"/>";
+    Element site_elem = converter.getDOM(message).getDocumentElement();
+    comm.configure(site_elem);
+    message = "<message><request type=\"describe\" to=\"\" lang=\"en\"/></message>";
+    //message = "<message><request type=\"describe\" to=\"\" lang=\"en\"/></message>";
+    Element request_elem = converter.getDOM(message).getDocumentElement();
+    Element response = comm.process(request_elem);
+    System.err.println("response was "+converter.getPrettyString(response));
+    }
+    /*
+    public Element process(Element message) {
+    NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);
+    if (requests.getLength()==0) {
+        // no requests
+        return null;
+    }
+    // if the communicator is part of a site, it needs to edit the to and from fields, otherwise it just passes the message on, as is
+    // for now, use local_site_name_ as the flag.
+    if (local_site_name_!=null) { // no local site
+        for (int i=0;i<requests.getLength(); i++) {
+        Element e = (Element)requests.item(i);
+        String to = e.getAttribute(GSXML.TO_ATT);
+        to = GSPath.removeFirstLink(to); // remove the server name, should check that it is present
+        e.setAttribute(GSXML.TO_ATT, to);
+        String from = e.getAttribute(GSXML.FROM_ATT);
+        from = GSPath.appendLink(from, local_site_name_);
+        e.setAttribute(GSXML.FROM_ATT, from);
+        }
+    }
     // else do nothing to the message, just pass it on
 …
         // Set Method Parameters - use literal xml
         Parameter param = new Parameter("xml_in",
                         org.w3c.dom.Element.class,
                         message,
                         Constants.NS_URI_LITERAL_XML);
+//      Parameter param = new Parameter("xml_in",
+//                      org.w3c.dom.Element.class,
+//                      message,
+//                      Constants.NS_URI_LITERAL_XML);
         Vector param_list = new Vector ();
         param_list.addElement (param);
         call_.setParams (param_list);
         //  Set the URL for the Web Service
         URL url = new URL(remote_site_address_);
+//      Vector param_list = new Vector ();
+//      param_list.addElement (param);
+//      call_.setParams (param_list);
+//      //  Set the URL for the Web Service
+//      URL url = new URL(remote_site_address_);
         // Invoke the Service
 …
+    }
+    }
+    */
+}

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java

-              r7825
+              r9874
     Element page_request = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
+    // if it is a system request, then we don't bother with this.
+    String action = page_request.getAttribute(GSXML.ACTION_ATT);
+    if (action.equals("s")) {
+        System.err.println("HACK: don't ask for coll info if system action");
+        return;
+    }
     ///ystem.out.println("add extra info, page request="+this.converter.getString(page_request));
     // is a collection defined?
 …
         Element coll_about_response_message = this.mr.process(coll_about_message);
         Element coll_about_response = (Element)GSXML.getChildByTagName(coll_about_response_message, GSXML.RESPONSE_ELEM);
+        if (coll_about_response == null) {
+        return;
+        }
         coll_description = (Element)GSXML.getChildByTagName(coll_about_response, GSXML.COLLECTION_ELEM);
         if (coll_description==null) { // may be a cluster

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

-              r9276
+              r9874
     this.converter = new XMLConverter();
     this.doc = this.converter.newDOM();
+    }
+    }
+    public void cleanUp() {
+    if (this.module_map != null) {
+        Iterator i = this.module_map.values().iterator();
+        while (i.hasNext()) {
+        ((ModuleInterface)i.next()).cleanUp();
+        }
+    }
+    }
     /** site_home must be set before configure called */
     public void setSiteHome(String home) {
 …
     this.module_map = new HashMap();
+    Element config = this.converter.getDOM(configFile).getDocumentElement();
+    Element local_site_name = (Element)GSXML.getChildByTagName(config, GSXML.SITE_NAME_ELEM);
+    Document config_doc = this.converter.getDOM(configFile);
+    if (config_doc == null) {
+System.err.println("MessageRouter: couldn't parse site config file: "+configFile.getPath());
+        return false;
+    }
+    Element config_elem = config_doc.getDocumentElement();
+    Element local_site_name = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_NAME_ELEM);
     if (local_site_name == null) {
         System.err.println("MessageRouter configure error:no site name in config file");
 …
+    }
     Element http_address = (Element)GSXML.getChildByTagName(config, GSXML.SITE_HTTP_ADDRESS_ELEM);
+    Element http_address = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_HTTP_ADDRESS_ELEM);
     if (http_address == null) {
         System.err.println("MessageRouter configure error: no http address  in config file");
 …
+    }
     Element proxy = (Element)GSXML.getChildByTagName(config, "proxy");
+    Element proxy = (Element)GSXML.getChildByTagName(config_elem, "proxy");
     if (proxy != null) {
         String host = proxy.getAttribute("host");
 …
     // load up the services
     Element service_rack_list = (Element)GSXML.getChildByTagName(config, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
+    Element service_rack_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
     configureServices(service_rack_list);
     // load up the service clusters
     Element cluster_list = (Element)GSXML.getChildByTagName(config, GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);
+    Element cluster_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);
     configureClusters(cluster_list);
 …
     // load up the external sites - this also adds their services/clusters/collections to the other lists - so must be done last
     Element site_list = (Element)GSXML.getChildByTagName(config, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
+    Element site_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
     configureSites(site_list);
 …
                     continue;
+                }
+                site_config_elem  = this.converter.getDOM(configFile).getDocumentElement();
+                Document site_config_doc = this.converter.getDOM(configFile);
+                if (site_config_doc == null) {
+                    System.err.println("MessageRouter: couldn't parse site config file: "+configFile.getPath());
+                    continue;
+                }
+                site_config_elem  = site_config_doc.getDocumentElement();
+                }
                 if (subset.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {
 …
     File init_file = new File(GSFile.collectionInitFile(this.site_home, col_name));
     if (init_file.exists()) {
+        Element init_elem = this.converter.getDOM(init_file).getDocumentElement();
+        String coll_class_name = init_elem.getAttribute("class");
+        if (coll_class_name.equals("")) {
+        c = new Collection();
+        } else {
+        try {
+            c = (Collection)Class.forName("org.greenstone.gsdl3.collection."+coll_class_name).newInstance();
+        } catch (Exception e) {
+            System.out.println("MessageRouter: couldn't create a new collection, type "+coll_class_name+", defaulting to class Collection");
+            c = new Collection();
+        }
+        }
+    } else {
+        // use the defualt collection
+        Document init_doc = this.converter.getDOM(init_file);
+        if (init_doc != null) {
+        Element init_elem = init_doc.getDocumentElement();
+        if (init_elem != null) {
+            String coll_class_name = init_elem.getAttribute("class");
+            if (!coll_class_name.equals("")) {
+            try {
+                c = (Collection)Class.forName("org.greenstone.gsdl3.collection."+coll_class_name).newInstance();
+            } catch (Exception e) {
+                System.out.println("MessageRouter: couldn't create a new collection, type "+coll_class_name+", defaulting to class Collection");
+            }
+            }
+        }
+        }
+    }
+    if (c==null) { // we haven't found anpther classname to use
         c = new Collection();
+    }
     c.setCollectionName(col_name);
     c.setSiteHome(this.site_home);
 …
+    }
     protected boolean activateSite(String site_name) {
     System.out.println("MessageRouter:Activating site: "+site_name+".");
 …
         return false;
+    }
+    Element config = this.converter.getDOM(configFile).getDocumentElement();
+    Element site_list = (Element)GSXML.getChildByTagName(config, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
+    Document config_doc = this.converter.getDOM(configFile);
+    if (config_doc == null) {
+        System.err.println("MessageRouter: couldn't parse site config file: "+configFile.getPath());
+        return false;
+    }
+    Element config_elem = config_doc.getDocumentElement();
+    Element site_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
     if (site_list ==null ) {
         System.err.println("MessageRouter:activateSite, no sites found");
 …
         System.out.println("MessageRouter: deactivating "+name);
         this.module_map.remove(name);
+        ModuleInterface m = (ModuleInterface)this.module_map.remove(name);
+        m.cleanUp(); // clean up any open files/connections etc - can cause trouble on windows
         // also remove the xml bit from description list
         if (type.equals(GSXML.COLLECTION_ELEM)) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/ModuleInterface.java

-              r3502
+              r9874
    */
     abstract public Element process(Element xml_in);
+    /**
+     * Do any clean up necessary for deactivating the module, eg
+     * close any open file handles (gdbm in particular) or windows
+     * holds locks on them.
+     */
+    abstract public void cleanUp();
+}

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/Receptionist.java

-              r8921
+              r9874
+    }
+    public void cleanUp() {}
     public void setParams(GSParams params) {
     this.params = params;
 …
+    }
+    Element config_doc = this.converter.getDOM(interface_config_file).getDocumentElement();
+    String base_interface = config_doc.getAttribute("baseInterface");
+    Document config_doc = this.converter.getDOM(interface_config_file);
+    if (config_doc == null) {
+        System.err.println("Receptionist: could not parse interface config file: "+interface_config_file.getPath());
+        return false;
+    }
+    Element config_elem = config_doc.getDocumentElement();
+    String base_interface = config_elem.getAttribute("baseInterface");
     setUpBaseInterface(base_interface);
     setUpInterfaceOptions(config_doc);
+    setUpInterfaceOptions(config_elem);
     // load up the actions
     Element action_list = (Element)GSXML.getChildByTagName(config_doc, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
+    Element action_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
     NodeList actions = action_list.getElementsByTagName(GSXML.ACTION_ELEM);
 …
+    }
     this.language_list = (Element)GSXML.getChildByTagName(config_doc, "languageList");
+    this.language_list = (Element)GSXML.getChildByTagName(config_elem, "languageList");
     if (language_list == null) {
         System.err.println("Receptionist: didn't find a language list in the config file!!");
 …
         base_interfaces.add(base_interface);
         // now see if this has a base interface
+        Element config_doc = this.converter.getDOM(base_interface_config_file).getDocumentElement();
+        base_interface = config_doc.getAttribute("baseInterface");
+        Document config_doc = this.converter.getDOM(base_interface_config_file);
+        if (config_doc == null) {
+        System.err.println("Receptionist: could not parse base interface config file: "+base_interface_config_file.getPath());
+        return false;
+        }
+        Element config_elem = config_doc.getDocumentElement();
+        base_interface = config_elem.getAttribute("baseInterface");
+    }
     return true;
+    }
     protected boolean setUpInterfaceOptions(Element config_doc) {
     Element option_list = (Element)GSXML.getChildByTagName(config_doc, "optionList");
+    protected boolean setUpInterfaceOptions(Element config_elem) {
+    Element option_list = (Element)GSXML.getChildByTagName(config_elem, "optionList");
     if (option_list != null) {
         System.err.println("found an option list");

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

-              r9405
+              r9874
         return false;
+    }
+    Element config_doc = this.converter.getDOM(interface_config_file, "utf-8").getDocumentElement();
+    String base_interface = config_doc.getAttribute("baseInterface");
+    Document config_doc = this.converter.getDOM(interface_config_file, "utf-8");
+    if (config_doc == null) {
+        System.err.println("TransformingReceptionist: could not parse interface config file: "+interface_config_file.getPath());
+        return false;
+    }
+    Element config_elem = config_doc.getDocumentElement();
+    String base_interface = config_elem.getAttribute("baseInterface");
     setUpBaseInterface(base_interface);
     setUpInterfaceOptions(config_doc);
     Element action_list = (Element)GSXML.getChildByTagName(config_doc, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
+    setUpInterfaceOptions(config_elem);
+    Element action_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
     NodeList actions = action_list.getElementsByTagName(GSXML.ACTION_ELEM);
 …
+    }
     Element lang_list = (Element)GSXML.getChildByTagName(config_doc, "languageList");
+    Element lang_list = (Element)GSXML.getChildByTagName(config_elem, "languageList");
     if (lang_list == null) {
         System.err.println("TransformingReceptionist: didn't find a language list in the config file!!");
 …
+    }
     Document style_doc = this.converter.getDOM(new File(xslt_file), "UTF-8");
+    if (style_doc == null) {
+        System.err.println("TransformingReceptionist: cant parse the xslt file needed, so returning the original page!");
+        return page;
+    }
     // look for the format element in the page response
 …
         // need to transform the format info
         String stylesheet_file = GSFile.stylesheetFile((String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces,   "config_format.xsl");
+        Document stylesheet = this.converter.getDOM(new File(stylesheet_file));
+        Document format_doc = this.converter.newDOM();
+        format_doc.appendChild(format_doc.importNode(format_elem, true));
+        Element new_format = (Element)this.transformer.transform(stylesheet, format_doc);
+        Document stylesheet_doc = this.converter.getDOM(new File(stylesheet_file));
+        if (stylesheet_doc != null) {
+        Document format_doc = this.converter.newDOM();
+        format_doc.appendChild(format_doc.importNode(format_elem, true));
+        Element new_format = (Element)this.transformer.transform(stylesheet_doc, format_doc);
         ///ystem.err.println("new format elem="+this.converter.getPrettyString(new_format));
         // add it in to the main stylesheet
+        GSXSLT.mergeStylesheets(style_doc, new_format);
+        GSXSLT.mergeStylesheets(style_doc, new_format);
+        } else {
+        System.err.println("TransformingReceptionist: couldn't parse the config_format stylesheet, adding the format info as is");
+        GSXSLT.mergeStylesheets(style_doc, format_elem);
+        }
         ///ystem.out.println("the converted stylesheet is:");
         ///ystem.out.println(this.converter.getPrettyString(style_doc.getDocumentElement()));

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/CollectionManager.java

-              r8969
+              r9874
       GS3SQLSelect select = new GS3SQLSelect("build");
       select.addField("*");
+      this.database.execute(select.toString());
+      ResultSet results = this.database.getResultSet();
+      if (results != null &&
+      results.first()) {
+      Statement statement = this.database.createStatement();
+      ResultSet results = statement.executeQuery(select.toString());
+      if (results.first()) {
     System.out.println("Reading all keys");
     do {
 …
     } while (results.next());
+      }
+      statement.close();
+    }
     catch (SQLException ex)
 …
     // Update build date information
+    GS3SQLDelete remove = new GS3SQLDelete("build");
+    //    GS3SQLWhere where = new GS3SQLWhere(new GS3SQLWhereItem("buildKey", "=", "NextSeqNo"));
+    //    rem
+    this.database.execute(remove.toString());
+    GS3SQLInsert insert = new GS3SQLInsert("build");
+    insert.addValue("buildKey", "NextSeqNo");
+    insert.addValue("buildValue", Integer.toString(this.buildDocNo));
+    this.database.execute(insert.toString());
+    insert = new GS3SQLInsert("build");
+    insert.addValue("buildKey", "lastBuildDate");
+    insert.addValue("buildValue", getDateString(this.lastBuildDate));
+    this.database.execute(insert.toString());
+    try {
+      GS3SQLDelete remove = new GS3SQLDelete("build");
+      //    GS3SQLWhere where = new GS3SQLWhere(new GS3SQLWhereItem("buildKey", "=", "NextSeqNo"));
+      //    rem
+      Statement statement = this.database.createStatement();
+      statement.execute(remove.toString());
+      GS3SQLInsert insert = new GS3SQLInsert("build");
+      insert.addValue("buildKey", "NextSeqNo");
+      insert.addValue("buildValue", Integer.toString(this.buildDocNo));
+      statement.execute(insert.toString());
+      insert = new GS3SQLInsert("build");
+      insert.addValue("buildKey", "lastBuildDate");
+      insert.addValue("buildValue", getDateString(this.lastBuildDate));
+      statement.execute(insert.toString());
+      statement.close();
+    } catch (SQLException e) {
+    System.err.println("CollectionManager.endBuild(): Can't update build information: "+e);
+    }
     // Do tail of build output
     Date startDate = this.lastBuildDate.getTime();

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/Create.java

r8497	r9874
48	48
49	49	System.err.println("New collection created in "+coll_home);
50		System.err.println("Put source documents into import, set the collection's configuration in etc/collectionConfig.xml, then run gs3-build.sh to build the collection");
	50	System.err.println("Put source documents into import, set the collection's configuration in etc/collectionConfig.xml, then run gs3-build.sh (linux) or gs3-build (windows) to build the collection");
51	51	}
52	52

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/AZListClassifier.java

-              r8742
+              r9874
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import org.xml.sax.XMLReader;
 …
     select.setWhere(where);
-    connection.execute(select.toString());
     try {
+      ResultSet results = connection.getResultSet();
+      if (results != null && results.first()) {
+      Statement statement = connection.createStatement();
+      ResultSet results = statement.executeQuery(select.toString());
+      if (results.first()) {
     GS3SQLUpdate update = new GS3SQLUpdate("classifiers");
     update.setWhere(where);
 …
     action = insert;
+    classifyRef = -1;
+      }
       action.addValue("ClassifyID", label);
 …
       action.addValue("NumLeafDocs", Integer.toString(noOfLeafDocs), GS3SQLField.INTEGER_TYPE);
+      connection.execute(action.toString());
+      classifyRef = -1;
+    }
+    catch (SQLException sqlEx) {
+      System.err.println(sqlEx);
+      return -1;
+    }
+    // get the ClassifyRef if we don't already have it (have done a
+    // insert action above)...
+    if (classifyRef == -1) {
+      connection.execute(select.toString());
+      try {
+    ResultSet results = connection.getResultSet();
+    if (results == null || !results.first()) {
+      // do the update/insert
+      statement.execute(action.toString());
+      // get the ClassifyRef if we don't already have it (have done a
+      // insert action above)...
+      if (classifyRef == -1) {
+    results = statement.executeQuery(select.toString());
+    if (!results.first()) {
       return -1;
+    }
 …
     classifyRef = results.getInt("ClassifyRef");
+      }
+      catch (SQLException sqlEx) {
+    System.err.println(sqlEx);
+      statement.close();
+    }  catch (SQLException sqlEx) {
+    System.err.println("AZListClassifier.writeSQLClassifyNode(): "+sqlEx);
     return -1;
+      }
+    }
+    }
     return classifyRef;
 …
+    }
+    try {
+    Statement statement = connection.createStatement();
     List children;
 …
         Iterator iterator = childDocs.iterator();
     int childOrder = 1;
+    //St
     while (iterator.hasNext()) {
       AZDocumentItem documentItem = (AZDocumentItem) iterator.next();
 …
       insert.addValue("DocOrder", Integer.toString(childOrder), GS3SQLField.INTEGER_TYPE);
       connection.execute(insert.toString());
+      statement.execute(insert.toString());
       childOrder ++;
 …
+    }
     /*
     else {
 …
       delete.setWhere(where);
       connection.execute(delete.toString());
+      statement.execute(delete.toString());
+    }
 …
+    }
     */
+    statement.close();
+    } catch (SQLException e) {
+    System.err.println("AZListClassifier.writeSQL(): "+e);
+    return false;
+    }
     return true;

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/AbstractHierarchyNode.java

-              r8742
+              r9874
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentID;
 …
     GS3SQLInsert insert;
+    Statement statement;
+    // can we connect to the database?
+    try {
+    statement = connection.createStatement();
+    } catch (SQLException e) {
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+e);
+    return false;
+    }
     // Get own full id
     String fullId = this.id.length() > 0 ? this.prefix+"."+this.id : this.prefix;
 …
     select.setWhere(where);
-    connection.execute(select.toString());
     // update or insert the classifier as required
     try {
       ResultSet results = connection.getResultSet();
       if (results != null && results.first()) {
+      ResultSet results = statement.executeQuery(select.toString());
+      if (results.first()) {
     GS3SQLUpdate update = new GS3SQLUpdate("classifiers");
     update.setWhere(where);
 …
     action = insert;
+    classifyRef = -1;
+      }
       action.addValue("ClassifyID", fullId);
 …
       action.addValue("NumLeafDocs", Integer.toString(this.noOfLeafDocs()), GS3SQLField.INTEGER_TYPE);
+      connection.execute(action.toString());
+      classifyRef = -1;
+      statement.execute(action.toString());
+    }
     catch (SQLException sqlEx) {
       if (action == null) {
     System.err.println(sqlEx);
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+sqlEx);
+      }
       else {
     System.err.println(sqlEx + " " + action.toString());
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+sqlEx + " " + action.toString());
+      }
       return false;
 …
     // insert action above)...
     if (classifyRef == -1) {
-      connection.execute(select.toString());
       try {
+    ResultSet results = connection.getResultSet();
+    if (results == null || !results.first()) {
+      return false;
+        ResultSet results = statement.executeQuery(select.toString());
+    if (!results.first()) {
+        statement.close();
+        return false;
+    }
     classifyRef = results.getInt("ClassifyRef");
+      }
       catch (SQLException sqlEx) {
     System.err.println(sqlEx);
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+sqlEx);
     return false;
+      }
 …
       GS3SQLDelete delete = new GS3SQLDelete("classdocuments");
       delete.setWhere(where);
+      connection.execute(delete.toString());
+    }
+      try {
+      statement.execute(delete.toString());
+      } catch (SQLException e) {
+      System.err.println("AbstractHierarchyNode.writeSQL(): "+e);
+      return false;
+      }
+    }
     // post the child nodes...
     Iterator iterator = this.childNodes.iterator();
 …
       if (!childNode.writeSQL(connection)) {
       System.out.println("Failed to write " );
     return false;
+      return false;
+      }
+    }
 …
       insert.addValue("DocID", docId.toString());
       insert.addValue("DocOrder", Integer.toString(order), GS3SQLField.INTEGER_TYPE);
+      connection.execute(insert.toString());
+      try {
+      statement.execute(insert.toString());
+      } catch (SQLException e) {
+      System.err.println("AbstractHierarchyNode.writeSQL(): "+e);
+      return false;
+      }
       order ++;
+    }
+    // close the statment
+    try {
+    statement.close();
+    } catch (SQLException e) {
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+e);
+    }
     return true;
+  }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/database/GS3SQLConnection.java

-              r8773
+              r9874
+{
     public GS3SQLConnection(java.sql.Connection connection)
+    public GS3SQLConnection(java.sql.Connection connection, String database)
+    {
     super(connection);
+    super(connection, database);
+    }
 …
+  }
+    public GS3SQLConnection cloneConnection() {
+    GS3SQLConnection conn = GS3SQLConnectionFactory.getGS3SQLConnection(this.database);
+    return conn;
+    }
   /**
    *  Initialise a collection for use.
 …
     try {
       statement = this.connection.createStatement();
+      Statement statement = this.connection.createStatement();
       // create build history table
 …
       statement.execute(classData.toString());
+      statement.close();
       //
       // END OF GSDL TABLES

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/database/GS3SQLConnectionFactory.java

r8745	r9874
32	32	return null;
33	33	}
34		return new SQLConnection(c);
	34	return new SQLConnection(c, database);
35	35	}
36	36
…	…
42	42	return null;
43	43	}
44		return new GS3SQLConnection(c);
	44	return new GS3SQLConnection(c, database);
45	45	}
46	46

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/database/SQLConnection.java

-              r8745
+              r9874
+{
     protected Connection connection;
+    protected Statement  statement;
+    public SQLConnection(java.sql.Connection connection)
+    protected String database;
+    public SQLConnection(java.sql.Connection connection, String database)
+    {
     this.connection = connection;
+    this.database = database;
+    }
 …
     if (this.connection!=null) {
         try {
         this.connection.close();
+        this.connection.close();
         } catch (Exception e) {}
+        this.connection = null;
+    }
+    }
+    this.connection = null;
+    }
+    public boolean execute(String sql)
+    {
+    try {
+        this.statement = this.connection.createStatement();
+        this.statement.execute(sql);
+    }
+    catch (SQLException ex) {
+        System.out.println(ex);
+        return false;
+    }
+    return true;
+    public void close() {
+    finalize();
+    }
     public Statement createStatement()
+    public Statement createStatement() throws SQLException
+    {
+    try {
+        return this.connection.createStatement();
+    }
+    catch (SQLException ex) {
+        return null;
+    }
+    }
+    public Statement getStatement()
+    {
+    return this.statement;
+    }
+    public ResultSet getResultSet()
+    {
+    try {
+        return this.statement.getResultSet();
+    }
+    catch (SQLException ex) {
+        return null;
+    }
+    return this.connection.createStatement();
+    }
     public boolean connectToDatabase(String database) {
+    if (this.connection != null) {
+        try {
+        this.connection.close();
+        } catch (Exception e) {}
+    }
     this.connection = GS3SQLConnectionFactory.getConnection(database);
     if (this.connection == null) {
         return false;
+    }
+    this.database = database;
     return true;
+    }
 …
     public boolean dropDatabase(String database) {
     try {
+        this.statement = this.connection.createStatement();
+        this.statement.execute("DROP DATABASE "+database+";");
+        Statement statement = this.connection.createStatement();
+        statement.execute("DROP DATABASE "+database+";");
+        statement.close();
+    }
     catch (SQLException ex){
 …
     try {
         String command = "CREATE DATABASE " + database;
+        this.statement = this.connection.createStatement();
+        this.statement.execute(command);
+        Statement statement = this.connection.createStatement();
+        statement.execute(command);
+        statement.close();
     } catch (Exception e) {
         System.err.println(e);

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/AbstractDocument.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 …
     // Query for documents using the same file...
     String query = "SELECT DocID FROM files INNER JOIN filegroups ON files.FileGroupRef=filegroups.FileGroupRef WHERE (filegroups.FileGroupId=\"default\" AND files.FileLocation=\"" + this.fileSet.getFile(0).getLocation().toString() + "\")";
-    connection.execute(query);
-    List docs = new ArrayList();
-    ResultSet results = connection.getResultSet();
     try {
+      if (results != null &&
+      results.first())
+      { do {
+          String value = results.getString("DocID");
+      docs.add(value);
+        } while (results.next());
+        Iterator docIterator = docs.iterator();
+    while (docIterator.hasNext()) {
+      String docId = docIterator.next().toString();
+      String innerQuery = "SELECT * FROM document WHERE DocID=\"" + docId + "\"";
+      connection.execute(innerQuery);
+      ResultSet innerSet = connection.getResultSet();
+      if (innerSet != null && innerSet.first()) {
+        String docType = innerSet.getString("DocType");
+        if (docType.equals(this.getDocumentType())) {
+          return docId;
+    Statement statement = connection.createStatement();
+    ResultSet results = statement.executeQuery(query);
+    List docs = new ArrayList();
+    if (results.first()) {
+        do {
+        String value = results.getString("DocID");
+        docs.add(value);
+        } while (results.next());
+        Iterator docIterator = docs.iterator();
+        while (docIterator.hasNext()) {
+        String docId = docIterator.next().toString();
+        String innerQuery = "SELECT * FROM document WHERE DocID=\"" + docId + "\"";
+        results = statement.executeQuery(innerQuery);
+        if (results.first()) {
+            String docType = results.getString("DocType");
+            if (docType.equals(this.getDocumentType())) {
+            return docId;
+            }
+        }
+        }
+      }
+    }
+      }
+    statement.close();
+    }
     catch (java.sql.SQLException sqlEx) {
       System.err.println(sqlEx);
+      System.err.println("AbstractDocument.getDuplicateID(): "+sqlEx);
+    }
 …
    *  Obtain a document from the SQL database
    */
   public static AbstractDocument readSQL(GS3SQLConnection connection, ResultSet sqlResult)
+    public static AbstractDocument readSQL(GS3SQLConnection connection, ResultSet sqlResult)
   { try {
       DocumentID id = new DocumentID(sqlResult.getString("DocID"));
 …
       // Use a factory method to create the correct subtype...
       AbstractDocument document = DocumentFactory.createDocument(type, id);
       // Append the document date information
       document.indexDate    = sqlResult.getTimestamp("IndexedDate");
 …
+    }
     catch (SQLException sqlEx) {
       System.out.println("Failure to load document: " + sqlEx);
+      System.err.println("AbstractDocument.readSQL(): Failure to load document: " + sqlEx);
+    }
     return null;

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/DocumentFactory.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 import java.net.URL;
 …
+  {
     String query = "SELECT * FROM document WHERE DocID=\""+id.toString()+"\";";
-    connection.execute(query);
     try {
+      ResultSet results = connection.getResultSet();
+      if (results != null && results.first()) {
+    return AbstractDocument.readSQL(connection, results);
+      }
+    Statement statement = connection.createStatement();
+    ResultSet results = statement.executeQuery(query);
+    DocumentInterface di = null;
+    if (results.first()) {
+        di = AbstractDocument.readSQL(connection, results);
+    }
+    statement.close();
+    return di;
+    }
     catch (SQLException sqlEx) {
       System.err.println(sqlEx);
+      System.err.println("AbstractDocument.readSQLDocument():"+sqlEx);
+    }
     return null;

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/DocumentList.java

-              r8861
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
     select.setWhere(where);
+    this.connection.execute(select.toString());
+    ResultSet results = this.connection.getResultSet();
+    if (results != null) {
+      select = new GS3SQLSelect("filegroups");
+      select.addField("DocID");
+      select.setDistinct(true);
+      where = new GS3SQLWhere();
+      where.setCondition(GS3SQLWhere.OR_CONDITION);
+      GS3SQLWhereItem whereItem = null;
+      try {
+    results.first();
+    try {
+    Statement statement = connection.createStatement();
+    ResultSet results = statement.executeQuery(select.toString());
+    select = new GS3SQLSelect("filegroups");
+    select.addField("DocID");
+    select.setDistinct(true);
+    where = new GS3SQLWhere();
+    where.setCondition(GS3SQLWhere.OR_CONDITION);
+    GS3SQLWhereItem whereItem = null;
+        results.first();
     do {
       int fileGroupRef = results.getInt("FileGroupRef");
 …
     while (results.next());
     select.setWhere(where);
+    results.close();
+    this.connection.execute(select.toString());
+    results = this.connection.getResultSet();
+    results = statement.executeQuery(select.toString());
     results.first();
     do {
 …
       reply.add(docId);
     } while (results.next());
+      }
+      catch (SQLException sqlEx)
+      { System.err.println(sqlEx);
+      }
+    }
+    statement.close();
+    }
+    catch (SQLException sqlEx) {
+    System.err.println("DocumentList.getDocumentIdsWithFile(): "+sqlEx);
+    }
     return reply;
+  }
 …
+  }
+  private List findDocumentIdsUsingFileQuery(String query)
+  { this.connection.execute(query);
+    try {
+      ResultSet results = this.connection.getResultSet();
+      if (results == null ||
+      !results.first()) {
+    return null;
+      }
+    private List findDocumentIdsUsingFileQuery(String query) {
+    try {
+    Statement statement = connection.createStatement();
+    ResultSet results = statement.executeQuery(query);
+    if (!results.first()) {
+        statement.close();
+        return null;
+    }
       // get a list of group ids first and turn it into a query on filegroups
 …
       // structures...recreating new filegroup queries as necessary
       while (queryBuffer.length() > 0) {
     connection.execute(queryBuffer.toString());
     results = this.connection.getResultSet();
     if (results == null || !results.first()) {
       return null;
+    results = statement.executeQuery(queryBuffer.toString());
+    if (!results.first()) {
+        statement.close();
+        return null;
+    }
 …
       // execute the division query
+      this.connection.execute(queryBuffer.toString());
+      results = this.connection.getResultSet();
+      if (results == null ||
+      !results.first()) {
+    return null;
+      results = statement.executeQuery(queryBuffer.toString());
+      if (!results.first()) {
+      statement.close();
+      return null;
+      }
 …
     reply.add(results.getString("DocID"));
       } while (results.next());
+      statement.close();
       return reply;
+    }
     catch (SQLException ex) {
       System.err.println(ex);
+      System.err.println("DocumentList.findDocumentIdsUsingFileQuery()"+ ex);
+    }
     return null;
 …
     select.addField("*");
-    ResultSet documents;
     try {
       connection.execute(select.toString());
       documents = connection.getResultSet();
+      if (documents.first())
+      { do
     { DocumentInterface document = AbstractDocument.readSQL(connection, documents);
+          list.addDocument(document);
+    }
     while (documents.next());
+      }
+    }
     catch (java.sql.SQLException ex)
     { System.out.println(ex);
       return null;
+    Statement statement = connection.createStatement();
+    ResultSet documents = statement.executeQuery(select.toString());
+    if (documents.first()) {
+        do {
+        DocumentInterface document = AbstractDocument.readSQL(connection, documents);
+        list.addDocument(document);
+        }
+        while (documents.next());
+    }
+    statement.close();
+    }
+    catch (java.sql.SQLException ex) {
+    System.out.println("DocumentList.writeSQLDocuments(): "+ex);
+    return null;
+    }
 …
+{
   private boolean hasNext;
+  private Statement statement;
   private ResultSet resultSet;
   private GS3SQLConnection connection;
 …
     try {
       connection.execute(select.toString());
       this.resultSet = connection.getResultSet();
+    this.statement = connection.createStatement();
+      this.resultSet = statement.executeQuery(select.toString());
       this.hasNext = this.resultSet.first();
     } catch (SQLException ex) {
+      System.err.println("DocumentListIterator(): "+ex);
       this.hasNext = false;
+    }
 …
       if (!this.hasNext) {
     this.resultSet.close(); // be a good citizen & close used result sets
+      this.statement.close(); // be a good citizen & close used statement
+      }
     } catch (SQLException ex) {
+    System.err.println("DocumentList.iterator.next(): "+ex);
       this.hasNext = false;
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/DocumentSQLWriter.java

-              r8742
+              r9874
     update.addDate("IndexedDate", new java.sql.Timestamp(touchTime));
     update.addDate("ModifiedDate", new java.sql.Timestamp(modTime));
+    connection.execute(update.toString());
+    try {
+    Statement statement = connection.createStatement();
+    statement.execute(update.toString());
+    statement.close();
+    } catch (SQLException e) {
+    System.err.println("DocumentSQLWriter.touchDocument() Error: "+ e);
+    return false;
+    }
     System.out.println(update.toString());
     return true;
 …
     select.addField("*");
     select.setWhere(new GS3SQLWhere(new GS3SQLWhereItem("DocID", "=", document.getID().toString())));
-    connection.execute(select.toString());
+    ResultSet results = connection.getResultSet();
+    if (results == null ||
+        !results.first())
+    { GS3SQLInsert insert = new GS3SQLInsert("document");
+    Statement statement = connection.createStatement();
+    ResultSet results = statement.executeQuery(select.toString());
+    if (!results.first()) { // empty result
+      GS3SQLInsert insert = new GS3SQLInsert("document");
       insert.addValue("DocID", document.getID().toString());
       insert.addValue("DocType", document.getDocumentType());
 …
       insert.addDate("ModifiedDate", new java.sql.Timestamp(document.getModifiedDatestamp()));
       connection.execute(insert.toString());
+      statement.execute(insert.toString());
+    }
     else {
 …
       //      connection.execute(update.toString());
+    }
+    statement.close();
+      }
     } catch (Exception ex) {
     System.out.println(ex);
+    } catch (SQLException ex) {
+    System.out.println("DocumentSQLWriter.writeDocument() Error:"+ex);
+    }
     //    output.println(tag);

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/HTMLDocument.java

r8929	r9874
279	279	public Document getDOMDocument()
280	280	{
281		if (this.domDocument == null) {
	281	if (this.domDocument == null) {
282	282	URL url =(URL) this.fileSet.getFile(0).getLocation();
283	283	this.loadDocument(url);

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGPPIndexer.java

-              r9006
+              r9874
+    {
     if (this.pass == 0) {
         document.removeAllMetadata("gsdl3", "mgppseqno");
+        document.removeAllMetadata("gsdl3", "mgseqno");
+    }
 …
     String docText = null;
+    int startSeqNo = this.sectionSeqNo;
+    this.sectionSeqNo ++;
+    //int startSeqNo = this.sectionSeqNo;
+    //this.sectionSeqNo ++;
+    int startSeqNo = this.documentSeqNo;
     Document domDocument = document.getDOMDocument();
     if (domDocument != null) {
 …
     if (this.pass == 0) {
         document.addDocumentMetadata("gsdl3", "mgppseqno", "dtx."+Integer.toString(startSeqNo));
+    }
     this.documentSeqNo += 1;
+        document.addDocumentMetadata("gsdl3", "mgseqno", "dtx."+Integer.toString(startSeqNo));
+    }
+    this.documentSeqNo++;
 //  try {
 …
     this.firstDocument = true;
     this.documentSeqNo = 1;
+    this.sectionSeqNo = 1;
     this.mgppPasses = new MGPPPassesWrapper();
     this.indexBuffer = new StringBuffer();
 …
         System.out.println("Compressed dictionary successfully written");
         } else {
+        System.err.println("Error from mg_compression_dict: " + exit_value);
+        index.setError(true);
+        System.err.println("Error from mgpp_compression_dict: " + exit_value);
+        //index.setError(true);
         return false;
+        }
 …
         } else {
         System.err.println("Unable to build the perfect hash");
         index.setError(true);
+        //index.setError(true);
         return false;
+        }
 …
         } else {
         System.err.println("Unable to create weights file");
         index.setError(true);
+        //index.setError(true);
         return false;
+        }
 …
         } else {
         System.out.println("Unable to create inverted dictionary file");
         index.setError(true);
+        //index.setError(true);
         return false;
+        }
 …
         } else {
         System.out.println("Unable to create stemmed index 1");
         index.setError(true);
+        //index.setError(true);
         return false;
+        }
 …
         } else {
         System.out.println("Unable to create stemmed index 2");
         index.setError(true);
+        //index.setError(true);
         return false;
+        }
 …
         } else {
         System.out.println("Unable to create stemmed index 3");
         index.setError(true);
+        //index.setError(true);
         return false;
+        }
 …
     Element default_index = doc.createElement("defaultIndex");
     default_index.setAttribute(GSXML.NAME_ATT, def_index);
     Element base_index_name = doc.createElement("baseIndexPrefix");
+    base_index_name.setAttribute(GSXML.NAME_ATT, "index");  //overallName);
+    base_index_name.setAttribute(GSXML.NAME_ATT, "dtx");  //overallName);
     Element index_stem = doc.createElement("indexStem");
     index_stem.setAttribute(GSXML.NAME_ATT, "index");
 …
     Element retrieve_service_elem = doc.createElement(GSXML.SERVICE_CLASS_ELEM);
     Element default_level = doc.createElement("defaultLevel");
+    default_index.setAttribute(GSXML.NAME_ATT, "Document");
+    default_level.setAttribute(GSXML.NAME_ATT, "Document");
+    Element level_list = doc.createElement("levelList");
+    Element level = doc.createElement("level");
+    level.setAttribute(GSXML.NAME_ATT, "Document");
+    level_list.appendChild(level);
+    Element field_list = doc.createElement("fieldList");
+    Element field = doc.createElement("field");
+    field.setAttribute(GSXML.NAME_ATT, "ZZ");
+    field_list.appendChild(field);
     service_rack_list.appendChild(search_service_elem);
     service_rack_list.appendChild(retrieve_service_elem);
 …
     search_service_elem.appendChild(index_list);
     search_service_elem.appendChild(default_index);
+    search_service_elem.appendChild(level_list);
     search_service_elem.appendChild(default_level);
+search_service_elem.appendChild(field_list); // do we need this??
     search_service_elem.appendChild(base_index_name);
     search_service_elem.appendChild(index_stem);

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSDescriptive.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
         } else {
         // TODO: raise an error!
         System.out.println("Error: METSDescriiptive: unrecognised tag "+childName);
+        System.out.println("Error: METSDescriptive: unrecognised tag "+childName);
+        }
+    }
 …
     select.setWhere(where);
-    connection.execute(select.toString());
     try {
+        Statement statement = connection.createStatement();
+        ResultSet resultSet = statement.executeQuery(select.toString());
         GS3SQLAction action;
+        ResultSet resultSet = connection.getResultSet();
+        if (resultSet != null &&
+        resultSet.first()) {
+        if (resultSet.first()) {
         // the node already exists - no need to do anything as such
         GS3SQLUpdate update = new GS3SQLUpdate("metadata");
 …
         action = update;
+        }
+        else
+        { // Set result set to null, just in case next() didn't work above...
+            resultSet = null;
+            // It is a new node and needs writing
+            action = new GS3SQLInsert("metadata");
+            action.addValue("DocID", document.getID().toString());
+            action.addValue("MetaID", this.ID);
+        }
+        else { // Set result set to null, just in case first() didn't work above...
+        // It is a new node and needs writing
+        action = new GS3SQLInsert("metadata");
+        action.addValue("DocID", document.getID().toString());
+        action.addValue("MetaID", this.ID);
+        }
         // always set the group identifier
 …
         // execute the action as required
+        connection.execute(action.toString());
+        // create a new resultset if necessary
+        if (resultSet == null) {
+        // now execute the select statement again to get the new identifier
+        // 'MetadataRef'
+        // System.out.println(select.toString());
+        connection.execute(select.toString());
+        resultSet = connection.getResultSet();
+        resultSet.first();
+        }
+        // get the reference for this item...
+        sqlId = resultSet.getInt("MetadataRef");
+        statement.execute(action.toString());
+        // get the resultSet again
+        // now execute the select statement again to get the new identifier
+        // 'MetadataRef'
+        // System.out.println(select.toString());
+        resultSet = statement.executeQuery(select.toString());
+        if (resultSet.first()) {
+        // get the reference for this item...
+        sqlId = resultSet.getInt("MetadataRef");
+        }
+        statement.close();
+    }
     catch (SQLException sql){
+        System.out.println(sql);
+        System.err.println("METSDescriptive.writeSQL(): "+sql);
+    }
+    if (sqlId == -1) {
+        return false;
+    }
 …
         select.setWhere(where);
+        connection.execute(select.toString());
+        // parse through the namespaces, calling the namespace class to create instances
+        // as it will
+        ResultSet namespaceSet = connection.getResultSet();
+        if (namespaceSet != null && namespaceSet.first()) {
+        Statement statement = connection.createStatement();
+        ResultSet namespaceSet = statement.executeQuery(select.toString());
+        // parse through the namespaces, calling the namespace class to create instances as it will
+        if (namespaceSet.first()) {
         do {
             METSNamespace namespace = METSNamespace.readSQL(connection, namespaceSet);
 …
+            }
             else {
             System.out.println("Null namespace output");
+            System.err.println("Null namespace output");
+            }
+        }
         while (namespaceSet.next());
+        }
+        statement.close();
         return descriptive;
+    }
     catch (SQLException sqlEx){
         System.out.println(sqlEx);
+        System.err.println("METSDescriptive.readSQL(): "+sqlEx);
         System.exit(1);
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSDescriptiveSet.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
     GS3SQLWhereItem whereItem = new GS3SQLWhereItem("DocID", "=", document.getID().toString());
     select.setWhere(new GS3SQLWhere(whereItem));
+    connection.execute(select.toString());
     // start going through the matching metadata blocks
     try {
+        ResultSet resultSet = connection.getResultSet();
+        resultSet.first();
+        do {
+        METSDescriptive descriptive = METSDescriptive.readSQL(document, connection, resultSet);
+        if (descriptive != null) {
+            set.addDescriptive(descriptive);
+        }
+        else {
+            System.out.println("Null descriptive");
+        }
+        } while (resultSet.next());
+        Statement statement = connection.createStatement();
+        ResultSet resultSet = statement.executeQuery(select.toString());
+        if (resultSet.first()) {
+        do {
+            METSDescriptive descriptive = METSDescriptive.readSQL(document, connection, resultSet);
+            if (descriptive != null) {
+            set.addDescriptive(descriptive);
+            }
+            else {
+            System.out.println("Null descriptive");
+            }
+        } while (resultSet.next());
+        }
+        statement.close();
+    }
     catch (SQLException sqlEx) {
         System.out.println(sqlEx);
+        System.err.println("METSDescriptiveSet.readSQL(): "+sqlEx);
         System.exit(1);
+    }
     return set;
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSDivision.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
     select.setWhere(where);
+    connection.execute(select.toString());
+    Statement statement = null;
+    ResultSet resultSet = null;
     // Do the actual writing
     GS3SQLAction action;
-    ResultSet resultSet = connection.getResultSet();
     try {
         if (resultSet == null ||
         !resultSet.first()) {
         resultSet = null;
+        statement = connection.createStatement();
+        resultSet = statement.executeQuery(select.toString());
+        if (!resultSet.first()) {
         GS3SQLInsert insert = new GS3SQLInsert("divisions");
 …
         GS3SQLUpdate update = new GS3SQLUpdate("divisions");
         GS3SQLWhere  updateWhere =
+            new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef),
+                            GS3SQLField.INTEGER_TYPE));
+            new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE));
         update.setWhere(updateWhere);
         action = update;
 …
     action.addValue("UserLabel", this.userLabel);
+    if (!connection.execute(action.toString())){
+    try {
+        statement.execute(action.toString());
+    } catch (SQLException e) {
+        System.err.println("METSDivision.writeSQL(): "+e);
         return false;
+    }
     // if doing a fresh item, get the new structure reference...
     if (resultSet == null){
+    if (sqlRef == -1){
         // get the new structure reference
-        connection.execute(select.toString());
-        // get the sql reference for the division
         try {
         // read in the structure reference
         resultSet = connection.getResultSet();
         if (resultSet == null) {
             return false;
+        resultSet = statement.executeQuery(select.toString());
+        if (resultSet.first()) {
+            sqlRef = resultSet.getInt("DivisionRef");
+        }
-        resultSet.first();
-        sqlRef = resultSet.getInt("DivisionRef");
-        resultSet.close();
-        resultSet = null;
+        }
         catch (SQLException sqlex) {
         System.err.println("Unable to retrieve reference for Division " + sqlex);
+        System.err.println("METSDIVISION.writeSQL(): Unable to retrieve reference for Division " + sqlex);
         return false;
+        }
+    }
-    // close the open resultSet, as we don't need it any longer...
-    else {
-        try {
-        resultSet.close();
+        }
-        catch (SQLException sql) {
-        System.err.println(sql + " " + select.toString());
+        }
+    }
     // delete the old file/metadata references
+    GS3SQLWhere referenceWhere =
+        new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef),
+                        GS3SQLField.INTEGER_TYPE));
+    GS3SQLDelete delete = new GS3SQLDelete("divisionfilerefs");
+    delete.setWhere(referenceWhere);
+    connection.execute(delete.toString());
+    delete = new GS3SQLDelete("divisionmetarefs");
+    delete.setWhere(referenceWhere);
+    connection.execute(delete.toString());
+    // write the new file references
+    if (this.fileRefs.size() > 0){
+        Iterator iterator = this.fileRefs.iterator();
+        while (iterator.hasNext()) {
+        GS3SQLInsert fileinsert = new GS3SQLInsert("divisionfilerefs");
+        fileinsert.addValue("DocID", docId.toString());
+        fileinsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
+        fileinsert.addValue("DivisionType", "Group");
+        fileinsert.addValue("FileID", iterator.next().toString());
+        connection.execute(fileinsert.toString());
+        }
+    }
+    // write the metadata references
+    if (this.metadataRefs.size() > 0){
+        Iterator iterator = this.metadataRefs.iterator();
+        while (iterator.hasNext()) {
+        GS3SQLInsert metainsert = new GS3SQLInsert("divisionmetarefs");
+        metainsert.addValue("DocID", docId.toString());
+        metainsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
+        metainsert.addValue("DivisionType", "Group");
+        metainsert.addValue("MetaID", iterator.next().toString());
+        connection.execute(metainsert.toString());
+        }
+    }
+    try {
+        GS3SQLWhere referenceWhere =
+        new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef),
+                            GS3SQLField.INTEGER_TYPE));
+        GS3SQLDelete delete = new GS3SQLDelete("divisionfilerefs");
+        delete.setWhere(referenceWhere);
+        statement.execute(delete.toString());
+        delete = new GS3SQLDelete("divisionmetarefs");
+        delete.setWhere(referenceWhere);
+        statement.execute(delete.toString());
+        // write the new file references
+        if (this.fileRefs.size() > 0){
+        Iterator iterator = this.fileRefs.iterator();
+        while (iterator.hasNext()) {
+            GS3SQLInsert fileinsert = new GS3SQLInsert("divisionfilerefs");
+            fileinsert.addValue("DocID", docId.toString());
+            fileinsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
+            fileinsert.addValue("DivisionType", "Group");
+            fileinsert.addValue("FileID", iterator.next().toString());
+            statement.execute(fileinsert.toString());
+        }
+        }
+        // write the metadata references
+        if (this.metadataRefs.size() > 0){
+        Iterator iterator = this.metadataRefs.iterator();
+        while (iterator.hasNext()) {
+            GS3SQLInsert metainsert = new GS3SQLInsert("divisionmetarefs");
+            metainsert.addValue("DocID", docId.toString());
+            metainsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
+            metainsert.addValue("DivisionType", "Group");
+            metainsert.addValue("MetaID", iterator.next().toString());
+            statement.execute(metainsert.toString());
+        }
+        }
+        statement.close();
+    } catch (SQLException e) {
+        System.err.println("METSDIVISION.writeSQL(): "+e);
+        return false;
+    }
     // write out any children in turn
     Iterator groups = this.children.values().iterator();
 …
         select.setWhere(where);
+        connection.execute(select.toString());
+        Statement statement = connection.createStatement();
+        ResultSet childSet = statement.executeQuery(select.toString());
         // circulate through to obtain further children
-        ResultSet childSet = connection.getResultSet();
         if (childSet.first())
+        {
 …
             while (childSet.next());
+        }
         select = new GS3SQLSelect("divisionfilerefs");
         select.addField("*");
 …
         select.setWhere(where);
+        connection.execute(select.toString());
+        ResultSet fileSet = connection.getResultSet();
+        if (fileSet != null && fileSet.first()){
+        ResultSet fileSet = statement.executeQuery(select.toString());
+        if (fileSet.first()){
         do {
             String reference = fileSet.getString("FileID");
 …
         while (fileSet.next());
+        }
         select = new GS3SQLSelect("divisionmetarefs");
         select.addField("*");
 …
         select.setWhere(where);
+        connection.execute(select.toString());
+        ResultSet metaSet = connection.getResultSet();
+        if (metaSet != null && metaSet.first()){
+        ResultSet metaSet = statement.executeQuery(select.toString());
+        if (metaSet.first()){
         do {
             String reference = metaSet.getString("MetaID");
 …
+        }
+        statement.close();
         return division;
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSFile.java

-              r8742
+              r9874
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import org.w3c.dom.Document;
 …
     where.add(whereItem);
     select.setWhere(where);
+    connection.execute(select.toString());
+    Statement statement = null;
     // if not, then make an insert action
     try {
         ResultSet results = connection.getResultSet();
         if (results == null ||
         !results.first()){
+        statement = connection.createStatement();
+        ResultSet results = statement.executeQuery(select.toString());
+        if (!results.first()){
         GS3SQLInsert insert = new GS3SQLInsert("files");
 …
+    }
     catch (SQLException ex){
         System.err.println(ex);
+        System.err.println("METSFile.writeSQL(): "+ex);
         return false;
+    }
 …
     action.addValue("MIMEType", this.MIMEType);
+    return connection.execute(action.toString());
+    try {
+        statement.execute(action.toString());
+        statement.close();
+    } catch (SQLException e) {
+        System.err.println("METSFile.writeSQL():"+e);
+        return false;
+    }
+    return true;
+    }
 …
+    }
     catch (SQLException ex){
         System.out.println(ex);
+        System.out.println("METSFile.readSQL(): "+ex);
+    }
     catch (java.net.MalformedURLException urlEx){
         System.out.println(urlEx);
+        System.out.println("METSFile.readSQL(): "+urlEx);
+    }
     return null;
 …
     } catch (java.net.MalformedURLException ex) {
         // TODO: raise error
         System.err.println(ex);
+        System.err.println("METSFile.parse_flocateXML(): "+ex);
+    }
     return thisFilePos;

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSFileGroup.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
+    {
     int sqlId = -1;
     // check if this node is in the database already
     GS3SQLSelect select = new GS3SQLSelect("filegroups");
 …
     select.setWhere(where);
+    connection.execute(select.toString());
+    ResultSet selectResult = connection.getResultSet();
+    ResultSet results = null;
+    Statement statement = null;
     try {
+        if (selectResult == null ||
+        !selectResult.first()) {
+        statement = connection.createStatement();
+        results = statement.executeQuery(select.toString());
+        if (!results.first()) {
         GS3SQLInsert insert = new GS3SQLInsert("filegroups");
 …
         insert.addValue("ParentType", parentIsSection ? SECTION_PARENT : GROUP_PARENT);
+        if (!connection.execute(insert.toString())) {
+            return false;
+        }
+        statement.execute(insert.toString());
+        }
         else {
 …
+    }
     catch (SQLException ex){
         System.err.println(ex);
+        System.err.println("METSFileGroup.writeSQL(): "+ex);
         return false;
+    }
     // get the filegroup reference now
-    connection.execute(select.toString());
     try {
+        ResultSet results = connection.getResultSet();
+        if (results == null) {
+        results = statement.executeQuery(select.toString());
+        if (results.first()) {
+        sqlId = results.getInt("FileGroupRef");
+        } else {
+        statement.close();
         return false;
+        }
+        results.first();
+        sqlId = results.getInt("FileGroupRef");
+    }
+    catch (SQLException sqlex) {
+        System.out.println(sqlex);
+        statement.close();
+    } catch (SQLException sqlex) {
+        System.err.println("METSFileGroup.writeSQL(): "+sqlex);
         return false;
+    }
     // iterate over the child groups
     Iterator childIter = childGroups.iterator();
 …
         if (!fileGroup.writeSQL(document, Integer.toString(sqlId), false, connection)){
+        System.err.println("METSFileGroup.writeSQL(): Couldn't write FileGroup");
         return false;
+        }
 …
     childIter = children.iterator();
     while (childIter.hasNext()){
+        METSFile file = (METSFile) childIter.next();
+        METSFile file = (METSFile) childIter.next();
         if (!file.writeSQL(sqlId, connection)){
+        System.err.println("METSFileGroup.writeSQL(): Couldn't write File");
         return false;
+        }
 …
         select.setWhere(where);
         connection.execute(select.toString());
+        Statement statement = connection.createStatement();
         // parse through the child groups
         ResultSet childSet = connection.getResultSet();
+        ResultSet childSet = statement.executeQuery(select.toString());
         if (childSet.first()) {
         do {
 …
         while (childSet.next());
+        }
         // now scan for file members
         select = new GS3SQLSelect("files");
         select.addField("*");
+        whereItem = new GS3SQLWhereItem("FileGroupRef", "=", Integer.toString(groupRef),
+                        GS3SQLField.INTEGER_TYPE);
+        whereItem = new GS3SQLWhereItem("FileGroupRef", "=", Integer.toString(groupRef), GS3SQLField.INTEGER_TYPE);
         where = new GS3SQLWhere(whereItem);
         select.setWhere(where);
+        connection.execute(select.toString());
+        ResultSet childFileSet = connection.getResultSet();
+        if (childFileSet != null && childFileSet.first()) {
+        ResultSet childFileSet = statement.executeQuery(select.toString());
+        if (childFileSet.first()) {
         do {
             METSFile file = METSFile.readSQL(connection, childFileSet);
 …
         while (childFileSet.next());
+        }
+        statement.close();
         return group;
+    }
     catch (SQLException sqlEx){
         System.out.println(sqlEx);
+        System.err.println("METSFileGroup.readSQL(): "+sqlEx);
         System.exit(1);
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSFileSet.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
         insert.addValue("FileSecID", "test"); // TODO: remove magic string
+        if (!connection.execute(insert.toString())){
+        Statement statement = null;
+        try {
+        statement = connection.createStatement();
+        statement.execute(insert.toString());
+        } catch (SQLException e) {
+        System.err.println("METSFileSet.writeSQL(): "+e);
         return false;
+        }
 …
         try {
         connection.execute(select.toString());
         ResultSet set = connection.getResultSet();
         set.first();
         int sectionRef = set.getInt("FileSectionRef");
         this.reference = Integer.toString(sectionRef);
+        ResultSet set = statement.executeQuery(select.toString());
+        if (set.first()) {
+            int sectionRef = set.getInt("FileSectionRef");
+            this.reference = Integer.toString(sectionRef);
+        }
+        statement.close();
+        }
         catch (SQLException ex){
         System.out.println(ex);
+        System.out.println("METSFileSet.writeSQL(): "+ex);
         return false;
+        }
+    }
+    if (this.reference == null) {
+        return false;
+    }
     // write out the children
     while (groups.hasNext()){
 …
     GS3SQLWhereItem whereItem = new GS3SQLWhereItem("DocID", "=", document.getID().toString());
     select.setWhere(new GS3SQLWhere(whereItem));
+    connection.execute(select.toString());
+    Statement statement = null;
     // Get the identifier for this file set, etc.
+    ResultSet sections = connection.getResultSet();
+    int fileSetRef;
+    int fileSetRef = -1;
     try {
+        sections.first();
+        fileSetRef     = sections.getInt("FileSectionRef");
+        set.reference = Integer.toString(fileSetRef);
+        statement = connection.createStatement();
+        ResultSet sections = statement.executeQuery(select.toString());
+        if (sections.first()) {
+        fileSetRef = sections.getInt("FileSectionRef");
+        set.reference = Integer.toString(fileSetRef);
+        } else {
+        statement.close();
+        return null;
+        }
+    }
     catch (SQLException ex){
         System.out.println(ex);
+        System.err.println("METSFileSet.readSQL() "+ex);
         return null;
+    }
     // Get child file groups
     select = new GS3SQLSelect("filegroups");
 …
     where.add(whereItem);
     select.setWhere(where);
-    connection.execute(select.toString());
     // start going through the matching file groups
     try {
+        ResultSet resultSet = connection.getResultSet();
+        resultSet.first();
+        do {
+        METSFileGroup filegroup = METSFileGroup.readSQL(document, connection, resultSet);
+        if (filegroup != null) {
+            set.addGroup(filegroup);
+        }
+        } while (resultSet.next());
+        ResultSet resultSet = statement.executeQuery(select.toString());
+        if (resultSet.first()) {
+        do {
+            METSFileGroup filegroup = METSFileGroup.readSQL(document, connection, resultSet);
+            if (filegroup != null) {
+            set.addGroup(filegroup);
+            }
+        } while (resultSet.next());
+        }
+        statement.close();
+    }
     catch (SQLException sqlEx) {
         System.out.println(sqlEx);
+        System.out.println("METSFileSet.readSQL(): "+sqlEx);
         System.exit(1);
+    }
     return set;
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSNamespace.java

-              r8742
+              r9874
 import java.util.Iterator;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
     // Execute the action
+    connection.execute(action.toString());
+    Statement statement = null;
+    try {
+        statement = connection.createStatement();
+        statement.execute(action.toString());
+    } catch (SQLException e) {
+        System.err.println("METSNamespace.writeSQL(): "+e);
+        return false;
+    }
     // then get the namespace reference number if needsbe...
     if (this.id == null) {
 …
         where.add(where);
         try {
         connection.execute(select.toString());
         ResultSet result = connection.getResultSet();
         result.last();
         this.id = Integer.toString(result.getInt("NamespaceRef"));
+        ResultSet result  = statement.executeQuery(select.toString());
+            if (result.last()) {
+            this.id = Integer.toString(result.getInt("NamespaceRef"));
+        }
+        statement.close();
+        }
         catch (SQLException sqlex){
         this.id = null;
         System.err.println(sqlex);
+        System.err.println("METSNamespace.writeSQL(): "+sqlex);
         return false;
+        }
 …
         select.setWhere(where);
+        connection.execute(select.toString());
+        ResultSet valuesSet = connection.getResultSet();
+        if (valuesSet != null && valuesSet.first()) {
+        Statement statement = connection.createStatement();
+        ResultSet valuesSet = statement.executeQuery(select.toString());
+        if (valuesSet.first()) {
         do {
             String label = valuesSet.getString("Label");
 …
         while (valuesSet.next());
+        }
+        statement.close();
         return namespace;
+    }
     catch (java.net.MalformedURLException urlEx){
         System.out.println(urlEx);
+        System.err.println("METSNamespace.readSQL(): "+urlEx);
+    }
     catch (SQLException sqlEx){
         System.out.println(sqlEx);
+        System.err.println("METSNamespace.readSQL(): "+sqlEx);
+    }
     return null;

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSStructure.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
+    {
     int sqlRef = -1;
+    ResultSet results;
+    ResultSet results = null;
+    Statement statement = null;
     // Prepare query to see if this structure has already been written
     GS3SQLSelect select = new GS3SQLSelect("structure");
 …
     where.add(item);
     select.setWhere(where);
     // attempt to execute the query & get the current structure's reference
     try {
+        connection.execute(select.toString());
+        results = connection.getResultSet();
+        if (results != null &&
+        results.first()){
+        statement = connection.createStatement();
+        results = statement.executeQuery(select.toString());
+        if (results.first()){
         sqlRef = results.getInt("structureRef");
+        }
-        else {
-        results = null;
+        }
-        if (results != null) {
-        results.close();
+        }
+    }
     catch (SQLException sqlEx) {
         System.err.print(sqlEx);
+        System.err.print("METSStructure.writeSQL(): "+sqlEx);
         return false;
+    }
     // insert a new structure if it wasn't there previously
     if (results == null) {
+    if (sqlRef == -1) {
         GS3SQLInsert insert = new GS3SQLInsert("structure");
         insert.addValue("DocID", document.getID().toString());
 …
         insert.addValue("Label", this.label);
+        if (!connection.execute(insert.toString())) {
+        try {
+        statement.execute(insert.toString());
+        // get the new structure reference by re-running the original select object
+        results = statement.executeQuery(select.toString());
+        if (results.first()) {
+            sqlRef = results.getInt("StructureRef");
+        }
+        } catch (SQLException sqlEx) {
+        System.err.print("METSStructure.writeSQL(): "+sqlEx);
         return false;
+        }
-        // get the new structure reference by re-running the original select object
-        connection.execute(select.toString());
-        try {
-        results = connection.getResultSet();
-        results.first();
-        sqlRef = results.getInt("StructureRef");
+        }
-        catch (SQLException sql) {
-        System.err.println(sql);
-        return false;
+        }
+    }
     else {
 …
         update.addValue("Label", this.label);
+        connection.execute(update.toString());
+    }
+        try {
+        statement.execute(update.toString());
+        } catch (SQLException sqlEx) {
+        System.err.print("METSStructure.writeSQL(): "+sqlEx);
+        return false;
+        }
+    }
+    // close the statement
+    try {
+        statement.close();
+    } catch (SQLException e) {
+        System.err.println("METSStructure.writeSQL(): "+e);
+    }
     // write out the child groups (Divisions) now...
     Iterator groups = this.children.values().iterator();
 …
         select.setWhere(where);
+        connection.execute(select.toString());
+        Statement statement = connection.createStatement();
+        ResultSet divisionSet = statement.executeQuery(select.toString());
         // parse through the divisions
+        ResultSet divisionSet = connection.getResultSet();
+        if (divisionSet != null && divisionSet.first()) {
+        if (divisionSet.first()) {
         do {
             METSDivision division = METSDivision.readSQL(connection, divisionSet);
 …
         while (divisionSet.next());
+        }
+        statement.close();
         return structure;
+    }
     catch (SQLException sqlEx)
         { System.out.println(sqlEx + " " + select.toString());
+    catch (SQLException sqlEx) {
+        System.err.println("METSStructure.readSQL(): "+ sqlEx + " " + select.toString());
         System.exit(1);
+        }
+    }
     return null;
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSStructureSet.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
     GS3SQLWhereItem whereItem = new GS3SQLWhereItem("DocID", "=", document.getID().toString());
     select.setWhere(new GS3SQLWhere(whereItem));
+    connection.execute(select.toString());
     // start going through the matching metadata blocks
     try {
+        ResultSet resultSet = connection.getResultSet();
+        resultSet.first();
+        do {
+        METSStructure structure = METSStructure.readSQL(document, connection, resultSet);
+        if (structure != null) {
+            set.addStructure(structure);
+        }
+        } while (resultSet.next());
+        Statement statement = connection.createStatement();
+        ResultSet resultSet = statement.executeQuery(select.toString());
+        if (resultSet.first()) {
+        do {
+            METSStructure structure = METSStructure.readSQL(document, connection, resultSet);
+            if (structure != null) {
+            set.addStructure(structure);
+            }
+        } while (resultSet.next());
+        }
+        statement.close();
+    }
     catch (SQLException sqlEx) {
         System.out.println(sqlEx);
+        System.err.println("METSStructureSet.readSQL(): "+sqlEx);
         System.exit(1);
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/SimpleNamespace.java

-              r8742
+              r9874
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 …
+    }
+    Statement statement = null;
+    ResultSet results = null;
     try {
+        statement = connection.createStatement();
         if (this.id == null) {
         GS3SQLSelect select = new GS3SQLSelect("namespaces");
         select.setWhere(new GS3SQLWhere(new GS3SQLWhereItem("MetadataRef", "=", Integer.toString(parentId), GS3SQLField.INTEGER_TYPE)));
         select.addField("NamespaceRef");
+        connection.execute(select.toString());
+        ResultSet results = connection.getResultSet();
+        results.first();
+        sqlId = Integer.toString(results.getInt("NamespaceRef"));
+        results = statement.executeQuery(select.toString());
+        if (results.first()) {
+            sqlId = Integer.toString(results.getInt("NamespaceRef"));
+        } else {
+            statement.close();
+            return false;
+        }
+        }
         else {
 …
         GS3SQLWhere where = new GS3SQLWhere(new GS3SQLWhereItem("NamespaceRef", "=", sqlId, GS3SQLField.INTEGER_TYPE));
         delete.setWhere(where);
         connection.execute(delete.toString());
+        statement.execute(delete.toString());
         // write out the metadata for this namespace
 …
             insert.addValue("Label", thisKey);
             insert.addValue("Value", value);
+            connection.execute(insert.toString());
+        }
+        }
+            statement.execute(insert.toString());
+        }
+        }
+        statement.close();
+    }
     catch (SQLException sql) {
         System.out.println(sql);
+        System.out.println("SimpleNamespace.writeSQL(): "+sql);
+    }
     return true;

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/notifier/NotifierManager.java

-              r8869
+              r9874
 public class NotifierManager {
+    public NotifierManager() {
+    }
+    public NotifierManager() {
+    }
+    public void detectEvents(CollectionManager collManager) {
+    String notifyHost = collManager.getNotifyHost();
+    if (notifyHost == null)
+        return;
+    public void detectEvents(CollectionManager collManager) {
+        String notifyHost = collManager.getNotifyHost();
+        if (notifyHost == null)
+            return;
+        System.out.println("detecting events");
+        String collectionName = collManager.getCollectionName();
+        String host = "http://localhost:8080/soap/servlet/rpcrouter";
+        String lastBuild = dateToSqlString(collManager.getBuildDate());
+        System.out.println("last build was " + lastBuild);
+        Statement statement = collManager.getDatabase().createStatement();
+    System.out.println("detecting events");
+    String collectionName = collManager.getCollectionName();
+    String host = "http://localhost:8080/soap/servlet/rpcrouter";
+    String lastBuild = dateToSqlString(collManager.getBuildDate());
+    System.out.println("last build was " + lastBuild);
         try {
+        Statement statement = collManager.getDatabase().createStatement();
             // detect all new documents. A document is new if and only if
             // AccessionDate >= CollectionLastRebuiltDate
+            ResultSet results = statement.executeQuery("SELECT DocID FROM document WHERE DocType != 'GSMETADATA' AND AccessionDate >= " + lastBuild);
+            notify(collectionName, host, notifyHost, results, collManager.getDatabase(), collManager.getBuildDate(), "new_document");
+            // detect modified documents. A document is modified if and only if
+            // AccessionDate < CollectionLastRebuiltDate (ie, it is not new) and
+            // IndexedDate >= CollectionLastRebuiltDate
+            results = statement.executeQuery("SELECT DocID FROM document WHERE DocType != 'GSMETADATA' AND AccessionDate < " + lastBuild + " AND IndexedDate >= " + lastBuild);
+            notify(collectionName, host, notifyHost, results, collManager.getDatabase(), collManager.getBuildDate(), "document_modified");
+            // TODO deleted docs?
+        ResultSet results = statement.executeQuery("SELECT DocID FROM document WHERE DocType != 'GSMETADATA' AND AccessionDate >= " + lastBuild);
+        notify(collectionName, host, notifyHost, results, collManager.getDatabase(), collManager.getBuildDate(), "new_document");
+        // detect modified documents. A document is modified if and only if
+        // AccessionDate < CollectionLastRebuiltDate (ie, it is not new) and
+        // IndexedDate >= CollectionLastRebuiltDate
+        results = statement.executeQuery("SELECT DocID FROM document WHERE DocType != 'GSMETADATA' AND AccessionDate < " + lastBuild + " AND IndexedDate >= " + lastBuild);
+        notify(collectionName, host, notifyHost, results, collManager.getDatabase(), collManager.getBuildDate(), "document_modified");
+        statement.close();
+        // TODO deleted docs?
         } catch (SQLException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+        }
+    }
+    }
     /**
      * @param collName
 …
      * @throws SQLException
      */
     private void notify(String collName, String hostURL, String notifyHost, ResultSet results, GS3SQLConnection database, Date date, String eventType) {
         try {
             System.out.println("notifyHost is " + notifyHost);
             URL url = new URL("http://" + notifyHost + "/alerting/service");
             System.out.println("trying to send to " + url);
             while(results.next()) {
                 System.out.println(eventType + ": " + results.getString("DocID"));
+    private void notify(String collName, String hostURL, String notifyHost, ResultSet results, GS3SQLConnection database, Date date, String eventType) {
+    try {
+        System.out.println("notifyHost is " + notifyHost);
+        URL url = new URL("http://" + notifyHost + "/alerting/service");
+        System.out.println("trying to send to " + url);
+        while(results.next()) {
+        System.out.println(eventType + ": " + results.getString("DocID"));
                 String documentID = results.getString("DocID");
                 try {
+        try {
                     HttpURLConnection conn = (HttpURLConnection) url.openConnection(); // TODO what about proxies?
                     conn.setUseCaches(false);
 …
                     e1.printStackTrace();
+                }
+            }
         } catch (SQLException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         } catch (MalformedURLException e) {
+        }
+    } catch (SQLException e) {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+    } catch (MalformedURLException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
+        }
+    }
+    }
     /**
 …
     private String getDocumentTitle(String documentID, GS3SQLConnection database) {
         System.out.println("getting title for document " + documentID + " from database");
-        Statement statement = database.createStatement();
-        ResultSet results;
         try {
+        Statement statement = database.createStatement();
             String sqlString = "SELECT mdvalues.value " +
                     "FROM structure s JOIN divisions d ON (s.structureref = d.parentref) " +
                     "                 JOIN divisionmetarefs USING (divisionref) " +
                     "                 JOIN metadata m USING (metaid) " +
                     "                 JOIN namespaces USING (metadataref) " +
                     "                 JOIN mdvalues USING (namespaceref) " +
                     "  WHERE mdvalues.label = 'Title' AND s.docid = '" + documentID + "'" +
                     "                                 AND s.structureType = 'Whole Document' " +
                     "                                 AND d.parenttype = 'Structure' " +
                     "                                 AND m.docID = s.docid;";
             results = statement.executeQuery(sqlString);
             if (results.next()) {
+        "FROM structure s JOIN divisions d ON (s.structureref = d.parentref) " +
+        "                 JOIN divisionmetarefs USING (divisionref) " +
+        "                 JOIN metadata m USING (metaid) " +
+        "                 JOIN namespaces USING (metadataref) " +
+        "                 JOIN mdvalues USING (namespaceref) " +
+        "  WHERE mdvalues.label = 'Title' AND s.docid = '" + documentID + "'" +
+        "                                 AND s.structureType = 'Whole Document' " +
+        "                                 AND d.parenttype = 'Structure' " +
+        "                                 AND m.docID = s.docid;";
+            ResultSet results = statement.executeQuery(sqlString);
+            if (results.first()) {
                 String title = results.getString("value");
                 System.out.println("title is " + title);
                 return title;
+            }
+        statement.close();
         } catch (SQLException e) {
             e.printStackTrace();

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/util/HTMLTidy.java

r8710	r9874
93	93	handler.setContentHandler(this);
94	94	handler.setProperty("http://xml.org/sax/properties/lexical-handler", commentHandler);
95		handler.parse(file.toString());
	95	handler.parse(file.toURI().toString());
96	96	}
97	97	catch (java.io.IOException io)
98	98	{
	99	System.out.println(io);
99	100	}
100	101	catch (org.xml.sax.SAXException saxEx)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java

-              r9288
+              r9874
 // Greenstone classes
 //import org.greenstone.gdbm.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSPath;
 …
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
         System.err.println("AbstractDocumentRetrieve, DocumentMetadataRetrieve Error: missing paramList.\n");
         return result;  // Return the empty result
+        GSXML.addError(this.doc, result, "DocumentMetadataRetrieve: missing "+ GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+        return result;
+    }
 …
+    }
+    Element node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    result.appendChild(node_list);
+    // check that there has been some metadata specified
+    if (!all_metadata && metadata_names_list.size()==0) {
+        GSXML.addError(this.doc, result, "DocumentMetadataRetrieve: no metadata names found in the "+ GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+        return result;
+    }
     // Get the documents
     Element request_node_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (request_node_list == null) {
         System.err.println("Error: DocumentMetadataRetrieve request had no "+GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+        GSXML.addError(this.doc, result, "DocumentMetadataRetrieve: missing " +GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
         return result;
+    }
+    NodeList request_nodes = request_node_list.getChildNodes();
+    // copy the request doc node list to the response
+    Element response_node_list = (Element) this.doc.importNode(request_node_list, true);
+    result.appendChild(response_node_list);
+    // use the copied list so that we add the metadata into the copy
+    // are we just adding metadata for the top level nodes? or can we accept a hierarchy here???
+    NodeList request_nodes = GSXML.getChildrenByTagName(response_node_list, GSXML.DOC_NODE_ELEM);
+    if (request_nodes.getLength()==0) {
+        GSXML.addError(this.doc, result, "DocumentMetadataRetrieve: no "+GSXML.DOC_NODE_ELEM +" found in the "+ GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+        return result;
+    }
+    // Whew, now we have checked (almost) all the syntax of the request, now we can process it.
     for (int i = 0; i < request_nodes.getLength(); i++) {
         Element request_node = (Element) request_nodes.item(i);
         String node_id = request_node.getAttribute(GSXML.NODE_ID_ATT);
-        // Add the document to the results list
-        Element new_node = (Element)this.doc.importNode(request_node, false);
-        node_list.appendChild(new_node);
         if (external_id) {
         // can we have .pr etc extensions with external ids?
 …
         continue;
+        }
+        Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list);
+        new_node.appendChild(metadata_list);
+        try {
+        Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list);
+        request_node.appendChild(metadata_list);
+        } catch (GSException e) {
+        GSXML.addError(this.doc, result, e.getMessage(), e.getType());
+        if (e.getType().equals(GSXML.ERROR_TYPE_SYSTEM)) {
+            // there is no point trying any others
+            return result;
+        }
+        }
+    }
 …
     String lang = request.getAttribute(GSXML.LANG_ATT);
-    Element query_doc_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
-    if (query_doc_list == null) {
-        System.err.println("AbstractDocumentRetrieve Error: DocumentStructureRetrieve request specified no doc nodes.\n");
-        return result;
+    }
     // Get the parameters of the request
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
+        System.err.println("AbstractDocumentRetrieve Error: DocumentStructureRetrieve request had no paramList.");
+        return result;  // Return the empty result
+    }
+        GSXML.addError(this.doc, result, "DocumentStructureRetrieve: missing "+ GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+        return result;
+    }
+    // get the documents of the request
+    Element query_doc_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    if (query_doc_list == null) {
+        GSXML.addError(this.doc, result, "DocumentStructureRetrieve: missing " +GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+        return result;
+    }
+    // copy the doc_list to the response
+    Element response_node_list = (Element) this.doc.importNode(query_doc_list, true);
+    result.appendChild(response_node_list);
+    // check that we have some doc nodes specified
+    NodeList node_list = GSXML.getChildrenByTagName(response_node_list, GSXML.DOC_NODE_ELEM);
+    if (node_list.getLength()==0) {
+        GSXML.addError(this.doc, result, "DocumentStructureRetrieve: no "+GSXML.DOC_NODE_ELEM +" found in the "+ GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+        return result;
+    }
     Element extid_param = GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, EXTID_PARAM);
     boolean external_id = false;
 …
     if (want_descendants)
         want_children = false;
+    // the document list to hold the results
+    Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    result.appendChild(doc_list);
+    // Get the documents
+    String[] doc_ids = GSXML.getAttributeValuesFromList(query_doc_list,
+                                GSXML.NODE_ID_ATT);
+    for (int i = 0; i < doc_ids.length; i++) {
+        // Add the document to the list
+        Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+        doc_list.appendChild(doc);
+        String doc_id = doc_ids[i];
+        doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
+    for (int i=0; i < node_list.getLength(); i++) {
+        Element doc = (Element) node_list.item(i);
+        String doc_id = doc.getAttribute(GSXML.NODE_ID_ATT);
         if (external_id) {
         doc_id = translateExternalId(doc_id);
 …
+    }
     // Get the parameters of the request - no parameters at this stage
+    // Get the parameters of the request
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     Element extid_param = GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, EXTID_PARAM);
 …
         continue;
+        }
+        Element node_content = getNodeContent(doc_id);
+        doc.appendChild(node_content);
+        try {
+        Element node_content = getNodeContent(doc_id);
+        doc.appendChild(node_content);
+        } catch (GSException e) {
+        GSXML.addError(this.doc, result, e.getMessage());
+        return result;
+        }
+    }
     return result;
 …
+    }
+    /** if id ends in .fc, .pc etc, then translate it to the correct id */
+    abstract protected String translateId(String id);
+    /** if id ends in .fc, .pc etc, then translate it to the correct id
+     * default implementation: just remove the suffix */
+    protected String translateId(String id) {
+    return id.substring(0,id.length());
+    }
     /** if an id is not a greenstone id (an external id) then translate
+    it to a greenstone one*/
+    abstract protected String translateExternalId(String id);
+     * it to a greenstone one
+     * default implementation: return the id */
+    protected String translateExternalId(String id) {
+    return id;
+    }
     /** returns the document type of the doc that the specified node
     belongs to. should be one of
 …
     GSXML.DOC_TYPE_PAGED,
     GSXML.DOC_TYPE_HIERARCHY
+    default implementation: return DOC_TYPE_SIMPLE
     */
+    abstract protected String getDocType(String node_id);
+    /** returns the id of the root node of the document containing node node_id. . may be the same as node_id */
+    abstract protected String getRootId(String node_id);
+    /** returns a list of the child ids in order, null if no children */
+    abstract protected ArrayList getChildrenIds(String node_id);
+    /** returns the node id of the parent node, null if no parent */
+    abstract protected String getParentId(String node_id);
+    protected String getDocType(String node_id) {
+    return GSXML.DOC_TYPE_SIMPLE;
+    }
+    /** returns the id of the root node of the document containing
+     * node node_id. may be the same as node_id
+     * default implemntation: return node_id
+    */
+    protected String getRootId(String node_id) {
+    return node_id;
+    }
+    /** returns a list of the child ids in order, null if no children
+     * default implementation: return null */
+    protected ArrayList getChildrenIds(String node_id) {
+    return null;
+    }
+    /** returns the node id of the parent node, null if no parent
+     * default implementation: return null */
+    protected String getParentId(String node_id) {
+    return null;
+    }
     /** get the metadata for the doc node doc_id
 …
     abstract protected Element getMetadataList(String doc_id,
                            boolean all_metadata,
                            ArrayList metadata_names);
+                           ArrayList metadata_names) throws GSException;
     /** returns the content of a node
      * shoudl return a nodeContent element:
+     * should return a nodeContent element:
      * <nodeContent>text content or other elements</nodeContent>
+     * can return
      */
     abstract protected Element getNodeContent(String doc_id);
+    abstract protected Element getNodeContent(String doc_id) throws GSException;
     /** returns the structural information asked for.

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

-              r9000
+              r9874
 // Greenstone classes
 import org.greenstone.gdbm.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSFile;
 …
 import org.greenstone.gsdl3.util.GS2MacroResolver;
 import org.greenstone.gsdl3.util.GSConstants;
+import org.greenstone.gsdl3.util.GDBMWrapper;
+import org.greenstone.gsdl3.util.DBInfo;
 // XML classes
 import org.w3c.dom.Document;
 …
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.gdbm_src.closeDatabase();
+    }
     /** configure this service */
     public boolean configure(Element info, Element extra_info)
 …
     // assumes only one value per metadata
     protected Element getMetadataList(String node_id, boolean all_metadata,
+                      ArrayList metadata_names) {
+                      ArrayList metadata_names)
+    throws GSException {
     Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
     DBInfo info = this.gdbm_src.getInfo(node_id);
 …
      * <nodeContent>text content or other elements</nodeContent>
      */
     abstract protected Element getNodeContent(String doc_id);
+    abstract protected Element getNodeContent(String doc_id) throws GSException;
     protected String getMetadata(String node_id, DBInfo info,

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS3DocumentRetrieve.java

-              r9000
+              r9874
 // Greenstone classes
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSFile;
 …
     // set up a macro resolver
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.database.closeConnection();
+    }
     /** configure this service */
 …
+    }
-    /** if an id is not a greenstone id (an external id) then translate
-    it to a greenstone one*/
-    protected String translateExternalId(String node_id){
-    // dont have this yet
-    return node_id;
+    }
     /** returns the id of the root node of the document containing node node_id. . may be the same as node_id */
     protected String getRootId(String node_id) {
 …
     // assumes only one value per metadata
     protected Element getMetadataList(String node_id, boolean all_metadata,
+                      ArrayList metadata_names) {
+                      ArrayList metadata_names)
+    throws GSException {
     Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
 …
      * <nodeContent>text content or other elements</nodeContent>
      */
     abstract protected Element getNodeContent(String doc_id);
+    abstract protected Element getNodeContent(String doc_id) throws GSException;
+}

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractMGPPSearch.java

-              r9280
+              r9874
+    {
     this.mgpp_src = new MGPPWrapper();
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.mgpp_src.unloadIndexData();
+    }
 …
     } else if (name.equals(RANK_PARAM)) {
         String [] vals1 = {RANK_PARAM_RANK, RANK_PARAM_NONE };
         String [] vals1_texts = { getTextString("param."+RANK_PARAM+"."+RANK_PARAM_RANK, lang), getTextString("param."+RANK_PARAM+"."+RANK_PARAM_NONE, lang, "MGPPSearch")};
+        String [] vals1_texts = { getTextString("param."+RANK_PARAM+"."+RANK_PARAM_RANK, lang), getTextString("param."+RANK_PARAM+"."+RANK_PARAM_NONE, lang)};
         param = GSXML.createParameterDescription(this.doc, RANK_PARAM, getTextString("param."+RANK_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, RANK_PARAM_RANK, vals1, vals1_texts );

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractMGSearch.java

-              r9280
+              r9874
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.mg_src.unloadIndexData();
+    }
     public boolean configure(Element info, Element extra_info)
+    {
 …
     this.mg_src.runQuery(basedir, textdir, query);
     MGQueryResult mqr = this.mg_src.getQueryResult();
+    if (mqr.isClear()) {
+        // something has gone wrong
+        GSXML.addError(this.doc, result, "Couldn't query the mg database", GSXML.ERROR_TYPE_SYSTEM);
+        return result;
+    }
     long totalDocs = mqr.getTotalDocs();

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GATEServices.java.tmp

-              r6501
+              r9874
         annotated_text = "<nodeContent>" + annotated_text + "</nodeContent>";
+        Element annotated_content = this.converter.getDOM(annotated_text).getDocumentElement();
+        doc_node.replaceChild(doc_node.getOwnerDocument().importNode(annotated_content, true), content);
+    }
+        Document annotated_content_doc = this.converter.getDOM(annotated_text);
+        if (annotated_content_doc != null) {
+        Element annotated_content = annotated_content_doc.getDocumentElement();
+        doc_node.replaceChild(doc_node.getOwnerDocument().importNode(annotated_content, true), content);
+        } else {
+        System.err.println("GATEServices.processGatePOSTag Error: Couldn't parse annotated text for doc node "+i);
+        }
+    }
     result.appendChild(this.doc.importNode(doc_node_list, true));

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Browse.java

-              r8959
+              r9874
 // Greenstone classes
-import org.greenstone.gdbm.*;
 import org.greenstone.gsdl3.util.OID;
 import org.greenstone.gsdl3.util.GSXML;
 …
 import org.greenstone.gsdl3.util.MacroResolver;
 import org.greenstone.gsdl3.util.GS2MacroResolver;
+import org.greenstone.gsdl3.util.GDBMWrapper;
+import org.greenstone.gsdl3.util.DBInfo;
 // XML classes
 import org.w3c.dom.Document;
 …
     this.gdbm_src = new GDBMWrapper();
     this.macro_resolver = new GS2MacroResolver(this.gdbm_src);
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.gdbm_src.closeDatabase();
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java

-              r8959
+              r9874
 // Greenstone classes
 import org.greenstone.mgpp.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
 …
     public GS2MGPPRetrieve() {
     this.mgpp_src = new MGPPWrapper();
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.mgpp_src.unloadIndexData();
+    }
 …
      * <nodeContent>text content or other elements</nodeContent>
      */
     protected Element getNodeContent(String doc_id) {
+    protected Element getNodeContent(String doc_id) throws GSException {
     String lang = "en"; //  **********
     long doc_num = this.gdbm_src.OID2Docnum(doc_id);

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java

-              r9002
+              r9874
 // Greenstone classes
 import org.greenstone.gsdl3.util.*;
-import org.greenstone.gdbm.*;
 // XML classes
 …
+    {
     this.gdbm_src = new GDBMWrapper();
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.gdbm_src.closeDatabase();
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java

-              r8959
+              r9874
 // Greenstone classes
 import org.greenstone.mg.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
 …
     public GS2MGRetrieve() {
     this.mg_src = new MGWrapper();
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.mg_src.unloadIndexData();
+    }
 …
      * <nodeContent>text content or other elements</nodeContent>
      */
     protected Element getNodeContent(String doc_id) {
+    protected Element getNodeContent(String doc_id) throws GSException {
     String lang = "en"; //  **********
     long doc_num = this.gdbm_src.OID2Docnum(doc_id);

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGSearch.java

-              r9002
+              r9874
 // Greenstone classes
 import org.greenstone.gsdl3.util.*;
-import org.greenstone.gdbm.*;
 // XML classes
 …
+    {
     this.gdbm_src = new GDBMWrapper();
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.gdbm_src.closeDatabase();
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3Browse.java

r8959	r9874
52	52	}
53	53
	54	public void cleanUp() {
	55	super.cleanUp();
	56	this.database.closeConnection();
	57	}
	58
54	59	public boolean configure(Element info, Element extra_info)
55	60	{

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGPPRetrieve.java

-              r8959
+              r9874
 // Greenstone classes
 import org.greenstone.mgpp.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
 …
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.mgpp_src.unloadIndexData();
+    }
     /** configure this service */
     public boolean configure(Element info, Element extra_info)
+    {
+    // Do generic configuration
+    if (!super.configure(info, extra_info)) {
+        return false;
+    }
     // Do specific configuration
     System.out.println("Configuring GS3MGPPRetrieve...");
 …
     // The location of the MGPP text files
     mgpp_textdir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) +
         File.separatorChar + GSFile.collectionTextPath(this.cluster_name);
+        File.separatorChar + GSFile.collectionTextPath(this.index_stem);
+    // Do generic configuration
+    return super.configure(info, extra_info);
+    return true;
+    }
 …
      * <nodeContent>text content or other elements</nodeContent>
      */
     protected Element getNodeContent(String doc_id) {
+    protected Element getNodeContent(String doc_id) throws GSException {
     if (GS3OID.isDocTop(doc_id) && database.isHierarchicalDocument(doc_id)) {
         // if we have a whole doc id, and the document is hierarchical,

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGPPSearch.java

r9002	r9874
50	50	{
51	51	this.database = new SQLQuery();
	52	}
	53
	54	public void cleanUp() {
	55	super.cleanUp();
	56	this.database.closeConnection();
52	57	}
53	58

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGRetrieve.java

-              r9001
+              r9874
 // Greenstone classes
 import org.greenstone.mg.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
 …
     private String mg_textdir = null;
     private String default_index = null;
     public GS3MGRetrieve() {
     this.mg_src = new MGWrapper();
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.mg_src.unloadIndexData();
+    }
 …
      * <nodeContent>text content or other elements</nodeContent>
      */
     protected Element getNodeContent(String doc_id) {
+    protected Element getNodeContent(String doc_id) throws GSException {
     if (GS3OID.isDocTop(doc_id) && database.isHierarchicalDocument(doc_id)) {
 …
     } catch (Exception e) {
         System.out.println("exception happended with mg_src.getDocument()");
+        doc_content = "this is the content for section hash id "+ doc_id+", mg doc num "+doc_int+"\n";
+        throw new GSException("Couldn't get document content for id: "+ doc_int+"\n"+e.getMessage());
+        //doc_content = "this is the content for section hash id "+ doc_id+", mg doc num "+doc_int+"\n";
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3MGSearch.java

r9002	r9874
50	50	{
51	51	this.database = new SQLQuery();
	52	}
	53
	54	public void cleanUp() {
	55	super.cleanUp();
	56	this.database.closeConnection();
52	57	}
53	58

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaProxy.java

-              r8158
+              r9874
 // Greenstone classes
-import org.greenstone.gdbm.*;
 import org.greenstone.gsdl3.util.*;
 …
     doc_node.setAttribute(GSXML.NODE_ID_ATT, doc_id);
+    Element content_element = this.converter.getDOM(processed_content.toString()).getDocumentElement();
+    doc_node.appendChild(this.doc.importNode(content_element, true));
+    Document content_doc = this.converter.getDOM(processed_content.toString());
+    if (content_doc != null) {
+        Element content_element = content_doc.getDocumentElement();
+        doc_node.appendChild(this.doc.importNode(content_element, true));
+    } else {
+        System.err.println("IViaProxy.getDocument Error: Couldn't parse the node content");
+    }
     return doc_node;

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaRetrieve.java

-              r9289
+              r9874
 // Greenstone classes
 import org.greenstone.gdbm.*;
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.*;
 …
     /** gets a document by sending a request to iVia, then processes it and creates a documentNode around the text */
+    protected Element getNodeContent(String doc_id) {
+    protected Element getNodeContent(String doc_id)
+    throws GSException {
     String url_string = ivia_server_url+"/cgi-bin/view_record?theme=gsdl3&record_id="+doc_id;
 …
     StringBuffer buffer = new StringBuffer();
     try {
         BufferedReader reader = makeConnection(url_string);
+        BufferedReader reader = Misc.makeHttpConnection(url_string);
             String line;
         while((line = reader.readLine())!= null) {
         buffer.append(line);
+        }
+    } catch (Exception e) {
+        System.err.println("IViaRetrieve Error:exception happened");
+        e.printStackTrace();
+    }
+    } catch (java.net.MalformedURLException e) {
+        throw new GSException("Malformed URL: "+url_string, GSXML.ERROR_TYPE_SYSTEM);
+    } catch (java.io.IOException e) {
+        throw new GSException("IOException during connection to "+url_string+": "+e.toString(),GSXML.ERROR_TYPE_SYSTEM);
+    }
     String node_content = buffer.toString();
 …
     processed_content.append("</nodeContent>");
+    Element content_element = this.converter.getDOM(processed_content.toString()).getDocumentElement();
+    Document content_doc = this.converter.getDOM(processed_content.toString());
+    if (content_doc == null) {
+        System.err.println("IViaRetrieve.getNodeContent Error: Couldn't parse node content");
+        System.err.println(processed_content.toString());
+        return null;
+    }
+    Element content_element = content_doc.getDocumentElement();
     return (Element)this.doc.importNode(content_element,true);
 …
+    }
-    protected BufferedReader makeConnection(String url_string) {
-    BufferedReader reader = null;
-    try {
-        URL url = new URL(url_string);
-        HttpURLConnection connection = (HttpURLConnection)url.openConnection();
-        InputStream input = connection.getInputStream();
-        reader = new BufferedReader(new InputStreamReader(input));
-    } catch (java.net.MalformedURLException e) {
-        System.err.println("IViaRetrieve: Malformed URL: "+url_string);
-    } catch (java.io.IOException e) {
-        System.err.println("IViaRetrieve Error: An error occurred during IO to url "+url_string);
+    }
-    return reader;
+    }
     protected String translateId(String oid){
     int p = oid.lastIndexOf('.');
 …
     protected Element getMetadataList (String doc_id,
                        boolean all_metadata,
+                       ArrayList metadata_names){
+                       ArrayList metadata_names)
+    throws GSException {
     Element meta_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
 …
     String url_string = ivia_server_url+"/cgi-bin/view_record_set?theme=gsdl3&record_id_list="+doc_id+"&field_list="+field_list.toString();
     try {
         BufferedReader reader = makeConnection(url_string);
+        BufferedReader reader = Misc.makeHttpConnection(url_string);
         String line;
         while  ((line = reader.readLine()) != null) {
 …
         GSXML.addMetadata(this.doc, meta_list, name, value);
+        }
+    } catch (Exception e) {
+        System.err.println("IViaRetrieve Error:exception happened");
+        e.printStackTrace();
+    } catch (java.net.MalformedURLException e) {
+        throw new GSException("Malformed URL: "+url_string, GSXML.ERROR_TYPE_SYSTEM);
+    } catch (java.io.IOException e) {
+        throw new GSException("IOException: "+e.toString(), GSXML.ERROR_TYPE_SYSTEM);
+    }
     return meta_list;

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaSearch.java

-              r9273
+              r9874
 // Greenstone classes
-import org.greenstone.gdbm.*;
 import org.greenstone.gsdl3.util.*;
 …
 import java.util.HashMap;
 import java.io.File;
-import java.io.InputStream;
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URLConnection;
-import java.net.URL;
 import java.net.Authenticator;
-import java.net.MalformedURLException;
 /**
+ *
  * @author <a href="mailto:[email protected]">Katherine Don</a>
+ * @version $Revision$
+ * Modified by <a href="mailto:[email protected]">Chi-Yu Huang</a>
+ * @author <a href="mailto:[email protected]">Chi-Yu Huang</a>
  */
 …
     String results_num = null;
     String doc_ids = null;
+    BufferedReader reader = null;
     try {
         ///system.err.println("IViaSearch, sending "+url_string);
         BufferedReader reader = makeConnection(url_string);
+        reader = Misc.makeHttpConnection(url_string);
         results_num = reader.readLine();
         doc_ids = reader.readLine();
+    } catch (Exception e) {
+        System.err.println("IViaSearch.TextQuery Error: exception happened during query");
+        e.printStackTrace();
+    } catch (java.net.MalformedURLException e) {
+        GSXML.addError(this.doc, result, "Malformed URL: "+url_string);
+        return result;
+    } catch (java.io.IOException e) {
+        GSXML.addError(this.doc, result, "IOException during connection to "+url_string+": "+e.toString());
         return result;
+    }
 …
     } else {
         System.err.println("IViaSearch.TextQuery Error: badly formatted results line: "+results_num);
+        GSXML.addError(this.doc, result, "Error: badly formatted result from IVia server: "+results_num);
         return result;
+    }
 …
     } else {
         System.err.println("IViaSearch.TextQuery Error: badly formatted docs line: "+doc_ids);
+        GSXML.addError(this.doc, result, "Error: badly formatted result from IVia server: "+doc_ids);
         return result;
+    }
 …
+    }
-    protected BufferedReader makeConnection(String url_string) {
-    BufferedReader reader = null;
-    try {
-        URL url = new URL(url_string);
-        HttpURLConnection connection = (HttpURLConnection)url.openConnection();
-        InputStream input = connection.getInputStream();
-        reader = new BufferedReader(new InputStreamReader(input));
-    } catch (java.net.MalformedURLException e) {
-        System.err.println("IViaSearch Error: Malformed URL: "+url_string);
-    } catch (java.io.IOException e) {
-        System.err.println("IViaSearch Error: An error occurred during IO to url "+url_string);
+    }
-    return reader;
+    }
     /**

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/LuceneSearch.java

r9272	r9874
2	2
3	3	// Greenstone classes
4		~~import org.greenstone.gdbm.*;~~
5	4	import org.greenstone.gsdl3.util.*;
6	5

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/MapRetrieve.java

r6694	r9874
2	2
3	3	// Greenstone classes
4		~~import org.greenstone.gdbm.*;~~
5	4	import org.greenstone.gsdl3.util.*;
6	5

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/MapSearch.java

r9286	r9874
20	20
21	21	// Greenstone classes
22		~~import org.greenstone.gdbm.*;~~
23	22	import org.greenstone.gsdl3.util.*;
24	23

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ModuleWrapper.java

-              r3621
+              r9874
+  }
+  public void cleanUp() {}
   /** The all-args constructor */
   public ModuleWrapper(String in,String out, ModuleInterface inner){

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java

-              r6490
+              r9874
     this.mgpp_src.setCase(true);
+    }
+    public void cleanUp() {
+    super.cleanUp();
+    this.mgpp_src.unloadIndexData();
+    }
     /** configure the service module
+     *
 …
     Document dom = this.converter.getDOM(app_info);
+    if (dom==null) {
+        System.err.println("PhindPhraseBrowse.configure Error: Couldn't parse applet info");
+        return false;
+    }
     Element app_elem = dom.getDocumentElement();
     applet_description.appendChild(this.doc.importNode(app_elem, true));
     return true;
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

-              r9426
+              r9874
     setClusterName(coll_name);
+    }
+    public void cleanUp() {}
     /** sets the site home */
 …
     Document doc = this.converter.getDOM(xml_in);
+    if (doc == null) {
+        System.err.println("ServiceRack.process(String) Error: Couldn't parse request");
+        System.err.println(xml_in);
+        return null;
+    }
     Element res = process(doc.getDocumentElement());
     return this.converter.getString(res);

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/Visualizer.java

-              r8347
+              r9874
     Document dom = converter.getDOM(app_info);
+    if (dom == null) {
+        System.err.println("Visualizer.configure Error: Couldn't parse applet info");
+        return false;
+    }
     Element app_elem = dom.getDocumentElement();
     applet_description.appendChild(this.doc.importNode(app_elem, true));

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/Dictionary.java

r9424	r9874
47	47	this.raw = ResourceBundle.getBundle(this.resource, this.locale);
48	48	} catch (Exception e) {
49		System.err.println("Dictionary: couldn't locate a resource bundle for "+resource);
	49	//System.err.println("Dictionary: couldn't locate a resource bundle for "+resource);
50	50	}
51	51	}
…	…
70	70	this.raw = ResourceBundle.getBundle(this.resource, this.locale);
71	71	} catch (Exception ex) {
72		System.err.println("Dictionary: couldn't locate a resource bundle for "+resource);
	72	//System.err.println("Dictionary: couldn't locate a resource bundle for "+resource);
73	73	}
74	74
…	…
129	129	}
130	130	catch (Exception e) {
131		System.err.println("Dictionary Error: couldn't find string for key:" + key +" in resource "+this.resource);
	131	//System.err.println("Dictionary Error: couldn't find string for key:" + key +" in resource "+this.resource);
132	132	return null;
133	133	}

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java

r8962	r9874
20	20
21	21	import java.util.ArrayList;
22		~~import org.greenstone.gdbm.GDBMWrapper;~~
23		~~import org.greenstone.gdbm.DBInfo;~~
24	22
25	23	public class GS2MacroResolver

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSFile.java

-              r9425
+              r9874
 import java.io.File;
+import org.apache.soap.encoding.soapenc.Base64;
+//import org.apache.soap.encoding.soapenc.Base64;
+import org.apache.axis.encoding.Base64;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 …
     /** text path (for doc retrieval) relative to collectionBaseDir */
     static public String collectionTextPath(String collection_name) {
+    static public String collectionTextPath(String index_stem) {
     return "index"+File.separatorChar+"text"+File.separatorChar+
         collection_name;
+        index_stem;
+    }
     /** index path (for querying) relative to collectionBaseDir */
     static public String collectionIndexPath(String collection_name,
+    static public String collectionIndexPath(String index_stem,
                          String index_name) {
     return "index"+File.separatorChar+index_name+File.separatorChar+
         collection_name;
+        index_stem;
+    }

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSXML.java

-              r9261
+              r9874
     public static final String PARAM_IGNORE_POS_ATT = "ignore";
     public static final String CLASSIFIER_CONTENT_ATT = "content";
+    public static final String ERROR_TYPE_ATT = "type";
     // document stuff
     public static final String DOC_TYPE_ATT = "docType";
 …
     public static final String COMM_TYPE_SOAP_JAVA = "soap";
+    // error types
+    public static final String ERROR_TYPE_SYNTAX = "syntax";
+    public static final String ERROR_TYPE_SYSTEM = "system";
+    public static final String ERROR_TYPE_INVALID_ID = "invalid_id";
+    public static final String ERROR_TYPE_OTHER = "other";
     // some system wide param names
     public static final String SUBSET_PARAM = "subset";
 …
+    }
+    /** add an error message, unknown error type */
+    public static boolean addError(Document owner, Element doc, String text) {
+    return addError(owner, doc, text, ERROR_TYPE_OTHER);
+    }
     /** add an error message */
+    public static boolean addError(Document owner, Element doc, String text) {
+    public static boolean addError(Document owner, Element doc, String text,
+                   String error_type) {
     Element content = owner.createElement(ERROR_ELEM);
+    content.setAttribute(ERROR_TYPE_ATT, error_type);
     Text t = owner.createTextNode(text);
     content.appendChild(t);
 …
     /** add an error message */
     public static boolean addError(Document owner, Element doc, Throwable error) {
+      error.printStackTrace();
+      return addError(owner, doc, error.toString());
+      return addError(owner, doc, error, ERROR_TYPE_OTHER);
+    }
+    /** add an error message */
+    public static boolean addError(Document owner, Element doc,
+                   Throwable error, String error_type) {
+    error.printStackTrace();
+    return addError(owner, doc, error.toString(), error_type);
+    }
 …
+    }
+    public static NodeList getChildrenByTagName(Node n, String name) {
+    MyNodeList node_list = new MyNodeList();
+    Node child = n.getFirstChild();
+    while (child!=null) {
+        if (child.getNodeName().equals(name)) {
+        node_list.addNode(child);
+        }
+        child = child.getNextSibling();
+    }
+    return node_list;
+    }
     /** Duplicates an element, but gives it a new name */
 …
                            String element_name, boolean with_attributes)
+    {
+    Element duplicate = owner.createElement(element_name);
+    return duplicateWithNewNameNS(owner, element, element_name, null, with_attributes);
+    }
+    /** Duplicates an element, but gives it a new name */
+    public static Element duplicateWithNewNameNS(Document owner,
+                         Element element,
+                         String element_name,
+                         String namespace_uri,
+                         boolean with_attributes)
+    {
+    Element duplicate;
+    if (namespace_uri == null) {
+        duplicate = owner.createElement(element_name);
+    } else {
+        duplicate = owner.createElementNS(namespace_uri, element_name);
+    }
     // Copy element attributes
     if (with_attributes) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/Misc.java

-              r7444
+              r9874
+/*
+ *    Misc.java
+ *    Copyright (C) 2002 New Zealand Digital Library, http://www.nzdl.org
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 package org.greenstone.gsdl3.util;
 import java.util.HashMap;
 …
 import java.util.Iterator;
 import java.util.Properties;
+import java.io.InputStream;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
 /** contains miscellaneous functions */
 …
+    }
+    public static BufferedReader makeHttpConnection(String url_string)
+    throws java.net.MalformedURLException, java.io.IOException {
+    BufferedReader reader = null;
+    URL url = new URL(url_string);
+    HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+    InputStream input = connection.getInputStream();
+    reader = new BufferedReader(new InputStreamReader(input));
+    return reader;
+    }
+}

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/SQLQuery.java

-              r8746
+              r9874
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 …
     public boolean setDatabase(String db_name) {
     try {
         connection = GS3SQLConnectionFactory.getGS3SQLConnection(db_name);
+    connection = GS3SQLConnectionFactory.getGS3SQLConnection(db_name);
+    try {
         // test the connection
         String query = "select * from "+GSSQL.DOCUMENT_TABLE+GSSQL.END;
+        if (!connection.execute(query)) {
+        //connection.close();
+        connection = null;
+        return false;
+        }
+        Statement s = connection.createStatement();
+        s.execute(query);
+        s.close();
         return true;
     } catch (Exception e) {
+        System.err.println("SQLQuery.setDatabase Exception");
+        return false;
+        System.err.println("SQLQuery.setDatabase():"+e);
+    }
+    closeConnection();
+    return false;
+    }
+    public void closeConnection() {
+    if (connection != null) {
+        connection.close();
+        connection=null;
+    }
+    }
 …
         GSSQL.END;
     connection.execute(query);
+    Statement statement = null;
     ResultSet results = null;
     String doc_id = null;
     String meta_id = null;
     try {
+        results = connection.getResultSet();
+        results.first();
+        doc_id = results.getString(GSSQL.DOCUMENT_ID);
+        meta_id = results.getString(GSSQL.METADATA_ID);
+    } catch (java.sql.SQLException e) {
+        System.err.println("SQLQuery.MGNum2OID() Error: "+e.getMessage());
+        return null;
+    }
+    System.out.println("doc id ="+doc_id+", meta id = "+meta_id);
+        statement = connection.createStatement();
+        results = statement.executeQuery(query);
+        if (results.first()) {
+        doc_id = results.getString(GSSQL.DOCUMENT_ID);
+        meta_id = results.getString(GSSQL.METADATA_ID);
+        } else {
+        statement.close();
+        return null;
+        }
+    } catch (java.sql.SQLException e) {
+        System.err.println("SQLQuery.MGNum2OID(): "+e);
+        return null;
+    }
     // now get division label
 …
         GSSQL.END;
     connection.execute(query);
     String short_label = null;
     try {
+        results = connection.getResultSet();
+        results.first();
+        short_label = results.getString(GSSQL.SHORT_LABEL);
+    } catch (java.sql.SQLException e) {
+        results = statement.executeQuery(query);
+        if (results.first()) {
+        short_label = results.getString(GSSQL.SHORT_LABEL);
+        } else {
+        statement.close();
+        return null;
+        }
+        statement.close();
+    } catch (SQLException e) {
         System.err.println("SQLQuery.MGNum2OID() Error: "+e.getMessage());
         return null;
+    }
+    ///ystem.out.println("short label = "+short_label);
+    System.out.println("final doc_id = "+GS3OID.createOID(doc_id, short_label));
     return GS3OID.createOID(doc_id, short_label);
+    }
     public String OID2MGNum(String oid) {
-    System.out.println("converting oid "+oid+" to mg num");
     String id = getDocumentMetadata(oid, "gsdl3.mgseqno");
-    System.out.println("mg id = "+id);
     return id;
 …
         " and "+ GSSQL.STRUCTURE_ID +GSSQL.EQUALS_QUOTE + "Section" + GSSQL.QUOTE +
         GSSQL.END;
+    connection.execute(query);
+    ResultSet results = null;
+    try {
+        results = connection.getResultSet();
+        if (results.next()) {
+        return true;
+        }
+    boolean is_hierarchical = false;
+    try {
+        Statement statement = connection.createStatement();
+        ResultSet results = statement.executeQuery(query);
+        is_hierarchical = results.first();
+        statement.close();
     } catch (java.sql.SQLException e) {
         return false;
+    }
     return false;
+    return is_hierarchical;
+    }
 …
     public String getClassifierMetadata(String oid, String full_meta_name) {
+    if (full_meta_name.equals("Title") || full_meta_name.equals("numleafdocs")) {
+        // get the description
+        String field_name="";
+        if (full_meta_name.equals("Title")) {
+        field_name = GSSQL.DESCRIPTION;
+        } else {
+        field_name = GSSQL.NUM_LEAF_DOCUMENTS;
+        }
+        String query = "select "+ field_name+
+        " from " + GSSQL.CLASSIFIER_TABLE +
+        " where " + GSSQL.CLASSIFIER_ID + GSSQL.EQUALS_QUOTE + oid + GSSQL.QUOTE +
+        GSSQL.END;
+    if (!full_meta_name.equals("Title") && !full_meta_name.equals("numleafdocs")) {
+        return null;
+    }
+    // get the description
+    String field_name="";
+    if (full_meta_name.equals("Title")) {
+        field_name = GSSQL.DESCRIPTION;
+    } else {
+        field_name = GSSQL.NUM_LEAF_DOCUMENTS;
+    }
+    String query = "select "+ field_name+
+        " from " + GSSQL.CLASSIFIER_TABLE +
+        " where " + GSSQL.CLASSIFIER_ID + GSSQL.EQUALS_QUOTE + oid + GSSQL.QUOTE +
+        GSSQL.END;
+    String value = null;
+    try {
+        Statement statement = connection.createStatement();
+        ResultSet results = statement.executeQuery(query);
+        if (results.first()) {
+        value = results.getString(field_name);
+        }
+        statement.close();
+    } catch (java.sql.SQLException e) {
+        connection.execute(query);
+        ResultSet results = null;
+        String value = null;
+        try {
+        results = connection.getResultSet();
+        results.first();
+        value = results.getString(field_name);
+        } catch (java.sql.SQLException e) {
+        System.err.println("SQLQuery.getClassifierMetadata() Error: "+e.getMessage());
+        return null;
+        }
+        return value;
+    }  else return null;
+        System.err.println("SQLQuery.getClassifierMetadata() Error: "+e.getMessage());
+        return null;
+    }
+    return value;
+    }
 …
         section_id = GS3OID.getSectionLabel(oid);
+    }
-    System.out.println("getDocChildren: oid = "+oid+", doc id = "+doc_id+", sec id ="+section_id);
 //      int sep_index = oid.indexOf(".");
 //      if (sep_index != -1) {
 …
         GSSQL.END;
-    connection.execute(query);
     ResultSet results = null;
+    Statement statement = null;
     String div_ref = null;
     try {
+        results = connection.getResultSet();
+        results.first();
+        div_ref = results.getString(GSSQL.DIVISION_REF);
+        statement = connection.createStatement();
+        results = statement.executeQuery(query);
+        if (results.first()) {
+        div_ref = results.getString(GSSQL.DIVISION_REF);
+        } else {
+        statement.close();
+        return null;
+        }
     } catch (java.sql.SQLException e) {
 …
         " and "+GSSQL.PARENT_REF+GSSQL.EQUALS_QUOTE+div_ref+GSSQL.QUOTE+
         GSSQL.END;
+    connection.execute(query);
+    results = null;
+    try {
+        results = connection.getResultSet();
+    try {
+        results = statement.executeQuery(query);
         while (results.next()) {
         String id = results.getString(GSSQL.SHORT_LABEL);
         children.add(GS3OID.createOID(doc_id, id));
+        }
+        statement.close();
     } catch (java.sql.SQLException e) {
 …
         GSSQL.END;
+    connection.execute(query);
+    ResultSet results = null;
+    try {
+        results = connection.getResultSet();
+    try {
+        Statement statement = connection.createStatement();
+        ResultSet results = statement.executeQuery(query);
         while (results.next()) {
         String id = results.getString(GSSQL.CLASSIFIER_ID);
         children.add(id);
+        }
+    } catch (java.sql.SQLException e) {
+        statement.close();
+    } catch (java.sql.SQLException e) {
         System.err.println("SQLQuery.getClassifierChildren Error: "+e.getMessage());
         return null;
 …
     public ArrayList getClassifierDocChildren(String oid) {
-    System.out.println("in getclassifierdocchildren");
     ArrayList children = new ArrayList();
 …
         " order by "+GSSQL.CLASS_DOCUMENT_TABLE+GSSQL.DOT+GSSQL.DOCUMENT_ORDER+
         GSSQL.END;
+    System.out.println("query="+query);
+    connection.execute(query);
+    ResultSet results = null;
+    try {
+        results = connection.getResultSet();
+    try {
+        Statement statement = connection.createStatement();
+        ResultSet results = statement.executeQuery(query);
         while (results.next()) {
         String id = results.getString(GSSQL.DOCUMENT_ID);
 …
         return null;
+    }
-    // now check for documents
     return children;
 …
 //      }
-    System.out.println("get meta for "+oid+", doc id = "+doc_id+"sec id = "+section_id);
     // get the metadata block id
 …
         GSSQL.END;
     connection.execute(query);
+    Statement statement = null;
     ResultSet results = null;
     String meta_id = null;
     try {
+        results = connection.getResultSet();
+        results.first();
+        meta_id = results.getString(GSSQL.METADATA_ID);
+        statement = connection.createStatement();
+        results = statement.executeQuery(query);
+        if (results.first()) {
+        meta_id = results.getString(GSSQL.METADATA_ID);
+        } else {
+        statement.close();
+        return null;
+        }
     } catch (java.sql.SQLException e) {
 …
         return null;
+    }
+    System.err.println("metadata block id = "+meta_id);
     // now get the list of namespace refs for the right namespace
     int sep_index = full_meta_name.indexOf('.');
 …
         meta_name = full_meta_name.substring(sep_index+1);
+    }
-    System.out.println("orig meta = "+full_meta_name+", ns = "+meta_ns+", name="+meta_name);
     query = "select * "+
 …
         " and "+GSSQL.NAMESPACE_TABLE+GSSQL.DOT+GSSQL.NAMESPACE_REF+GSSQL.EQUALS+GSSQL.METADATA_VALUE_TABLE+GSSQL.DOT+GSSQL.NAMESPACE_REF+
         GSSQL.END;
+    System.out.println("query="+query);
+    connection.execute(query);
     String meta_value = null;
     try {
+        results = connection.getResultSet();
+        statement = connection.createStatement();
+        results = statement.executeQuery(query);
         while (results.next()) {
         String m_name = results.getString(GSSQL.LABEL);
 …
+        }
+        }
+        statement.close();
     } catch (java.sql.SQLException e) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/XMLConverter.java

-              r8923
+              r9874
     String nodeName = xmlNode.getNodeName();
+    if (nodeType == Node.DOCUMENT_NODE) {
+        return getString(((Document)xmlNode).getDocumentElement(), depth, pretty);
+    }
     // Handle Element nodes
     if (nodeType == Node.ELEMENT_NODE) {

trunk/gsdl3/src/packages/mg/java/org/greenstone/mg/MGQueryResult.java

-              r3794
+              r9874
+    }
+    public boolean isClear() {
+    return (total_num_docs_ == 0 && docs_.isEmpty() && terms_.isEmpty());
+    }
     /** returns the result as a String - useful for printing out results */

trunk/gsdl3/src/packages/mg/jni/MGWrapperImpl.c

-              r8920
+              r9874
   /* Check that the index was loaded successfully */
+  assert(qd != NULL);
+  if (qd==NULL) {
+    return NULL;
+  }
+  /*assert(qd != NULL);*/
   /* Get the document position and length in the text file */
 …
   jthrowable exc;
+  /* Make sure an index has been specified */
+  index_path = data->queryInfo->index;
+  assert(index_path != NULL);
+  /* Obtain C versions of the two string parameters */
+  base_dir = (*j_env)->GetStringUTFChars(j_env, j_base_dir, NULL);
+  if (base_dir == NULL) {
+    return;
+  }
+  text_path = (*j_env)->GetStringUTFChars(j_env, j_text_path, NULL);
+  if (text_path == NULL) {
+    (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+    return;
+  }
+  /* Load the appropriate index for satisfying this request */
+  qd = loadIndexData((char*) base_dir, (char*) index_path, (char*) text_path);
+  /* The C text strings are no longer needed */
+  (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+  (*j_env)->ReleaseStringUTFChars(j_env, j_text_path, text_path);
+  /* Check that the index was loaded successfully */
+  assert(qd != NULL);
+  /* Remove anything hanging around from last time */
+  FreeQueryDocs(qd);
+  /* First of all, clear the previous result */
   /* The result to write to */
   result_ptr = (*j_env)->GetObjectField(j_env, j_obj, FID_query_result);
 …
     return;
+  }
+  /* Make sure an index has been specified */
+  index_path = data->queryInfo->index;
+  assert(index_path != NULL);
+  /* Obtain C versions of the two string parameters */
+  base_dir = (*j_env)->GetStringUTFChars(j_env, j_base_dir, NULL);
+  if (base_dir == NULL) {
+    return;
+  }
+  text_path = (*j_env)->GetStringUTFChars(j_env, j_text_path, NULL);
+  if (text_path == NULL) {
+    (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+    return;
+  }
+  /* Load the appropriate index for satisfying this request */
+  qd = loadIndexData((char*) base_dir, (char*) index_path, (char*) text_path);
+  /* The C text strings are no longer needed */
+  (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+  (*j_env)->ReleaseStringUTFChars(j_env, j_text_path, text_path);
+  /* Check that the index was loaded successfully */
+  if (qd == NULL) {
+    return;
+  }
+  /*assert(qd != NULL);*/
+  /* Remove anything hanging around from last time */
+  FreeQueryDocs(qd);
   /* Obtain a C version of the query string */

trunk/gsdl3/src/packages/mg/src/images/WIN32.MAK

-              r3921
+              r9874
 mostlyclean:
+    rm -f *$o _*.c _*.o *._c *._o core core.*
+    if exist *$o del *$o
+    if exist  _*.c del  _*.c
+    if exist _*.o  del  _*.o
+    if exist *._c  del *._c
+    if exist *._o  del *._o
+    if exist core  del  core
+    if exist core.* del  core.*
 clean: mostlyclean
     rm -f $(EXEC)
+    if exist *$e del *$e
 distclean: clean
+    rm -f ansi2knr
+    rm -f Makefile
+    del ansi2knr
 maintainer-clean: distclean
     @echo "This command is intended only for maintainers to use;"

trunk/gsdl3/src/packages/mg/src/text/win32.mak

r7585	r9874
237	237	clean:
238	238	if exist $o del $o
239		if exist ~~$(EXEC) del $(EXEC)~~
	239	if exist $e del $e
240	240	if exist libmgtextin.lib del libmgtextin.lib
241	241	if exist libmgpass.lib del libmgpass.lib

trunk/gsdl3/src/packages/mg/winMake.bat

-              r6416
+              r9874
     cd ..\..
+    cd java\org\greenstone\mg
+    call winMake.bat %1
+    cd ..\..\..\..
     cd jni
     %MAKE% %MAKE_OPTIONS% win32.mak %1
 …
 :done

trunk/gsdl3/web/interfaces/classic/transform/document.xsl

r8637	r9874
4	4	xmlns:java="http://xml.apache.org/xslt/java"
5	5	xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
6		xmlns:gsf="http://www.greenstone.org/~~configf~~ormat"
	6	xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
7	7	extension-element-prefixes="java util"
8	8	exclude-result-prefixes="java util gsf">

trunk/gsdl3/web/interfaces/classic/transform/query-common.xsl

r8585	r9874
14	14	<input type="hidden" name="a" value="q"/>
15	15	<input type="hidden" name="sa" value="{$subaction}"/>
16		<input type="hidden" name="rt" value="r"/>
	16	<input type="hidden" name="rt" value="rd"/>
17	17	<input type="hidden" name="s" value="{@name}"/>
18	18	<input type="hidden" name="c" value="{$collName}"/>

trunk/gsdl3/web/interfaces/default/transform/config_format.xsl

r8648	r9874
4	4	xmlns:xslt="output.xsl"
5	5	xmlns:java="http://xml.apache.org/xslt/java"
6		xmlns:gsf="http://www.greenstone.org/~~configf~~ormat"
	6	xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
7	7	extension-element-prefixes="java">
8	8

trunk/gsdl3/web/interfaces/default/transform/document.xsl

-              r9008
+              r9874
   xmlns:java="http://xml.apache.org/xslt/java"
   xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
   xmlns:gsf="http://www.greenstone.org/configformat"
+  xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
   extension-element-prefixes="java util"
   exclude-result-prefixes="java util gsf">
 …
     <xsl:variable name="p.c"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='p.c']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='p.c']/@value"/></xsl:when><xsl:otherwise><xsl:value-of select="$collName"/></xsl:otherwise></xsl:choose></xsl:variable>
     <table><tr><td>
       <a href="{$library_name}?a={$p.a}&amp;sa={$p.sa}&amp;s={$p.s}&amp;c={$p.c}&amp;rt=r"><xsl:call-template name="openbookimg"><xsl:with-param name="title">Close this book and return to search/browse</xsl:with-param>
+      <a href="{$library_name}?a={$p.a}&amp;sa={$p.sa}&amp;s={$p.s}&amp;c={$p.c}&amp;rt=rd"><xsl:call-template name="openbookimg"><xsl:with-param name="title">Close this book and return to search/browse</xsl:with-param>
       </xsl:call-template></a></td>
     <td valign='top'><b><font size="+1">&#160;
 …
       <xsl:choose>
     <xsl:when test="@type='document'">a=d</xsl:when>
     <xsl:when test="@type='query'">a=q&amp;s=<xsl:value-of select="@service"/>&amp;rt=r</xsl:when>
+    <xsl:when test="@type='query'">a=q&amp;s=<xsl:value-of select="@service"/>&amp;rt=rd</xsl:when>
     <xsl:otherwise>
+      p

trunk/gsdl3/web/interfaces/default/transform/query.xsl

r9009	r9874
77	77	<input type="hidden" name="a" value="q"/>
78	78	<input type="hidden" name="sa" value="{$subaction}"/>
79		<input type="hidden" name="rt" value="r"/>
	79	<input type="hidden" name="rt" value="rd"/>
80	80	<input type="hidden" name="s" value="{@name}"/>
81	81	<input type="hidden" name="c" value="{$collName}"/>

trunk/gsdl3/web/interfaces/default/transform/style.xsl

-              r9274
+              r9874
           <tr><td>
           <xsl:apply-templates select="pageResponse"/>
+          <xsl:apply-templates select="descendant::error"/>
+          <xsl:if test="descendant::error">
+            <script language="Javascript">
+              <xsl:text disable-output-escaping="yes">
+            function removeAllChildren(node) {
+             while (node.hasChildNodes()) {
+              node.removeChild(node.firstChild);
+             }
+            }
+              function toggleHideError(obj) {
+              if (obj.style.display == "none") {
+            obj.style.display = "";
+            hide_link = document.getElementById("hide");
+            removeAllChildren(hide_link);
+            hide_link.appendChild(document.createTextNode("Hide Error"));
+              } else {
+            obj.style.display = "none";
+            hide_link = document.getElementById("hide");
+            removeAllChildren(hide_link);
+            hide_link.appendChild(document.createTextNode("Show Error"));
+            }
+              }
+              </xsl:text>
+            </script>
+            <p align='right'><a id="hide" href="javascript:toggleHideError(error);">Show Error</a></p>
+            <div id="error" style="display: none;">
+              <xsl:apply-templates select="descendant::error"/>
+            </div>
+          </xsl:if>
           <xsl:call-template name="greenstoneFooter"/>
         </td></tr>
 …
     Error: <xsl:value-of select="."/>
   </xsl:template>
   <xsl:template name="standardPageBanner">
     <xsl:param name="collName"/>

trunk/gsdl3/web/sites/gateway/siteConfig.xml.in

r9460	r9874
3	3	<localSiteName value="gateway"/>
4	4	<siteList>
5		<site name="localsite" address="http://@hostname@:@port@/~~soap/servlet/rpcrouter~~" type="soap"/>
	5	<site name="localsite" address="http://@hostname@:@port@/axis/services/localsite" type="soap"/>
6	6	</siteList>
7	7	<serviceClusterList/>

trunk/gsdl3/web/sites/localsite/collect/gberg/etc/collectionConfig.xml

r6228	r9874
1	1	<collectionConfig
2		xmlns:gsf="http://www.greenstone.org/~~configf~~ormat"
	2	xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
3	3	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
4	4	<metadataList>

trunk/gsdl3/web/sites/localsite/collect/gberg/index/buildConfig.xml

r6230	r9874
1		<buildConfig xmlns:gsf="http://www.greenstone.org/~~configf~~ormat" >
	1	<buildConfig xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat" >
2	2	<metadataList>
3	3	<metadata name="numDocs">4</metadata>

trunk/gsdl3/web/sites/localsite/collect/gs2mgdemo/etc/collectionConfig.xml

r7977	r9874
1	1	<collectionConfig
2		xmlns:gsf="http://www.greenstone.org/~~configf~~ormat"
	2	xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
3	3	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
4	4	<metadataList>

trunk/gsdl3/web/sites/localsite/collect/gs2mgdemo/index/buildConfig.xml

r8965	r9874
1		<buildConfig xmlns:gsf="http://www.greenstone.org/~~configf~~ormat">
	1	<buildConfig xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat">
2	2	<metadataList>
3	3	<metadata name="numDocs">11</metadata>

trunk/gsdl3/web/sites/localsite/collect/gs2mgppdemo/etc/collectionConfig.xml

r8057	r9874
1		<collectionConfig xmlns:gsf="http://www.greenstone.org/~~configf~~ormat" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
	1	<collectionConfig xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
2	2	<metadataList>
3	3	<metadata name="creator">[email protected]</metadata>

trunk/gsdl3/web/sites/localsite/collect/gs3mgdemo/etc/collectionConfig.xml

r8725	r9874
1		<collectionConfig xmlns:gsf="http://www.greenstone.org/~~configformat" xmlns:xslt="http://www.w3.org/1999/XSL/Transform">~~>
	1	<collectionConfig xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat" xmlns:xslt="http://www.w3.org/1999/XSL/Transform">
2	2	<metadataList>
3	3	<metadata name="creator">[email protected]</metadata>

trunk/gsdl3/web/sites/localsite/collect/infomine/etc/collectionConfig.xml

r8161	r9874
1		<collectionConfig xmlns:gsf="http://www.greenstone.org/~~configf~~ormat" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
	1	<collectionConfig xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
2	2	<metadataList/>
3	3	<displayItemList>

trunk/indexers/mg/java/org/greenstone/mg/MGQueryResult.java

-              r3794
+              r9874
+    }
+    public boolean isClear() {
+    return (total_num_docs_ == 0 && docs_.isEmpty() && terms_.isEmpty());
+    }
     /** returns the result as a String - useful for printing out results */

trunk/indexers/mg/jni/MGWrapperImpl.c

-              r8920
+              r9874
   /* Check that the index was loaded successfully */
+  assert(qd != NULL);
+  if (qd==NULL) {
+    return NULL;
+  }
+  /*assert(qd != NULL);*/
   /* Get the document position and length in the text file */
 …
   jthrowable exc;
+  /* Make sure an index has been specified */
+  index_path = data->queryInfo->index;
+  assert(index_path != NULL);
+  /* Obtain C versions of the two string parameters */
+  base_dir = (*j_env)->GetStringUTFChars(j_env, j_base_dir, NULL);
+  if (base_dir == NULL) {
+    return;
+  }
+  text_path = (*j_env)->GetStringUTFChars(j_env, j_text_path, NULL);
+  if (text_path == NULL) {
+    (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+    return;
+  }
+  /* Load the appropriate index for satisfying this request */
+  qd = loadIndexData((char*) base_dir, (char*) index_path, (char*) text_path);
+  /* The C text strings are no longer needed */
+  (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+  (*j_env)->ReleaseStringUTFChars(j_env, j_text_path, text_path);
+  /* Check that the index was loaded successfully */
+  assert(qd != NULL);
+  /* Remove anything hanging around from last time */
+  FreeQueryDocs(qd);
+  /* First of all, clear the previous result */
   /* The result to write to */
   result_ptr = (*j_env)->GetObjectField(j_env, j_obj, FID_query_result);
 …
     return;
+  }
+  /* Make sure an index has been specified */
+  index_path = data->queryInfo->index;
+  assert(index_path != NULL);
+  /* Obtain C versions of the two string parameters */
+  base_dir = (*j_env)->GetStringUTFChars(j_env, j_base_dir, NULL);
+  if (base_dir == NULL) {
+    return;
+  }
+  text_path = (*j_env)->GetStringUTFChars(j_env, j_text_path, NULL);
+  if (text_path == NULL) {
+    (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+    return;
+  }
+  /* Load the appropriate index for satisfying this request */
+  qd = loadIndexData((char*) base_dir, (char*) index_path, (char*) text_path);
+  /* The C text strings are no longer needed */
+  (*j_env)->ReleaseStringUTFChars(j_env, j_base_dir, base_dir);
+  (*j_env)->ReleaseStringUTFChars(j_env, j_text_path, text_path);
+  /* Check that the index was loaded successfully */
+  if (qd == NULL) {
+    return;
+  }
+  /*assert(qd != NULL);*/
+  /* Remove anything hanging around from last time */
+  FreeQueryDocs(qd);
   /* Obtain a C version of the query string */

trunk/indexers/mg/src/images/WIN32.MAK

-              r3921
+              r9874
 mostlyclean:
+    rm -f *$o _*.c _*.o *._c *._o core core.*
+    if exist *$o del *$o
+    if exist  _*.c del  _*.c
+    if exist _*.o  del  _*.o
+    if exist *._c  del *._c
+    if exist *._o  del *._o
+    if exist core  del  core
+    if exist core.* del  core.*
 clean: mostlyclean
     rm -f $(EXEC)
+    if exist *$e del *$e
 distclean: clean
+    rm -f ansi2knr
+    rm -f Makefile
+    del ansi2knr
 maintainer-clean: distclean
     @echo "This command is intended only for maintainers to use;"

trunk/indexers/mg/src/text/win32.mak

r7585	r9874
237	237	clean:
238	238	if exist $o del $o
239		if exist ~~$(EXEC) del $(EXEC)~~
	239	if exist $e del $e
240	240	if exist libmgtextin.lib del libmgtextin.lib
241	241	if exist libmgpass.lib del libmgpass.lib

trunk/indexers/mg/winMake.bat

-              r6416
+              r9874
     cd ..\..
+    cd java\org\greenstone\mg
+    call winMake.bat %1
+    cd ..\..\..\..
     cd jni
     %MAKE% %MAKE_OPTIONS% win32.mak %1
 …
 :done

Context Navigation

Legend:

Download in other formats: