-/* $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.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2011 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
#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
i=2;
else
lev=YLOG_LOG; /* this is in the default set!*/
- yaz_log( lev, restargs(args,i));
+ yaz_log( lev, "%s", restargs(args,i));
return 0; /* ok */
}
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=" ZINT_FORMAT "\n",sysno);
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;
}
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, 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++)
/* 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_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() */
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab