X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fcql2pqf.c;h=e182db05d579c9e2b7d4b3ddf56348ec9b80d395;hb=5c0fa4bf1be2881b55a3ed27ae08cdc8b35271bc;hp=55bea5ddd7c31df9551e3ca774eebfa5cdf8d67c;hpb=b3d5a30f4d074053085693a8fc5381a4ebc41544;p=yaz-moved-to-github.git

diff --git a/util/cql2pqf.c b/util/cql2pqf.c
index 55bea5d..e182db0 100644
--- a/util/cql2pqf.c
+++ b/util/cql2pqf.c
@@ -1,7 +1,10 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -23,11 +26,12 @@ int main(int argc, char **argv)
     char *query = 0;
     char *fname = 0;
     int reverse = 0;
+    int verbose = 1;
 
     int ret;
     char *arg;
 
-    while ((ret = options("n:r", argv, argc, &arg)) != -2)
+    while ((ret = options("n:rv", argv, argc, &arg)) != -2)
     {
         switch (ret)
         {
@@ -37,18 +41,25 @@ int main(int argc, char **argv)
             else
                 query = arg;
             break;
-        case 'r':
-            reverse = 1;
         case 'n':
             iterations = atoi(arg);
             break;
+        case 'r':
+            reverse = 1;
+            break;
+        case 'v':
+            verbose = 1;
+            break;
         default:
             usage();
         }
     }
     if (!fname)
         usage();
-    ct = cql_transform_open_fname(fname);
+    if (!strcmp(fname, "-"))
+        ct = cql_transform_create();
+    else
+        ct = cql_transform_open_fname(fname);
     if (!ct)
     {
         fprintf(stderr, "failed to read properties %s\n", fname);
@@ -70,7 +81,8 @@ int main(int argc, char **argv)
             }
             else 
             {
-                int ret = cql_transform_rpn2cql(ct, cql_fputs, stdout, rpn);
+                int ret = cql_transform_rpn2cql_stream(ct, cql_fputs,
+                                                       stdout, rpn);
                 
                 if (ret)
                 {
@@ -92,6 +104,8 @@ int main(int argc, char **argv)
         
         if (query)
         {
+            if (verbose)
+                printf("Parsing CQL %s\n", query);
             for (i = 0; i<iterations; i++)
                 r = cql_parser_string(cp, query);
         }
@@ -126,6 +140,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab