X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrash.c;h=6980699075b9b041f1287cf87936832779a43ff3;hb=cd3f39bbae63668b8806ed205132da166e73102f;hp=fceab10936433bc8d426dfbe5d26080a87340aa6;hpb=9d902359e729980cc1844cce2b5b83d72a4367d3;p=idzebra-moved-to-github.git diff --git a/index/zebrash.c b/index/zebrash.c index fceab10..6980699 100644 --- a/index/zebrash.c +++ b/index/zebrash.c @@ -1,5 +1,5 @@ -/* $Id: zebrash.c,v 1.21 2003-09-23 09:53:08 adam Exp $ - Copyright (C) 2002,2003 +/* $Id: zebrash.c,v 1.26 2004-06-15 07:42:45 adam Exp $ + Copyright (C) 2002,2003,2004 Index Data Aps This file is part of the Zebra server. @@ -28,6 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include +#include /* for isatty */ #if HAVE_READLINE_READLINE_H #include @@ -39,6 +40,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "zebraapi.h" #include #include +#include +#include #include #define MAX_NO_ARGS 32 @@ -58,6 +61,7 @@ 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; /************************************** * Help functions @@ -157,11 +161,12 @@ 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); + zs=zebra_start(conf, 0, 0); if (!zs) { wrbuf_puts(outbuff, "zebra_start failed" ); return 2; @@ -303,7 +308,7 @@ static int cmd_init ( char *args[], WRBUF outbuff) 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); } @@ -346,7 +351,13 @@ static int cmd_record_insert( char *args[], WRBUF outbuff) 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)); if (0==rc) { wrbuf_printf(outbuff,"ok sysno=%d\n",sysno); @@ -357,18 +368,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; } @@ -445,11 +455,56 @@ static int cmd_show( char *args[], WRBUF outbuff) } 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 */ @@ -548,6 +603,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 +620,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", @@ -708,29 +768,42 @@ void shell() wrbuf_puts(outbuff,"Zebrash at your service"); while (rc!=-99) { + char *nl_cp; char buf[MAX_ARG_LEN]; + char* line_in = 0; #if HAVE_READLINE_READLINE_H - char* line_in; - line_in=readline(PROMPT); - if (!line_in) - break; + if (isatty(0)) { + line_in=readline(PROMPT); + if (!line_in) + break; #if HAVE_READLINE_HISTORY_H - if (*line_in) - add_history(line_in); + if (*line_in) + add_history(line_in); #endif - if(strlen(line_in) > MAX_ARG_LEN-1) { - fprintf(stderr,"Input line too long\n"); - break; } - strcpy(buf,line_in); - free (line_in); -#else +#endif + /* line_in != NULL if readine is present and input is a tty */ + printf (PROMPT); fflush (stdout); - if (!fgets (buf, MAX_ARG_LEN-1, stdin)) - break; -#endif + if (line_in) + { + if(strlen(line_in) > MAX_ARG_LEN-1) { + fprintf(stderr,"Input line too long\n"); + break; + } + strcpy(buf,line_in); + free (line_in); + } + else + { + if (!fgets (buf, MAX_ARG_LEN-1, stdin)) + break; + } + /* 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); @@ -750,12 +823,34 @@ void shell() } /* shell() */ +static void usage() +{ + 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(); + default: + fprintf(stderr, "bad option %s\n", arg); + usage(); + } + } shell(); return 0; } /* main */