* Copyright (c) 1995-2002, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.159 2002-06-17 14:57:34 ja7 Exp $
+ * $Id: client.c,v 1.161 2002-07-12 12:20:34 ja7 Exp $
*/
#include <stdio.h>
#include <yaz/yaz-util.h>
-#include <yaz/tcpip.h>
-#ifdef USE_XTIMOSI
-#include <yaz/xmosi.h>
-#endif
+#include <yaz/comstack.h>
#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
+#include <unistd.h>
#endif
#if HAVE_READLINE_HISTORY_H
#include <readline/history.h>
yaz_oi_APDU(apdu, &p);
- if (p0=yaz_oi_update(p, out, NULL, 0, 0)) {
+ if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) {
ODR_MASK_SET(req->options, Z_Options_negotiationModel);
p0->which = Z_OtherInfo_externallyDefinedInfo;
{
void *add;
char type_and_host[101], base[101];
- CS_TYPE t;
if (conn)
{
session_mem = NULL;
}
}
- if (strncmp (arg, "unix:", 5) == 0)
- {
+ if (strncmp (arg, "unix:", 5) == 0)
+ {
base[0] = '\0';
conn = cs_create_host(arg, 1, &add);
- }
- else
- {
- t = tcpip_type;
- base[0] = '\0';
- if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1)
- return 0;
-
- if(yazProxy)
- conn = cs_create_host(yazProxy, 1, &add);
- else
- conn = cs_create_host(type_and_host, 1, &add);
-
+ }
+ else
+ {
+ base[0] = '\0';
+ if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1)
+ return 0;
+ if (yazProxy)
+ conn = cs_create_host(yazProxy, 1, &add);
+ else
+ conn = cs_create_host(type_and_host, 1, &add);
}
if (!conn)
{
odr_perror(in, "Decoding constructed record.");
fprintf(stderr, "[Near %d]\n", odr_offset(in));
fprintf(stderr, "Packet dump:\n---------\n");
- odr_dumpBER(stderr, (char*)r->u.octet_aligned->buf,
- r->u.octet_aligned->len);
+ odr_dumpBER(stderr, (char*)r->u.octet_aligned->buf,r->u.octet_aligned->len);
fprintf(stderr, "---------\n");
- exit(1);
- }
- /*
- * Note: we throw away the original, BER-encoded record here.
- * Do something else with it if you want to keep it.
- */
- r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */
- r->which = type->what;
+
+ /* note just ignores the error ant print the bytes form the octet_aligned laiter */
+ } else {
+ /*
+ * Note: we throw away the original, BER-encoded record here.
+ * Do something else with it if you want to keep it.
+ */
+ r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */
+ r->which = type->what;
+ };
}
}
if (ent && ent->oclass != CLASS_RECSYN)
(int *) odr_malloc(out, sizeof(int));
*r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno;
-#if YAZ_MODULE_ill
if (!strcmp (type, "item") || !strcmp(type, "2"))
{
printf ("using item-request\n");
else
r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
-#else
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
-#endif
return r;
}
static void initialize(void)
{
-#if YAZ_MODULE_ccl
FILE *inf;
-#endif
if (!(out = odr_createmem(ODR_ENCODE)) ||
!(in = odr_createmem(ODR_DECODE)) ||
!(print = odr_createmem(ODR_PRINT)))
if (apdu_file)
odr_setprint(print, apdu_file);
-#if YAZ_MODULE_ccl
bibset = ccl_qual_mk ();
inf = fopen (ccl_fields, "r");
if (inf)
ccl_qual_file (bibset, inf);
fclose (inf);
}
-#endif
cmd_base("Default");
#if HAVE_READLINE_READLINE_H
}
+int cmd_cclparse(char* arg) {
+ int error, pos;
+ struct ccl_rpn_node *rpn=NULL;
+
+
+ rpn = ccl_find_str (bibset, arg, &error, &pos);
+
+ if (error) {
+ printf ("%*s^ - ", 3+strlen(last_cmd)+1+pos, " ");
+ printf ("%s\n", ccl_err_msg (error));
+ }
+ else
+ {
+ if (rpn)
+ {
+ ccl_pr_tree(rpn, stdout);
+ }
+ }
+ if (rpn)
+ ccl_rpn_delete(rpn);
+
+ printf ("\n");
+
+ return 0;
+};
+
+
static int cmd_help (char *line);
typedef char *(*completerFunctionType)(const char *text, int state);
int (*fun)(char *arg);
char *ad;
completerFunctionType rl_completerfunction;
- //char *(*rl_completerfunction)(const char *text, int state);
int complete_filenames;
char **local_tabcompletes;
} cmd[] = {
{"!", cmd_subshell, "Subshell command",NULL,1,NULL},
{"set_apdufile", cmd_set_apdufile, "<filename>",NULL,1,NULL},
{"set_marcdump", cmd_set_marcdump," <filename>",NULL,1,NULL},
- {"set_cclfiele", cmd_set_cclfields," <filename>",NULL,1,NULL},
+ {"set_cclfile", cmd_set_cclfields," <filename>",NULL,1,NULL},
{"register_oid", cmd_register_oid,"<name> <class> <oid>",NULL,0,NULL},
{"push_command", cmd_push_command,"<command>",command_generator,0,NULL},
{"register_tab", cmd_register_tab,"<commandname> <tab>",command_generator,0,NULL},
+ {"cclparse", cmd_cclparse,"<ccl find command>",NULL,0,NULL},
/* Server Admin Functions */
{"adm-reindex", cmd_adm_reindex, "<database-name>",NULL,0,NULL},
{"adm-truncate", cmd_adm_truncate, "('database'|'index')<object-name>",NULL,0,NULL},
int cmd_register_tab(char* arg) {
char command[101], tabargument[101];
- int i, res;
+ int i;
int num_of_tabs;
char** tabslist;
tabslist=cmd[i].local_tabcompletes;
tabslist[num_of_tabs]=strdup(tabargument);
tabslist[num_of_tabs+1]=NULL;
+ return 1;
}
+
void process_cmd_line(char* line)
{
int i,res;
exit (1);
}
break;
- case 'c':
- strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
- ccl_fields[sizeof(ccl_fields)-1] = '\0';
- break;
+ case 'c':
+ strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
+ ccl_fields[sizeof(ccl_fields)-1] = '\0';
+ break;
case 'a':
if (!strcmp(arg, "-"))
apdu_file=stderr;
else
apdu_file=fopen(arg, "a");
break;
- case 'p':
- yazProxy=strdup(arg);
- break;
+ case 'p':
+ yazProxy=strdup(arg);
+ break;
case 'u':
if (!auth_command)
{