Mercurial > hg > digilib-old

comparison client/digitallibrary/dlImage.jsp @ 60:58d23f512c80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New DigilibServlet.jar with new version (with DigilibRequest object). Changes in digilib, digicat, dlImage JSP. Initialization now done only once in jspInit. Uses DigilibRequest object to convert old +++-style requests to parameter-style requests and for BaseURL. Prettyfied config files (no authentication is default).
author robcast
date Wed, 28 Aug 2002 20:17:35 +0200
parents 866e798e2bef
children b877e54b0794
comparison
equal deleted inserted replaced
59:8d9a0abf3626 60:58d23f512c80
25 </html> 25 </html>
26 26
27 <% 27 <%
28 } else { 28 } else {
29 29
30 digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest();
30 // default values for parameters 31 // default values for parameters
31 String fn = "/"; // url of the page/document 32 dlRequest.setFn("/"); // url of the page/document
32 String pn = "1"; // page number 33 dlRequest.setPn(1); // page number
33 String ws = "1"; // scale factor 34 dlRequest.setWs(1); // scale factor
34 String mo = ""; // special options like 'fit' for gifs 35 dlRequest.setMo(""); // special options like 'fit' for gifs
35 String mk = "0/0"; // marks 36 dlRequest.setMk("0/0"); // marks
36 String wx = "0"; // left edge of image (float from 0 to 1) 37 dlRequest.setWx(0); // left edge of image (float from 0 to 1)
37 String wy = "0"; // top edge in image (float from 0 to 1) 38 dlRequest.setWy(0); // top edge in image (float from 0 to 1)
38 String ww = "1"; // width of image (float from 0 to 1) 39 dlRequest.setWw(1); // width of image (float from 0 to 1)
39 String wh = "1"; // height of image (float from 0 to 1) 40 dlRequest.setWh(1); // height of image (float from 0 to 1)
40 String dw = ""; // width of client in pixels
41 String dh = ""; // height of client in pixels
42
43 String pt = ""; // (module pagesTotal.js) total number of pages
44
45 // overrriding default parameters with provided parameters from query-string 41 // overrriding default parameters with provided parameters from query-string
46 if (request.getParameter("fn") != null) fn = request.getParameter("fn"); 42 dlRequest.setWithRequest(request);
47 if (request.getParameter("pn") != null) pn = request.getParameter("pn");
48 if (request.getParameter("ws") != null) ws = request.getParameter("ws");
49 if (request.getParameter("mo") != null) mo = request.getParameter("mo");
50 if (request.getParameter("mk") != null) mk = request.getParameter("mk");
51 if (request.getParameter("wx") != null) wx = request.getParameter("wx");
52 if (request.getParameter("wy") != null) wy = request.getParameter("wy");
53 if (request.getParameter("ww") != null) ww = request.getParameter("ww");
54 if (request.getParameter("wh") != null) wh = request.getParameter("wh");
55 if (request.getParameter("dw") != null) dw = request.getParameter("dw");
56 if (request.getParameter("dh") != null) dh = request.getParameter("dh");
57 if (request.getParameter("pt") != null) pt = request.getParameter("pt");
58 43
59 //String imageLocation = "http://" + request.getServerName() + "/docuserver/digitallibrary/servlet/Scaler/" + fn + "?pn=" + pn + "&ws=" + ws + "&mo=" + mo + "&wx=" + wx + "&wy=" + wy + "&ww=" + ww + "&wh=" + wh + "&dw=" + dw + "&dh=" + dh; 44 //String imageLocation = "http://" + request.getServerName() + "/docuserver/digitallibrary/servlet/Scaler/" + fn + "?pn=" + pn + "&ws=" + ws + "&mo=" + mo + "&wx=" + wx + "&wy=" + wy + "&ww=" + ww + "&wh=" + wh + "&dw=" + dw + "&dh=" + dh;
60 45
61 String baseUrl = request.getRequestURL().toString(); 46 String baseUrl = dlRequest.getBaseURL();
62 int eop = baseUrl.lastIndexOf("/");
63 if (eop > 0) {
64 baseUrl = baseUrl.substring(0, eop);
65 } else {
66 baseUrl = "http://" + request.getServerName() + "/docuserver/digitallibrary";
67 }
68 47
69 String imageLocation = baseUrl + "/servlet/Scaler/" + fn + "?pn=" + pn + "&ws=" + ws + "&mo=" + mo + "&wx=" + wx + "&wy=" + wy + "&ww=" + ww + "&wh=" + wh + "&dw=" + dw + "&dh=" + dh; 48 String imageLocation = dlRequest.getBaseURL() + "/servlet/Scaler/?" + dlRequest.getAsString();
70
71 %> 49 %>
72 50
73 <html> 51 <html>
74 <head> 52 <head>
75 <script language="JavaScript"> 53 <script language="JavaScript">
76 54
77 var baseUrl = "<%= baseUrl %>"; 55 var baseUrl = "<%= dlRequest.getBaseURL() %>";
78 56
79 // browser version test to include the corresponding navigation-file 57 // browser version test to include the corresponding navigation-file
80 if (navigator.userAgent.toLowerCase().indexOf("opera") > -1) { 58 if (navigator.userAgent.toLowerCase().indexOf("opera") > -1) {
81 document.write('<script src="navigation_o6.js"><\/script>'); 59 document.write('<script src="navigation_o6.js"><\/script>');
82 } else if (navigator.userAgent.toLowerCase().indexOf("msie") > -1) { 60 } else if (navigator.userAgent.toLowerCase().indexOf("msie") > -1) {
94 document.write('<script src="modules\/pagesTotal.js"><\/script>'); 72 document.write('<script src="modules\/pagesTotal.js"><\/script>');
95 // document.write('<script src="modules\/pdfMaker.js"><\/script>'); 73 // document.write('<script src="modules\/pdfMaker.js"><\/script>');
96 74
97 </script> 75 </script>
98 </head> 76 </head>
99 <body bgcolor="#666666" onload='init_pagesTotal("<%= fn %>", "<%= pn %>", "<%= ws %>", "<%= mo %>", "<%= mk %>", "<%= wx %>", "<%= wy %>", "<%= ww %>", "<%= wh %>", "<%= pt %>")'> 77 <body bgcolor="#666666" onload='init_pagesTotal("<%= dlRequest.getFn() %>", "<%= dlRequest.getPn() %>", "<%= dlRequest.getWs() %>", "<%= dlRequest.getMo() %>", "<%= dlRequest.getMk() %>", "<%= dlRequest.getWx() %>", "<%= dlRequest.getWy() %>", "<%= dlRequest.getWw() %>", "<%= dlRequest.getWh() %>", "<%= dlRequest.getPt() %>")'>
100 78
101 <div id="lay1" style="position: absolute; left: 10px; top: 10px; visibility: visible"><img name="pic" src="<%= imageLocation %>" border="0"></div> 79 <div id="lay1" style="position: absolute; left: 10px; top: 10px; visibility: visible"><img name="pic" src="<%= imageLocation %>" border="0"></div>
102 80
103 <div id="dot0" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark1.gif" border="0"></div> 81 <div id="dot0" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark1.gif" border="0"></div>
104 <div id="dot1" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark2.gif" border="0"></div> 82 <div id="dot1" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark2.gif" border="0"></div>