Mercurial > hg > digilib-old
comparison servlet2/src/main/java/digilib/servlet/DigilibServletRequest.java @ 1157:7a4f27ee087f
fix bug when calling Scaler without fn-parameter.
author | robcast |
---|---|
date | Tue, 19 Feb 2013 17:27:53 +0100 |
parents | 7779b37d1d05 |
children |
comparison
equal
deleted
inserted
replaced
1156:4f84a635a820 | 1157:7a4f27ee087f |
---|---|
158 newParameter("img.pix_x", new Integer(0), null, 'c'); | 158 newParameter("img.pix_x", new Integer(0), null, 'c'); |
159 // hires image size y | 159 // hires image size y |
160 newParameter("img.pix_y", new Integer(0), null, 'c'); | 160 newParameter("img.pix_y", new Integer(0), null, 'c'); |
161 // total number of pages | 161 // total number of pages |
162 newParameter("pt", new Integer(0), null, 'c'); | 162 newParameter("pt", new Integer(0), null, 'c'); |
163 // display level of digilib (0 = just image, 1 = one HTML page | |
164 // 2 = in frameset, 3 = XUL-'frameset' | |
165 // 4 = XUL-Sidebar ) | |
166 newParameter("lv", new Integer(2), null, 'c'); | |
167 // marks | 163 // marks |
168 newParameter("mk", "", null, 'c'); | 164 newParameter("mk", "", null, 'c'); |
169 } | 165 } |
170 | 166 |
171 /* (non-Javadoc) | 167 /* (non-Javadoc) |
191 // & separator | 187 // & separator |
192 setWithParamString(qs, "&"); | 188 setWithParamString(qs, "&"); |
193 } else if (qs.indexOf(";") > -1) { | 189 } else if (qs.indexOf(";") > -1) { |
194 // ; separator | 190 // ; separator |
195 setWithParamString(qs, ";"); | 191 setWithParamString(qs, ";"); |
196 } else if (request.getParameter("fn") != null) { | 192 } else if (request.getParameter("fn") != null || |
193 request.getParameter("dw") != null || request.getParameter("dh") != null) { | |
197 // standard '&' parameters | 194 // standard '&' parameters |
198 setWithParamRequest(request); | 195 setWithParamRequest(request); |
199 } else { | 196 } else { |
200 setWithOldString(qs); | 197 setWithOldString(qs); |
201 } | 198 } |