# HG changeset patch # User robcast # Date 1294343598 -3600 # Node ID fbddbe0a1a3ec5be40653c41f781165a082d82d4 # Parent 1ef9467f861a65595e95f5ee467d26f980964d5c# Parent 1be12036e67dfe7275bf468480707624f3836d0f Merge from HEAD a667d2952aab2cfd5070237fa1e2fee320f5d897 diff -r 1ef9467f861a -r fbddbe0a1a3e client/digitallibrary/dirInfo-xml.jsp --- 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); %> - <% if (dir != null) { %> <%= dirSize %> <%= dir.getDirName() %> diff -r 1ef9467f861a -r fbddbe0a1a3e client/digitallibrary/oldskin/dclib.js --- 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;