X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fcql2pqf.c;h=203cdae736e6859af39c5ed8533d54d10d10eca0;hp=070e54273aa3fcf85776ddabe9b7df04e77c6951;hb=fbd98e3ba1435882c6fa121e5dee6648ed295b60;hpb=b977948f73d07c0bf4478565f9af3497ffe862e7

diff --git a/util/cql2pqf.c b/util/cql2pqf.c
index 070e542..203cdae 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-2013 Index Data
  * See the file LICENSE for details.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -12,7 +15,8 @@
 
 static void usage(void)
 {
-    fprintf(stderr, "usage\n cql2pqf [-n <n>] [-r] <properties> [<query>]\n");
+    fprintf(stderr, "usage\n cql2pqf [-n <n>] [-r] [-S] <properties> "
+            "[<query>]\n");
     exit(1);
 }
 
@@ -23,11 +27,13 @@ int main(int argc, char **argv)
     char *query = 0;
     char *fname = 0;
     int reverse = 0;
+    int verbose = 0;
+    int do_strict = 0;
 
     int ret;
     char *arg;
 
-    while ((ret = options("n:r", argv, argc, &arg)) != -2)
+    while ((ret = options("n:rSv", argv, argc, &arg)) != -2)
     {
         switch (ret)
         {
@@ -37,18 +43,28 @@ 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 'S':
+            do_strict = 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);
@@ -57,9 +73,14 @@ int main(int argc, char **argv)
 
     if (reverse)
     {
+        char buf[1024];
+
         if (!query)
-            usage();
-        else
+        {
+            if (fgets(buf, sizeof buf, stdin))
+                query = buf;
+        }
+        if (query)
         {
             ODR odr = odr_createmem(ODR_ENCODE);
             YAZ_PQF_Parser pp = yaz_pqf_create();
@@ -68,11 +89,11 @@ int main(int argc, char **argv)
             {
                 fprintf(stderr, "PQF syntax error\n");
             }
-            else 
+            else
             {
                 int ret = cql_transform_rpn2cql_stream(ct, cql_fputs,
                                                        stdout, rpn);
-                
+
                 if (ret)
                 {
                     const char *addinfo;
@@ -90,15 +111,18 @@ int main(int argc, char **argv)
     {
         CQL_parser cp = cql_parser_create();
         int r = 0;
-        
+
+        cql_parser_strict(cp, do_strict);
         if (query)
         {
+            if (verbose)
+                printf("Parsing CQL %s\n", query);
             for (i = 0; i<iterations; i++)
                 r = cql_parser_string(cp, query);
         }
         else
             r = cql_parser_stdio(cp, stdin);
-        
+
         if (r)
             fprintf(stderr, "Syntax error\n");
         else
@@ -127,6 +151,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