Mercurial > hg > digilib-old
diff client/digitallibrary/ImgInfo-json.jsp @ 840:a7e157d258e8 jquery
merge
| author | hertzhaft |
|---|---|
| date | Tue, 01 Mar 2011 22:00:50 +0100 |
| parents | 485b85f6e097 |
| children |
line wrap: on
line diff
--- a/client/digitallibrary/ImgInfo-json.jsp Tue Mar 01 17:12:25 2011 +0100 +++ b/client/digitallibrary/ImgInfo-json.jsp Tue Mar 01 22:00:50 2011 +0100 @@ -1,6 +1,6 @@ <%@page language="java" - import="digilib.io.FileOps, digilib.io.ImageFileset, digilib.io.ImageFile, - digilib.image.ImageSize, digilib.servlet.DigilibConfiguration" + import="digilib.io.FileOps, digilib.io.ImageFileSet, digilib.io.ImageFile, + digilib.util.ImageSize, digilib.servlet.DigilibConfiguration" contentType="application/json"%><%! // create DocumentBean instance for all JSP requests digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean(); @@ -23,14 +23,11 @@ digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache"); // get file FileOps.FileClass fc = FileOps.FileClass.IMAGE; -ImageFileset imgFile = (ImageFileset) dirCache.getFile(dlRequest.getFilePath(), dlRequest.getAsInt("pn"), fc); +ImageFileSet imgFile = (ImageFileSet) dirCache.getFile(dlRequest.getFilePath(), dlRequest.getAsInt("pn"), fc); %>{ <% if (imgFile != null) { - ImageFile img = imgFile.getBiggest(); - if (!img.isChecked()) { - DigilibConfiguration.docuImageIdentify(img); - } + ImageFile img = (ImageFile) imgFile.getBiggest(); ImageSize imgSize = img.getSize(); %> "filename" : "<%= imgFile.getName() %>",