# HG changeset patch
# User robcast
# Date 1070473946 -3600
# Node ID f921735dc57859b0261f807e2d0ab581dcd6aba6
# Parent  d8e85606d41c72fe2a2e4b910cefef9a2bfa7c07
Servlet version 1.18b4
- bugfix where metadata in filename.meta wasn't read

diff -r d8e85606d41c -r f921735dc578 client/digitallibrary/WEB-INF/lib/DigilibServlet.jar
Binary file client/digitallibrary/WEB-INF/lib/DigilibServlet.jar has changed
diff -r d8e85606d41c -r f921735dc578 servlet/src/digilib/io/DocuDirent.java
--- a/servlet/src/digilib/io/DocuDirent.java	Fri Nov 28 20:08:25 2003 +0100
+++ b/servlet/src/digilib/io/DocuDirent.java	Wed Dec 03 18:52:26 2003 +0100
@@ -62,7 +62,7 @@
 	 *  
 	 */
 	public void readMeta() {
-		if ((fileMeta != null) || (getFile() != null)) {
+		if ((fileMeta != null) || (getFile() == null)) {
 			// there is already metadata or there is no file
 			return;
 		}
@@ -79,7 +79,7 @@
 				}
 				fileMeta = (HashMap) meta.get(getName());
 			} catch (Exception e) {
-				Logger.getLogger(this.getClass()).warn("error reading index.meta", e);
+				Logger.getLogger(this.getClass()).warn("error reading file .meta", e);
 			}
 		}
 	}
diff -r d8e85606d41c -r f921735dc578 servlet/src/digilib/io/XMLMetaLoader.java
--- a/servlet/src/digilib/io/XMLMetaLoader.java	Fri Nov 28 20:08:25 2003 +0100
+++ b/servlet/src/digilib/io/XMLMetaLoader.java	Wed Dec 03 18:52:26 2003 +0100
@@ -191,7 +191,7 @@
 	 *    returns HashMap with list data
 	 */
 	public HashMap loadURL(String path) throws SAXException, IOException {
-		//System.out.println("loadurl ("+path+")");
+		logger.debug("loading meta: "+path);
 		// Create a JAXP SAXParserFactory and configure it
 		SAXParserFactory spf = SAXParserFactory.newInstance();
 		spf.setNamespaceAware(true);
diff -r d8e85606d41c -r f921735dc578 servlet/src/digilib/servlet/Scaler.java
--- a/servlet/src/digilib/servlet/Scaler.java	Fri Nov 28 20:08:25 2003 +0100
+++ b/servlet/src/digilib/servlet/Scaler.java	Wed Dec 03 18:52:26 2003 +0100
@@ -59,7 +59,7 @@
 public class Scaler extends HttpServlet {
 
 	// digilib servlet version (for all components)
-	public static final String dlVersion = "1.18b3";
+	public static final String dlVersion = "1.18b4";
 
 	// logger for accounting requests
 	Logger accountlog = Logger.getLogger("account.request");