From a0bab2238c728655720d5bb0ef5b4282efcb815b Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Mon, 30 Jan 2006 12:31:14 +0000
Subject: [PATCH] Fix issue where importer failed to find correct xml meta-data
 file when an .acp file contained exported xml files.  The importer would
 start parsing the last xml file found in the .acp file and generally barf
 with an exception that was bemusing.l

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../importer/ACPImportPackageHandler.java     | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/source/java/org/alfresco/repo/importer/ACPImportPackageHandler.java b/source/java/org/alfresco/repo/importer/ACPImportPackageHandler.java
index a057409cf3..e87e0871ae 100644
--- a/source/java/org/alfresco/repo/importer/ACPImportPackageHandler.java
+++ b/source/java/org/alfresco/repo/importer/ACPImportPackageHandler.java
@@ -80,27 +80,39 @@ public class ACPImportPackageHandler
     {
         try
         {
-            // find data file
-            InputStream dataStream = null;
+            // find xml meta-data file
+            ZipEntry xmlMetaDataEntry = null;
+            
+            // TODO: First, locate xml meta-data file by name
+            
+            // Scan the zip entries one by one (the slow approach)
             Enumeration entries = zipFile.entries();
             while(entries.hasMoreElements())
             {
                 ZipEntry entry = (ZipEntry)entries.nextElement();
                 if (!entry.isDirectory())
                 {
-                    if (entry.getName().endsWith(".xml"))
+                    // Locate xml file in root of .acp
+                    String entryName = entry.getName();
+                    if (entryName.endsWith(".xml") && entryName.indexOf('/') == -1 && entryName.indexOf('\\') == -1)
                     {
-                        dataStream = zipFile.getInputStream(entry);
+                        if (xmlMetaDataEntry != null)
+                        {
+                            throw new ImporterException("Failed to find unique xml meta-data file within .acp package - multiple xml meta-data files exist.");
+                        }
+                        xmlMetaDataEntry = entry;
                     }
                 }
             }
 
             // oh dear, there's no data file
-            if (dataStream == null)
+            if (xmlMetaDataEntry == null)
             {
-                throw new ImporterException("Failed to find data file within zip package");
+                throw new ImporterException("Failed to find xml meta-data file within .acp package");
             }
             
+            // open the meta-data xml file
+            InputStream dataStream = zipFile.getInputStream(xmlMetaDataEntry);
             Reader inputReader = (dataFileEncoding == null) ? new InputStreamReader(dataStream) : new InputStreamReader(dataStream, dataFileEncoding);
             return new BufferedReader(inputReader);
         }
@@ -110,7 +122,7 @@ public class ACPImportPackageHandler
         }
         catch(IOException e)
         {
-            throw new ImporterException("Failed to open data file within zip package due to " + e.getMessage());
+            throw new ImporterException("Failed to open xml meta-data file within .acp package due to " + e.getMessage());
         }
     }