# HG changeset patch # User robcast # Date 1372358202 -7200 # Node ID bed5a2825db6f1e2359b9c21830b1d51a06c0e73 # Parent d62806e28820068221f6aba0f0e149af403208e0 fix bugs in JSPs diff -r d62806e28820 -r bed5a2825db6 webapp/src/main/webapp/api/dirInfo-xml.jsp --- 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"%> <%! diff -r d62806e28820 -r bed5a2825db6 webapp/src/main/webapp/api/dlContext-xml.jsp --- 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")) { diff -r d62806e28820 -r bed5a2825db6 webapp/src/main/webapp/dirInfo-xml.jsp --- 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"%> <%! diff -r d62806e28820 -r bed5a2825db6 webapp/src/main/webapp/dlContext-xml.jsp --- 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")) {