Changeset 11391

Timestamp:

2006-03-17T14:36:57+13:00 (18 years ago)

Author:

mdewsnip

Message:

Internal collection names are now made up from ASCII characters only.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -218 +218 @@
      * @return the filename as a String
      */
-    public String getName() {
-    // Retrieve the first 8 non-whitespace characters of title_final.
+    public String getName()
+    {
+    // Retrieve the first 8 non-whitespace ASCII characters of title_final.
     StringBuffer name_buffer = new StringBuffer("");
-
-    int i = 0;
-    int u = 0;
-    while(i < title_final.length() && u < 8) {
+    for (int i = 0, u = 0; (i < title_final.length() && u < 8); i++) {
+        // To be safe we make sure the internal collection name (folder name) contains only ASCII characters
         char c = title_final.charAt(i);
-        // Arg. We need a few more tests than just whitespace
-        if(Character.isLetterOrDigit(c)) {
+        if ((int) c < 128 && Character.isLetterOrDigit(c)) {
         name_buffer.append(Character.toLowerCase(c));
         u++;
         }
-        i++;
-    }
+    }
+
+    // Use "col" as the base collection name if we have nothing left
+    if (name_buffer.length() == 0) {
+        name_buffer = new StringBuffer("col");
+    }
+
     // We need to ensure the filename is unique
     int counter = 0;