/*
- * $Id: zoomsh.c,v 1.21 2003-07-09 23:00:21 mike Exp $
+ * Copyright (C) 1995-2005, Index Data ApS
+ * See the file LICENSE for details.
*
- * ZOOM-C Shell
+ * $Id: zoomsh.c,v 1.35 2005-06-06 12:32:03 adam Exp $
*/
+/* ZOOM-C Shell */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <yaz/comstack.h>
+
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
#endif
}
}
-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)
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)
{
- const char *syntax_oid = oid_name_to_dotstring(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, syntax_oid);
+ 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);
}
+
}
}
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;
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]);
}
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,
{
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);
}
}
}
+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)
printf (" piggyback\n");
printf (" group\n");
printf (" user\n");
- printf (" pass\n");
+ printf (" password\n");
printf (" implementationName\n");
printf (" charset\n");
printf (" lang\n");
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;
}
}
-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;
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);
}
projects / yaz-moved-to-github.git / blobdiff