X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=2d592213684135a926e257f1cc46f0265ad9a60b;hb=8a616a92f7c17554add083af9163a8dd2d91694b;hp=0196c81e88ad524c05fba937b7aa02279a21253e;hpb=4fb9818b0657f561397b29e55d87cc8d4f194436;p=yaz-moved-to-github.git

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 0196c81..2d59221 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2002-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoomsh.c,v 1.26 2004-01-16 10:04:55 adam Exp $
+ * $Id: zoomsh.c,v 1.35 2005-06-06 12:32:03 adam Exp $
  */
 
 /* ZOOM-C Shell */
@@ -12,6 +12,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include <yaz/comstack.h>
+
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h> 
 #endif
@@ -257,7 +259,14 @@ static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
 		     dset, error, addinfo);
 	else if (p[i])
 	{
+	    const char *v;
             printf ("ok\n");
+	    v = ZOOM_package_option_get (p[i], "targetReference");
+	    if (v)
+		printf("targetReference: %s\n", v);
+	    v = ZOOM_package_option_get (p[i], "xmlUpdateDoc");
+	    if (v)
+		printf("xmlUpdateDoc: %s\n", v);
 	}
         ZOOM_package_destroy (p[i]);
     }
@@ -267,7 +276,7 @@ static void cmd_debug (ZOOM_connection *c, ZOOM_resultset *r,
                        ZOOM_options options,
                        const char **args)
 {
-    yaz_log_init_level(LOG_ALL);
+    yaz_log_init_level(YLOG_ALL);
 }
 
 static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
@@ -368,6 +377,25 @@ static void cmd_scan (ZOOM_connection *c, ZOOM_resultset *r,
     }
 }
 
+static void cmd_sort (ZOOM_connection *c, ZOOM_resultset *r,
+                      ZOOM_options options,
+                      const char **args)
+{
+    const char *sort_spec = *args;
+    int i;
+    
+    while (*sort_spec == ' ')
+        sort_spec++;
+    
+    for (i = 0; i<MAX_CON; i++)
+    {
+        if (r[i])
+            ZOOM_resultset_sort(r[i], "yaz", sort_spec);
+    }
+    while (ZOOM_event(MAX_CON, c))
+        ;
+}
+
 static void cmd_help (ZOOM_connection *c, ZOOM_resultset *r,
 		      ZOOM_options options,
 		      const char **args)
@@ -479,6 +507,8 @@ static int cmd_parse (ZOOM_connection *c, ZOOM_resultset *r,
 	cmd_debug(c, r, options, buf);
     else if (is_command ("scan", cmd_str, cmd_len))
 	cmd_scan(c, r, options, buf);
+    else if (is_command ("sort", cmd_str, cmd_len))
+	cmd_sort(c, r, options, buf);
     else
 	printf ("unknown command %.*s\n", cmd_len, cmd_str);
     return 2;
@@ -519,14 +549,13 @@ void shell(ZOOM_connection *c, ZOOM_resultset *r,
     }
 }
 
-int main (int argc, char **argv)
+static void zoomsh(int argc, char **argv)
 {
     ZOOM_options options = ZOOM_options_create();
     int i, res;
     ZOOM_connection z39_con[MAX_CON];
     ZOOM_resultset  z39_res[MAX_CON];
 
-    nmem_init();
     for (i = 0; i<MAX_CON; i++)
     {
 	z39_con[i] = 0;
@@ -553,6 +582,30 @@ int main (int argc, char **argv)
 	ZOOM_connection_destroy(z39_con[i]);
 	ZOOM_resultset_destroy(z39_res[i]);
     }
+}
+
+int main(int argc, char **argv)
+{
+    const char *maskstr = 0;
+    if (argc > 2 && !strcmp(argv[1], "-v"))
+    {
+        maskstr = argv[2];
+        argv += 2;
+        argc -= 2;
+    }
+    else if (argc > 1 && !strncmp(argv[1], "-v", 2))
+    {
+        maskstr = argv[1]+2;
+        argv++;
+        argc--;
+    }
+    if (maskstr)
+    {
+        int mask = yaz_log_mask_str(maskstr);
+        yaz_log_init_level(mask);
+    }
+    nmem_init();
+    zoomsh(argc, argv);
     nmem_exit();
     exit (0);
 }