/*
- * $Id: zoomsh.c,v 1.19 2003-04-23 20:39:25 adam Exp $
+ * $Id: zoomsh.c,v 1.21 2003-07-09 23:00:21 mike Exp $
*
* ZOOM-C Shell
*/
#include <yaz/log.h>
#include <yaz/nmem.h>
#include <yaz/zoom.h>
+#include <yaz/oid.h>
#define MAX_CON 100
}
}
+static const char *oid_name_to_dotstring(const char *name) {
+ struct oident ent;
+ int oid[OID_SIZE];
+ static char oidbuf[100]; /* ### bad interface */
+ int i;
+
+ /* Translate syntax to oid_val */
+ oid_value value = oid_getvalbyname(name);
+
+ /* Build it into an oident */
+ ent.proto = PROTO_Z3950;
+ ent.oclass = CLASS_RECSYN;
+ ent.value = value;
+
+ /* Translate to an array of int */
+ (void) oid_ent_to_oid(&ent, oid);
+
+ /* Write the array of int into a dotted string (phew!) */
+ oidbuf[0] = '\0';
+ for (i = 0; oid[i] != -1; i++) {
+ char tmpbuf[20];
+ sprintf(tmpbuf, "%d", oid[i]);
+ if (i > 0) strcat(oidbuf, ".");
+ strcat(oidbuf, tmpbuf);
+ }
+
+ return oidbuf;
+}
+
static void display_records (ZOOM_connection c,
ZOOM_resultset r,
int start, int count)
/* if rec is non-null, we got a record for display */
if (rec)
{
- printf ("%d %s %s\n", pos+1, (db ? db : "unknown"), syntax);
+ const char *syntax_oid = oid_name_to_dotstring(syntax);
+ printf ("%d %s %s (%s)\n",
+ pos+1, (db ? db : "unknown"), syntax, syntax_oid);
if (render)
fwrite (render, 1, len, stdout);
printf ("\n");
size_t p, sz = ZOOM_scanset_size(s[i]);
for (p = 0; p < sz; p++)
{
- int occ = 0;
- size_t len = 0;
+ int occ = 0;
+ int len = 0;
const char *term = ZOOM_scanset_term(s[i], p, &occ, &len);
fwrite(term, 1, len, stdout);
printf (" %d\n", occ);