svn commit: r209824 - /lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java

Author: andreas
Date: Fri Jul  8 08:53:31 2005
New Revision: 209824

URL: http://svn.apache.org/viewcvs?rev=209824&view=rev
Log:
Applying patch for Bug #35660: UniqueDocumentId should not try to increase a 
dash-separated character value (foo-a), only number values (foo-1), credits to 
Simon Litwan

Modified:
    
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java

Modified: 
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java
URL: 
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java?rev=209824&r1=209823&r2=209824&view=diff
==============================================================================
--- 
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java
 (original)
+++ 
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java
 Fri Jul  8 08:53:31 2005
@@ -45,29 +45,28 @@
             String idwithoutsuffix = null;
 
             if (node != null) {
-                int n = documentid.lastIndexOf("/");
+                int n = documentid.lastIndexOf("/");               
                 String lastToken = "";
                 String substring = documentid;
-                if ((n < documentid.length()) && (n > 0)) {
-                    lastToken = documentid.substring(n);
-                    substring = documentid.substring(0, n);
-                }
+                lastToken = documentid.substring(n);
+                substring = documentid.substring(0, n);
 
                 int l = lastToken.length();
                 int index = lastToken.lastIndexOf("-");
-                if (0 < index && index < l) {
+                if (0 < index && index < l && lastToken.substring(index + 
1).matches("[\\d]*")) {
                     suffix = lastToken.substring(index + 1);
                     idwithoutsuffix = substring + lastToken.substring(0, 
index);
-                    version = Integer.parseInt(suffix);
+                    version = Integer.parseInt(suffix);                   
                 } else {
                     idwithoutsuffix = substring + lastToken;
                 }
+                
 
                 while (node != null) {
                     version = version + 1;
                     suffix = (new Integer(version)).toString();
                     documentid = idwithoutsuffix + "-" + suffix;
-                    node = tree.getNode(documentid);
+                    node = tree.getNode(documentid);                           
                 }
             }
         } catch (SiteTreeException e) {