X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrash.c;h=333b378833aa9b0a778fdd51ca8c9826198c5c36;hb=27a6d4f7f7425896345ab5a2bfdf35a96c97416e;hp=63a878266309e51e5118b9bf7330b6933d50a950;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git diff --git a/index/zebrash.c b/index/zebrash.c index 63a8782..333b378 100644 --- a/index/zebrash.c +++ b/index/zebrash.c @@ -1,6 +1,6 @@ -/* $Id: zebrash.c,v 1.30 2004-11-19 10:27:04 heikki Exp $ - Copyright (C) 2002,2003,2004 - Index Data Aps +/* $Id: zebrash.c,v 1.44 2007-03-19 21:50:39 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,7 +28,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#include /* for isatty */ +#if HAVE_UNISTD_H +#include +#endif #if HAVE_READLINE_READLINE_H #include @@ -38,7 +40,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include -#include +#include #include #include #include @@ -191,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 */ } @@ -349,21 +351,21 @@ static int cmd_end_trans( char *args[], WRBUF outbuff) 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; } @@ -381,8 +383,12 @@ static int cmd_exchange_record( char *args[], WRBUF outbuff) 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; } @@ -390,15 +396,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; } @@ -406,21 +412,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); + 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; } @@ -741,7 +747,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) @@ -755,7 +761,6 @@ static void Zerrors ( WRBUF outbuff) wrbuf_printf(outbuff, " Zebra error %d: %s, (%s)\n", ec, zebra_errString (zh), zebra_errAdd (zh) ); - zebra_clearError(zh); } } @@ -763,7 +768,7 @@ static void Zerrors ( WRBUF outbuff) * The shell */ -void shell() +void shell(void) { int rc=0; WRBUF outbuff=wrbuf_alloc(); @@ -807,7 +812,7 @@ void shell() /* 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) @@ -820,13 +825,13 @@ void shell() 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"); @@ -860,3 +865,11 @@ int main (int argc, char ** argv) shell(); return 0; } /* main */ +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +