Add OID for External XMLES too

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

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index be86ef6..2d59221 100644 (file)
--- 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.29 2004-04-29 08:54:56 adam Exp $
+ * $Id: zoomsh.c,v 1.35 2005-06-06 12:32:03 adam Exp $
  */
 
 /* ZOOM-C Shell */
@@ -259,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]);
     }
@@ -269,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,
@@ -542,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;
@@ -576,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);
 }