Changeset 4510

Timestamp:

2003-06-09T11:46:48+12:00 (21 years ago)

Author:

jmt12

Message:

2030109: If can now read in some crazily (but not poorly) formed collect.cfg files.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

@@ -235 +235 @@
      * @see org.greenstone.gatherer.util.EmailAddress
      */
+    private BufferedReader in;
+    /** If one of the submanagers detects that it hasn't been provided enough arguments (such as format which always requires at least three) it can call this method to request another line of text from the collect.cfg. If the collect.cfg was not well formed this will cause some problems, but that can't be helped. 
+     * @param prefix the String we have so far
+     * @return a String with a further line form the collect.cfg appended
+     */
+    public String parseMore(String prefix) {
+    ///ystem.err.println("Command incomplete: " + prefix);
+    try {
+        String suffix = in.readLine();
+        ///ystem.err.println("Adding: " + suffix);
+        if(suffix != null) {
+        prefix = prefix + " " + suffix;
+        }
+        suffix = null;
+    }
+    catch(Exception error) {
+        error.printStackTrace();
+    }
+    return prefix;
+    }
+
     public void parse(String filename) {
     try {
         in_file = new File(filename);
         FileReader in_reader = new FileReader(in_file);
-        BufferedReader in = new BufferedReader(in_reader);
+        in = new BufferedReader(in_reader);
         String command = null;
         while((command = in.readLine()) != null) {
         if(command.length() > 0) {
+            // Now we've finished parsing a command line, see what manager wants a piece of it.
             // 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) {
+            String next_line = (in.readLine()).trim();
+            if(next_line != null && next_line.length() > 0) {
+                command = command.substring(0, command.lastIndexOf("\\"));
                 command = command + next_line;
             }