Mercurial > hg > digilib-old

comparison client/digitallibrary/digilib.jsp @ 167:2336ac05d57d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author robcast
date Wed, 29 Oct 2003 22:45:51 +0100
parents 28f96364040f
children 21789f3f7251
comparison
equal deleted inserted replaced
166:6132c29ac9f9 167:2336ac05d57d
23 <% 23 <%
24 24
25 // parsing the query 25 // parsing the query
26 // ----------------- 26 // -----------------
27 27
28 //digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request); 28 digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
29 digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest();
30 dlRequest.setWithRequest(request);
31 // check if authentication is needed and redirect if necessary 29 // check if authentication is needed and redirect if necessary
32 docBean.doAuthentication(dlRequest, response); 30 docBean.doAuthentication(dlRequest, response);
33 31
34 %> 32 %>
35 33
46 // however this requires client-side tests and 44 // however this requires client-side tests and
47 // so slows down everything. 45 // so slows down everything.
48 // we might want to talk about it for a future 46 // we might want to talk about it for a future
49 // release 47 // release
50 48
51 if (dlRequest.getLv() == 3) { 49 if (dlRequest.getAsInt("lv") == 3) {
52 String userAgent = request.getHeader("User-Agent").toLowerCase(); 50 String userAgent = request.getHeader("User-Agent").toLowerCase();
53 51
54 if (userAgent.indexOf("mozilla/5.0") == 0) { 52 if (userAgent.indexOf("mozilla/5.0") == 0) {
55 53
56 // mozilla 5 that does not support xul-sidebars 54 // mozilla 5 that does not support xul-sidebars
57 if (userAgent.indexOf("opera") > -1) dlRequest.setLv(2); 55 if (userAgent.indexOf("opera") > -1) dlRequest.setValue("lv", 2);
58 if (userAgent.indexOf("chimera") > -1) dlRequest.setLv(2); 56 if (userAgent.indexOf("chimera") > -1) dlRequest.setValue("lv", 2);
59 if (userAgent.indexOf("camino") > -1) dlRequest.setLv(2); 57 if (userAgent.indexOf("camino") > -1) dlRequest.setValue("lv", 2);
60 if (userAgent.indexOf("konqueror") > -1) dlRequest.setLv(2); 58 if (userAgent.indexOf("konqueror") > -1) dlRequest.setValue("lv", 2);
61 if (userAgent.indexOf("safari") > -1) dlRequest.setLv(2); 59 if (userAgent.indexOf("safari") > -1) dlRequest.setValue("lv", 2);
62 if (userAgent.indexOf("galeon") > -1) dlRequest.setLv(2); 60 if (userAgent.indexOf("galeon") > -1) dlRequest.setValue("lv", 2);
63 if (userAgent.indexOf("skipstone") > -1) dlRequest.setLv(2); 61 if (userAgent.indexOf("skipstone") > -1) dlRequest.setValue("lv", 2);
64 if (userAgent.indexOf("k-meleon") > -1) dlRequest.setLv(2); 62 if (userAgent.indexOf("k-meleon") > -1) dlRequest.setValue("lv", 2);
65 if (userAgent.indexOf("firebird") > -1) dlRequest.setLv(2); 63 if (userAgent.indexOf("firebird") > -1) dlRequest.setValue("lv", 2);
66 64
67 // the chance is quite big, that the browser supports xul-sidebars 65 // the chance is quite big, that the browser supports xul-sidebars
68 dlRequest.setLv(1); 66 dlRequest.setValue("lv", 1);
69 67
70 } else { 68 } else {
71 69
72 // redirect to level 2 because of definitive lack of sidebar support 70 // redirect to level 2 because of definitive lack of sidebar support
73 dlRequest.setLv(2); 71 dlRequest.setValue("lv", 2);
74 } 72 }
75 } 73 }
76 74
77 75
78 76
79 switch (dlRequest.getLv()) { 77 switch (dlRequest.getAsInt("lv")) {
80 78
81 // LEVEL 0 -------------------------------------------------------------- 79 // LEVEL 0 --------------------------------------------------------------
82 80
83 case 0: 81 case 0:
84 %> 82 %>
94 case 1: 92 case 1:
95 %> 93 %>
96 94
97 <% 95 <%
98 // checking if the height and width of this client is already known 96 // checking if the height and width of this client is already known
99 if ((dlRequest.getDw() == 0) || (dlRequest.getDh() == 0)) { 97 if ((dlRequest.getAsInt("dw") == 0) || (dlRequest.getAsInt("dh") == 0)) {
100 %> 98 %>
101 99
102 <html> 100 <html>
103 <head> 101 <head>
104 <script language="Javascript"> 102 <script language="Javascript">
138 136
139 <% 137 <%
140 } else { 138 } else {
141 139
142 // add number of pages 140 // add number of pages
143 dlRequest.setPt(docBean.getNumPages(dlRequest)); 141 dlRequest.setValue("pt", docBean.getNumPages(dlRequest));
144 142
145 String imageLocation = dlRequest.getBaseURL() + "/servlet/Scaler/?" + dlRequest.getAsString(); 143 String imageLocation = dlRequest.getAsString("base.url") + "/servlet/Scaler/?" + dlRequest.getAsString();
146 %> 144 %>
147 145
148 <html> 146 <html>
149 <head> 147 <head>
150 <title>Digital Document Library - Alcatraz (Level 1)</title> 148 <title>Digital Document Library - Alcatraz (Level 1)</title>
156 <script src="modules/newReferences.js" type="text/javascript"> </script> 154 <script src="modules/newReferences.js" type="text/javascript"> </script>
157 <script src="modules/imago.js" type="text/javascript"> </script> 155 <script src="modules/imago.js" type="text/javascript"> </script>
158 156
159 <script type="text/javascript"> 157 <script type="text/javascript">
160 158
161 var baseUrl = "<%= dlRequest.getBaseURL() %>"; 159 var baseUrl = "<%= dlRequest.getAsString("base.url") %>";
162 160
163 newParameter('fn', '<%= dlRequest.getFilePath() %>', '', 1); 161 newParameter('fn', '<%= dlRequest.getFilePath() %>', '', 1);
164 newParameter('pn', '<%= dlRequest.getPn() %>', '1', 1); 162 newParameter('pn', '<%= dlRequest.getAsString("pn") %>', '1', 1);
165 newParameter('ws', '<%= dlRequest.getWs() %>', '1.0', 1); 163 newParameter('ws', '<%= dlRequest.getAsString("ws") %>', '1.0', 1);
166 newParameter('mo', '<%= dlRequest.getMo() %>', '', 1); 164 newParameter('mo', '<%= dlRequest.getAsString("mo") %>', '', 1);
167 newParameter('mk', '<%= dlRequest.getMk() %>', '', 3); 165 newParameter('mk', '<%= dlRequest.getAsString("mk") %>', '', 3);
168 newParameter('wx', '<%= dlRequest.getWx() %>', '0.0', 2); 166 newParameter('wx', '<%= dlRequest.getAsString("wx") %>', '0.0', 2);
169 newParameter('wy', '<%= dlRequest.getWy() %>', '0.0', 2); 167 newParameter('wy', '<%= dlRequest.getAsString("wy") %>', '0.0', 2);
170 newParameter('ww', '<%= dlRequest.getWw() %>', '1.0', 2); 168 newParameter('ww', '<%= dlRequest.getAsString("ww") %>', '1.0', 2);
171 newParameter('wh', '<%= dlRequest.getWh() %>', '1.0', 2); 169 newParameter('wh', '<%= dlRequest.getAsString("wh") %>', '1.0', 2);
172 170
173 newParameter('pt', '<%= dlRequest.getPt() %>', '<%= dlRequest.getPt() %>', 9); 171 newParameter('pt', '<%= dlRequest.getAsString("pt") %>', '<%= dlRequest.getAsString("pt") %>', 9);
174 172
175 newParameter('brgt', '<%= dlRequest.getBrgt() %>', '0.0', 1); 173 newParameter('brgt', '<%= dlRequest.getAsString("brgt") %>', '0.0', 1);
176 newParameter('cont', '<%= dlRequest.getCont() %>', '0.0', 1); 174 newParameter('cont', '<%= dlRequest.getAsString("cont") %>', '0.0', 1);
177 newParameter('rot', '<%= dlRequest.getRot() %>', '0.0', 1); 175 newParameter('rot', '<%= dlRequest.getAsString("rot") %>', '0.0', 1);
178 newParameter('rgba', '<%= dlRequest.getRgba_s() %>', '', 1); 176 newParameter('rgba', '<%= dlRequest.getAsString("rgba") %>', '', 1);
179 newParameter('rgbm', '<%= dlRequest.getRgbm_s() %>', '', 1); 177 newParameter('rgbm', '<%= dlRequest.getAsString("rgbm") %>', '', 1);
180 178
181 newParameter('ddpix', '<%= dlRequest.getDdpix() %>', '', 9); 179 newParameter('ddpix', '<%= dlRequest.getAsString("ddpix") %>', '', 9);
182 newParameter('ddpiy', '<%= dlRequest.getDdpiy() %>', '', 9); 180 newParameter('ddpiy', '<%= dlRequest.getAsString("ddpiy") %>', '', 9);
183 181
184 </script> 182 </script>
185 183
186 </head> 184 </head>
187 185
220 case 2: 218 case 2:
221 %> 219 %>
222 220
223 <% 221 <%
224 // retrieve request in new paramter format and redirect to level 1 222 // retrieve request in new paramter format and redirect to level 1
225 dlRequest.setLv(1); 223 dlRequest.setValue("lv", 1);
226 String query = "digilib.jsp?" + dlRequest.getAsString(); 224 String query = "digilib.jsp?" + dlRequest.getAsString();
227 %> 225 %>
228 226
229 <html> 227 <html>
230 <head> 228 <head>