# HG changeset patch # User robcast # Date 1043442829 -3600 # Node ID fcc9030be367ff5e590dec6d8bbcff1cbc453d3e # Parent 78c7f985017c782274c92f0c143bb866eff03059 New servlet version 1.5b. Mostly cleanup. Global parameters for digilib now in DigilibConfiguration, per request parameters are now all in DigilibRequest. The DocuImage implementation can be selected by the configuration docuimage-class. Pixel-by-pixel view implemented with "mo=clip". diff -r 78c7f985017c -r fcc9030be367 client/digitallibrary/dlInfo-js.jsp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/digitallibrary/dlInfo-js.jsp Fri Jan 24 22:13:49 2003 +0100 @@ -0,0 +1,44 @@ +<%@ page language="java" %> + +<%! +// authentication stuff - robert +// ----------------------------- +// create DocumentBean instance for all JSP requests +digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean(); + +// initialize DocumentBean instance in JSP init +public void jspInit() { + try { + // set servlet init-parameter + docBean.setConfig(getServletConfig()); + } catch (javax.servlet.ServletException e) { + System.out.println(e); + } +} +%> + +<% +// parse the query +digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request); +// add number of pages from DocBean +dlRequest.setPt(docBean.getNumPages(dlRequest)); +%> + +// Automatically generated JavaScript snippet with parameters + +var dlreqPt = <%= dlRequest.getPt() %>; // total number of pages (generated by sevlet) + +var dlreqRequestPath = "<%= dlRequest.getRequestPath() %>"; // url of the page/document +var dlreqFn = "<%= dlRequest.getFn() %>"; // url of the page/document +var dlreqFilePath = "<%= dlRequest.getFilePath() %>"; // effective path of the page/document +var dlreqPn = "<%= dlRequest.getPn() %>"; // page number +var dlreqDw = "<%= dlRequest.getDw() %>"; // width of client in pixels +var dlreqDh = "<%= dlRequest.getDh() %>"; // height of client in pixels +var dlreqWx = "<%= dlRequest.getWx() %>"; // left edge of image (float from 0 to 1) +var dlreqWy = "<%= dlRequest.getWy() %>"; // top edge in image (float from 0 to 1) +var dlreqWw = "<%= dlRequest.getWw() %>"; // width of image (float from 0 to 1) +var dlreqWh = "<%= dlRequest.getWh() %>"; // height of image (float from 0 to 1) +var dlreqWs = "<%= dlRequest.getWs() %>"; // scale factor +var dlreqMo = "<%= dlRequest.getMo() %>"; // special options like 'fit' for gifs +var dlreqMk = "<%= dlRequest.getMk() %>"; // marks +var dlreqBaseURL = "<%= dlRequest.getBaseURL() %>"; // base URL (from http:// to below /servlet) diff -r 78c7f985017c -r fcc9030be367 client/digitallibrary/server/dlConfig.jsp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/digitallibrary/server/dlConfig.jsp Fri Jan 24 22:13:49 2003 +0100 @@ -0,0 +1,141 @@ +<%@ page language="java" %> + +<%! +// authentication stuff - robert +// ----------------------------- +// create DocumentBean instance for all JSP requests +digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean(); + +// initialize DocumentBean instance in JSP init +public void jspInit() { + try { + // set servlet init-parameter + docBean.setConfig(getServletConfig()); + } catch (javax.servlet.ServletException e) { + System.out.println(e); + } +} +%> + +<% +// get digilib config +digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig(); +// parsing the query +digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request); +// add number of pages +dlRequest.setPt(docBean.getNumPages(dlRequest)); +%> + + + +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

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ServletVersion<%= dlConfig.getServletVersion() %>
AuthConfPath<%= dlConfig.getAuthConfPath() %>
AuthURLPath<%= dlConfig.getAuthURLPath() %>
BaseDirs<%= dlConfig.getBaseDirList() %>
DebugLevel<%= dlConfig.getDebugLevel() %>
DenyImgFileName<%= dlConfig.getDenyImgFileName() %>
DLConfPath<%= dlConfig.getDlConfPath() %>
DocuImageType<%= dlConfig.getDocuImageType() %>
ErrorImgFileName<%= dlConfig.getErrorImgFileName() %>
SendFileAllowed<%= dlConfig.isSendFileAllowed() %>
UseAuthentication<%= dlConfig.isUseAuthentication() %>
+ + +