X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=342e54666d308ece331283e601113a953de66e8f;hb=f1fef5aeb2f4aad16d5c66e7ed4b58def0a26464;hp=2983b43ee2d96718d5fc1957ebada34280528fb4;hpb=72a7de6dfe07d7079de3c287aecdeb0f164c78b8;p=yaz-moved-to-github.git

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 2983b43..342e546 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomsh.c,v 1.20 2003-05-26 11:35:46 adam Exp $
+ * $Id: zoomsh.c,v 1.25 2004-01-12 12:10:44 adam Exp $
  *
  * ZOOM-C Shell
  */
@@ -21,6 +21,7 @@
 #include <yaz/log.h>
 #include <yaz/nmem.h>
 #include <yaz/zoom.h>
+#include <yaz/oid.h>
 
 #define MAX_CON 100
 
@@ -152,17 +153,24 @@ static void display_records (ZOOM_connection c,
 	int pos = i + start;
         ZOOM_record rec = ZOOM_resultset_record (r, pos);
 	const char *db = ZOOM_record_get (rec, "database", 0);
-	int len;
+	int len, opac_len;
 	const char *render = ZOOM_record_get (rec, "render", &len);
+	const char *opac_render = ZOOM_record_get (rec, "opac", &opac_len);
 	const char *syntax = ZOOM_record_get (rec, "syntax", 0);
 	/* if rec is non-null, we got a record for display */
 	if (rec)
 	{
-	    printf ("%d %s %s\n", pos+1, (db ? db : "unknown"), syntax);
+	    char oidbuf[100];
+	    (void) oid_name_to_dotstring(CLASS_RECSYN, syntax, oidbuf);
+	    printf ("%d %s %s (%s)\n",
+		    pos+1, (db ? db : "unknown"), syntax, oidbuf);
 	    if (render)
 		fwrite (render, 1, len, stdout);
 	    printf ("\n");
+	    if (opac_render)
+		fwrite (opac_render, 1, opac_len, stdout);
 	}
+	    
     }
 }
 
@@ -212,15 +220,19 @@ static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
                      const char **args)
 {
     ZOOM_package p[MAX_CON];
+    char ext_type_str[10];
     
     int i;
+
+    if (next_token_copy (args, ext_type_str, sizeof(ext_type_str)) < 0)
+	return;
     
     for (i = 0; i<MAX_CON; i++)
     {
 	if (c[i])
         {
             p[i] = ZOOM_connection_package (c[i], 0);
-            ZOOM_package_send(p[i], "itemorder");
+            ZOOM_package_send(p[i], ext_type_str);
         }
         else
             p[i] = 0;
@@ -343,7 +355,8 @@ static void cmd_scan (ZOOM_connection *c, ZOOM_resultset *r,
             {
                 int occ = 0;
                 int len = 0;
-                const char *term = ZOOM_scanset_term(s[i], p, &occ, &len);
+                const char *term = ZOOM_scanset_display_term(s[i], p,
+				&occ, &len);
                 fwrite(term, 1, len, stdout);
                 printf (" %d\n", occ);
             }