X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=80970661384f7a25f519e2c8b53875f966dc9f17;hb=d9d97a04b6f9597225b8440dad61790dfa39a751;hp=6aedbd06dcadcfca1501e73ec947edaaa33dea50;hpb=c9c53d8b79a1d6283dcc446ed3f1292a4522a49c;p=yaz-moved-to-github.git

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 6aedbd0..8097066 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomsh.c,v 1.11 2002-06-05 21:09:20 adam Exp $
+ * $Id: zoomsh.c,v 1.14 2003-02-17 14:35:42 adam Exp $
  *
  * ZOOM-C Shell
  */
@@ -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)))
+	    printf ("%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... */
@@ -211,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)))
+	    printf ("%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");
@@ -232,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)
     {
-	fprintf (stderr, "Bad PQF: %s\n", *args);
+        ZOOM_query_cql (s, query_str + 4);
+    }
+    else if (ZOOM_query_prefix (s, query_str))
+    {
+	printf ("Bad PQF: %s\n", query_str);
 	return;
     }
     for (i = 0; i<MAX_CON; i++)
@@ -257,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",
-		     ZOOM_connection_option_get(c[i], "host"), errmsg,
-		     error, addinfo);
+	if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+	    printf ("%s error: %s (%s:%d) %s\n",
+		    ZOOM_connection_option_get(c[i], "host"), errmsg,
+		    dset, error, addinfo);
 	else if (r[i])
 	{
 	    /* OK, no major errors. Look at the result count */
@@ -316,7 +323,7 @@ static void cmd_connect (ZOOM_connection *c, ZOOM_resultset *r,
 			 const char **args)
 {
     int error;
-    const char *errmsg, *addinfo;
+    const char *errmsg, *addinfo, *dset;
     char host[60];
     int j, i;
     if (!next_token_copy (args, host, sizeof(host)))
@@ -347,12 +354,11 @@ static void cmd_connect (ZOOM_connection *c, ZOOM_resultset *r,
     }
     c[i] = ZOOM_connection_create (options);
     ZOOM_connection_connect (c[i], host, 0);
-
-    if ((error = ZOOM_connection_error(c[i], &errmsg, &addinfo)))
-	printf ("%s error: %s (%d) %s\n",
-                ZOOM_connection_option_get(c[i], "host"),
-		errmsg, error, addinfo);
-    
+	
+    if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+       printf ("%s error: %s (%s:%d) %s\n",
+	    ZOOM_connection_option_get(c[i], "host"), errmsg,
+	    dset, error, addinfo);
 }
 
 static int cmd_parse (ZOOM_connection *c, ZOOM_resultset *r,
@@ -410,7 +416,7 @@ void shell(ZOOM_connection *c, ZOOM_resultset *r,
 	    add_history(line_in);
 #endif
 	if(strlen(line_in) > 999) {
-	    fprintf(stderr,"Input line too long\n");
+	    printf("Input line too long\n");
 	    break;
 	};
 	strcpy(buf,line_in);
@@ -433,6 +439,10 @@ int main (int argc, char **argv)
     int i, res;
     ZOOM_connection z39_con[MAX_CON];
     ZOOM_resultset  z39_res[MAX_CON];
+
+#if 0
+    yaz_log_init_level(65535);
+#endif
     for (i = 0; i<MAX_CON; i++)
     {
 	z39_con[i] = 0;