Mercurial > hg > digilib-old

changeset 592:f7e2b6f29b6d stream

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from HEAD a667d2952aab2cfd5070237fa1e2fee320f5d897
author robcast
date Thu, 06 Jan 2011 20:53:18 +0100
parents 69bc69381ac4 (current diff) a667d2952aab (diff)
children 7768ea8f59cf
files
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/client/digitallibrary/dirInfo-xml.jsp	Thu Jan 06 20:42:29 2011 +0100
+++ b/client/digitallibrary/dirInfo-xml.jsp	Thu Jan 06 20:53:18 2011 +0100
@@ -1,5 +1,4 @@
-<%@page import="digilib.io.FileOps"%>
-<%@ page language="java" %><%!
+<%@page import="digilib.io.FileOps"%><%@ page language="java" %><%!
 // create DocumentBean instance for all JSP requests
 digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
 
@@ -27,7 +26,6 @@
 int dirSize = dir.size(fc);
 
 %><!-- Automatically generated XML snippet with directory info -->
-<huhu/>
 <dir><% if (dir != null) { %>
   <size><%= dirSize %></size>
   <name><%= dir.getDirName() %></name>
--- a/client/digitallibrary/oldskin/dclib.js	Thu Jan 06 20:42:29 2011 +0100
+++ b/client/digitallibrary/oldskin/dclib.js	Thu Jan 06 20:53:18 2011 +0100
@@ -58,7 +58,7 @@
     var pt = getParameter("pt");
     var pn = parseInt(getParameter("pn"));
     var fn = getParameter("fn");
-    var par_mo = (hasParameter("mo")) ? "mo="+getParameter("mo") : "";
+    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;