-/* $Id: zebrash.c,v 1.29 2004-08-25 09:23:36 adam Exp $
- Copyright (C) 2002,2003,2004
- Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 2004-2013 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/*
+/*
zebrash.c - command-line interface to zebra API
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
-#include <string.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>
+#include <readline/readline.h>
#endif
#if HAVE_READLINE_HISTORY_H
#include <readline/history.h>
#include <yaz/sortspec.h>
#include <yaz/options.h>
#include <yaz/wrbuf.h>
+#include <yaz/oid_db.h>
#define MAX_NO_ARGS 32
#define MAX_OUT_BUFF 4096
/* 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
*/
-
+
static int split_args( char *line, char** args )
-{ /* splits line into individual null-terminated strings,
+{ /* splits line into individual null-terminated strings,
* returns pointers to them in args */
/* FIXME - do we need to handle quoted args ?? */
char *p=line;
while (*p==' ' || *p=='\t' || *p=='\n')
p++;
if (*p=='#') /* skip comments */
- break;
+ break;
args[i++]=p;
args[i]=0;
while (*p && *p!=' ' && *p!='\t' && *p!='\n' && *p!='#')
return args[0]+skiplen;
}
-int onecommand( char *line, WRBUF outbuff, const char *prevout);
+int onecommand( char *line, WRBUF outbuff, const char *prevout);
/**************************************
* Simple support commands
wrbuf_printf(outbuff,"%s\n",restargs(args,1));
return 0;
}
-
+
int cmd_quit( char *args[], WRBUF outbuff)
{
if (zs)
/**************************************
* Tests for starting and stopping zebra, etc
*/
-
-static int cmd_help( char *args[], WRBUF outbuff);
-
+
+static int cmd_help( char *args[], WRBUF outbuff);
+
static int cmd_zebra_start( char *args[], WRBUF outbuff)
{
char *conf=args[1];
}
return 0; /* ok */
}
-
+
static int cmd_zebra_stop( char *args[], WRBUF outbuff)
{
if (!zs)
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 */
static int cmd_logf( char *args[], WRBUF outbuff)
{
int lev = defargint(args[1],0);
- int i=1;
+ int i=1;
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, "%s", restargs(args,i));
return 0; /* ok */
}
-
+
/****************
- * Error handling
+ * Error handling
*/
static int cmd_err ( char *args[], WRBUF outbuff)
{
wrbuf_printf(outbuff, "errCode: %d \nerrStr: %s\nerrAdd: %s \n",
zebra_errCode (zh),
- zebra_errString (zh),
+ zebra_errString (zh),
zebra_errAdd (zh) );
return 0; /* ok */
}
static int cmd_erradd ( char *args[], WRBUF outbuff)
{
wrbuf_printf(outbuff, "errAdd: %s \n",
- zebra_errAdd (zh) );
+ zebra_errAdd (zh) );
return 0; /* ok */
}
wrbuf_printf(outbuff,"Selecting database '%s'\n",db);
return zebra_select_database(zh, db);
}
-
+
static int cmd_create_database( char *args[], WRBUF outbuff)
{
char *db=defarg(args[1],DEFAULTDATABASE);
wrbuf_printf(outbuff,"Creating database '%s'\n",db);
-
+
return zebra_create_database(zh, db);
}
static int cmd_record_insert( char *args[], WRBUF outbuff)
{
- SYSNO sysno=0;
+ zint sysno = 0;
int rc;
char *rec=restargs(args,1);
-
- rc = zebra_insert_record(zh,
+
+ rc = zebra_update_record(zh,
+ action_insert,
0, /* record type */
&sysno,
0, /* match */
0, /* fname */
rec,
- strlen(rec),
- 0);
+ strlen(rec));
if (0==rc)
{
- wrbuf_printf(outbuff,"ok sysno=%d\n",sysno);
+ wrbuf_printf(outbuff,"ok sysno=" ZINT_FORMAT "\n",sysno);
}
return rc;
}
onecommand("help exchange_record", outbuff, "");
return -90;
}
- rc=zebra_admin_exchange_record(zh, rec, strlen(rec),
- id, strlen(id), atoi(action));
+
+ rc = zebra_update_record(zh, action_update, 0 /* record_type */,
+ 0 /* sysno */,
+ id /* match */,
+ 0 /* fname */,
+ rec, strlen(rec));
return rc;
}
* 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);
+ wrbuf_printf(outbuff, "find %s\n",wrbuf_cstr(qry));
+ rc = zebra_search_PQF(zh, wrbuf_cstr(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_destroy(qry);
return rc;
}
ODR odr;
Z_RecordComposition *pcomp=0;
int i;
- oid_value format;
- odr=odr_createmem(ODR_ENCODE);
+ odr = odr_createmem(ODR_ENCODE);
recs= odr_malloc(odr,sizeof(ZebraRetrievalRecord)*nrecs);
rc =z_RecordComposition(odr, &pcomp, 0,"recordComposition");
- format=oid_getvalbyname ("xml"); /*FIXME - let the user specify*/
+
for (i=0;i<nrecs;i++)
recs[i].position=start+i;
- rc = zebra_records_retrieve (zh, odr, setname,
- pcomp, format, nrecs,recs);
+ rc = zebra_records_retrieve(zh, odr, setname,
+ pcomp, yaz_oid_recsyn_xml, nrecs,recs);
if (0==rc)
{
for (i=0;i<nrecs;i++)
*/
/**************************************)
- * Command table, parser, and help
+ * Command table, parser, and help
*/
struct cmdstruct
int (*testfunc)(char *args[], WRBUF outbuff);
} ;
-
+
struct cmdstruct cmds[] = {
/* special cases:
* if text is 0, does not list the command
* if cmd is "", adds the args (and newline) in command listing
*/
{ "", "Starting and stopping:", "", 0 },
- { "zebra_start",
- "[configfile]",
+ { "zebra_start",
+ "[configfile]",
"starts the zebra service. You need to call this first\n"
- "if no configfile is given, assumes " DEFAULTCONFIG,
+ "if no configfile is given, assumes " DEFAULTCONFIG,
cmd_zebra_start },
- { "zebra_stop", "",
- "stops the zebra service",
+ { "zebra_stop", "",
+ "stops the zebra service",
cmd_zebra_stop },
- { "zebra_open", "",
+ { "zebra_open", "",
"starts a zebra session. Once you have called zebra_start\n"
- "you can call zebra_open to start working",
+ "you can call zebra_open to start working",
cmd_zebra_open },
- { "zebra_close", "",
- "closes a zebra session",
- cmd_zebra_close },
- { "quickstart", "[configfile]",
- "Does a zebra_start, zebra_open, and sets up the log",
- cmd_quickstart },
-
- { "", "Log file:","", 0},
- { "yaz_log_file",
+ { "zebra_close", "",
+ "closes a zebra session",
+ cmd_zebra_close },
+ { "quickstart", "[configfile]",
+ "Does a zebra_start, zebra_open, and sets up the log",
+ cmd_quickstart },
+
+ { "", "Log file:","", 0},
+ { "yaz_log_file",
"[filename]",
"Directs the log to filename (or stderr)",
cmd_yaz_log_file },
- { "yaz_log_level",
+ { "yaz_log_level",
"[level]",
"Sets the logging level (or returns to default)",
cmd_yaz_log_level },
- { "yaz_log_prefix",
+ { "yaz_log_prefix",
"[prefix]",
"Sets the log prefix",
- cmd_yaz_log_prefix},
- { "logf",
+ cmd_yaz_log_prefix},
+ { "yaz_log",
"[level] text...",
"writes an entry in the log",
- cmd_logf},
+ cmd_logf},
{ "", "Error handling:","", 0},
{ "err", "",
"Displays zebra's error status (code, str, add)",
- cmd_err},
+ cmd_err},
{ "errcode", "",
"Displays zebra's error code",
- cmd_errcode},
+ cmd_errcode},
{ "errstr", "",
"Displays zebra's error string",
- cmd_errstr},
+ cmd_errstr},
{ "erradd", "",
"Displays zebra's additional error message",
- cmd_erradd},
-
- { "", "Admin:","", 0},
+ cmd_erradd},
+
+ { "", "Admin:","", 0},
{ "init", "",
"Initializes the zebra database, destroying all data in it",
- cmd_init},
+ cmd_init},
{ "select_database", "basename",
"Selects a database",
- cmd_select_database},
+ cmd_select_database},
{ "create_database", "basename",
"Create database",
cmd_create_database},
{ "sort","sortspec",
"sorts a result set. (example spec: 1=4 >)",
cmd_sort},
-
- { "", "Misc:","", 0},
- { "echo", "string",
- "ouputs the string",
+
+ { "", "Misc:","", 0},
+ { "echo", "string",
+ "ouputs the string",
cmd_echo },
- { "q", "",
- "exits the program",
+ { "q", "",
+ "exits the program",
cmd_quit },
- { "quit", "",
- "exits the program",
+ { "quit", "",
+ "exits the program",
cmd_quit },
- { "help", "[command]",
- "Gives help on command, or lists them all",
+ { "help", "[command]",
+ "Gives help on command, or lists them all",
cmd_help },
- { "", "help [command] gives more info on command", "",0 },
-
+ { "", "help [command] gives more info on command", "",0 },
+
{0,0,0,0} /* end marker */
};
-
-int onecommand(
+
+int onecommand(
char *line, /* input line */
WRBUF outbuff, /* output goes here */
const char *prevout) /* prev output, for 'expect' */
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 *));*/
nargs=split_args(argbuf, args);
-
+
#if 0
for (i = 0; i <= n; i++)
{
if (0==nargs)
return -90; /* no command on line, too bad */
- if (0==strcmp(args[0],"expect"))
+ if (0==strcmp(args[0],"expect"))
{
char *rest;
if (nargs>1) /* args[0] is not yet set, can't use restargs */
if (0==strstr(prevout,rest))
{
printf( "Failed expectation, '%s' not found\n", rest);
- exit(9);
+ exit(9);
}
return 0;
}
for (i=0;cmds[i].cmd;i++)
- if (0==strcmp(cmds[i].cmd, args[0]))
+ if (0==strcmp(cmds[i].cmd, args[0]))
{
if (nargs>1)
args[0]= line + (args[1]-argbuf); /* rest of the line */
else
- args[0]="";
+ args[0]="";
return ((cmds[i].testfunc)(args,outbuff));
}
wrbuf_printf(outbuff, "Unknown command '%s'. Try help\n",args[0]);
- logf(LOG_APP,"Unknown command");
- return -90;
+ yaz_log(log_level,"Unknown command");
+ return -90;
}
-
+
static int cmd_help( char *args[], WRBUF outbuff)
-{
+{
int i;
int linelen;
- if (args[1])
- { /* help for a single command */
+ if (args[1])
+ { /* help for a single command */
for (i=0;cmds[i].cmd;i++)
- if (0==strcmp(cmds[i].cmd, args[1]))
+ if (0==strcmp(cmds[i].cmd, args[1]))
{
wrbuf_printf(outbuff,"%s %s\n%s\n",
- cmds[i].cmd, cmds[i].args,
+ cmds[i].cmd, cmds[i].args,
cmds[i].explanation);
return 0;
}
wrbuf_printf(outbuff, "Unknown command '%s'", args[1]);
}
- else
+ else
{ /* list all commands */
linelen=9999;
for (i=0;cmds[i].cmd;i++)
}
return 0;
}
-
+
/* If Zebra reports an error after an operation,
* append it to the outbuff and log it */
-static void Zerrors ( WRBUF outbuff)
+static void Zerrors (WRBUF outbuff)
{
int ec;
if (!zh)
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",
ec, zebra_errString (zh),
zebra_errAdd (zh) );
- zebra_clearError(zh);
}
}
-/**************************************
+/**************************************
* The shell
*/
-
-void shell()
+
+void shell(void)
{
int rc=0;
WRBUF outbuff=wrbuf_alloc();
}
#endif
/* line_in != NULL if readine is present and input is a tty */
-
- printf (PROMPT);
+
+ printf (PROMPT);
fflush (stdout);
if (line_in)
{
strcpy(buf,line_in);
free (line_in);
}
- else
+ else
{
if (!fgets (buf, MAX_ARG_LEN-1, stdin))
- break;
+ break;
}
-
+
/* get rid of \n in line */
if ((nl_cp = strchr(buf, '\n')))
*nl_cp = '\0';
- strncpy(prevout, wrbuf_buf(outbuff), MAX_OUT_BUFF);
+ strncpy(prevout, wrbuf_cstr(outbuff), MAX_OUT_BUFF);
wrbuf_rewind(outbuff);
rc=onecommand(buf, outbuff, prevout);
if (rc==0)
{
wrbuf_puts(outbuff, " OK\n");
- logf(LOG_APP, "OK");
+ yaz_log(log_level, "OK");
}
else if (rc>-90)
{
wrbuf_printf(outbuff, " command returned %d\n",rc);
- }
+ }
Zerrors(outbuff);
- printf("%s\n", wrbuf_buf(outbuff));
+ printf("%s\n", wrbuf_cstr(outbuff));
} /* while */
- wrbuf_free(outbuff,1);
+ wrbuf_destroy(outbuff);
} /* shell() */
-static void usage()
+static void usage(void)
{
printf ("usage:\n");
printf ("zebrash [-c config]\n");
exit(1);
}
/**************************************
- * Main
+ * Main
*/
int main (int argc, char ** argv)
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 */
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff