Changeset 7206

Timestamp:

2004-04-20T09:20:11+12:00 (20 years ago)

Author:

kjdon

Message:

added a new field: strip_quotes. added a new constructor which sets it. now it uses strip_quotes to determine whether to strip the quotes from the tokens or not - sometimes we don't want it to

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CommandTokenizer.java (modified) (3 diffs)

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

@@ -63 +63 @@
     private int count = -1;
     private StringTokenizer internal_tokenizer;
-    
+    private boolean strip_quotes = true;
     /** Basic Constructor. Used to parse tokens from a string keeping tokens surrounded by speechmarks or square brackets intact. Thus something like:<br>
      * collectionmeta collectionextra [l = en] "Hello World"<br>
@@ -90 +90 @@
     }
     
+    public CommandTokenizer(String command, BufferedReader in_stream, boolean strip_quotes) {
+    this.internal_tokenizer = new StringTokenizer(command);
+    this.in_stream = in_stream;
+    this.strip_quotes = strip_quotes;
+    }
+    
     /** Returns the minumum number of remaining tokens before the tokenizer runs out of string. There may be more tokens than this count, but never less. The discrepancy is due to internal functionality and the fact we can't read ahead in the string or associated stream without risking the need for unpredictable push-back
      * @return the minumum number of tokens available as an int
@@ -120 +126 @@
         case StaticStrings.DOUBLEQUOTE_CHAR:
         ///ystem.err.println("Building token wrapped by double quotes.");
-        result = buildToken(buffer, StaticStrings.DOUBLEQUOTE_CHAR, true);
+        result = buildToken(buffer, StaticStrings.DOUBLEQUOTE_CHAR, this.strip_quotes);
         break;
         case StaticStrings.SINGLEQUOTE_CHAR:
         ///ystem.err.println("Building token wrapped by single quotes.");
-        result = buildToken(buffer, StaticStrings.SINGLEQUOTE_CHAR, true);
+        result = buildToken(buffer, StaticStrings.SINGLEQUOTE_CHAR, this.strip_quotes);
         break;
         case StaticStrings.OPENBRACKET_CHAR: