# HG changeset patch
# User robcast
# Date 1029447615 -7200
# Node ID 866e798e2befed05fa02d70a7cb6619f4e49f3a8
# Parent 67bbba76f34aa8b7a918a2c0f0514600750d5e75
13.8.2002 - [different files] : roc
- changed all hardcoded occurrences of /docuserver/digitallibrary to
work relative or take the path from the request URL. Introduced a
variable baseURL to hold the URL path (up to digilib.jsp etc.). Now
it should be possible to install digilib in other directories.
- removed xerces.jar. It seems not necessary any more (JDK 1.3.1, Tomcat 4.0.4)
diff -r 67bbba76f34a -r 866e798e2bef client/digitallibrary/CHANGES
--- a/client/digitallibrary/CHANGES Sun Jul 07 18:03:54 2002 +0200
+++ b/client/digitallibrary/CHANGES Thu Aug 15 23:40:15 2002 +0200
@@ -10,6 +10,13 @@
CHANGES
+13.8.2002 - [different files] : roc
+
+- changed all hardcoded occurrences of /docuserver/digitallibrary to
+ work relative or take the path from the request URL. Introduced a
+ variable baseURL to hold the URL path (up to digilib.jsp etc.). Now
+ it should be possible to install digilib in other directories.
+
20.05.2002 - navigation_o6.js : luginbuehl
- Opera browser support done. the 'b'-key does not work currently, beause
diff -r 67bbba76f34a -r 866e798e2bef client/digitallibrary/dlImage.jsp
--- a/client/digitallibrary/dlImage.jsp Sun Jul 07 18:03:54 2002 +0200
+++ b/client/digitallibrary/dlImage.jsp Thu Aug 15 23:40:15 2002 +0200
@@ -56,7 +56,17 @@
if (request.getParameter("dh") != null) dh = request.getParameter("dh");
if (request.getParameter("pt") != null) pt = request.getParameter("pt");
-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;
+//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;
+
+String baseUrl = request.getRequestURL().toString();
+int eop = baseUrl.lastIndexOf("/");
+if (eop > 0) {
+ baseUrl = baseUrl.substring(0, eop);
+} else {
+ baseUrl = "http://" + request.getServerName() + "/docuserver/digitallibrary";
+}
+
+String imageLocation = baseUrl + "/servlet/Scaler/" + fn + "?pn=" + pn + "&ws=" + ws + "&mo=" + mo + "&wx=" + wx + "&wy=" + wy + "&ww=" + ww + "&wh=" + wh + "&dw=" + dw + "&dh=" + dh;
%>
@@ -64,6 +74,8 @@
diff -r 67bbba76f34a -r 866e798e2bef client/digitallibrary/dlMenu.html
--- a/client/digitallibrary/dlMenu.html Sun Jul 07 18:03:54 2002 +0200
+++ b/client/digitallibrary/dlMenu.html Thu Aug 15 23:40:15 2002 +0200
@@ -32,7 +32,7 @@
helpText[8] = "'zoom out'-button|To gain the original unzoomed picture, click on 'zoom out'.
Note that any set marks are still saved at their positions.";
helpText[9] = "'move to'-button|This button allows you change the center of a zoomed picture, while not changing the current zoom-factor.
Use: Click on the point in the picture you want to be the new center of the image.";
helpText[10] = "'scale'-button|By clicking on one of the menu entries you can select the factor the currently displayed picture will be scaled.
Note: a scale factor of '1.0' means that the picture fits right into the working area, while '2.0' means that it will be twice as high and large.";
-helpText[11] = "'make pdf'-button|You can make a PDF with several pictures from this directory in it. Click the button and follow the instructions.";
+//helpText[11] = "'make pdf'-button|You can make a PDF with several pictures from this directory in it. Click the button and follow the instructions.";
helpText[12] = "'?'-button|In its menu you are able change options like the visibility of this contextsensitive help, with 'Keep area' the program keeps its current area when changing to another page or with 'Fit GIFs' you can force to program to adjust the size of GIF-images to the working area.";
@@ -71,25 +71,27 @@
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
Contexthelp
Keep area