Changeset 7115

Timestamp:

2004-03-24T10:36:09+12:00 (20 years ago)

Author:

kjdon

Message:

fixed bugs in updateCollectionCFG when baseing a colleciton on an old one: now reads the config files in UTF-8, and doesn't copy across collectionname, collectionextra, iconcollection and iconcollectionsmall

File:

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

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

@@ -1341 +1341 @@
        return success;
      }
-
-    private void updateCollectionCFG(File base_cfg, File new_cfg, String description, String email, String title) {
-        boolean first_name = true;
-        boolean first_extra = true;
-        String collection_path = (base_cfg.getParentFile().getParentFile()).getAbsolutePath();
-
-        HashMap mappings = collection.msm.profiler.getActions(collection_path);
-        if(mappings == null) {
-            Gatherer.println("Mappings is null, which is odd. Leaving all configuration commands which use metadata as they are.");
+    
+    private void updateCollectionCFG(File base_cfg, File new_cfg, String description, String email, String title) {
+    boolean first_name = true;
+    boolean first_extra = true;
+    String collection_path = (base_cfg.getParentFile().getParentFile()).getAbsolutePath();
+    
+    HashMap mappings = collection.msm.profiler.getActions(collection_path);
+    if(mappings == null) {
+        Gatherer.println("Mappings is null, which is odd. Leaving all configuration commands which use metadata as they are.");
+    }
+    
+    // Now read in base_cfg line by line, parsing important onces and/or replacing them with information pertinent to our collection. Each line is then written back out to the new collect.cfg file.
+    try {
+        BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(base_cfg), "UTF-8"));
+        BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new_cfg), "UTF-8"));
+        String command = null;
+        while((command = in.readLine()) != null) {
+        // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
+        while(command.trim().endsWith("\\")) {
+            command = command.substring(0, command.lastIndexOf("\\"));
+            String next_line = in.readLine();
+            if(next_line != null) {
+            command = command + next_line;
+            }
         }
-
-        // Now read in base_cfg line by line, parsing important onces and/or replacing them with information pertinent to our collection. Each line is then written back out to the new collect.cfg file.
-        try {
-            BufferedReader in = new BufferedReader(new FileReader(base_cfg));
-            BufferedWriter out = new BufferedWriter(new FileWriter(new_cfg, false)); // Overwrite whats there.
-            String command = null;
-            while((command = in.readLine()) != null) {
-            // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
-            while(command.trim().endsWith("\\")) {
-                command = command.substring(0, command.lastIndexOf("\\"));
-                String next_line = in.readLine();
-                if(next_line != null) {
-                command = command + next_line;
-                }
-            }
-            ///ystem.err.println("Read: " + command);
-            // Now we've finished parsing a line, determine what to do with it.
-            String command_lc = command.toLowerCase();
-            // We replace the creator string with our own.
-            /*
-            if(command_lc.startsWith(Utility.CFG_CREATOR)) {
-                ///ystem.err.println("Found creator - replace with current");
-                write(out, Utility.CFG_CREATOR + " " + email);
-            }
-            else if(command_lc.startsWith(Utility.CFG_MAINTAINER)) {
-                ///ystem.err.println("Found maintainer - replace with current");
-                write(out, Utility.CFG_MAINTAINER + " " + email);
-            }
-            else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONNAME)) {
-                if(first_name) {
-                    write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONNAME + " \"" + title + "\"");
-                    first_name = false;
-                }
-            }
-            else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA)) {
-                if(first_extra) {
-                    write(out, Utility.CFG_COLLECTIONMETA_COLLECTIONEXTRA + " \"" + description + "\"");
-                    first_extra = false;
-                }
-            }
-            else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_ICONCOLLECTION)) {
-                write(out, Utility.CFG_COLLECTIONMETA_ICONCOLLECTION + " \"\"");
-            }
-            */
-            // Just before we try more general parsing there are the special cases to check. These are explicit changes required by some collections to produce sensible results.
-            if(command_lc.startsWith(Utility.CFG_CLASSIFY)) {
+        ///ystem.err.println("Read: " + command);
+        // Now we've finished parsing a line, determine what to do with it.
+        String command_lc = command.toLowerCase();
+        if (command_lc.startsWith(StaticStrings.COLLECTIONMETADATA_STR)) {
+            // we don't want to import collectionname, collectionextra, iconcollection, iconcollectionsmall from the base collection
+            StringTokenizer tokeniser = new StringTokenizer(command_lc);
+            tokeniser.nextToken(); // remove the first one
+            String meta_name = tokeniser.nextToken();
+            tokeniser = null;
+            if (meta_name.equals(StaticStrings.COLLECTIONMETADATA_COLLECTIONNAME_STR) || meta_name.equals(StaticStrings.COLLECTIONMETADATA_COLLECTIONEXTRA_STR) || meta_name.equals(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTION_STR) || meta_name.equals(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR) ) {
+            continue;
+            }
+        }
+        // Just before we try more general parsing there are the special cases to check. These are explicit changes required by some collections to produce sensible results.
+        if(command_lc.startsWith(Utility.CFG_CLASSIFY)) {
             StringTokenizer tokenizer = new StringTokenizer(command);
             StringBuffer text = new StringBuffer(tokenizer.nextToken());
@@ -1462 +1446 @@
             }
             tokenizer = null;
-
+            
             // If we replaced the metadata argument and didn't encounter a buttonname, then add one now pointing back to the old metadata name in order to accomodate macro files which required such names (buttonname is metadata name by default)!
             if(old_metadata != null && new_metadata != null && buttonname == null) {
@@ -1510 +1494 @@
     // All done, I hope.
     }
-
+    
     private void write(BufferedWriter out, String message)
     throws Exception {