Mercurial > hg > digilib-old

diff servlet/src/digilib/image/ImageJobDescription.java @ 574:790cbfb58b52 stream

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ripping apart ImageFileSet
author robcast
date Wed, 22 Dec 2010 18:32:06 +0100
parents 8beefd1142b2
children dad720e9b12b
line wrap: on
line diff
--- a/servlet/src/digilib/image/ImageJobDescription.java	Wed Dec 22 09:54:34 2010 +0100
+++ b/servlet/src/digilib/image/ImageJobDescription.java	Wed Dec 22 18:32:06 2010 +0100
@@ -12,7 +12,7 @@
 import digilib.io.FileOps;
 import digilib.io.FileOps.FileClass;
 import digilib.io.ImageFile;
-import digilib.io.ImageFileset;
+import digilib.io.ImageSet;
 import digilib.servlet.DigilibConfiguration;
 import digilib.util.OptionsSet;
 import digilib.util.Parameter;
@@ -37,7 +37,7 @@
 	protected static Logger logger = Logger.getLogger("digilib.servlet");
 
 	ImageFile fileToLoad = null;
-	ImageFileset fileset = null;
+	ImageSet fileset = null;
 	DocuDirectory fileDir = null;
 	String filePath = null;
 	ImageSize expectedSourceSize = null;
@@ -182,11 +182,11 @@
 		return fileDir;
 	}
 	
-    public ImageFileset getFileset() throws FileOpException {
+    public ImageSet getFileset() throws FileOpException {
         if(fileset==null){
             DocuDirCache dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
     
-            fileset = (ImageFileset) dirCache.getFile(getFilePath(), getAsInt("pn"), FileClass.IMAGE);
+            fileset = (ImageSet) dirCache.getFile(getFilePath(), getAsInt("pn"), FileClass.IMAGE);
             if (fileset == null) {
                 throw new FileOpException("File " + getFilePath() + "("
                         + getAsInt("pn") + ") not found.");
@@ -245,7 +245,7 @@
 		logger.debug("get_hiresSize()");
 
 		ImageSize hiresSize = null;
-		ImageFileset fileset = getFileset();
+		ImageSet fileset = getFileset();
 		if (getAbsoluteScale()) {
 			ImageFile hiresFile = fileset.getBiggest();
 			if (!hiresFile.isChecked()) {