X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebrash.c;h=73cc7d49a02c972508aad6b0e921ff5a8e5f05b2;hp=bd42f93684a265db7acbe7289cf9a8b175b515f4;hb=89d3a004b7c651fd5673abfc192e1472dc4d4197;hpb=b4c71713ff8400d7b6eb211c9c2ed23adb04fded diff --git a/index/zebrash.c b/index/zebrash.c index bd42f93..73cc7d4 100644 --- a/index/zebrash.c +++ b/index/zebrash.c @@ -1,6 +1,6 @@ -/* $Id: zebrash.c,v 1.23 2003-11-21 15:30:16 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. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ /* @@ -28,6 +28,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include +#if HAVE_UNISTD_H +#include +#endif #if HAVE_READLINE_READLINE_H #include @@ -36,9 +39,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #endif -#include "zebraapi.h" +#include #include #include +#include +#include #include #define MAX_NO_ARGS 32 @@ -58,6 +63,9 @@ ZebraService zs=0; /* our global handle to zebra */ 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 @@ -157,9 +165,10 @@ static int cmd_zebra_start( char *args[], WRBUF outbuff) { 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) { @@ -184,7 +193,7 @@ 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); + zh = zebra_open(zs, 0); return 0; /* ok */ } @@ -205,10 +214,10 @@ static int cmd_quickstart( char *args[], WRBUF outbuff) 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,""); @@ -234,7 +243,7 @@ static int cmd_yaz_log_file( char *args[], WRBUF 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 */ @@ -255,8 +264,8 @@ static int cmd_logf( char *args[], WRBUF outbuff) 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 */ } @@ -342,14 +351,21 @@ static int cmd_end_trans( char *args[], WRBUF outbuff) 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; } @@ -357,18 +373,17 @@ static int cmd_record_insert( char *args[], WRBUF outbuff) 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; } - 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; } @@ -377,15 +392,15 @@ static int cmd_exchange_record( char *args[], WRBUF outbuff) * 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; } @@ -393,21 +408,21 @@ static int cmd_find( char *args[], WRBUF outbuff) { 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; } @@ -449,7 +464,52 @@ static int cmd_show( char *args[], WRBUF outbuff) } 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 */ @@ -501,7 +561,7 @@ struct cmdstruct cmds[] = { "[prefix]", "Sets the log prefix", cmd_yaz_log_prefix}, - { "logf", + { "yaz_log", "[level] text...", "writes an entry in the log", cmd_logf}, @@ -548,6 +608,7 @@ struct cmdstruct cmds[] = { "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 ", @@ -564,6 +625,10 @@ struct cmdstruct cmds[] = { { "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", @@ -591,7 +656,7 @@ int onecommand( 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 *));*/ @@ -631,7 +696,7 @@ int onecommand( 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; } @@ -678,7 +743,7 @@ static int cmd_help( char *args[], WRBUF outbuff) /* 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) @@ -686,13 +751,12 @@ static void Zerrors ( WRBUF outbuff) 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); } } @@ -700,7 +764,7 @@ static void Zerrors ( WRBUF outbuff) * The shell */ -void shell() +void shell(void) { int rc=0; WRBUF outbuff=wrbuf_alloc(); @@ -750,7 +814,7 @@ void shell() if (rc==0) { wrbuf_puts(outbuff, " OK\n"); - logf(LOG_APP, "OK"); + yaz_log(log_level, "OK"); } else if (rc>-90) { @@ -763,12 +827,45 @@ void shell() } /* 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 + */ +