Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: helix84/DSpace
...
head fork: helix84/DSpace
  • 7 commits
  • 8 files changed
  • 0 commit comments
  • 4 contributors
Commits on Mar 31, 2005
DSpace Developer This commit was manufactured by cvs2svn to create branch
'dspace-1_2_2-patches'.

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_2_2-patches@1149 9c30dcfa-912a-0410-8fc2-9e0234be79fd
6a46c05
Commits on Apr 28, 2005
@richardrodgers richardrodgers Part of fix for bug that causes metadata errors when edited post-subm…
…ission.

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_2_2-patches@1199 9c30dcfa-912a-0410-8fc2-9e0234be79fd
d3d1675
@richardrodgers richardrodgers Part of fix for bug causing corruption of metadata if edited post-sub…
…mission

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_2_2-patches@1200 9c30dcfa-912a-0410-8fc2-9e0234be79fd
6dd4a0b
@richardrodgers richardrodgers Part of fix for bug causing metadata corruption if edited post-submis…
…sion

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_2_2-patches@1201 9c30dcfa-912a-0410-8fc2-9e0234be79fd
f494e48
Commits on May 04, 2005
@rtansley rtansley (Robert Tansley)
- Updated known bugs


git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_2_2-patches@1206 9c30dcfa-912a-0410-8fc2-9e0234be79fd
0d55090
@rtansley rtansley (Robert Tansley)
- Worded to reflect packaged docs


