--- /afs/cs/user/eepeter/genkit/genkit.cpp	2002-09-27 13:54:57.000000000 -0400
+++ genkit.cpp	2002-10-05 13:24:59.000000000 -0400
@@ -243,12 +243,12 @@
   

 }

 

-int GenKit::runBatch(string infile, string outfile) {

+int GenKit::runBatch(string infile, string outfile, string tracing) {

   ofstream out;

   vector<string> genstrings;

   int i;

 

-  generateFromFStructureFile(infile, genstrings, "off");

+  generateFromFStructureFile(infile, genstrings, tracing);

 

   out.open(outfile.c_str());

   for (i = 0; i < genstrings.size(); i++) {

--- /afs/cs/user/eepeter/genkit/genkit.hpp	2002-09-27 13:54:38.000000000 -0400
+++ genkit.hpp	2002-10-05 13:25:13.000000000 -0400
@@ -61,7 +61,7 @@
 

   void runCommandLine();

 

-  int runBatch(string infile, string outfile);

+  int runBatch(string infile, string outfile, string tracing);

 

   void runServer(int serverport);

 

--- /afs/cs/user/eepeter/genkit/GenKitTest.cpp	2002-09-18 14:34:20.000000000 -0400
+++ GenKitTest.cpp	2002-10-05 13:28:44.000000000 -0400
@@ -10,14 +10,20 @@
   bool isInteractive = false;

   bool isServer = false;

   bool isBatch = false;

-  string inputfile, outputfile;

+  string inputfile, outputfile, tracing="off";

 

   GenKit gk;

   gk.setEncoding("ASCII");

   gk.setGrammarLoadDebug(false);

 

   for (argi = 1; argi < argc; argi++) {

-    if (strcmp("-i", argv[argi]) == 0) {

+    if (strcmp("-t", argv[argi]) == 0) {

+      if (argi+1 < argc) {

+	tracing = argv[argi+1];

+	argi++;

+      }      

+    }

+    else if (strcmp("-i", argv[argi]) == 0) {

       isInteractive = true;

 

     } else if (strcmp("-if", argv[argi]) == 0) {

@@ -74,6 +80,8 @@
       cout << "-i			: Start program in interactive mode.\n\n";

 

       cout << "-gd			: Turn on grammar loading debugging.\n\n";

+

+      cout << "-t tracing_mode          : Turn on tracing in batch mode (rule|fs|eq|off).\n\n";

 	

       cout << "-h			: Print help.\n";

       exit(0);

@@ -87,7 +95,7 @@
     gk.runServer(newserverport);

   } else if (isBatch == true) {

     cout << "Processing f-structures in " << inputfile << endl;

-    gk.runBatch(inputfile, outputfile);

+    gk.runBatch(inputfile, outputfile, tracing);

   }