Changeset 16250

Timestamp:

2008-06-30 14:46:16 (2 months ago)

Author:

ak19

Message:

For GSDLRemote case. Moved duplicate scheduling code into scheduling() method which is now only called when greenstone is NOT remote. Otherwise GLI won't allow creation of a new collection over a remote GS server.

Files:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (4 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -557 +557 @@
-            collection.import_options.setValue("removeold", true, null);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            stmp = "";
-            String fromaddr = ""; 
@@ -598 +713 @@
-            maincfg.close();
-
-e
+
-            if(smtptmp.equals("NULL") || smtptmp.equals("null")) {
-                String email2=fromaddr; 
@@ -611 +726 @@
-            }
-
-            MetadataSetManager.clearMetadataSets();
-            MetadataXMLFileManager.clearMetadataXMLFiles();
-            DocXMLFileManager.clearDocXMLFiles();
-
-            // Import default metadata sets, if any
-            // for (int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
-            // importMetadataSet((MetadataSet) metadata_sets.get(i));
-            // }
-
-            ProfileXMLFileManager.loadProfileXMLFile(new File(collection_directory_path + "metadata"));
-
-            // Before creating the CollectionDesignManager check if we are basing it upon some other collection
-            if (base_collection_directory != null) {
-                DebugStream.println("Basing new collection on existing one: " + base_collection_directory);
-
-                // If we're using a remote Greenstone server, download the collection shell to get the files needed
-                if (Gatherer.isGsdlRemote) {
-                    String base_collection_name = base_collection_directory.getName();
-                    RemoteGreenstoneServer.downloadCollection(base_collection_name);
-                }
-
-                collection.setBaseCollection(base_collection_directory.getAbsolutePath());
-                // copy over other needed directories
-                copyExtraBaseCollStuff(new File(collection_directory_path), base_collection_directory);
-
-                // Try to import any existing metadata sets for this collection
-                // Look in base_collection_directory/metadata and import any metadata sets found.
-                File base_metadata_directory = new File(base_collection_directory, "metadata");
-                ArrayList base_metadata_sets = MetadataSetManager.listMetadataSets(base_metadata_directory);
-                if (base_metadata_sets != null) {
-                    for (int i = 0; i < base_metadata_sets.size(); i++) {
-                        importMetadataSet((MetadataSet) base_metadata_sets.get(i));
-                    }
-                }
-                else {
-                    DebugStream.println("This base collection has no metadata directory.");
-                }
-
-                // Now we update our collect.cfg
-                DebugStream.println("Copy and update " + file_name + " from base collection.");
-
-                if (Gatherer.GS3 == true) {
-                    updateCollectionConfigXML(new File(base_collection_directory, Utility.CONFIG_GS3_FILE),
-                                        new File(collection_directory_path, Utility.CONFIG_GS3_FILE)); 
-                } else {
-                    updateCollectionCFG(new File(base_collection_directory, Utility.CONFIG_FILE),
-                                        new File(collection_directory_path, Utility.CONFIG_FILE),
-                                        description, email, title);
-                }
-            }
-
-            // Load the default metadata sets
-            addDefaultMetadataSets();
-
-            // Make sure we always have the extracted metadata set
-            addRequiredMetadataSets();
-
-            collection.cdm = new CollectionDesignManager(new File(getLoadedCollectionCfgFilePath()));
-
-            // We always set title and description here rather than calling mkcol.pl with Unicode arguments
-            CollectionMeta collection_name_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONNAME_STR);
-            collection_name_collectionmeta.setValue(title);
-            CollectionMeta collection_extra_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
-            collection_extra_collectionmeta.setValue(description);
-
-            // Now that we have a CDM, update several settings, such as if we created this collection by basing it on another, set it as public automatically. This update is done to the internal xml structure which may be saved into collect.cfg or collectionConfig.xml accordingly.
-            if (base_collection_directory != null) {
-                // Update the creator and maintainer
-                CollectionMeta creator_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getCreator());
-                creator_collectionmeta.setValue(email);
-                creator_collectionmeta = null;
-                CollectionMeta maintainer_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getMaintainer());
-                maintainer_collectionmeta.setValue(email);
-                maintainer_collectionmeta = null;
-
-                // All collections based on others are automatically public
-                CollectionMeta public_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getPublic());
-                public_collectionmeta.setValue(StaticStrings.TRUE_STR);
-                public_collectionmeta = null;
-
-                // Finally reset the icons
-                CollectionMeta icon_collection_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTION_STR);
-                icon_collection_collectionmeta.setValue(StaticStrings.EMPTY_STR);
-                icon_collection_collectionmeta = null;
-                CollectionMeta icon_collection_small_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
-                icon_collection_small_collectionmeta.setValue(StaticStrings.EMPTY_STR);
-                icon_collection_small_collectionmeta = null;
-            }
-
-            saveCollection();
-
-            // Create a lock file
-            createLockFile(new File(collection_directory_path, LOCK_FILE));
-
-            // We're done. Let everyone know.
-            Gatherer.refresh(Gatherer.COLLECTION_OPENED);
-        }
-        catch (Exception error) {
-            DebugStream.printStackTrace(error);
-        }
-    }
-
@@ -1198 +1213 @@
-                return;
-            }
-
-
+
+
+
- 
-    
-    
-    
-    
-
+       
+       
+       
+       
+    
-               
-
-
-
-
-
+
+
+
+
+
+
-                    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-            MetadataSetManager.clearMetadataSets();
-            MetadataSetManager.loadMetadataSets(collection_metadata_directory);