git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_2_2-patches@1207 9c30dcfa-912a-0410-8fc2-9e0234be79fd
f10ff36
Commits on May 11, 2009
@mdiggory mdiggory New location for DSpace Project
git-svn-id: http://scm.dspace.org/svn/repo/dspace/branches/dspace-1_2_2-patches@3767 9c30dcfa-912a-0410-8fc2-9e0234be79fd
479e150
View
23 dspace/CHANGES
@@ -1,10 +1,31 @@
+1.3 branch (unreleased)
+=======================
+
+(David Little)
+- SF patch #1165647, 1165649-52 - USCD mods to support SRB and Registration
+
+(Scott Yeadon)
+- Updated handle.jar and associated license to 5.4.3
+
+(Richard Jones)
+- Addition of supervision order setting tools for administration area, to allow
+user accounts to observe or collaborate on unfinished submission
+
+(Robert Tansley)
+- OAI-PMH set names now XML-encoded (e.g. &, <, >) (Collection names with such
+characters previously caused bad XML in OAI-PMH ListSets responses)
+
+
+1.2.2 beta 2
+============
+
(Robert Tansley)
- Fixed bug whereby 'Submit to this Collection' button only appears if admin.
(Larry Stone)
- SF patch #1143570 Fix various bugs handling slash ("/") in bitstream names
-(Scott Phillips)
+(Scott Phillips & David Little)
- Patch for SF bug #1145527 Able to delete 'unknown' bitstream format
(Mike Simpson)
View
55 dspace/KNOWN_BUGS
@@ -1,43 +1,34 @@
-This release of DSpace contains two known bugs, described below. If you
-encounter these bugs and they cause you problems please report this to
-dspace-devel@lists.sourceforge.net so that the developers can know that
-these bugs are a user priority.
+This version of DSpace has the following known problems. Please follow the
+provided links to learn more about the problem, and to see if it has been
+subsequently fixed.
-[ 1088692 ] Edit item template as a collection administrator
-The problem described below occurs only when the item template is defined
- during the create collection wizard.
+http://sourceforge.net/tracker/index.php?func=detail&aid=1174342&group_id=19984&atid=119984
+Potential Memory Issue for a large collection
-If I check "New submissions will have some metadata already filled out
-with defaults", during the create collection wizard, and then I log in as
-a collection admin and try to edit the item template, I get an internal
-server error.
+http://sourceforge.net/tracker/index.php?func=detail&aid=1173600&group_id=19984&atid=119984
+Items Mapper has memory issue for a large collection
--- Gabriela Mircea
+http://sourceforge.net/tracker/index.php?func=detail&aid=1169975&group_id=19984&atid=119984
+workspace item policy not updated after workflow change
+http://sourceforge.net/tracker/index.php?func=detail&aid=1161459&group_id=19984&atid=119984
+ItemExporter fails with Too many open files
-[ 1105336 ] Inappropriate Auth required when creating collection
-
- Group G has at least ADD and WRITE permissions on
- Community Cy
- Logged in as anyone in G
+http://sourceforge.net/tracker/index.php?func=detail&aid=1155173&group_id=19984&atid=119984
+Forms in custom 'skin' break group admin tool
- 1) In Cy, create a new collection.
+http://sourceforge.net/tracker/index.php?func=detail&aid=1120726&group_id=19984&atid=119984
+Performance bottlekneck in Group.update()
- 2) Check none but "This collection will have delegated
- collection administrators"
+http://sourceforge.net/tracker/index.php?func=detail&aid=1066771&group_id=19984&atid=119984
+Metadata edit form dropping DC qualified element
- 3) Click Next>.
-
- System shows you the 401/403 screen (Forbidden / Authorization required)
-
- Same result occurs immediately if you check "Some users will be able to
- submit to this collection".
-
- If you deselect all options, you can edit the collection details and
- select epeople to have read permissions, but get Auth Required when you
- try to commit the read permissions.
-
--- Jim Downing
+http://sourceforge.net/tracker/index.php?func=detail&aid=1066713&group_id=19984&atid=119984
+Two (sub)communities can not have one name
+http://sourceforge.net/tracker/index.php?func=detail&aid=1160898&group_id=19984&atid=119984
+dspace_migrate removes Date.Issued from prev published items
+http://sourceforge.net/tracker/index.php?func=detail&aid=1076506&group_id=19984&atid=119984
+Templates applied to imported items
View
19 dspace/README
@@ -1,21 +1,16 @@
-DSpace Version 1.2.2 beta 1, 15-February-2005
+DSpace Version 1.2.2, 04-May-2005
-Installation instructions are included in the 'dspace-docs' download,
-available from:
+Installation instructions for packaged downloads are included in the
+'docs' directory.
-http://sourceforge.net/projects/dspace/
-
-Documentation for the most recent stable release may be viewed online at
-dspace.org:
+Documentation for the most recent stable release may also be viewed
+online at dspace.org:
http://dspace.org/technology/system-docs/
Installation instructions for other version may be different, so you
-are encouraged to obtain the corresponding documentation package from
-SourceForge, or to download the latest documentation snapshot from CVS
-or:
-
-http://dspace.sourceforge.net/doc-snapshots/
+are encouraged to use the documentation included with a downloaded
+package, or obtain the corresponding documentation from CVS.
Please also read the KNOWN_BUGS file.
View
19 dspace/jsp/submit/edit-metadata.jsp
@@ -52,6 +52,7 @@
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.net.URLEncoder" %>
<%@ page import="javax.servlet.ServletException" %>
@@ -543,12 +544,22 @@
}
void doQualdropValue(javax.servlet.jsp.JspWriter out, Item item,
- String fieldName, String element, boolean repeatable,
+ String fieldName, String element, DCInputSet inputs, boolean repeatable,
int fieldCountIncr, List qualMap, String label)
throws java.io.IOException
{
-
- DCValue[] defaults = item.getDC(element, Item.ANY, Item.ANY);
+ DCValue[] unfiltered = item.getDC(element, Item.ANY, Item.ANY);
+ // filter out both unqualified and qualified values occuring elsewhere in inputs
+ ArrayList filtered = new ArrayList();
+ for (int i = 0; i < unfiltered.length; i++)
+ {
+ String qName = unfiltered[i].element + "." + unfiltered[i].qualifier;
+ if ( ! inputs.isFieldPresent(qName) )
+ {
+ filtered.add( unfiltered[i] );
+ }
+ }
+ DCValue[] defaults = (DCValue[])filtered.toArray(new DCValue[0]);
int fieldCount = defaults.length + fieldCountIncr;
StringBuffer sb = new StringBuffer();
String q, v, currentQual, currentVal;
@@ -800,7 +811,7 @@
}
else if (inputType.equals("qualdrop_value"))
{
- doQualdropValue(out, item, fieldName, dcElement, repeatable,
+ doQualdropValue(out, item, fieldName, dcElement, inputSet, repeatable,
fieldCountIncr, inputs[z].getPairs(), label);
}
else if (inputType.equals("textarea"))
View
6 dspace/src/org/dspace/app/webui/jsptag/ItemListTag.java
@@ -62,8 +62,6 @@
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
import java.sql.SQLException;
import javax.imageio.ImageIO;
@@ -496,7 +494,7 @@ private String getThumbMarkup(HttpServletRequest hrq, Item item)
.append(item.getHandle()).append("/").append(
originalBitstream.getSequenceID())
.append("/").append(
- URLEncoder.encode(originalBitstream
+ UIUtil.encodeBitstreamName(originalBitstream
.getName(),
Constants.DEFAULT_ENCODING));
}
@@ -510,7 +508,7 @@ private String getThumbMarkup(HttpServletRequest hrq, Item item)
thumbLink.append("\"><img src=\"").append(
hrq.getContextPath()).append("/retrieve/").append(
thumbnailBitstream.getID()).append("/").append(
- URLEncoder.encode(thumbnailBitstream.getName(),
+ UIUtil.encodeBitstreamName(thumbnailBitstream.getName(),
Constants.DEFAULT_ENCODING)).append(
"\" alt=\"").append(thumbnailBitstream.getName())
.append("\" ").append(
View
8 dspace/src/org/dspace/app/webui/jsptag/ItemTag.java
@@ -54,8 +54,6 @@
import java.io.IOException;
-import java.net.URLEncoder;
-
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -504,7 +502,7 @@ private void listBitstreams() throws IOException
out.print(request.getContextPath());
out.print("/html/");
out.print(handle + "/");
- out.print(URLEncoder.encode(primaryBitstream.getName(),
+ out.print(UIUtil.encodeBitstreamName(primaryBitstream.getName(),
Constants.DEFAULT_ENCODING));
out.print("\">View/Open</A></td></tr>");
}
@@ -557,7 +555,7 @@ private void listBitstreams() throws IOException
}
bsLink = bsLink
- + URLEncoder.encode(
+ + UIUtil.encodeBitstreamName(
bitstreams[k].getName(),
Constants.DEFAULT_ENCODING) + "\">";
@@ -574,7 +572,7 @@ private void listBitstreams() throws IOException
+ "/retrieve/"
+ tb.getID()
+ "/"
- + URLEncoder.encode(tb.getName(),
+ + UIUtil.encodeBitstreamName(tb.getName(),
Constants.DEFAULT_ENCODING);
out.print(bsLink);
View
4 dspace/src/org/dspace/app/webui/servlet/SubmitServlet.java
@@ -857,6 +857,10 @@ else if (inputType.equals("qualdrop_value"))
for (int z = 0; z < vals.size(); z++)
{
String thisQual = (String)quals.get(z);
+ if ( "".equals(thisQual) )
+ {
+ thisQual = null;
+ }
String thisVal = (String)vals.get(z);
if (! buttonPressed.equals("submit_" + dcElement + "_remove_" + z) &&
! thisVal.equals(""))
View
2  dspace/src/org/dspace/app/webui/util/DCInputSet.java
@@ -152,7 +152,7 @@ public boolean isDefinedPubBefore()
*
* @return true if the current set has the named field
*/
- private boolean isFieldPresent(String fieldName)
+ public boolean isFieldPresent(String fieldName)
{
for (int i = 0; i < inputPages.length; i++)
{

No commit comments for this range

Something went wrong with that request. Please try again.