Changeset 10205

Timestamp:

2005-07-04T17:14:06+12:00 (19 years ago)

Author:

mdewsnip

Message:

Can now create a collection with Unicode title and description. This did not work before because these were passed as arguments to mkcol.pl, and encoding and shell issues would cause them to be screwed up. Now the collection title and description is set by the GLI after mkcol.pl has been run.

File:

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

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

@@ -310 +310 @@
 
         // Create the new collection.
-        makeCollection(description, email, name, title);
+        makeCollection(name, email);
         progress.setProgress(1);
         
@@ -400 +400 @@
         collection.cdm = new CollectionDesignManager(new File(getCollectionConfigFilePath()));
 
+        // 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
         if (base_collection_directory != null) {
@@ -410 +416 @@
         maintainer_collectionmeta = null;
 
-        // Update the collection title
-        CollectionMeta collection_name_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONNAME_STR);
-        collection_name_collectionmeta.setValue(title);
-        collection_name_collectionmeta = null;
-
-        // And now the description
-        CollectionMeta collection_extra_collectionmeta = collection.cdm.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
-        collection_extra_collectionmeta.setValue(description);
-        collection_extra_collectionmeta = null;
-
         // All collections based on others are automatically public
         CollectionMeta public_collectionmeta = new CollectionMeta(collection.cdm.collect_config.getPublic());
@@ -434 +430 @@
         }
 
+        collection.cdm.save();
         progress.setProgress(3);
 
@@ -901 +898 @@
 
 
-    private void makeCollection(String description, String email, String name, String title) {
-    // Encode the description so it is safe to write to shell
-    if(Utility.isWindows()) {
-        description = Codec.transform(description, Codec.TEXT_TO_SHELL_WINDOWS);
-    }
-    else {
-        description = Codec.transform(description, Codec.TEXT_TO_SHELL_UNIX);
-    }
-
+    private void makeCollection(String name, String email)
+    {
     // Generate the mkcol.pl command
     ArrayList command_parts_list = new ArrayList();
@@ -923 +913 @@
     command_parts_list.add((Gatherer.isGsdlRemote) ? "false" : "true");
 
-    if (title != null && !title.equals("")) {
-        command_parts_list.add("-title");
-        command_parts_list.add(title);
-    }
     if (email != null && !email.equals("")) {
         command_parts_list.add("-creator");
         command_parts_list.add(email);
-    }
-    if (description != null && !description.equals("")) {
-        command_parts_list.add("-about");
-        command_parts_list.add(description);
     }