Mercurial > hg > digilib-old
diff servlet/src/digilib/servlet/Scaler.java @ 284:c633e97cac12
Servlet version 1.22b1
- more fast searching (hopefully all working now)
- some simple synchronisation
- some reshuffling of methods to eliminate cruft
| author | robcast |
|---|---|
| date | Fri, 15 Oct 2004 16:59:47 +0200 |
| parents | fba0857fde34 |
| children | ffafe3e470fb |
line wrap: on
line diff
--- a/servlet/src/digilib/servlet/Scaler.java Fri Oct 15 16:59:47 2004 +0200 +++ b/servlet/src/digilib/servlet/Scaler.java Fri Oct 15 16:59:47 2004 +0200 @@ -40,9 +40,8 @@ import digilib.auth.AuthOpException; import digilib.auth.AuthOps; import digilib.image.DocuImage; -import digilib.image.DocuInfo; -import digilib.image.ImageLoaderImageInfoDocuInfo; import digilib.image.ImageOpException; +import digilib.image.ImageOps; import digilib.image.ImageSize; import digilib.io.DocuDirCache; import digilib.io.FileOpException; @@ -61,7 +60,7 @@ private static final long serialVersionUID = -325080527268912852L; // digilib servlet version (for all components) - public static final String dlVersion = "1.21b3"; + public static final String dlVersion = "1.22b1"; // logger for accounting requests Logger accountlog = Logger.getLogger("account.request"); @@ -326,9 +325,6 @@ // ImageFileset of the image to load ImageFileset fileset = null; - // new DocuInfo instance - DocuInfo docuInfo = new ImageLoaderImageInfoDocuInfo(); - /* find the file to load/send */ // get PathInfo @@ -393,7 +389,7 @@ } else if (loresOnly) { // enforced lores uses next smaller resolution fileToLoad = - fileset.getNextSmaller(expectedSourceSize, docuInfo); + fileset.getNextSmaller(expectedSourceSize); if (fileToLoad == null) { // this is the smallest we have fileToLoad = fileset.getSmallest(); @@ -401,7 +397,7 @@ } else { // autores: use next higher resolution fileToLoad = - fileset.getNextBigger(expectedSourceSize, docuInfo); + fileset.getNextBigger(expectedSourceSize); if (fileToLoad == null) { // this is the highest we have fileToLoad = fileset.getBiggest(); @@ -447,7 +443,7 @@ // check the source image if (!fileToLoad.isChecked()) { - docuInfo.checkFile(fileToLoad); + ImageOps.checkFile(fileToLoad); } // get the source image type mimeType = fileToLoad.getMimetype();