Mercurial > hg > digilib-old

changeset 354:7958035abec1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Servlet version 1.5.9d - fixed a bug reading metadata
author robcast
date Wed, 12 Oct 2005 19:09:41 +0200
parents 25095f85ba7c
children 4a45cd965133
files servlet/src/digilib/io/ImageFileset.java servlet/src/digilib/servlet/Scaler.java
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/servlet/src/digilib/io/ImageFileset.java	Tue Sep 27 19:37:28 2005 +0200
+++ b/servlet/src/digilib/io/ImageFileset.java	Wed Oct 12 19:09:41 2005 +0200
@@ -308,15 +308,16 @@
 						gp.checkMeta();
 						if (gp.getDirMeta() != null) {
 							fileMeta = gp.getDirMeta();
-						} else {
-							// no metadata available
-							metaChecked = true;
-							return;
 						}
 					}
 				}
 			}
 		}
+		if (fileMeta == null) {
+			// no metadata available
+			metaChecked = true;
+			return;
+		}
 		metaChecked = true;
 		String s;
 		float dpi = 0;
--- a/servlet/src/digilib/servlet/Scaler.java	Tue Sep 27 19:37:28 2005 +0200
+++ b/servlet/src/digilib/servlet/Scaler.java	Wed Oct 12 19:09:41 2005 +0200
@@ -59,7 +59,7 @@
 	private static final long serialVersionUID = -325080527268912852L;
 
 	/** digilib servlet version (for all components) */
-	public static final String dlVersion = "1.5.9c";
+	public static final String dlVersion = "1.5.9d";
 
 	/** logger for accounting requests */
 	private static Logger accountlog = Logger.getLogger("account.request");