Mercurial > hg > digilib

changeset 1591:8dff61ffdbc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new digilib version 2.5 (for new Scaler options/flags handling)
author robcast
date Wed, 08 Feb 2017 19:21:46 +0100
parents bd71cb53e1a3
children 7031524fc6e9
files common-bioformats/pom.xml common-imagej/pom.xml common-jai/pom.xml common/pom.xml doc/pom.xml pdf/pom.xml pom.xml servlet/pom.xml servlet2/pom.xml servlet2/src/main/java/digilib/servlet/Scaler.java servlet2/src/main/java/digilib/servlet/ScalerNoThread.java servlet3/pom.xml servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java servlet3/src/main/java/digilib/servlet/Scaler.java text/pom.xml webapp/pom.xml webapp/src/main/webapp/jquery/jquery.digilib.js
diffstat 17 files changed, 46 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/common-bioformats/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/common-bioformats/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-bioformats</artifactId>
--- a/common-imagej/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/common-imagej/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-imagej</artifactId>
--- a/common-jai/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/common-jai/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-jai</artifactId>
--- a/common/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/common/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.4-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>digilib-common</artifactId>
--- a/doc/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/doc/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -3,7 +3,7 @@
   <parent>
     <groupId>digilib</groupId>
     <artifactId>digilib</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <artifactId>digilib-doc</artifactId>
   <packaging>pom</packaging>
--- a/pdf/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/pdf/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.4-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>digilib-pdf</artifactId>
 	<name>digilib-pdf</name>
--- a/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -9,7 +9,7 @@
 
   <groupId>digilib</groupId>
   <artifactId>digilib</artifactId>
-  <version>2.4-SNAPSHOT</version>
+  <version>2.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>digilib</name>
@@ -196,57 +196,57 @@
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common-jai</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common-imagej</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common-bioformats</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-doc</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-pdf</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-text</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-servlet</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-servlet2</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-servlet3</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-webapp</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
--- a/servlet/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/servlet/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -5,7 +5,7 @@
   <parent>
     <groupId>digilib</groupId>
     <artifactId>digilib</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <artifactId>digilib-servlet</artifactId>
   <name>digilib-servlet</name>
--- a/servlet2/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/servlet2/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <artifactId>digilib-servlet2</artifactId>
   <name>digilib-servlet2</name>
--- a/servlet2/src/main/java/digilib/servlet/Scaler.java	Wed Feb 08 17:28:02 2017 +0100
+++ b/servlet2/src/main/java/digilib/servlet/Scaler.java	Wed Feb 08 19:21:46 2017 +0100
@@ -41,6 +41,7 @@
 
 import digilib.auth.AuthOpException;
 import digilib.auth.AuthzOps;
+import digilib.conf.DigilibOption;
 import digilib.conf.DigilibServletConfiguration;
 import digilib.conf.DigilibServletRequest;
 import digilib.image.DocuImage;
@@ -227,9 +228,9 @@
         
         // type of error reporting
         ErrMsg errMsgType = ErrMsg.IMAGE;
