comparison client/digitallibrary/dirInfo-xml.jsp @ 571:6e8488acb499

fixed default file class for DocuDir.size()
author robcast
date Wed, 22 Dec 2010 14:46:00 +0100
parents 4778d8af7913
children 3af19d51dd7e
comparison
equal deleted inserted replaced
570:fd2ef7e46119 571:6e8488acb499
1 <%@page import="digilib.io.FileOps"%>
1 <%@ page language="java" %><%! 2 <%@ page language="java" %><%!
2 // create DocumentBean instance for all JSP requests 3 // create DocumentBean instance for all JSP requests
3 digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean(); 4 digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
4 5
5 // initialize DocumentBean instance in JSP init 6 // initialize DocumentBean instance in JSP init
20 digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request); 21 digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
21 // dir cache 22 // dir cache
22 digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache"); 23 digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
23 // get directory 24 // get directory
24 digilib.io.DocuDirectory dir = dirCache.getDirectory(dlRequest.getFilePath()); 25 digilib.io.DocuDirectory dir = dirCache.getDirectory(dlRequest.getFilePath());
26 FileOps.FileClass fc = FileOps.FileClass.IMAGE;
27 int dirSize = dir.size();
25 28
26 %><!-- Automatically generated XML snippet with directory info --> 29 %><!-- Automatically generated XML snippet with directory info -->
30 <huhu/>
27 <dir><% if (dir != null) { %> 31 <dir><% if (dir != null) { %>
28 <size><%= dir.size() %></size> 32 <size><%= dirSize %></size>
29 <name><%= dir.getDirName() %></name> 33 <name><%= dir.getDirName() %></name>
30 <fsname><%= dir.getDir().getPath() %></fsname> 34 <fsname><%= dir.getDir().getPath() %></fsname>
31 <% 35 <%
32 if (!dlRequest.hasOption("mo", "dir")) { 36 if (!dlRequest.hasOption("mo", "dir")) {
33 int l = dir.size(); 37 for (int i = 0; i < dirSize; i++) {
34 for (int i = 0; i < l; i++) { 38 digilib.io.DocuDirent f = dir.get(i, fc);
35 digilib.io.DocuDirent f = dir.get(i);
36 String fn = (f != null) ? f.getName() : "null"; 39 String fn = (f != null) ? f.getName() : "null";
37 %> <file> 40 %> <file>
38 <index><%= i+1 %></index> 41 <index><%= i+1 %></index>
39 <name><%= digilib.io.FileOps.basename(fn) %></name> 42 <name><%= digilib.io.FileOps.basename(fn) %></name>
40 <fsname><%= fn %></fsname> 43 <fsname><%= fn %></fsname>