cql2xcql: option -c makes conversion to CCL.

By default cql2xcql converts to XCQL (XML).

diff --git a/util/cql2xcql.c b/util/cql2xcql.c
index 55d824d..5c70d7a 100644 (file)
--- a/util/cql2xcql.c
+++ b/util/cql2xcql.c
@@ -12,6 +12,12 @@
 #include <yaz/cql.h>
 #include <yaz/options.h>
 
 #include <yaz/cql.h>
 #include <yaz/options.h>
 

+static void usage(const char *prog)
+{
+    fprintf(stderr, "%s: [-c] [-n iterations] [infile]\n", prog);
+    exit(1);
+}
+

 int main(int argc, char **argv)
 {
     CQL_parser cp;
 int main(int argc, char **argv)
 {
     CQL_parser cp;

@@ -19,18 +25,25 @@ int main(int argc, char **argv)
     const char *fname = 0;
     int iterations = 1;
     int ret;
     const char *fname = 0;
     int iterations = 1;
     int ret;

+    int convert_to_ccl = 0;

     char *arg;
     char *arg;

+    char *prog = argv[0];

 
 

-    while ((ret = options("n:", argv, argc, &arg)) != -2)
+    while ((ret = options("cn:", argv, argc, &arg)) != -2)

     {
         switch (ret)
         {
         case 0:
             fname = arg;
             break;
     {
         switch (ret)
         {
         case 0:
             fname = arg;
             break;

+        case 'c':
+            convert_to_ccl = 1;
+            break;

         case 'n':
             iterations = atoi(arg);
             break;
         case 'n':
             iterations = atoi(arg);
             break;

+        default:
+            usage(prog);            

         }
     }
 
         }
     }
 

@@ -46,7 +59,15 @@ int main(int argc, char **argv)
     if (r)
         fprintf (stderr, "Syntax error\n");
     else
     if (r)
         fprintf (stderr, "Syntax error\n");
     else

-        cql_to_xml_stdio(cql_parser_result(cp), stdout);
+    {
+        if (convert_to_ccl)
+        {
+            cql_to_ccl_stdio(cql_parser_result(cp), stdout);
+            putchar('\n');
+        }
+        else
+            cql_to_xml_stdio(cql_parser_result(cp), stdout);
+    }

     cql_parser_destroy(cp);
     return 0;
 }
     cql_parser_destroy(cp);
     return 0;
 }