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

[cmailleux]

Author: cmailleux
Date: Wed Aug  9 16:25:21 2006
New Revision: 14880

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14880&repname=jahia
Log:
Try to find container list by aliasnames, and use the found one

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=14880&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java 
(original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java Wed 
Aug  9 16:25:21 2006
@@ -810,8 +810,18 @@
                     JahiaContainerSubDefinition sd = 
(JahiaContainerSubDefinition) parentDef.getSubDefs().get(new 
Integer(pageDefId));
                     struct = sd.getStructure();
                 } else {
-                    JahiaPageDefinition pageDef = 
ServicesRegistry.getInstance().getJahiaPageTemplateService().lookupPageTemplate(pageDefId);
-                    /// ... ??
+                    Vector definitions = 
JahiaContainerDefinitionsRegistry.getInstance().getDefinitionsInTemplate(pageDefId);
+                    for (int i = 0; i < definitions.size() && struct==null; 
i++) {
+                        JahiaContainerDefinition definition = 
(JahiaContainerDefinition) definitions.elementAt(i);
+                        String[] aliasNames = definition.getAliasName();
+                        for (int j = 0; j < aliasNames.length; j++) {
+                            String name = aliasNames[j];
+                            if(name!=null && (name.equals(aliasName) || 
name.equals(baseName))) {
+                                def = definition;
+                                isContainerList = true;
+                            }
+                        }
+                    }
                 }
                 if (struct != null) {
                     for (Iterator iterator = struct.iterator(); 
iterator.hasNext();) {
@@ -859,7 +869,7 @@
             if (parent instanceof ContentContainer) {
                 containerList = ((ContentContainer) 
parent).getJahiaContainer(jParams, elr).getContainerList(def.getName());
             } else {
-                int id = 
ServicesRegistry.getInstance().getJahiaContainersService().getContainerListID(containerName,
 pageID);
+                int id = 
ServicesRegistry.getInstance().getJahiaContainersService().getContainerListID(def.getName(),
 pageID);
                 if (id != -1) {
                     try {
                         containerList = 
ServicesRegistry.getInstance().getJahiaContainersService().loadContainerList(id,
 LoadFlags.ALL, jParams);