# HG changeset patch # User robcast # Date 1067463951 -3600 # Node ID cf1825c48e9d261549c724f599a71efa63dedfdd # Parent 2336ac05d57dd51cc0e8a4e51f8f0ea1251cf31b Servlet Version 1.16b2 with new DigilibParameter code. - more generic class for request parameters - like already done for DiglibConfig - changes in JSPs for new request stuff - changes in ImageSize class so size=0 is "wildcard" - missing dw and dh parameters now treated as wildcards - changed package name in imageinfo class diff -r 2336ac05d57d -r cf1825c48e9d client/digitallibrary/server/dlConfig.jsp --- a/client/digitallibrary/server/dlConfig.jsp Wed Oct 29 22:45:51 2003 +0100 +++ b/client/digitallibrary/server/dlConfig.jsp Wed Oct 29 22:45:51 2003 +0100 @@ -23,7 +23,7 @@ // parsing the query digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request); // add number of pages -dlRequest.setPt(docBean.getNumPages(dlRequest)); +dlRequest.setValue("pt", docBean.getNumPages(dlRequest)); // dir cache digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache"); %> @@ -33,122 +33,36 @@ Digilib configuration page - -

Local request information

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Pt<%= dlRequest.getPt() %>total number of pages (generated by servlet)
RequestPath<%= dlRequest.getRequestPath() %>url of the page/document
Fn<%= dlRequest.getFn() %>url of the page/document
FilePath<%= dlRequest.getFilePath() %>effective path of the page/document
Pn<%= dlRequest.getPn() %>page number
Dw<%= dlRequest.getDw() %>width of client in pixels
Dh<%= dlRequest.getDh() %>height of client in pixels
Wx<%= dlRequest.getWx() %>left edge of image (float from 0 to 1)
Wy<%= dlRequest.getWy() %>top edge in image (float from 0 to 1)
Ww<%= dlRequest.getWw() %>width of image (float from 0 to 1)
Wh<%= dlRequest.getWh() %>height of image (float from 0 to 1)
Ws<%= dlRequest.getWs() %>scale factor
Mo<%= dlRequest.getMo() %>special options like 'fit' for gifs
Mk<%= dlRequest.getMk() %>marks
BaseURL<%= dlRequest.getBaseURL() %>
base URL (from http:// to below /servlet)
- -

Global servlet configuration

- - - - - - - - +<% + Object[] keys = dlConfig.keySet().toArray(); + java.util.Arrays.sort(keys); + int l = keys.length; + for (int i = 0; i < l; i++) { + String key = (String) keys[i]; + String val = dlConfig.getAsString(key); + if (key.equals("basedir-list")) { + String[] bd = (String[]) dlConfig.getValue("basedir-list"); + val = ""; + if (bd != null) { + for (int j = 0; j < bd.length; j++) { + val += bd[j] + "
"; + } + } + } + if (val.length() == 0) { + val = "(none)"; + } +%> - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - +<% + } +%>
servlet.version<%= dlConfig.getAsString("servlet.version") %>
servlet.config.file<%= dlConfig.getAsString("servlet.config.file") %>
basedir-list<% - String[] bd = (String[]) dlConfig.getValue("basedir-list"); - if (bd != null) { - for (int i = 0; i < bd.length; i++) { - %><%= bd[i] %>
<% - } - } - %>
debug-level<%= dlConfig.getAsInt("debug-level") %> (<%= dlConfig.getUtil().getDebugLevel() %>)
docuimage-class<%= dlConfig.getAsString("docuimage-class") %>
- (<%= dlConfig.getValue("servlet.docuimage.class") %>)		<%= key %><%= val %>
error-image<%= dlConfig.getAsString("error-image") %>
denied-image<%= dlConfig.getAsString("denied-image") %>
subsample-minimum<%= dlConfig.getAsFloat("subsample-minimum") %>
sendfile-allowed<%= dlConfig.getAsBoolean("sendfile-allowed") %>
use-authorization<%= dlConfig.getAsBoolean("use-authorization") %>
auth-config<%= dlConfig.getAsString("auth-file") %>
auth-url-path<%= dlConfig.getAsString("auth-url-path") %>

Directory cache

@@ -183,6 +97,26 @@ java.version<%= System.getProperty("java.version") %> + + java.vendor<%= System.getProperty("java.vendor") %> + + + + os.name<%= System.getProperty("os.name") %> + + + + Runtime.maxMemory<%= Runtime.getRuntime().maxMemory() %> + + + + Runtime.totalMemory<%= Runtime.getRuntime().totalMemory() %> + + + + Runtime.freeMemory<%= Runtime.getRuntime().freeMemory() %> + +