X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=bf35f6a9bf40de8b3108f3a9c89aa6fde88a8888;hb=63d3984ef11179af51a79d202dca15b70403099b;hp=24746d26a5c033c9f5c7ce5d45ec83897b91ecd3;hpb=13671e7cc0f3dd4e4b02f94d64a50778c5696ba6;p=yaz-moved-to-github.git

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 24746d2..bf35f6a 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomsh.c,v 1.7 2001-11-18 21:14:23 adam Exp $
+ * $Id: zoomsh.c,v 1.12 2003-01-06 08:20:28 adam Exp $
  *
  * ZOOM-C Shell
  */
@@ -76,12 +76,25 @@ static void cmd_set (ZOOM_connection *c, ZOOM_resultset *r,
 	return ;
     }
     if (!next_token_copy (args, val, sizeof(val)))
+	ZOOM_options_set(options, key, 0);
+    else
+	ZOOM_options_set(options, key, val);
+}
+
+static void cmd_get (ZOOM_connection *c, ZOOM_resultset *r,
+		     ZOOM_options options,
+		     const char **args)
+{
+    char key[40];
+    if (!next_token_copy (args, key, sizeof(key)))
     {
-	const char *val = ZOOM_options_get(options, key);
-	printf ("%s = %s\n", key, val ? val : "<null>");
+	printf ("missing argument for get\n");
     }
     else
-	ZOOM_options_set(options, key, val);
+    {
+        const char *val = ZOOM_options_get(options, key);
+        printf ("%s = %s\n", key, val ? val : "<null>");
+    }
 }
 
 static void cmd_close (ZOOM_connection *c, ZOOM_resultset *r,
@@ -129,7 +142,7 @@ static void display_records (ZOOM_connection c,
 	    printf ("%d %s %s\n", pos+1, (db ? db : "unknown"), syntax);
 	    if (render)
 		fwrite (render, 1, len, stdout);
-	    putchar ('\n');
+	    printf ("\n");
 	}
     }
 }
@@ -155,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... */
@@ -173,17 +186,65 @@ static void cmd_show (ZOOM_connection *c, ZOOM_resultset *r,
     }
 }
 
+static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
+                     ZOOM_options options,
+                     const char **args)
+{
+    ZOOM_package p[MAX_CON];
+    
+    int i;
+    
+    for (i = 0; i<MAX_CON; i++)
+    {
+	if (c[i])
+        {
+            p[i] = ZOOM_connection_package (c[i], 0);
+            ZOOM_package_send(p[i], "itemorder");
+        }
+        else
+            p[i] = 0;
+    }
+
+    while (ZOOM_event (MAX_CON, c))
+	;
+
+    for (i = 0; i<MAX_CON; i++)
+    {
+	int error;
+	const char *errmsg, *addinfo, *dset;
+	/* display errors if any */
+	if (!p[i])
+	    continue;
+	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,
+		     dset, error, addinfo);
+	else if (p[i])
+	{
+            printf ("ok\n");
+	}
+        ZOOM_package_destroy (p[i]);
+    }
+}
+
 static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
 			ZOOM_options options,
 			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))
+    {
+	fprintf (stderr, "Bad PQF: %s\n", query_str);
 	return;
     }
     for (i = 0; i<MAX_CON; i++)
@@ -203,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 */
@@ -235,7 +296,8 @@ static void cmd_help (ZOOM_connection *c, ZOOM_resultset *r,
     printf ("show [<start> [<count>]\n");
     printf ("quit\n");
     printf ("close <zurl>\n");
-    printf ("set <option> [<value>]]\n");
+    printf ("set <option> [<value>]\n");
+    printf ("get <option>\n");
     printf ("\n");
     printf ("options:\n");
     printf (" start\n");
@@ -252,6 +314,8 @@ static void cmd_help (ZOOM_connection *c, ZOOM_resultset *r,
     printf (" user\n");
     printf (" pass\n");
     printf (" implementationName\n");
+    printf (" charset\n");
+    printf (" lang\n");
 }
 
 static void cmd_connect (ZOOM_connection *c, ZOOM_resultset *r,
@@ -312,22 +376,31 @@ static int cmd_parse (ZOOM_connection *c, ZOOM_resultset *r,
 	return 0;
     else if (is_command ("set", cmd_str, cmd_len))
 	cmd_set (c, r, options, buf);
+    else if (is_command ("get", cmd_str, cmd_len))
+	cmd_get (c, r, options, buf);
     else if (is_command ("connect", cmd_str, cmd_len))
 	cmd_connect (c, r, options, buf);
+    else if (is_command ("open", cmd_str, cmd_len))
+	cmd_connect (c, r, options, buf);
     else if (is_command ("search", cmd_str, cmd_len))
 	cmd_search (c, r, options, buf);
+    else if (is_command ("find", cmd_str, cmd_len))
+	cmd_search (c, r, options, buf);
     else if (is_command ("show", cmd_str, cmd_len))
 	cmd_show (c, r, options, buf);
     else if (is_command ("close", cmd_str, cmd_len))
 	cmd_close (c, r, options, buf);
     else if (is_command ("help", cmd_str, cmd_len))
 	cmd_help(c, r, options, buf);
+    else if (is_command ("ext", cmd_str, cmd_len))
+	cmd_ext(c, r, options, buf);
     else
 	printf ("unknown command %.*s\n", cmd_len, cmd_str);
     return 2;
 }
 
-void shell(ZOOM_connection *c, ZOOM_resultset *r, ZOOM_options options)
+void shell(ZOOM_connection *c, ZOOM_resultset *r,
+           ZOOM_options options)
 {
     while (1)
     {