[DSpace-changelog] dspace/jsp/error invalid-id.jsp,1.10,1.11

[Claudia Juergen]

Update of /cvsroot/dspace/dspace/jsp/error
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv7552/jsp/error

Modified Files:
invalid-id.jsp
Log Message:
(Stuart Lewis / Claudia Juergen)
SF patch #1561292 for SF bug #1554064 Bitstream servlet error

Index: invalid-id.jsp
===================================================================
RCS file: /cvsroot/dspace/dspace/jsp/error/invalid-id.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** invalid-id.jsp 25 Aug 2005 17:20:28 -0000 1.10
--- invalid-id.jsp 19 Sep 2006 12:07:30 -0000 1.11
***************
*** 53,61 ****
prefix="fmt" %>

<%@ page isErrorPage="true" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>

- <%@ page import="org.dspace.core.Constants" %>
-
<%
String badID = (String) request.getAttribute("bad.id");
--- 53,62 ----
prefix="fmt" %>

+ <%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
+ <%@ page import="org.dspace.core.Constants" %>
+
<%@ page isErrorPage="true" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>

<%
String badID = (String) request.getAttribute("bad.id");
***************
*** 69,93 ****

// Get text for the type
- //String typeString = "object";
- // if (type != null)
- // {
- // typeString = Constants.typeText[type.intValue()].toLowerCase();
- // }
-

! String typeString = "constants.object";
! if (type != null)
{
! typeString = "constants.type" + type.intValue();
}

-
%>

<dspace:layout locbar="off" titlekey="jsp.error.invalid-id.title">
- <%-- <h1>Invalid Identifier</h1> --%>
<h1><fmt:message key="jsp.error.invalid-id.title"/></h1>
- <%-- <p>The identifier <%= badID %> does not correspond to a valid
- reasons:</p> --%>
<p><fmt:message key="jsp.error.invalid-id.text1">
<fmt:param><%= badID %></fmt:param>
--- 70,84 ----

// Get text for the type

! String typeString = LocaleSupport.getLocalizedMessage(pageContext, "jsp.error.invalid-id.type.object");
! if (type != null && type.intValue() > -1 && type.intValue() < 8)
{
! typeString = LocaleSupport.getLocalizedMessage(pageContext, "jsp.error.invalid-id.constants.type." + type.intValue());
}

%>

<dspace:layout locbar="off" titlekey="jsp.error.invalid-id.title">
<h1><fmt:message key="jsp.error.invalid-id.title"/></h1>
<p><fmt:message key="jsp.error.invalid-id.text1">
<fmt:param><%= badID %></fmt:param>
***************
*** 96,108 ****

<ul>
- <%-- <li>The URL of the current page is incorrect - if you followed a link
- from outside of DSpace it may be mistyped or corrupt.</li> --%>
<li><fmt:message key="jsp.error.invalid-id.list1"/></li>
- <%-- <li>You entered an invalid ID into a form - please try again.</li> --%>
<li><fmt:message key="jsp.error.invalid-id.list2"/></li>
</ul>
-
- <%-- <p>If you're having problems, or you expected the ID to work, feel free to
- contact the site administrators.</p> --%>
<p><fmt:message key="jsp.error.invalid-id.text2"/></p>

--- 87,93 ----
***************
*** 110,114 ****

<p align="center">
- <%-- <a href="<%= request.getContextPath() %>/">Go to the DSpace home page</a> --%>
<a href="<%= request.getContextPath() %>/"><fmt:message key="jsp.general.gohome"/></a>
</p>
--- 95,98 ----