# HG changeset patch
# User robcast
# Date 1099329873 -3600
# Node ID 23866acd6509ecc5280a04d2bd2db16f91adedbf
# Parent  4ab3accf3f7ff14cc18fd013bd6c5f940f8d5d6e
fixed bug with detecting window size in Safari 1.2

diff -r 4ab3accf3f7f -r 23866acd6509 client/digitallibrary/WEB-INF/log4j-config.xml
--- a/client/digitallibrary/WEB-INF/log4j-config.xml	Mon Nov 01 18:24:31 2004 +0100
+++ b/client/digitallibrary/WEB-INF/log4j-config.xml	Mon Nov 01 18:24:33 2004 +0100
@@ -3,8 +3,14 @@
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
         
+  <appender name="cons" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d [%t] %p - %m%n"/>
+    </layout>
+  </appender>
+
   <appender name="log" class="org.apache.log4j.FileAppender">
-    <param name="File" value="/opt/tomcat/logs/digilib-log.txt"/>
+    <param name="File" value="digilib-log.txt"/>
     <param name="Append" value="true"/>
     <layout class="org.apache.log4j.PatternLayout">
       <param name="ConversionPattern" value="%d [%t] %p - %m%n"/>
@@ -12,7 +18,7 @@
   </appender>
 
   <appender name="account" class="org.apache.log4j.FileAppender">
-    <param name="File" value="/opt/tomcat/logs/dl-access-log.txt"/>
+    <param name="File" value="dl-access-log.txt"/>
     <param name="Append" value="true"/>
     <layout class="org.apache.log4j.PatternLayout">
       <param name="ConversionPattern" value="%d [%t] %p - %m%n"/>
@@ -26,6 +32,7 @@
 
   <root>
     <level value ="debug"/>
+    <appender-ref ref="cons"/>
     <appender-ref ref="log"/>
   </root>
 
diff -r 4ab3accf3f7f -r 23866acd6509 client/digitallibrary/oldskin/dclib.js
--- a/client/digitallibrary/oldskin/dclib.js	Mon Nov 01 18:24:31 2004 +0100
+++ b/client/digitallibrary/oldskin/dclib.js	Mon Nov 01 18:24:33 2004 +0100
@@ -31,7 +31,6 @@
 
 
 function dc_init() {
-
   // put the query parameters (sans "?") in the parameters array
   parseParameters(location.search.slice(1));
 }
@@ -46,49 +45,52 @@
 }
 
 function dc_render(doc) {
-	
-  var fWidth  = document.body ? document.body.clientWidth : innerWidth;
-  var fHeight = document.body ? document.body.clientHeight : innerHeight;
+    // creates the HTML for the image table
+    var wsize = getWinSize();
+    var fWidth  = wsize.width;
+    var fHeight = wsize.height;
 
-  var mx = getParameter("mx");
-  cells = mx.split('x');
+    var mx = getParameter("mx");
+    cells = mx.split('x');
   
-  var dw = getParameter("dw");
-  var dh = getParameter("dh");
-  var pt = getParameter("pt");
-  var pn = getParameter("pn");
+    var dw = getParameter("dw");
+    var dh = getParameter("dh");
+    var pt = getParameter("pt");
+    var pn = parseInt(getParameter("pn"));
+    var fn = getParameter("fn");
+    var par_mo = (hasParameter("mo")) ? "mo="+getParameter("mo") : "";
 
-  var picWidth = (dw != 0) ? dw : Math.floor((fWidth-30)/cells[0])-2*cells[0]-1;
-  var picHeight = (dh != 0) ? dh : picWidth;
-
-  if (cells.length > 1) {
-    picHeight = (dh != 0) ? dh : Math.floor(((fHeight-30)-12*cells[1])/cells[1])-2*cells[1]-1;
-  } else {
-    cells[1] = Math.ceil(pt/cells[0]);
-  }
+    var picWidth = (dw != 0) ? dw : Math.floor((fWidth-30)/cells[0])-2*cells[0]-1;
+    var picHeight = (dh != 0) ? dh : picWidth;
 
-  var cellWidth  = parseInt(picWidth)+8;
-  var cellHeight = parseInt(picHeight)+18;
+    if (cells.length > 1) {
+	picHeight = (dh != 0) ? dh : Math.floor(((fHeight-30)-12*cells[1])/cells[1])-2*cells[1]-1;
+    } else {
+	cells[1] = Math.ceil(pt/cells[0]);
+    }
 
-  doc.writeln('<table width="100%" height="100%" border="0" cellspacing="1" cellpadding="0">');
+    var cellWidth  = parseInt(picWidth)+8;
+    var cellHeight = parseInt(picHeight)+18;
+
+    doc.writeln('<table width="100%" height="100%" border="0" cellspacing="1" cellpadding="0">');
 
-  for (var j = 0; j < cells[1]; j++) {
-      doc.writeln('<tr>');
-      for (var i = 0; i < cells[0]; i++) {
-	  var idx  = parseInt(pn)+i+j*cells[0];
-	  var img  = baseUrl + "/servlet/Scaler?fn=" + getParameter("fn") + "&pn=" + idx;
-	  img += "&dw=" + picWidth + "&dh=" + picHeight + "&mo=" + getParameter("mo");
-	  doc.write('<td width="'+cellWidth+'" height="'+cellHeight+'">');
-	  if (idx <= pt) {
-	      doc.write('<a href="'+dl_link(idx)+'" target="_blank"><img src="'+img+'" border="0"></a><div class="number">'+idx+'</div>');
-	  } else {
-	      doc.write('<div class="nonumber">'+idx+'</div>');
-	  }
-	  doc.writeln('</td>');
-      }
-      doc.writeln(' </tr>');
-  }
-  doc.writeln('</table>');
+    for (var j = 0; j < cells[1]; j++) {
+	doc.writeln('<tr>');
+	for (var i = 0; i < cells[0]; i++) {
+	    var idx  = pn+i+j*cells[0];
+	    var img  = baseUrl + "/servlet/Scaler?fn=" + fn + "&pn=" + idx;
+	    img += "&dw=" + picWidth + "&dh=" + picHeight + par_mo;
+	    doc.write('<td width="'+cellWidth+'" height="'+cellHeight+'">');
+	    if (idx <= pt) {
+		doc.write('<a href="'+dl_link(idx)+'" target="_blank"><img src="'+img+'" border="0"></a><div class="number">'+idx+'</div>');
+	    } else {
+		doc.write('<div class="nonumber">'+idx+'</div>');
+	    }
+	    doc.writeln('</td>');
+	}
+	doc.writeln(' </tr>');
+    }
+    doc.writeln('</table>');
 }