Mercurial > hg > digilib-old

diff servlet/src/digilib/servlet/Scaler.java @ 161:ace2a4a0ba74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
servlet version 1.16a4 - rather experimental - new Texter servlet for sending text - reads and caches text files in DocuDirCache - DocuFile renamed to ImageFile (-Set) - new TextFile
author robcast
date Tue, 16 Sep 2003 18:32:28 +0200
parents 688ad0b8b0fa
children d40922628e4a
line wrap: on
line diff
--- a/servlet/src/digilib/servlet/Scaler.java	Tue Sep 16 18:32:00 2003 +0200
+++ b/servlet/src/digilib/servlet/Scaler.java	Tue Sep 16 18:32:28 2003 +0200
@@ -43,8 +43,8 @@
 import digilib.image.ImageOpException;
 import digilib.image.ImageSize;
 import digilib.io.DocuDirCache;
-import digilib.io.DocuFile;
-import digilib.io.DocuFileset;
+import digilib.io.ImageFile;
+import digilib.io.ImageFileset;
 import digilib.io.FileOpException;
 import digilib.io.FileOps;
 
@@ -58,7 +58,7 @@
 public class Scaler extends HttpServlet {
 
 	// digilib servlet version (for all components)
-	public static final String dlVersion = "1.16a2";
+	public static final String dlVersion = "1.16a4";
 
 	// Utils instance with debuglevel
 	Utils util;
@@ -70,7 +70,7 @@
 	ServletOps servletOp;
 	// DocuDirCache instance
 	DocuDirCache dirCache;
-	
+
 	// deny image file
 	File denyImgFile;
 	// error image file
@@ -320,8 +320,8 @@
 		//"big" try for all file/image actions
 		try {
 
-			// DocuFileset of the image to load
-			DocuFileset fileset = null;
+			// ImageFileset of the image to load
+			ImageFileset fileset = null;
 
 			// new DocuInfo instance
 			DocuInfo docuInfo = new ImageLoaderImageInfoDocuInfo();
@@ -359,8 +359,12 @@
 			}
 
 			// find the file(set)
-			DocuFile fileToLoad;
-			fileset = dirCache.getFileset(loadPathName, dlRequest.getPn());
+			ImageFile fileToLoad;
+			fileset =
+				(ImageFileset) dirCache.getFile(
+					loadPathName,
+					dlRequest.getPn(),
+					FileOps.CLASS_IMAGE);
 			if (fileset == null) {
 				throw new FileOpException(
 					"File "
@@ -642,10 +646,7 @@
 					subf = 1 / scaleXY;
 					// for higher quality reduce subsample factor by minSubsample
 					if (scaleQual > 0) {
-						subsamp =
-							Math.max(
-								Math.floor(subf / minSubsample),
-								1d);
+						subsamp = Math.max(Math.floor(subf / minSubsample), 1d);
 					} else {
 						subsamp = Math.floor(subf);
 					}