Better error reporting for CQL-to-RPN conversion failure

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index 38ea168..d44b50e 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.197 2003-05-22 23:55:19 mike Exp $
+ * $Id: client.c,v 1.199 2003-05-27 09:42:08 mike Exp $
  */
 
 #include <stdio.h>
@@ -61,10 +61,10 @@
 static char *codeset = 0;               /* character set for output */
 
 static ODR out, in, print;              /* encoding and decoding streams */
-#ifdef THESE_ARE_NOT_USED
+#if HAVE_XML2
 static ODR srw_sr_odr_out = 0;
 static Z_SRW_PDU *srw_sr = 0;
-#endif /*THESE_ARE_NOT_USED*/
+#endif
 static FILE *apdu_file = 0;
 static FILE *ber_file = 0;
 static COMSTACK conn = 0;               /* our z-association */
@@ -1068,16 +1068,15 @@ static int send_searchRequest(const char *arg)
        }
        parser = cql_parser_create();
        if ((error = cql_parser_string(parser, arg)) != 0) {
-           /* ### must do better with the reporting here */
-            printf("CQL ERROR %d: presumably a syntax error?\n", error);
+            printf("Can't parse CQL: must be a syntax error\n");
             return 0;
        }
        node = cql_parser_result(parser);
        if ((error = cql_transform_buf(cqltrans, node, pqfbuf,
                                       sizeof pqfbuf)) != 0) {
            error = cql_transform_error(cqltrans, &addinfo);
-            printf ("Couldn't convert CQL to PQF: error #%d (addinfo=%s)\n",
-                   error, addinfo);
+           printf ("Can't convert CQL to PQF: %s (addinfo=%s)\n",
+                   cql_strerror(error), addinfo);
             return 0;
         }
        arg = pqfbuf;