X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FCQLGenerator.java;h=991f60dbc535636273af256a8692d4f9bb6f6ef5;hb=08b7f3f08d97b9efdd5a3aef7992a359b71910d6;hp=67e70d1b5f924a15e121e4804b001d19c0188aa1;hpb=caeab95a0bbe3a694746bb3244e6605c36927c1e;p=cql-java-moved-to-github.git diff --git a/src/org/z3950/zing/cql/CQLGenerator.java b/src/org/z3950/zing/cql/CQLGenerator.java index 67e70d1..991f60d 100644 --- a/src/org/z3950/zing/cql/CQLGenerator.java +++ b/src/org/z3950/zing/cql/CQLGenerator.java @@ -1,4 +1,4 @@ -// $Id: CQLGenerator.java,v 1.2 2002-10-30 11:13:18 mike Exp $ +// $Id: CQLGenerator.java,v 1.3 2002-11-03 16:49:38 mike Exp $ package org.z3950.zing.cql; import java.util.Properties; @@ -22,7 +22,7 @@ import java.io.FileNotFoundException; * this distribution - there is a generate_x() method * for each grammar element X. * - * @version $Id: CQLGenerator.java,v 1.2 2002-10-30 11:13:18 mike Exp $ + * @version $Id: CQLGenerator.java,v 1.3 2002-11-03 16:49:38 mike Exp $ * @see http://zing.z3950.org/cql/index.html */ @@ -260,13 +260,14 @@ public class CQLGenerator { * A simple test-harness for the generator. *
* It generates a single random query using the parameters - * specified in a nominated properties file, and decompiles it - * into CQL which is written to standard output. + * specified in a nominated properties file, plus any additional + * name value pairs provided on the command-line, and + * decompiles it into CQL which is written to standard output. *
* For example, - * java org.z3950.zing.cql.CQLGenerator etc/generate.properties + * java org.z3950.zing.cql.CQLGenerator + * etc/generate.properties seed 18398, * where the file generate.properties contains:
- * seed=18398 * complexQuery=0.4 * complexClause=0.4 * equalsRelation=0.5 @@ -281,13 +282,19 @@ public class CQLGenerator { * @param configFile * The name of a properties file from which to read the * configuration parameters (see above). + * @param name + * The name of a configuration parameter. + * @param value + * The value to assign to the configuration parameter named in + * the immediately preceding command-line argument. * @return * A CQL query expressed in a form that should be comprehensible * to all conformant CQL compilers. */ public static void main (String[] args) throws Exception { - if (args.length != 1) { - System.err.println("Usage: CQLGenerator"); + if (args.length % 2 != 1) { + System.err.println("Usage: CQLGenerator "+ + "[ ]..."); System.exit(1); } @@ -300,6 +307,8 @@ public class CQLGenerator { Properties params = new Properties(); params.load(f); f.close(); + for (int i = 1; i < args.length; i += 2) + params.setProperty(args[i], args[i+1]); CQLGenerator generator = new CQLGenerator(params); CQLNode tree = generator.generate();