Changeset 19207 for gli/trunk/src/org/greenstone/gatherer/remote/ZipCollectionConfigurations.java

Timestamp:

2009-04-22T20:14:54+12:00 (15 years ago)

Author:

ak19

Message:

Recurses to add collection-Group configurations to the zip, necessary for colgroup in the remote case.

File:

• gli/trunk/src/org/greenstone/gatherer/remote/ZipCollectionConfigurations.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/remote/ZipCollectionConfigurations.java

@@ -31 +31 @@
         ZipTools.ZipFilter collection_metadata_zip_filter = new CollectionMetadataZipFilter();
 
-        // Add the etc and metadata directories from each of the collections the user has access to
-        File[] collection_directories = collect_directory.listFiles();
-        for (int i = 0; i < collection_directories.length; i++) {
-        if (collection_directories[i].isDirectory()) {
-            String collection_name = collection_directories[i].getName();
-            if (checkAccess(collection_name, user_name, user_groups)) {
-            String etc_relative_path = collection_directories[i].getName() + File.separator + "etc";
-            ZipTools.addFileToZip(zos, collect_directory_path, etc_relative_path, collection_etc_zip_filter);
+        addUserAccessibleCollections(collect_directory_path, "", collect_directory, zos, 
+                     collection_etc_zip_filter, collection_metadata_zip_filter,
+                     user_name, user_groups);
 
-            // The "metadata" directory may not exist (non-GLI collections)
-            String metadata_relative_path = collection_directories[i].getName() + File.separator + "metadata";
-            File metadata_directory = new File(collect_directory_path + File.separator + metadata_relative_path);
-            if (metadata_directory.exists()) {
-                ZipTools.addFileToZip(zos, collect_directory_path, metadata_relative_path, collection_metadata_zip_filter);
-            }
-            }
-        }
-        }
+        
 
         zos.putNextEntry(new ZipEntry(".gli"));
@@ -55 +42 @@
     catch (Exception exception) {
         exception.printStackTrace();
+    }
+    }
+
+    static private void addUserAccessibleCollections(String toplevel_path,        // remains unchanged
+                             String relative_path,        // grows with each level of recursion
+                             File collect_directory,      // current collection (group) directory being considered
+                             ZipOutputStream zos, 
+                             ZipTools.ZipFilter collection_etc_zip_filter,
+                             ZipTools.ZipFilter collection_metadata_zip_filter,
+                             String user_name,
+                             String user_groups) 
+    {
+    
+    if(!relative_path.equals("")) {
+        relative_path += File.separator;
+    }
+    
+    // Add the etc and metadata directories from each of the collections the user has access to
+    File[] collection_directories = collect_directory.listFiles();
+    for (int i = 0; i < collection_directories.length; i++) {
+        if (collection_directories[i].isDirectory()) {
+        String collection_name = collection_directories[i].getName();
+        if (checkAccess(collection_name, user_name, user_groups)) {
+            
+            String etc_relative_path = relative_path + collection_directories[i].getName() + File.separator + "etc";
+            ZipTools.addFileToZip(zos, toplevel_path, etc_relative_path, collection_etc_zip_filter);
+            
+            // The "metadata" directory may not exist (non-GLI collections)
+            String metadata_relative_path = relative_path + collection_directories[i].getName() + File.separator + "metadata";
+            File metadata_directory = new File(collect_directory.getAbsolutePath() + File.separator + metadata_relative_path);
+            if (metadata_directory.exists()) {
+            ZipTools.addFileToZip(zos, toplevel_path, metadata_relative_path, collection_metadata_zip_filter);
+            } 
+            else { // if a collection contains no metadata directory, then check if it is a collectgroup
+            
+            // read from collection config file in etc folder
+            File config_file = new File(collection_directories[i], "etc"+File.separator+"collect.cfg");
+            if(config_file.exists()) {
+                try {
+                BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(config_file)));
+                String line = null;
+                while((line = reader.readLine()) != null) { // read lines and look for: collectgroup true
+                    line = line.trim(); // need to ignore surrounding whitespace
+                    if(line.startsWith("collectgroup") && line.endsWith("true")) {
+                    // if collectgroup, then recurse on current folder
+                    addUserAccessibleCollections(toplevel_path, relative_path+collection_directories[i].getName(), collection_directories[i],
+                                     zos, collection_etc_zip_filter, collection_metadata_zip_filter,
+                                     user_name, user_groups);
+                    }
+                }
+                
+                reader.close();
+                } catch(Exception e) {
+                System.err.println("Exception reading from file " + config_file + ": " + e);
+                e.printStackTrace();
+                }
+            }               
+            }
+        }
+        }
     }
     }