svn commit: [jahia] r14854 - /trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java

[tdraier]

Author: tdraier
Date: Mon Aug  7 15:26:43 2006
New Revision: 14854

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14854&repname=jahia
Log:
fixed urlkey imports

Modified:
    trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java

Modified: trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java&rev=14854&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java 
(original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java Mon 
Aug  7 15:26:43 2006
@@ -1131,10 +1131,10 @@
         if (pageKey != null) {
             String basePageKey = null;
             for (int i=1;;i++) {
-                List pageProperties = 
ServicesRegistry.getInstance().getJahiaPageService().getPagePropertiesByValue(pageKey);
-                if (pageProperties.size() >= 1) {
-                    final PageProperty pageProperty = (PageProperty) 
pageProperties.get(0);
-                    if 
(pageProperty.getName().equals(PageProperty.PAGE_URL_KEY_PROPNAME)) {
+                List pageProperties = 
ServicesRegistry.getInstance().getJahiaPageService().getPagePropertiesByValueAndSiteID(pageKey,
 jParams.getSiteID());
+                for (Iterator iterator = pageProperties.iterator(); 
iterator.hasNext();) {
+                    PageProperty pageProperty = (PageProperty) iterator.next();
+                    if 
(pageProperty.getName().equals(PageProperty.PAGE_URL_KEY_PROPNAME) && 
pageProperty.getPageID() != cp.getID()) {
                         if (basePageKey == null) {
                             try {
                                 int index = pageKey.lastIndexOf("_");
@@ -1144,12 +1144,11 @@
                                 basePageKey = pageKey;
                             }
                         }
-
                         pageKey = basePageKey + "_" + i;
+                        continue;
                     }
-                } else {
-                    break;
                 }
+                break;
             }
 
             cp.setProperty(PageProperty.PAGE_URL_KEY_PROPNAME,pageKey);