SRW, CQL, 2003

[yaz-moved-to-github.git] / zoom / zoomsh.c

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 3890467..bf35f6a 100644 (file)
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomsh.c,v 1.10 2002-06-02 21:27:17 adam Exp $
+ * $Id: zoomsh.c,v 1.12 2003-01-06 08:20:28 adam Exp $
  *
  * ZOOM-C Shell
  */
@@ -85,7 +85,7 @@ static void cmd_get (ZOOM_connection *c, ZOOM_resultset *r,
                     ZOOM_options options,
                     const char **args)
 {
-    char key[40], val[80];
+    char key[40];
     if (!next_token_copy (args, key, sizeof(key)))
     {
        printf ("missing argument for get\n");
@@ -168,14 +168,14 @@ static void cmd_show (ZOOM_connection *c, ZOOM_resultset *r,
     for (i = 0; i<MAX_CON; i++)
     {
        int error;
-       const char *errmsg, *addinfo;
+       const char *errmsg, *addinfo, *dset;
        /* display errors if any */
        if (!c[i])
            continue;
-       if ((error = ZOOM_connection_error(c[i], &errmsg, &addinfo)))
-           fprintf (stderr, "%s error: %s (%d) %s\n",
+       if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+           fprintf (stderr, "%s error: %s (%s:%d) %s\n",
                     ZOOM_connection_option_get(c[i], "host"), errmsg,
-                    error, addinfo);
+                    dset, error, addinfo);
        else if (r[i])
        {
            /* OK, no major errors. Display records... */
@@ -190,7 +190,6 @@ static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
                      ZOOM_options options,
                      const char **args)
 {
-    ZOOM_query s;
     ZOOM_package p[MAX_CON];
     
     int i;
@@ -212,14 +211,14 @@ static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
     for (i = 0; i<MAX_CON; i++)
     {
        int error;
-       const char *errmsg, *addinfo;
+       const char *errmsg, *addinfo, *dset;
        /* display errors if any */
        if (!p[i])
            continue;
-       if ((error = ZOOM_connection_error(c[i], &errmsg, &addinfo)))
-           fprintf (stderr, "%s error: %s (%d) %s\n",
+       if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+           fprintf (stderr, "%s error: %s (%s:%d) %s\n",
                     ZOOM_connection_option_get(c[i], "host"), errmsg,
-                    error, addinfo);
+                    dset, error, addinfo);
        else if (p[i])
        {
             printf ("ok\n");
@@ -233,12 +232,19 @@ static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
                        const char **args)
 {
     ZOOM_query s;
+    const char *query_str = *args;
     int i;
     
     s = ZOOM_query_create ();
-    if (ZOOM_query_prefix (s, *args))
+    while (*query_str == ' ')
+        query_str++;
+    if (memcmp(query_str, "cql:", 4) == 0)
+    {
+        ZOOM_query_cql (s, query_str + 4);
+    }
+    else if (ZOOM_query_prefix (s, query_str))
     {
-       fprintf (stderr, "Bad PQF: %s\n", *args);
+       fprintf (stderr, "Bad PQF: %s\n", query_str);
        return;
     }
     for (i = 0; i<MAX_CON; i++)
@@ -258,14 +264,14 @@ static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
     for (i = 0; i<MAX_CON; i++)
     {
        int error;
-       const char *errmsg, *addinfo;
+       const char *errmsg, *addinfo, *dset;
        /* display errors if any */
        if (!c[i])
            continue;
-       if ((error = ZOOM_connection_error(c[i], &errmsg, &addinfo)))
-           fprintf (stderr, "%s error: %s (%d) %s\n",
+       if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+           fprintf (stderr, "%s error: %s (%s:%d) %s\n",
                     ZOOM_connection_option_get(c[i], "host"), errmsg,
-                    error, addinfo);
+                    dset, error, addinfo);
        else if (r[i])
        {
            /* OK, no major errors. Look at the result count */