Mercurial > hg > digilib

changeset 1430:af76d225da83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix pdf servlet.
author robcast
date Wed, 28 Oct 2015 15:58:08 +0100
parents f7a89b9adb9d
children 57a98efeb546
files common/src/main/java/digilib/image/ImageJobDescription.java common/src/main/java/digilib/meta/IndexMetaDirMeta.java pdf/src/main/java/digilib/conf/PDFRequest.java pdf/src/main/java/digilib/conf/PDFServletConfiguration.java pdf/src/main/java/digilib/pdf/PDFStreamWorker.java
diffstat 5 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/common/src/main/java/digilib/image/ImageJobDescription.java	Wed Oct 28 15:57:34 2015 +0100
+++ b/common/src/main/java/digilib/image/ImageJobDescription.java	Wed Oct 28 15:58:08 2015 +0100
@@ -141,6 +141,7 @@
      */
     public static ImageJobDescription getInstance(DigilibRequest dlReq, DigilibConfiguration dlcfg) {
         ImageJobDescription newMap = new ImageJobDescription(dlcfg);
+        newMap.initParams();
         // add all params to this map
         newMap.params.putAll(dlReq.getParams());
         newMap.initOptions();
@@ -159,6 +160,7 @@
      */
     public static ImageJobDescription getInstance(ParameterMap pm, DigilibConfiguration dlcfg) {
         ImageJobDescription newMap = new ImageJobDescription(dlcfg);
+        newMap.initParams();
         // add all params to this map
         newMap.params.putAll(pm.getParams());
         newMap.initOptions();
--- a/common/src/main/java/digilib/meta/IndexMetaDirMeta.java	Wed Oct 28 15:57:34 2015 +0100
+++ b/common/src/main/java/digilib/meta/IndexMetaDirMeta.java	Wed Oct 28 15:58:08 2015 +0100
@@ -32,7 +32,6 @@
 import digilib.io.Directory;
 import digilib.io.DocuDirectory;
 import digilib.io.DocuDirent;
-import digilib.io.FileOps.FileClass;
 
 /**
  * DirMeta implementation reading index.meta files.
--- a/pdf/src/main/java/digilib/conf/PDFRequest.java	Wed Oct 28 15:57:34 2015 +0100
+++ b/pdf/src/main/java/digilib/conf/PDFRequest.java	Wed Oct 28 15:58:08 2015 +0100
@@ -32,11 +32,9 @@
 
 import org.apache.log4j.Logger;
 
-import digilib.conf.DigilibConfiguration;
 import digilib.image.ImageJobDescription;
 import digilib.io.DocuDirectory;
 import digilib.io.FileOpException;
-import digilib.io.FileOps.FileClass;
 import digilib.util.NumRange;
 import digilib.util.OptionsSet;
 import digilib.util.ParameterMap;
@@ -59,18 +57,18 @@
 
 	
 	/**
-	 * Initialize the PDFJobInformation
+	 * Initialize the PDFRequest
 	 * 
-	 * @param dlcfg			
-	 * 						The DigilibConfiguration. 
+	 * @param dlcfg	The DigilibConfiguration. 
 	 */
 	public PDFRequest(DigilibConfiguration dlcfg) {
 		super(30);
 		dlConfig = dlcfg;
+		initParams();
 	}
 
 	/**
-	 * Initialize the PDFJobInformation with a request.
+	 * Initialize the PDFRequest with a request.
 	 * 
 	 * @param dlcfg		The DigilibConfiguration. 		
 	 * @param request
@@ -79,7 +77,8 @@
 	public PDFRequest(HttpServletRequest request, DigilibConfiguration dlcfg) throws FileOpException {
 		super(30);
 		dlConfig = dlcfg;
-		this.setWithRequest(request);
+		initParams();
+		setWithRequest(request);
 	}
 
 	
@@ -119,7 +118,7 @@
 		pages = new NumRange(getAsString("pgs"));
         ImageJobDescription ij = ImageJobDescription.getInstance(this, dlConfig);
         DocuDirectory dir = ij.getFileDirectory();
-        int dirsize = dir.size(FileClass.IMAGE);
+        int dirsize = dir.size();
         pages.setMaxnum(dirsize);
 	}
 	
--- a/pdf/src/main/java/digilib/conf/PDFServletConfiguration.java	Wed Oct 28 15:57:34 2015 +0100
+++ b/pdf/src/main/java/digilib/conf/PDFServletConfiguration.java	Wed Oct 28 15:58:08 2015 +0100
@@ -55,7 +55,7 @@
     public static final String PDF_CACHEDIR_KEY = "pdf.servlet.cache.dir";
 
     public static String getClassVersion() {
-        return "2.3.0 pdf";
+        return DigilibServletConfiguration.getClassVersion() + " pdf";
     }
 
     /* non-static getVersion for Java inheritance */
--- a/pdf/src/main/java/digilib/pdf/PDFStreamWorker.java	Wed Oct 28 15:57:34 2015 +0100
+++ b/pdf/src/main/java/digilib/pdf/PDFStreamWorker.java	Wed Oct 28 15:58:08 2015 +0100
@@ -176,7 +176,7 @@
 		Image pdfimg = Image.getInstance(img.getAwtImage(), null);
 		float docW = PageSize.A4.getWidth() - 2 * PageSize.A4.getBorder();
 		float docH = PageSize.A4.getHeight() - 2 * PageSize.A4.getBorder();
-		// TODO: do we really scale this again?
+		// fit the image to the page
 		pdfimg.scaleToFit(docW, docH);
 		// add to PDF
 		doc.add(pdfimg);