-/* $Id: zebrash.c,v 1.19 2003-07-04 14:27:19 heikki Exp $
- Copyright (C) 2002,2003
- Index Data Aps
+/* $Id: zebrash.c,v 1.42 2007-01-15 15:10:17 adam Exp $
+ Copyright (C) 1995-2007
+ Index Data ApS
This file is part of the Zebra server.
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
+
*/
/*
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
#include <readline/history.h>
#endif
-#include "zebraapi.h"
+#include <idzebra/api.h>
#include <yaz/log.h>
#include <yaz/proto.h>
+#include <yaz/sortspec.h>
+#include <yaz/options.h>
#include <yaz/wrbuf.h>
#define MAX_NO_ARGS 32
ZebraHandle zh=0; /* the current session */
/* 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
p++;
while (*p)
{
- while (*p==' ' || *p=='\t' || *p=='\n')
- p++;
- if (*p=='#') /* skip comments */
- break;
- args[i++]=p;
- args[i]=0;
- while (*p && *p!=' ' && *p!='\t' && *p!='\n' && *p!='#')
- p++;
- *p++='\0';
+ while (*p==' ' || *p=='\t' || *p=='\n')
+ p++;
+ if (*p=='#') /* skip comments */
+ break;
+ args[i++]=p;
+ args[i]=0;
+ while (*p && *p!=' ' && *p!='\t' && *p!='\n' && *p!='#')
+ p++;
+ *p++='\0';
}
n=i;
while (n<MAX_NO_ARGS)
- args[n++]=0;
+ args[n++]=0;
return i;
}
static char *defarg( char *arg, char *def )
{
if (!arg)
- return def;
+ return def;
if (!*arg)
- return def;
+ return def;
return arg;
}
static int defargint( char *arg, int def )
int v=def;
char *a=defarg(arg,0);
if (a)
- sscanf(a," %i", &v);
+ sscanf(a," %i", &v);
return v;
}
}
int onecommand( char *line, WRBUF outbuff, const char *prevout);
-
+
/**************************************
* Simple support commands
*/
{
char *conf=args[1];
if (!conf || !*conf) {
- wrbuf_puts(outbuff,"no config file specified, using "
- DEFAULTCONFIG "\n" );
- conf=DEFAULTCONFIG;
+ wrbuf_puts(outbuff,"no config file specified, using ");
+ wrbuf_puts(outbuff, default_config);
+ wrbuf_puts(outbuff, "\n");
+ conf=default_config;
}
zs=zebra_start(conf);
if (!zs) {
- wrbuf_puts(outbuff, "zebra_start failed" );
- return 2;
+ wrbuf_puts(outbuff, "zebra_start failed" );
+ return 2;
}
return 0; /* ok */
}
{
if (!zs)
wrbuf_puts(outbuff,"zebra seems not to have been started, "
- "stopping anyway\n");
+ "stopping anyway\n");
zebra_stop(zs);
zs=0;
return 0; /* ok */
static int cmd_zebra_open( char *args[], WRBUF outbuff)
{
if (!zs)
- wrbuf_puts(outbuff,"zebra seems not to have been started, "
- "trying anyway\n");
- zh=zebra_open(zs);
+ wrbuf_puts(outbuff,"zebra seems not to have been started, "
+ "trying anyway\n");
+ zh = zebra_open(zs, 0);
return 0; /* ok */
}
static int cmd_zebra_close( char *args[], WRBUF outbuff)
{
if (!zh)
- wrbuf_puts(outbuff,"Seems like you have not called zebra_open,"
- "trying anyway\n");
+ wrbuf_puts(outbuff,"Seems like you have not called zebra_open,"
+ "trying anyway\n");
zebra_close(zh);
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 */
int lev = defargint(args[1],0);
int i=1;
if (lev)
- i=2;
+ 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 */
}
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_errAdd (zh) );
+ zebra_errCode (zh),
+ zebra_errString (zh),
+ zebra_errAdd (zh) );
return 0; /* ok */
}
static int cmd_errcode ( char *args[], WRBUF outbuff)
{
wrbuf_printf(outbuff, "errCode: %d \n",
- zebra_errCode (zh));
+ zebra_errCode (zh));
return 0; /* ok */
}
static int cmd_errstr ( char *args[], WRBUF outbuff)
{
wrbuf_printf(outbuff, "errStr: %s\n",
- zebra_errString (zh));
+ zebra_errString (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 */
}
static int cmd_select_database ( char *args[], WRBUF outbuff)
{
char *db=defarg(args[1],DEFAULTDATABASE);
- wrbuf_puts(outbuff,"Selecting database 'Default'\n");
+ wrbuf_printf(outbuff,"Selecting database '%s'\n",db);
return zebra_select_database(zh, db);
}
{
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)
{
- int sysno=0;
+ zint sysno = 0;
int rc;
char *rec=restargs(args,1);
- rc=zebra_record_insert(zh,rec, strlen(rec), &sysno);
+ rc = zebra_insert_record(zh,
+ 0, /* record type */
+ &sysno,
+ 0, /* match */
+ 0, /* fname */
+ rec,
+ strlen(rec),
+ 0);
if (0==rc)
{
- wrbuf_printf(outbuff,"ok sysno=%d\n",sysno);
+ wrbuf_printf(outbuff,"ok sysno=" ZINT_FORMAT "\n",sysno);
}
return rc;
}
static int cmd_exchange_record( char *args[], WRBUF outbuff)
{
- char *base=args[1];
- char *id = args[2];
- char *action = args[3];
+ char *id = args[1];
+ char *action = args[2];
int rc;
- char *rec=restargs(args,4);
- if (!(base && id && action && args[4] ))
+ char *rec=restargs(args,3);
+ if (!(id && action && args[4] ))
{
- wrbuf_puts(outbuff,"Missing arguments!\n");
- onecommand("help exchange_record", outbuff, "");
- return -90;
+ wrbuf_puts(outbuff,"Missing arguments!\n");
+ onecommand("help exchange_record", outbuff, "");
+ return -90;
}
- rc=zebra_admin_exchange_record(zh, base, rec, strlen(rec),
+ rc=zebra_admin_exchange_record(zh, rec, strlen(rec),
id, strlen(id), atoi(action));
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, "");
+ 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;
}
int nrecs=defargint(args[2],1);
char *setname=defarg(args[3],DEFAULTRESULTSET);
int rc=0;
+ ZebraRetrievalRecord *recs;
ODR odr;
Z_RecordComposition *pcomp=0;
int i;
oid_value format;
odr=odr_createmem(ODR_ENCODE);
- ZebraRetrievalRecord *recs=
- odr_malloc(odr,sizeof(ZebraRetrievalRecord)*nrecs);
+ 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);
+ pcomp, format, nrecs,recs);
if (0==rc)
{
for (i=0;i<nrecs;i++)
} else
wrbuf_printf(outbuff,"NO Record %d\n", recs[i].position);
}
- nextrecno=start+nrecs+1;
+ nextrecno=start+nrecs;
}
odr_destroy(odr);
return rc;
-}
+} /* cmd_show */
+
+static int cmd_sort( char *args[], WRBUF outbuff)
+{
+ int rc=0;
+ ODR odr;
+ int sortstatus=0;
+ Z_SortKeySpecList *spec=0;
+ const char * inpsets[]={ DEFAULTRESULTSET, 0};
+ /* FIXME - allow the user to specify result sets in/out */
+
+ odr=odr_createmem(ODR_ENCODE);
+ spec=yaz_sort_spec (odr, restargs(args,1));
+ if (!spec)
+ rc=1;
+ if (!rc)
+ rc=zebra_sort(zh, odr,
+ 1, inpsets,
+ DEFAULTRESULTSET,
+ spec,
+ &sortstatus);
+ if (!rc)
+ wrbuf_printf(outbuff, "sort returned status %d\n",sortstatus);
+
+ odr_destroy(odr);
+ return rc;
+} /* cmd_sort */
+/*
+ *
+ * int bend_sort (void *handle, bend_sort_rr *rr)
+ * {
+ * ZebraHandle zh = (ZebraHandle) handle;
+ *
+ * zebra_sort (zh, rr->stream,
+ * rr->num_input_setnames, (const char **)
+ * rr->input_setnames,
+ * rr->output_setname,
+ * rr->sort_sequence,
+ * &rr->sort_status);
+ * zebra_result (zh, &rr->errcode,
+ * &rr->errstring);
+ * return 0;
+ * }
+ *
+ */
+
/**************************************)
* Command table, parser, and help
*/
"[prefix]",
"Sets the log prefix",
cmd_yaz_log_prefix},
- { "logf",
+ { "yaz_log",
"[level] text...",
"writes an entry in the log",
cmd_logf},
"inserts (1), updates (2), or deletes (3) a record \n"
"record-id must be a unique identifier for the record",
cmd_exchange_record},
+
{ "","Searching and retrieving:","",0},
{ "search_pqf","setname query",
"search ",
{ "s","[start] [numrecs] [resultset]",
"shows a result",
cmd_show},
+ { "sort","sortspec",
+ "sorts a result set. (example spec: 1=4 >)",
+ cmd_sort},
+
{ "", "Misc:","", 0},
{ "echo", "string",
"ouputs the string",
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==strcmp(args[0],"expect"))
{
- char *rest;
+ char *rest;
if (nargs>1) /* args[0] is not yet set, can't use restargs */
rest= line + (args[1]-argbuf); /* rest of the line */
else
return -1; /* need something to expect */
- if (0==strstr(prevout,rest))
- {
- printf( "Failed expectation, '%s' not found\n", rest);
+ if (0==strstr(prevout,rest))
+ {
+ printf( "Failed expectation, '%s' not found\n", rest);
exit(9);
- }
- return 0;
+ }
+ return 0;
}
for (i=0;cmds[i].cmd;i++)
- if (0==strcmp(cmds[i].cmd, args[0]))
- {
- if (nargs>1)
- args[0]= line + (args[1]-argbuf); /* rest of the line */
- else
- args[0]="";
- return ((cmds[i].testfunc)(args,outbuff));
- }
+ if (0==strcmp(cmds[i].cmd, args[0]))
+ {
+ if (nargs>1)
+ args[0]= line + (args[1]-argbuf); /* rest of the line */
+ else
+ args[0]="";
+ 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;
}
int linelen;
if (args[1])
{ /* help for a single command */
- for (i=0;cmds[i].cmd;i++)
- if (0==strcmp(cmds[i].cmd, args[1]))
- {
+ for (i=0;cmds[i].cmd;i++)
+ if (0==strcmp(cmds[i].cmd, args[1]))
+ {
wrbuf_printf(outbuff,"%s %s\n%s\n",
cmds[i].cmd, cmds[i].args,
- cmds[i].explanation);
- return 0;
- }
- wrbuf_printf(outbuff, "Unknown command '%s'", args[1]);
- }
+ cmds[i].explanation);
+ return 0;
+ }
+ wrbuf_printf(outbuff, "Unknown command '%s'", args[1]);
+ }
else
{ /* list all commands */
linelen=9999;
- for (i=0;cmds[i].cmd;i++)
+ for (i=0;cmds[i].cmd;i++)
{
if (*cmds[i].cmd)
{ /* ordinary command */
/* 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)
- return ;
+ return ;
ec=zebra_errCode (zh);
if (ec)
{
- logf(LOG_APP, " 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);
+ 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) );
}
}
-
+
/**************************************
* The shell
*/
-void shell()
+void shell(void)
{
int rc=0;
WRBUF outbuff=wrbuf_alloc();
wrbuf_puts(outbuff,"Zebrash at your service");
while (rc!=-99)
{
- char buf[MAX_ARG_LEN];
+ char *nl_cp;
+ char buf[MAX_ARG_LEN];
+ char* line_in = 0;
#if HAVE_READLINE_READLINE_H
- char* line_in;
+ if (isatty(0)) {
line_in=readline(PROMPT);
if (!line_in)
- break;
+ break;
#if HAVE_READLINE_HISTORY_H
if (*line_in)
- add_history(line_in);
+ add_history(line_in);
#endif
+ }
+#endif
+ /* line_in != NULL if readine is present and input is a tty */
+
+ printf (PROMPT);
+ fflush (stdout);
+ if (line_in)
+ {
if(strlen(line_in) > MAX_ARG_LEN-1) {
- fprintf(stderr,"Input line too long\n");
- break;
+ fprintf(stderr,"Input line too long\n");
+ break;
}
strcpy(buf,line_in);
free (line_in);
-#else
- printf (PROMPT);
- fflush (stdout);
+ }
+ else
+ {
if (!fgets (buf, MAX_ARG_LEN-1, stdin))
- break;
-#endif
+ break;
+ }
- strncpy(prevout, wrbuf_buf(outbuff), MAX_OUT_BUFF);
+ /* get rid of \n in line */
+ if ((nl_cp = strchr(buf, '\n')))
+ *nl_cp = '\0';
+ strncpy(prevout, wrbuf_buf(outbuff), MAX_OUT_BUFF);
wrbuf_rewind(outbuff);
- rc=onecommand(buf, outbuff, prevout);
- if (rc==0)
- {
- wrbuf_puts(outbuff, " OK\n");
- logf(LOG_APP, "OK");
- }
- else if (rc>-90)
- {
- wrbuf_printf(outbuff, " command returned %d\n",rc);
- }
- Zerrors(outbuff);
- printf("%s\n", wrbuf_buf(outbuff));
+ rc=onecommand(buf, outbuff, prevout);
+ if (rc==0)
+ {
+ wrbuf_puts(outbuff, " OK\n");
+ 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));
} /* while */
wrbuf_free(outbuff,1);
} /* shell() */
-
-
+
+
+static void usage(void)
+{
+ printf ("usage:\n");
+ printf ("zebrash [-c config]\n");
+ exit(1);
+}
/**************************************
* Main
*/
-
-int main (int argc, char ** args)
+
+int main (int argc, char ** argv)
{
+ int ret;
+ char *arg = 0;
+ while ((ret = options ("c:h", argv, argc, &arg)) != -2)
+ {
+ switch(ret)
+ {
+ case 'c':
+ default_config = arg;
+ 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
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff