[DS-569] Trailing white spaces lead to wrong order of texts in browse

git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5295 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java

@@ -962,6 +962,10 @@ public class ItemImport
         // //getElementData(n,
         // "qualifier");
         String language = getAttributeValue(n, "language");
+        if (language != null)
+        {
+            language = language.trim();
+        }
 
         System.out.println("\tSchema: " + schema + " Element: " + element + " Qualifier: " + qualifier
                 + " Value: " + value);

dspace-api/src/main/java/org/dspace/content/Item.java

@@ -727,7 +727,7 @@ public class Item extends DSpaceObject
             dcv.schema = schema;
             dcv.element = element;
             dcv.qualifier = qualifier;
-            dcv.language = lang;
+            dcv.language = (lang == null ? lang : lang.trim());
 
             // Logic to set Authority and Confidence:
             //  - normalize an empty string for authority to NULL.

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/EditItemServlet.java

@@ -600,11 +600,15 @@ public class EditItemServlet extends DSpaceServlet
                 String language = request.getParameter("language_" + key + "_"
                         + sequenceNumber);
 
-                // Empty string language = null
+                // trim language and set empty string language = null
-                if ((language != null) && language.equals(""))
+                if (language != null)
+                {
+                    language = language.trim();
+                    if (language.equals(""))
                     {
                         language = null;
                     }
+                }
 
                 // Get the authority key if any
                 String authority = request.getParameter("choice_" + key + "_authority_"
@@ -734,11 +738,15 @@ public class EditItemServlet extends DSpaceServlet
             String value = request.getParameter("addfield_value").trim();
             String lang = request.getParameter("addfield_language");
 
-            // Empty language = null
+            // trim language and set empty string language = null
+            if (lang != null)
+            {
+                lang = lang.trim();
                 if (lang.equals(""))
                 {
                     lang = null;
                 }
+            }
 
             MetadataField field = MetadataField.find(context, dcTypeID);
             MetadataSchema schema = MetadataSchema.find(context, field

dspace-jspui/dspace-jspui-webapp/src/main/webapp/tools/edit-item-form.jsp

@@ -421,7 +421,7 @@
                     <% } %>
                 </td>
                 <td headers="t4" class="<%= row %>RowOddCol">
-                    <input type="text" name="language_<%= key %>_<%= sequenceNumber %>" value="<%= (dcv[i].language == null ? "" : dcv[i].language) %>" size="5"/>
+                    <input type="text" name="language_<%= key %>_<%= sequenceNumber %>" value="<%= (dcv[i].language == null ? "" : dcv[i].language.trim()) %>" size="5"/>
                 </td>
                 <td headers="t5" class="<%= row %>RowEvenCol">
                     <%-- <input type="submit" name="submit_remove_<%= key %>_<%= sequenceNumber %>" value="Remove" /> --%>

dspace/CHANGES

@@ -14,6 +14,9 @@
 - [DS-648] Modern Browsers are not identified in XMLUI main sitemap.xmap
 - [DS-466] Add ability to export/import entire Community/Collection/Item structure (for easier backups, migrations, etc.)
 
+(Claudia Juergen)
+- [DS-569] Trailing white spaces lead to wrong order of texts in browse
+
 1.6.2
 =====