-/* $Id: zebrash.c,v 1.29 2004-08-25 09:23:36 adam Exp $
- Copyright (C) 2002,2003,2004
- Index Data Aps
+/* $Id: zebrash.c,v 1.35 2005-09-13 11:51:06 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <unistd.h> /* for isatty */
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
/* time being, only one session works */
int nextrecno=1; /* record number to show next */
static char *default_config = DEFAULTCONFIG;
+static int log_level=0;
+
/**************************************
* Help functions
if (!zs)
wrbuf_puts(outbuff,"zebra seems not to have been started, "
"trying anyway\n");
- zh=zebra_open(zs);
+ zh = zebra_open(zs, 0);
return 0; /* ok */
}
rc=onecommand("yaz_log_file zebrash.log",outbuff,"");
if (!rc)
rc=onecommand("yaz_log_prefix ZebraSh", outbuff,"");
- sprintf(tmp, "yaz_log_level 0x%x", LOG_DEFAULT_LEVEL | LOG_APP);
+ sprintf(tmp, "yaz_log_level 0x%x", YLOG_DEFAULT_LEVEL | log_level );
if (!rc)
rc=onecommand(tmp,outbuff,"");
- logf(LOG_APP,"quickstart");
+ yaz_log(log_level,"quickstart");
if (!zs)
if (!rc)
rc=onecommand("zebra_start",outbuff,"");
static int cmd_yaz_log_level( char *args[], WRBUF outbuff)
{
- int lev = defargint(args[1],LOG_DEFAULT_LEVEL);
+ int lev = defargint(args[1],YLOG_DEFAULT_LEVEL);
wrbuf_printf(outbuff, "setting yaz-log to level %d (ox%x)\n",lev,lev);
yaz_log_init_level(lev);
return 0; /* ok */
if (lev)
i=2;
else
- lev=LOG_LOG; /* this is in the default set!*/
- logf( lev, restargs(args,i));
+ lev=YLOG_LOG; /* this is in the default set!*/
+ yaz_log( lev, restargs(args,i));
return 0; /* ok */
}
* Searching and retrieving
*/
-static int cmd_search_pqf( char *args[], WRBUF outbuff)
+static int cmd_search_pqf(char *args[], WRBUF outbuff)
{
- int hits=0;
- char *set=args[1];
- char *qry=restargs(args,2);
+ zint hits = 0;
+ char *set = args[1];
+ char *qry = restargs(args,2);
int rc;
- rc=zebra_search_PQF(zh, qry, set, &hits);
+ rc = zebra_search_PQF(zh, qry, set, &hits);
if (0==rc)
- wrbuf_printf(outbuff,"%d hits found\n",hits);
+ wrbuf_printf(outbuff, ZINT_FORMAT " hits found\n", hits);
return rc;
}
{
char *setname=DEFAULTRESULTSET;
int rc;
- int hits=0;
- WRBUF qry=wrbuf_alloc();
+ zint hits = 0;
+ WRBUF qry = wrbuf_alloc();
if (0==strstr(args[0],"@attr"))
wrbuf_puts(qry, "@attr 1=/ ");
wrbuf_puts(qry,restargs(args,1));
if (!zh)
onecommand("quickstart", outbuff, "");
wrbuf_printf(outbuff, "find %s\n",wrbuf_buf(qry));
- rc=zebra_search_PQF(zh, wrbuf_buf(qry), setname, &hits);
+ rc = zebra_search_PQF(zh, wrbuf_buf(qry), setname, &hits);
if (0==rc)
{
- wrbuf_printf(outbuff,"%d hits found\n",hits);
- nextrecno=1;
+ wrbuf_printf(outbuff, ZINT_FORMAT " hits found\n", hits);
+ nextrecno = 1;
}
- wrbuf_free(qry,1);
+ wrbuf_free(qry, 1);
return rc;
}
"[prefix]",
"Sets the log prefix",
cmd_yaz_log_prefix},
- { "logf",
+ { "yaz_log",
"[level] text...",
"writes an entry in the log",
cmd_logf},
char *args[MAX_NO_ARGS];
int nargs;
char argbuf[MAX_ARG_LEN];
- logf(LOG_APP,"%s",line);
+ yaz_log(log_level,"%s",line);
strncpy(argbuf,line, MAX_ARG_LEN-1);
argbuf[MAX_ARG_LEN-1]='\0'; /* just to be sure */
/*memset(args,'\0',MAX_NO_ARGS*sizeof(char *));*/
return ((cmds[i].testfunc)(args,outbuff));
}
wrbuf_printf(outbuff, "Unknown command '%s'. Try help\n",args[0]);
- logf(LOG_APP,"Unknown command");
+ yaz_log(log_level,"Unknown command");
return -90;
}
ec=zebra_errCode (zh);
if (ec)
{
- logf(LOG_APP, " Zebra error %d: %s, (%s)",
+ yaz_log(log_level, " Zebra error %d: %s, (%s)",
ec, zebra_errString (zh),
zebra_errAdd (zh) );
wrbuf_printf(outbuff, " Zebra error %d: %s, (%s)\n",
if (rc==0)
{
wrbuf_puts(outbuff, " OK\n");
- logf(LOG_APP, "OK");
+ yaz_log(log_level, "OK");
}
else if (rc>-90)
{
break;
case 'h':
usage();
+ /* FIXME - handle -v */
default:
fprintf(stderr, "bad option %s\n", arg);
usage();
}
}
+ log_level=yaz_log_module_level("zebrash");
+
shell();
return 0;
} /* main */