Merge pull request #305 from rivaldi8/DS-1536

DS-1536 having a DOT in handle prefix causes identifier.uri to be cut of...
DSpace · Feb 5, 2014 · 0bc01a8 · 0bc01a8
2 parents 8f35788 + 45d702c
commit 0bc01a8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
@@ -545,7 +545,7 @@ protected String modifyHandleRecord(Context context, DSpaceObject dso, TableRow
     protected String getCanonical(Item item)
     {
         String canonical = item.getHandle();
-        if( canonical.lastIndexOf(DOT)!=-1)
+        if( canonical.matches(".*/.*\\.\\d+") && canonical.lastIndexOf(DOT)!=-1)
         {
             canonical =  canonical.substring(0, canonical.lastIndexOf(DOT));
         }
@@ -556,7 +556,7 @@ protected String getCanonical(Item item)
     protected String getCanonical(String identifier)
     {
         String canonical = identifier;
-        if( canonical.lastIndexOf(DOT)!=-1)
+        if( canonical.matches(".*/.*\\.\\d+") && canonical.lastIndexOf(DOT)!=-1)
         {
             canonical =  canonical.substring(0, canonical.lastIndexOf(DOT));
         }