Mercurial > hg > digilib

changeset 1191:bed5a2825db6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bugs in JSPs
author robcast
date Thu, 27 Jun 2013 20:36:42 +0200
parents d62806e28820
children e84eae4ee226
files webapp/src/main/webapp/api/dirInfo-xml.jsp webapp/src/main/webapp/api/dlContext-xml.jsp webapp/src/main/webapp/dirInfo-xml.jsp webapp/src/main/webapp/dlContext-xml.jsp
diffstat 4 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/api/dirInfo-xml.jsp	Wed Jun 12 17:25:11 2013 +0200
+++ b/webapp/src/main/webapp/api/dirInfo-xml.jsp	Thu Jun 27 20:36:42 2013 +0200
@@ -26,6 +26,7 @@
           digilib.io.DocuDirCache,
           digilib.io.DocuDirectory,
           digilib.io.DocuDirent,
+          digilib.io.FileOps,
           java.io.File"%>
    
 <%!
--- a/webapp/src/main/webapp/api/dlContext-xml.jsp	Wed Jun 12 17:25:11 2013 +0200
+++ b/webapp/src/main/webapp/api/dlContext-xml.jsp	Thu Jun 27 20:36:42 2013 +0200
@@ -24,6 +24,8 @@
           digilib.conf.DigilibServletConfiguration,
           digilib.conf.DigilibServletRequest,
           digilib.io.DocuDirCache,
+          digilib.io.DocuDirent,
+          java.util.HashMap,
           java.io.File"%><%!
 // create DocumentBean instance for all JSP requests
 DocumentBean docBean = new DocumentBean();
@@ -52,11 +54,11 @@
 int pn = dlRequest.getAsInt("pn");
 String fn = dlRequest.getFilePath();
 String ctx = "";
-digilib.io.DocuDirent f = dirCache.getFile(fn, pn, digilib.io.FileOps.FileClass.IMAGE);
+DocuDirent f = dirCache.getFile(fn, pn, digilib.io.FileOps.FileClass.IMAGE);
 if (f != null) {
     //ctx = "hasfile:"+f.getName();
     f.checkMeta();
-    java.util.HashMap meta = f.getFileMeta();
+    HashMap meta = f.getMeta().getFileMeta();
     if (meta != null) {
     	//ctx = "JSP:hasmeta!";
     	if (meta.containsKey("context")) {
--- a/webapp/src/main/webapp/dirInfo-xml.jsp	Wed Jun 12 17:25:11 2013 +0200
+++ b/webapp/src/main/webapp/dirInfo-xml.jsp	Thu Jun 27 20:36:42 2013 +0200
@@ -26,6 +26,7 @@
           digilib.io.DocuDirCache,
           digilib.io.DocuDirectory,
           digilib.io.DocuDirent,
+          digilib.io.FileOps,
           java.io.File"%>
    
 <%!
--- a/webapp/src/main/webapp/dlContext-xml.jsp	Wed Jun 12 17:25:11 2013 +0200
+++ b/webapp/src/main/webapp/dlContext-xml.jsp	Thu Jun 27 20:36:42 2013 +0200
@@ -24,6 +24,8 @@
           digilib.conf.DigilibServletConfiguration,
           digilib.conf.DigilibServletRequest,
           digilib.io.DocuDirCache,
+          digilib.io.DocuDirent,
+          java.util.HashMap,
           java.io.File"%><%!
 // create DocumentBean instance for all JSP requests
 DocumentBean docBean = new DocumentBean();
@@ -52,11 +54,11 @@
 int pn = dlRequest.getAsInt("pn");
 String fn = dlRequest.getFilePath();
 String ctx = "";
-digilib.io.DocuDirent f = dirCache.getFile(fn, pn, digilib.io.FileOps.FileClass.IMAGE);
+DocuDirent f = dirCache.getFile(fn, pn, digilib.io.FileOps.FileClass.IMAGE);
 if (f != null) {
     //ctx = "hasfile:"+f.getName();
     f.checkMeta();
-    java.util.HashMap meta = f.getFileMeta();
+    HashMap meta = f.getMeta().getFileMeta();
     if (meta != null) {
     	//ctx = "JSP:hasmeta!";
     	if (meta.containsKey("context")) {