* Copyright (c) 1995-2002, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.160 2002-06-18 21:30:25 adam Exp $
+ * $Id: client.c,v 1.163 2002-08-26 12:15:35 adam Exp $
*/
#include <stdio.h>
char *charset=NULL, *lang=NULL;
int selected;
- yaz_get_response_charneg(session_mem, p, &charset, &lang, &selected);
+ yaz_get_response_charneg(session_mem, p, &charset, &lang,
+ &selected);
- printf("Accepted character set : `%s'\n", charset);
- printf("Accepted code language : `%s'\n", lang);
+ printf("Accepted character set : %s\n", charset);
+ printf("Accepted code language : %s\n", lang ? lang : "none");
printf("Accepted records in ...: %d\n", selected );
}
}
num_databaseNames = 0;
while (1)
{
+ char *cp1;
if (!(cp = strchr(arg, ' ')))
cp = arg + strlen(arg);
if (cp - arg < 1)
break;
databaseNames[num_databaseNames] = (char *)xmalloc (1 + cp - arg);
memcpy (databaseNames[num_databaseNames], arg, cp - arg);
- databaseNames[num_databaseNames++][cp - arg] = '\0';
+ databaseNames[num_databaseNames][cp - arg] = '\0';
+
+ for (cp1 = databaseNames[num_databaseNames]; *cp1 ; cp1++)
+ if (*cp1 == '+')
+ *cp1 = ' ';
+ num_databaseNames++;
+
if (!*cp)
break;
arg = cp+1;
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)
if (qe->u.term->queryTerm)
{
Z_Term *term = qe->u.term->queryTerm;
- if (term->which == Z_Term_general)
+ switch (term->which)
+ {
+ case Z_Term_general:
printf (" %.*s", term->u.general->len, term->u.general->buf);
+ break;
+ case Z_Term_characterString:
+ printf (" %s", term->u.characterString);
+ break;
+ case Z_Term_numeric:
+ printf (" %d", *term->u.numeric);
+ break;
+ case Z_Term_null:
+ printf (" null");
+ break;
+ }
}
}
-
}
/* see if we can find USR:SearchResult-1 */
int cmd_charset(char* arg)
{
- if (*arg == '\0') {
- printf("Current character set is `%s'\n", (yazCharset)?yazCharset:NULL);
+ char l1[30], l2[30];
+
+ *l1 = *l2 = 0;
+ if (sscanf(arg, "%29s %29s", l1, l2) < 1)
+ {
+ printf("Current character set is `%s'\n", (yazCharset) ?
+ yazCharset:NULL);
return 1;
}
xfree (yazCharset);
yazCharset = NULL;
- if (*arg)
+ if (*l1)
+ yazCharset = xstrdup(l1);
+ if (*l2)
{
- yazCharset = (char *) xmalloc (strlen(arg)+1);
- strcpy (yazCharset, arg);
- }
+ odr_set_charset (out, l1, l2);
+ odr_set_charset (in, l2, l1);
+ }
return 1;
}
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},
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)
{