-        if (dlRequest.hasOption("errtxt")) {
+        if (dlRequest.hasOption(DigilibOption.errtxt)) {
             errMsgType = ErrMsg.TEXT;
-        } else if (dlRequest.hasOption("errcode")) {
+        } else if (dlRequest.hasOption(DigilibOption.errcode)) {
             errMsgType = ErrMsg.CODE;
         }
 
@@ -254,7 +255,7 @@
             // if requested, send image as a file
             if (sendFileAllowed && jobTicket.getSendAsFile()) {
                 String mt = null;
-                if (jobTicket.hasOption("rawfile")) {
+                if (jobTicket.hasOption(DigilibOption.rawfile)) {
                     mt = "application/octet-stream";
                 }
                 logger.debug("Sending RAW File as is.");
@@ -286,9 +287,9 @@
             DocuImage img = jobResult.get();
             // forced destination image type
             String mt = null;
-            if (jobTicket.hasOption("jpg")) {
+            if (jobTicket.hasOption(DigilibOption.jpg)) {
                 mt = "image/jpeg";
-            } else if (jobTicket.hasOption("png")) {
+            } else if (jobTicket.hasOption(DigilibOption.png)) {
                 mt = "image/png";
             }
             // send image
--- a/servlet2/src/main/java/digilib/servlet/ScalerNoThread.java	Wed Feb 08 17:28:02 2017 +0100
+++ b/servlet2/src/main/java/digilib/servlet/ScalerNoThread.java	Wed Feb 08 19:21:46 2017 +0100
@@ -37,6 +37,7 @@
 
 import digilib.auth.AuthOpException;
 import digilib.auth.AuthzOps;
+import digilib.conf.DigilibOption;
 import digilib.conf.DigilibServletConfiguration;
 import digilib.conf.DigilibServletRequest;
 import digilib.image.DocuImage;
@@ -210,9 +211,9 @@
 
         // type of error reporting
         ErrMsg errMsgType = ErrMsg.IMAGE;
-        if (dlRequest.hasOption("errtxt")) {
+        if (dlRequest.hasOption(DigilibOption.errtxt)) {
             errMsgType = ErrMsg.TEXT;
-        } else if (dlRequest.hasOption("errcode")) {
+        } else if (dlRequest.hasOption(DigilibOption.errcode)) {
             errMsgType = ErrMsg.CODE;
         }
 
@@ -236,7 +237,7 @@
             // if requested, send image as a file
             if (sendFileAllowed && jobTicket.getSendAsFile()) {
                 String mt = null;
-                if (jobTicket.hasOption("rawfile")) {
+                if (jobTicket.hasOption(DigilibOption.rawfile)) {
                     mt = "application/octet-stream";
                 }
                 logger.debug("Sending RAW File as is.");
@@ -260,9 +261,9 @@
             DocuImage img = job.call();
             // forced destination image type
             String mt = null;
-            if (jobTicket.hasOption("jpg")) {
+            if (jobTicket.hasOption(DigilibOption.jpg)) {
                 mt = "image/jpeg";
-            } else if (jobTicket.hasOption("png")) {
+            } else if (jobTicket.hasOption(DigilibOption.png)) {
                 mt = "image/png";
             }
             // send image
--- a/servlet3/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/servlet3/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
   <artifactId>digilib-servlet3</artifactId>
   <name>digilib-servlet3</name>
--- a/servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java	Wed Feb 08 17:28:02 2017 +0100
+++ b/servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java	Wed Feb 08 19:21:46 2017 +0100
@@ -38,6 +38,7 @@
 import org.apache.log4j.Logger;
 
 import digilib.conf.DigilibConfiguration;
+import digilib.conf.DigilibOption;
 import digilib.image.DocuImage;
 import digilib.image.ImageJobDescription;
 import digilib.image.ImageOpException;
@@ -104,9 +105,9 @@
              * set forced destination image type
              */
             String mt = null;
-            if (jobinfo.hasOption("jpg")) {
+            if (jobinfo.hasOption(DigilibOption.jpg)) {
                 mt = "image/jpeg";
-            } else if (jobinfo.hasOption("png")) {
+            } else if (jobinfo.hasOption(DigilibOption.png)) {
                 mt = "image/png";
             }
             /*
--- a/servlet3/src/main/java/digilib/servlet/Scaler.java	Wed Feb 08 17:28:02 2017 +0100
+++ b/servlet3/src/main/java/digilib/servlet/Scaler.java	Wed Feb 08 19:21:46 2017 +0100
@@ -43,6 +43,7 @@
 import digilib.auth.AuthOpException;
 import digilib.auth.AuthzOps;
 import digilib.conf.DigilibConfiguration;
+import digilib.conf.DigilibOption;
 import digilib.conf.DigilibServlet3Configuration;
 import digilib.conf.DigilibServletConfiguration;
 import digilib.conf.DigilibServletRequest;
@@ -241,11 +242,11 @@
 
         // type of error reporting
         ErrMsg errMsgType = defaultErrMsgType;
-        if (dlRequest.hasOption("errimg")) {
+        if (dlRequest.hasOption(DigilibOption.errimg)) {
             errMsgType = ErrMsg.IMAGE;
-        } else if (dlRequest.hasOption("errtxt")) {
+        } else if (dlRequest.hasOption(DigilibOption.errtxt)) {
             errMsgType = ErrMsg.TEXT;
-        } else if (dlRequest.hasOption("errcode")) {
+        } else if (dlRequest.hasOption(DigilibOption.errcode)) {
             errMsgType = ErrMsg.CODE;
         }
 
@@ -254,11 +255,11 @@
             final ImageJobDescription jobTicket = ImageJobDescription.getInstance(dlRequest, dlConfig);
 
             // handle the IIIF info-request
-            if (dlRequest.hasOption("info")) {
+            if (dlRequest.hasOption(DigilibOption.info)) {
                 ServletOps.sendIiifInfo(dlRequest, response, logger);
                 return;
             }
-            if (dlRequest.hasOption("redirect-info")) {
+            if (dlRequest.hasOption(DigilibOption.redirect_info)) {
                 // TODO: the redirect should have code 303
                 response.sendRedirect("info.json");
                 return;
@@ -291,7 +292,7 @@
              */
             if (sendFileAllowed && jobTicket.getSendAsFile()) {
                 String mt = null;
-                if (jobTicket.hasOption("rawfile")) {
+                if (jobTicket.hasOption(DigilibOption.rawfile)) {
                 	// mo=rawfile sends as octet-stream
                     mt = "application/octet-stream";
                 }
--- a/text/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/text/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.4-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>digilib-text</artifactId>
 	<name>digilib-text</name>
--- a/webapp/pom.xml	Wed Feb 08 17:28:02 2017 +0100
+++ b/webapp/pom.xml	Wed Feb 08 19:21:46 2017 +0100
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.4-SNAPSHOT</version>
+		<version>2.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>digilib-webapp</artifactId>
 	<name>digilib-webapp</name>
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Wed Feb 08 17:28:02 2017 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Wed Feb 08 19:21:46 2017 +0100
@@ -45,7 +45,7 @@
 
     var defaults = {
         // version of this script
-        'version' : 'jquery.digilib.js 2.4.0a',
+        'version' : 'jquery.digilib.js 2.5.0a',
         // logo url
         'logoUrl' : 'img/digilib-logo-text1.png',
         // homepage url (behind logo)