New location for DSpace Project

git-svn-id: http://scm.dspace.org/svn/repo/dspace/tags/dspace-1_2_2@3767 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace/CHANGES

@@ -1,10 +1,18 @@
+1.2.2
+=====
+(Richard Rodgers)
+Bug fix for bug causing corruption of metadata if edited post-submission
+
+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)

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.
-
-[ 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.
-
-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.
-
--- Gabriela Mircea
+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.
 
 
-[ 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=1174342&group_id=19984&atid=119984
+Potential Memory Issue for a large collection
 
- 1) In Cy, create a new collection.
+http://sourceforge.net/tracker/index.php?func=detail&aid=1173600&group_id=19984&atid=119984
+Items Mapper has memory issue for a large collection
 
- 2) Check none but "This collection will have delegated
- collection administrators"
+http://sourceforge.net/tracker/index.php?func=detail&aid=1169975&group_id=19984&atid=119984
+workspace item policy not updated after workflow change
 
- 3) Click Next>.
+http://sourceforge.net/tracker/index.php?func=detail&aid=1161459&group_id=19984&atid=119984
+ItemExporter fails with Too many open files
 
- System shows you the 401/403 screen (Forbidden / Authorization required)
+http://sourceforge.net/tracker/index.php?func=detail&aid=1155173&group_id=19984&atid=119984
+Forms in custom 'skin' break group admin tool
 
- Same result occurs immediately if you check "Some users will be able to
- submit to this collection".
+http://sourceforge.net/tracker/index.php?func=detail&aid=1120726&group_id=19984&atid=119984
+Performance bottlekneck in Group.update()
 
- 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.
+http://sourceforge.net/tracker/index.php?func=detail&aid=1066771&group_id=19984&atid=119984
+Metadata edit form dropping DC qualified element
 
--- 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

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.
 

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")) 

dspace/src/org/dspace/app/webui/jsptag/ItemListTag.java

@@ -62,8 +62,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
-import java.net.URLEncoder;
-
 import java.sql.SQLException;
 
 import javax.imageio.ImageIO;
@@ -496,7 +494,7 @@ public class ItemListTag extends TagSupport
                                 .append(item.getHandle()).append("/").append(
                                         originalBitstream.getSequenceID())
                                 .append("/").append(
-                                        URLEncoder.encode(originalBitstream
+                                		UIUtil.encodeBitstreamName(originalBitstream
                                                 .getName(),
                                                 Constants.DEFAULT_ENCODING));
                     }
@@ -510,7 +508,7 @@ public class ItemListTag extends TagSupport
                     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(

dspace/src/org/dspace/app/webui/jsptag/ItemTag.java

@@ -54,8 +54,6 @@ import org.dspace.core.Utils;
 
 import java.io.IOException;
 
-import java.net.URLEncoder;
-
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -504,7 +502,7 @@ public class ItemTag extends TagSupport
                 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 @@ public class ItemTag extends TagSupport
                             }
 
                             bsLink = bsLink
-                                    + URLEncoder.encode(
+                                    + UIUtil.encodeBitstreamName(
                                             bitstreams[k].getName(),
                                             Constants.DEFAULT_ENCODING) + "\">";
 
@@ -574,7 +572,7 @@ public class ItemTag extends TagSupport
                                             + "/retrieve/"
                                             + tb.getID()
                                             + "/"
-                                            + URLEncoder.encode(tb.getName(),
+                                            + UIUtil.encodeBitstreamName(tb.getName(),
                                                     Constants.DEFAULT_ENCODING);
 
                                     out.print(bsLink);

dspace/src/org/dspace/app/webui/servlet/SubmitServlet.java

@@ -857,6 +857,10 @@ public class SubmitServlet extends DSpaceServlet
     	      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(""))

dspace/src/org/dspace/app/webui/util/DCInputSet.java

@@ -152,7 +152,7 @@ public class DCInputSet
      *
      * @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++)
 	    {