changeset 1219:74363771603f

Merge with e543b88b3cfa5e6574bfc2b66835e6895b1491f8
author robcast
date Tue, 01 Oct 2013 12:24:29 +0200
parents bd7dfa8b164e (current diff) e543b88b3cfa (diff)
children cde51f04895c
files
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/dirInfo-xml.jsp	Fri Sep 06 10:25:05 2013 +0200
+++ b/webapp/src/main/webapp/dirInfo-xml.jsp	Tue Oct 01 12:24:29 2013 +0200
@@ -40,7 +40,7 @@
         System.out.println(e);
     }
 }
-%><?xml version="1.0" encoding="UTF-8" ?>
+%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%@ page contentType="text/xml" %><?xml version="1.0" encoding="UTF-8" ?>
 <%
 // process request
 // get digilib config
@@ -66,8 +66,8 @@
         String fn = (f != null) ? f.getName() : "null";
 %>  <file>
     <index><%= i+1 %></index>
-    <name><%= digilib.io.FileOps.basename(fn) %></name>
-    <fsname><%= fn %></fsname>
+   <name><c:out value="<%=digilib.io.FileOps.basename(fn)%>"/> </name>
+    <fsname><c:out value="<%=fn%>"/></fsname>
   </file>
 <%
       } // for