--- a/client/digitallibrary/navigation_n4.js	Thu Feb 21 02:27:06 2002 +0100
+++ b/client/digitallibrary/navigation_n4.js	Thu Feb 21 02:27:06 2002 +0100
@@ -1,34 +1,65 @@
-/* navigation_ie -- JS library for digilib (Netscape4 version)
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2001, 2002 Christian Luginbuehl (luginbuehl@student.unibe.ch)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-// these two global variables have to be initialised before the frist use of the functions below
-// to fill in the attributes you can use the function initPicture provided below
+// this global variable has to be initialised before the frist use of the functions below
+// to fill in the attributes you can use the function init provided below
 // - array with all attributes
 var att = new Array();
 
-// - variable to store the path to the frame, in which the pictures should be created
-var whichFrame = parent.mainFrame;
+// fill in the values of the "att"-array
+function init(fn, pn, ws, mo, mk, wx, wy, ww, wh) {
+
+	// debug window to check the parameters passed
+	//alert ("DEBUG message (parameters in init):\n\npu = " + pu + "\npn = " + pn + "\nws = " + ws + "\nmo = " + mo + "\nmk = " + mk + "\nwx = " + wx + "\nwy = " + wy + "\nww = " + ww + "\nwh = " + wh);
+
+	// attaching the values to the att-array
+	att[0] = fn;
+	att[1] = parseInt(pn);
+	att[2] = parseFloat(ws);
+	att[3] = mo;
+	att[4] = mk;
+	att[5] = parseFloat(wx);
+	att[6] = parseFloat(wy);
+	att[7] = parseFloat(ww);
+	att[8] = parseFloat(wh);
+	
+	// compatablility issue
+	if (att[3].indexOf("f") > -1) {
+		att[3] = "fit";
+	}
 
-// give a name to the window containing digilib - this way one can test if there is already a
-// digilib-window open and replace the contents of it (ex. digicat)
-window.name = "digilib";
+	// converts the old mark format (0-1000) to new format(0.0 - 1.0)
+	// could even be useless now
+	if (att[4] != "0/0") {
+		var tmp = att[4].split(";");
+		
+		att[4] = "";
+		
+		for (i = 0; i < tmp.length; i++) {
+			tmp[i] = tmp[i].split("/");
+
+			if (tmp[i][0] > 1 && tmp[i][1] > 1) {
+				tmp[i][0] /= 1000;
+				tmp[i][1] /= 1000;
+			}
+			
+			att[4] += tmp[i][0] + "/" + tmp[i][1] + ";";
+		}
+		att[4] = att[4].slice(0, -1);
+	}
+
+	// initialisation stuff
+	// ====================
+	
+	setMarks();
+
+	window.captureEvents(Event.KEYDOWN);
+	window.onkeydown = parseKeypress;
+
+	focus();
+	
+	// give a name to the window containing digilib - this way one can test if there is already a
+	// digilib-window open and replace the contents of it (ex. digicat)
+	top.window.name = "digilib";
+}
+
 
 // function that launches the ScaleServlet
 // the different detailGrades:
@@ -38,12 +69,8 @@
 
 function loadPicture(detailGrade, keepArea) {
 
-//	alert("wx: " + att[5] + "\tww: " + att[7] + "\nwy: " + att[6] + "\twh: " + att[8]);
-
-	var newPicture  = "http://" + location.host + "/docuserver/digitallibrary/servlet/Scaler/"
-	newPicture += att[0] + "?" + "pn=" + att[1] + "&ws=" + att[2];
-	newPicture += "&dw=" + (whichFrame.innerWidth-30) + "&dh=" + (whichFrame.innerHeight-30);
-	newPicture += "&mo=" + att[3];
+	var newURL  = "dlImage.jsp?"
+	newURL += "fn=" + att[0] + "&pn=" + att[1] + "&ws=" + att[2] + "&mo=" + att[3];
 
 	if (detailGrade == 0) {
 		att[4] = "0/0";
@@ -55,35 +82,18 @@
 		att[7] = 1;
 		att[8] = 1;
 	}
-	newPicture += "&wx=" + att[5] + "&wy=" + att[6] + "&ww=" + att[7] + "&wh=" + att[8];
+
+	newURL += "&mk=" + att[4] + "&wx=" + att[5] + "&wy=" + att[6] + "&ww=" + att[7] + "&wh=" + att[8];
+	newURL += "&dw=" + (innerWidth-30) + "&dh=" + (innerHeight-30);
 
-	whichFrame.document.open();
-	
-	whichFrame.document.write('<html><head></head><body bgcolor="#666666">');
-	whichFrame.document.write('<div ID="lay1" style="position:absolute; left:10;  top:10;  visibility:visible"><img src="' + newPicture + '"></div>');
-	whichFrame.document.write('<div ID="dot0" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/mark1.gif"></div>');
-	whichFrame.document.write('<div ID="dot1" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/mark2.gif"></div>');
-	whichFrame.document.write('<div ID="dot2" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/mark3.gif"></div>');
-	whichFrame.document.write('<div ID="dot3" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/mark4.gif"></div>');
-	whichFrame.document.write('<div ID="dot4" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/mark5.gif"></div>');
-	whichFrame.document.write('<div ID="dot5" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/mark6.gif"></div>');
-	whichFrame.document.write('<div ID="dot6" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/mark7.gif"></div>');
-	whichFrame.document.write('<div ID="dot7" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/mark8.gif"></div>');
-	whichFrame.document.write('<div ID="eck1" style="position:absolute; left:-20; top:120; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/olinks.gif"></div>');
-	whichFrame.document.write('<div ID="eck2" style="position:absolute; left:-20; top:140; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/orechts.gif"></div>');
-	whichFrame.document.write('<div ID="eck3" style="position:absolute; left:-20; top:160; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/ulinks.gif"></div>');
-	whichFrame.document.write('<div ID="eck4" style="position:absolute; left:-20; top:180; visibility:hidden"><img src="http://' + location.host + '/docuserver/digitallibrary/urechts.gif"></div>');
-	whichFrame.document.write('</body></html>');
-	
-	whichFrame.document.close();
-	
-	pageInfo();
+	// debug window - checking the parameters passed to the next image
+	//alert ("DEBUG MESSAGE (complete URL in loadPicture):\n\n" + newURL);
 
-	setmark();
+	location.href = newURL;
 }
 
 
-function Backpage(keepArea) {
+function backPage(keepArea) {
 
     att[1] = parseInt(att[1]) - 1;
 
@@ -96,24 +106,19 @@
 }
 
 
-function Nextpage(keepArea) {
+function nextPage(keepArea) {
 
     att[1] = parseInt(att[1]) + 1;
 
-    if (att[1] <= parent.numPages) {
-        loadPicture(0, keepArea);
-    } else {
-	    att[1] = parseInt(att[1]) - 1;
-        alert("You are already on the last page!");
-    }
+	loadPicture(0, keepArea);
 }
 
 
-function Page(keepArea) {
+function page(keepArea) {
 
 	do {
-    	page = prompt("Goto Page (1 - " + parent.numPages + "):", 1);
-	} while ((page != null) && ((page < 1) || (page > parent.numPages)));
+    	page = prompt("Goto Page:", 1);
+	} while ((page != null) && (page < 1));
 
    	if (page != null && page != att[1]) {
 		att[1] = page;
@@ -122,14 +127,14 @@
 }
 
 
-function Digicat() {
+function digicat() {
 	var url = "http://" + location.host + "/docuserver/digitallibrary/digicat.html?" + att[0] + "+" + att[1];
 	win = window.open(url, "digicat");
 	win.focus();
 }
 
 
-function Ref(refselect) {
+function ref(refselect) {
 
 	var hyperlinkRef = "http://" + location.host + "/docuserver/digitallibrary/digilib.jsp?";
 	hyperlinkRef += att[0] + "+" + att[1] + "+" + att[2] + "+" + att[3] + "+" + att[4];
@@ -146,15 +151,15 @@
 }
 
 
-function Mark(refselect) {
+function mark(refselect) {
 
 	if (att[4].split(";").length > 7) {
 		alert("Only 8 marks are possible at the moment!");
 		return;
 	}
 
-    whichFrame.document.lay1.captureEvents(Event.MOUSEDOWN);
-    whichFrame.document.lay1.onmousedown = function(event) {
+    document.lay1.captureEvents(Event.MOUSEDOWN);
+    document.lay1.onmousedown = function(event) {
 
         if ((att[4] != "") && (att[4] != "0/0")) {
             att[4] += ";";
@@ -162,22 +167,22 @@
             att[4] = "";
         }
 
-		var markX = cropFloat(att[5]+(att[7]*event.x/whichFrame.document.lay1.clip.width));
-		var markY = cropFloat(att[6]+(att[8]*event.y/whichFrame.document.lay1.clip.height));
+		var markX = cropFloat(att[5]+(att[7]*event.x/document.lay1.clip.width));
+		var markY = cropFloat(att[6]+(att[8]*event.y/document.lay1.clip.height));
 		
         att[4] += markX + "/" + markY;
 
-        whichFrame.document.lay1.releaseEvents(Event.MOUSEDOWN);
-        setmark();
+        document.lay1.releaseEvents(Event.MOUSEDOWN);
+        setMarks();
     }
 }
 
 
-function Zoomrect() {
+function zoomArea() {
     var state = 0;
     var x1, y1, x2, y2;
         
-    function Click(event) {
+    function click(event) {
 
         if (state == 0) {
             state = 1;
@@ -187,43 +192,43 @@
             x2 = x1;
             y2 = y1;
 
-            whichFrame.document.eck1.moveTo(((x1 < x2) ? x1 : x2), ((y1 < y2) ? y1 : y2));
-            whichFrame.document.eck2.moveTo(((x1 < x2) ? x2 : x1)-12, ((y1 < y2) ? y1 : y2));
-            whichFrame.document.eck3.moveTo(((x1 < x2) ? x1 : x2), ((y1 < y2) ? y2 : y1)-12);
-            whichFrame.document.eck4.moveTo(((x1 < x2) ? x2 : x1)-12, ((y1 < y2) ? y2 : y1)-12);
+            document.eck1.moveTo(((x1 < x2) ? x1 : x2), ((y1 < y2) ? y1 : y2));
+            document.eck2.moveTo(((x1 < x2) ? x2 : x1)-12, ((y1 < y2) ? y1 : y2));
+            document.eck3.moveTo(((x1 < x2) ? x1 : x2), ((y1 < y2) ? y2 : y1)-12);
+            document.eck4.moveTo(((x1 < x2) ? x2 : x1)-12, ((y1 < y2) ? y2 : y1)-12);
 
-            whichFrame.document.eck1.visibility="show";
-            whichFrame.document.eck2.visibility="show";
-            whichFrame.document.eck3.visibility="show";
-            whichFrame.document.eck4.visibility="show";
+            document.eck1.visibility="show";
+            document.eck2.visibility="show";
+            document.eck3.visibility="show";
+            document.eck4.visibility="show";
             
-            whichFrame.document.lay1.captureEvents(Event.MOUSEMOVE);
-            whichFrame.document.eck4.captureEvents(Event.MOUSEMOVE);
+            document.lay1.captureEvents(Event.MOUSEMOVE);
+            document.eck4.captureEvents(Event.MOUSEMOVE);
 
-            whichFrame.document.lay1.onmousemove = Move;
-            whichFrame.document.eck4.onmousemove = Move;
+            document.lay1.onmousemove = move;
+            document.eck4.onmousemove = move;
             
         } else {
 
-            x1 -= whichFrame.document.lay1.x;
-            y1 -= whichFrame.document.lay1.y;            
+            x1 -= document.lay1.x;
+            y1 -= document.lay1.y;            
 
-            x2 = event.pageX-whichFrame.document.lay1.x;
-            y2 = event.pageY-whichFrame.document.lay1.y;         
+            x2 = event.pageX-document.lay1.x;
+            y2 = event.pageY-document.lay1.y;         
 
-            whichFrame.document.lay1.releaseEvents(Event.MOUSEDOWN | Event.MOUSEMOVE);
-            whichFrame.document.eck4.releaseEvents(Event.MOUSEDOWN | Event.MOUSEMOVE);
+            document.lay1.releaseEvents(Event.MOUSEDOWN | Event.MOUSEMOVE);
+            document.eck4.releaseEvents(Event.MOUSEDOWN | Event.MOUSEMOVE);
 
-            whichFrame.document.eck1.visibility="hide";
-            whichFrame.document.eck2.visibility="hide";
-            whichFrame.document.eck3.visibility="hide";
-            whichFrame.document.eck4.visibility="hide";
+            document.eck1.visibility="hide";
+            document.eck2.visibility="hide";
+            document.eck3.visibility="hide";
+            document.eck4.visibility="hide";
 
-            att[5] = cropFloat(att[5]+att[7]*((x1 < x2) ? x1 : x2)/whichFrame.document.lay1.clip.width);
-            att[6] = cropFloat(att[6]+att[8]*((y1 < y2) ? y1 : y2)/whichFrame.document.lay1.clip.height);
+            att[5] = cropFloat(att[5]+att[7]*((x1 < x2) ? x1 : x2)/document.lay1.clip.width);
+            att[6] = cropFloat(att[6]+att[8]*((y1 < y2) ? y1 : y2)/document.lay1.clip.height);
 
-            att[7] = cropFloat(att[7]*Math.abs(x1-x2)/whichFrame.document.lay1.clip.width);
-            att[8] = cropFloat(att[8]*Math.abs(y1-y2)/whichFrame.document.lay1.clip.height);
+            att[7] = cropFloat(att[7]*Math.abs(x1-x2)/document.lay1.clip.width);
+            att[8] = cropFloat(att[8]*Math.abs(y1-y2)/document.lay1.clip.height);
                         
             if (att[7] != 0 && att[8] != 0) {
               loadPicture(2);
@@ -231,32 +236,32 @@
         }
     }
 
-    function Move(event) {
+    function move(event) {
 
         x2 = event.pageX;
         y2 = event.pageY;           
 
-        whichFrame.document.eck1.moveTo(((x1 < x2) ? x1 : x2), ((y1 < y2) ? y1 : y2));
-        whichFrame.document.eck2.moveTo(((x1 < x2) ? x2 : x1)-12, ((y1 < y2) ? y1 : y2));
-        whichFrame.document.eck3.moveTo(((x1 < x2) ? x1 : x2), ((y1 < y2) ? y2 : y1)-12);
-        whichFrame.document.eck4.moveTo(((x1 < x2) ? x2 : x1)-12, ((y1 < y2) ? y2 : y1)-12);
+        document.eck1.moveTo(((x1 < x2) ? x1 : x2), ((y1 < y2) ? y1 : y2));
+        document.eck2.moveTo(((x1 < x2) ? x2 : x1)-12, ((y1 < y2) ? y1 : y2));
+        document.eck3.moveTo(((x1 < x2) ? x1 : x2), ((y1 < y2) ? y2 : y1)-12);
+        document.eck4.moveTo(((x1 < x2) ? x2 : x1)-12, ((y1 < y2) ? y2 : y1)-12);
     }
 
-    whichFrame.document.lay1.captureEvents(Event.MOUSEDOWN);
-    whichFrame.document.eck4.captureEvents(Event.MOUSEDOWN);
+    document.lay1.captureEvents(Event.MOUSEDOWN);
+    document.eck4.captureEvents(Event.MOUSEDOWN);
 
-    whichFrame.document.lay1.onmousedown = Click;
-    whichFrame.document.eck4.onmousedown = Click;
+    document.lay1.onmousedown = click;
+    document.eck4.onmousedown = click;
 }
 
 
-function Zoomin() {
+function zoomPoint() {
 
-    whichFrame.document.lay1.captureEvents(Event.MOUSEDOWN);
-    whichFrame.document.lay1.onmousedown = function(event) {
+    document.lay1.captureEvents(Event.MOUSEDOWN);
+    document.lay1.onmousedown = function(event) {
 
-		att[5] = cropFloat(att[5]+(att[7]*event.x/whichFrame.document.lay1.clip.width-0.5*att[7]*0.7));
-		att[6] = cropFloat(att[6]+(att[8]*event.y/whichFrame.document.lay1.clip.height-0.5*att[8]*0.7));
+		att[5] = cropFloat(att[5]+(att[7]*event.x/document.lay1.clip.width-0.5*att[7]*0.7));
+		att[6] = cropFloat(att[6]+(att[8]*event.y/document.lay1.clip.height-0.5*att[8]*0.7));
 
         att[7] = cropFloat(att[7]*0.7);
         att[8] = cropFloat(att[8]*0.7);
@@ -281,18 +286,18 @@
 }
 
 
-function Zoomout() {
+function zoomOut() {
     loadPicture(1);
 }
 
 
-function Moveto() {
+function moveTo() {
 
-    whichFrame.document.lay1.captureEvents(Event.MOUSEDOWN);
-    whichFrame.document.lay1.onmousedown = function(event) {
+    document.lay1.captureEvents(Event.MOUSEDOWN);
+    document.lay1.onmousedown = function(event) {
 
-		att[5] = cropFloat(att[5]+(att[7]*event.x/whichFrame.document.lay1.clip.width-0.5*att[7]));
-		att[6] = cropFloat(att[6]+(att[8]*event.y/whichFrame.document.lay1.clip.height-0.5*att[8]));
+		att[5] = cropFloat(att[5]+(att[7]*event.x/document.lay1.clip.width-0.5*att[7]));
+		att[6] = cropFloat(att[6]+(att[8]*event.y/document.lay1.clip.height-0.5*att[8]));
 
 		if (att[5] < 0) {
 			att[5] = 0;
@@ -314,14 +319,14 @@
 }
 
 
-function Scaledef(scaledef) {
+function scale(scaledef) {
 
     att[2] = scaledef;
     loadPicture(2);
 }
 
 
-function setmark() {
+function setMarks() {
 	if ((att[4] != "") && (att[4] != "0/0")) {
 		var mark = att[4].split(";");
 
@@ -331,19 +336,19 @@
 		// we do not report this error because this is already done in func. "Mark"
 		if (countMarks > 8) countMarks = 8;
 
-		var picWidth  = whichFrame.document.lay1.clip.width;
-		var picHeight = whichFrame.document.lay1.clip.height;
+		var picWidth  = document.lay1.clip.width;
+		var picHeight = document.lay1.clip.height;
 
 		for (var i = 0; i < countMarks; i++) {
 			mark[i] = mark[i].split("/");
 
 			if ((mark[i][0] > att[5]) && (mark[i][1] > att[6]) && (mark[i][0] < (att[5]+att[7])) && (mark[i][1] < (att[6]+att[8]))) {
 
-				mark[i][0] = parseInt(whichFrame.document.lay1.x + (picWidth*(mark[i][0]-att[5]))/att[7]);
-				mark[i][1] = parseInt(whichFrame.document.lay1.y + (picHeight*(mark[i][1]-att[6]))/att[8]);
+				mark[i][0] = parseInt(document.lay1.x + (picWidth*(mark[i][0]-att[5]))/att[7]);
+				mark[i][1] = parseInt(document.lay1.y + (picHeight*(mark[i][1]-att[6]))/att[8]);
 
-				whichFrame.document.layers[i+1].moveTo(mark[i][0]-5, mark[i][1]-5);
-				whichFrame.document.layers[i+1].visibility = "show";
+				document.layers[i+1].moveTo(mark[i][0]-5, mark[i][1]-5);
+				document.layers[i+1].visibility = "show";
 			}
 		}
 	}
@@ -366,85 +371,3 @@
 function cropFloat(tmp) {
 	return parseInt(10000*tmp)/10000;
 }
-
-
-// initialize browser specific things (keypress caputring)
-function initScripts() {
-	window.captureEvents(Event.KEYDOWN);
-	window.onkeydown = parseKeypress;
-}
-
-
-// fill in the values of the "att"-array
-function initPicture(picURL) {
-	att = picURL.split("+");
-
-	if (att[0].lastIndexOf("/") == att[0].length-1) {
-		att[0] = att[0].substring(0, att[0].length-1);
-	}
-	
-	if (att.length < 2 || att[1] == "") {
-		att[1] = 1;
-	}
-	if (att.length < 3 || att[2] == "") {
-		att[2] = "1.0";
-	}
-
-	if (att.length < 4) {
-		att[3] = "";
-	}
-
-	if (att[3].indexOf("f") > -1) {
-		att[3] = "fit";
-	}
-
-	if (att.length < 5 || att[4] == "") {
-		att[4] = "0/0";
-	}
-
-	// converts the old mark format (0-1000) to new format(0.0 - 1.0)
-	if (att[4] != "0/0") {
-		var tmp = att[4].split(";");
-		
-		att[4] = "";
-		
-		for (i = 0; i < tmp.length; i++) {
-			tmp[i] = tmp[i].split("/");
-
-			if (tmp[i][0] > 1 && tmp[i][1] > 1) {
-				tmp[i][0] /= 1000;
-				tmp[i][1] /= 1000;
-			}
-			
-			att[4] += tmp[i][0] + "/" + tmp[i][1] + ";";
-		}
-		att[4] = att[4].slice(0, -1);
-	}
-	
-	if (att.length < 7) {
-		att[5] = 0;
-		att[6] = 0;
-		att[7] = 1;
-		att[8] = 1;
-	} else {
-		att[5] = parseFloat(att[5]);
-		att[6] = parseFloat(att[6]);
-		att[7] = parseFloat(att[7]);
-		att[8] = parseFloat(att[8]);
-	}
-}
-
-function pageInfo() {
-	
-	// bug in netscape 4.xx (confunding px and pt)
-	var fontsize = document.layers ? "11pt" : "11px";
-
-	if (window.pageFrame) {
-		pageFrame.document.open();
-		pageFrame.document.write('<html><head></head><body bgcolor="#CCCCCC" topmargin="5" marginheight="5">');
-		pageFrame.document.write('<p style="font-family: Verdana, Arial, Helvetica, sans-serif; text-align: center; color: #CC3333; font-size: ' + fontsize + '">');
-		pageFrame.document.write(att[1] + '<b> of </b>' + numPages + '</p></body></html>');
-		pageFrame.document.close();
-	}
-}
-