projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump copyright year
[idzebra-moved-to-github.git]
/
index
/
zebrash.c
diff --git
a/index/zebrash.c
b/index/zebrash.c
index
73cc7d4
..
ad12354
100644
(file)
--- a/
index/zebrash.c
+++ b/
index/zebrash.c
@@
-1,8
+1,5
@@
-/* $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-2010 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
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
@@
-45,6
+42,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/sortspec.h>
#include <yaz/options.h>
#include <yaz/wrbuf.h>
#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
#define MAX_NO_ARGS 32
#define MAX_OUT_BUFF 4096
@@
-265,7
+263,7
@@
static int cmd_logf( char *args[], WRBUF outbuff)
i=2;
else
lev=YLOG_LOG; /* this is in the default set!*/
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 */
}
return 0; /* ok */
}
@@
-355,14
+353,14
@@
static int cmd_record_insert( char *args[], WRBUF outbuff)
int rc;
char *rec=restargs(args,1);
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,
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);
if (0==rc)
{
wrbuf_printf(outbuff,"ok sysno=" ZINT_FORMAT "\n",sysno);
@@
-383,8
+381,12
@@
static int cmd_exchange_record( char *args[], WRBUF outbuff)
onecommand("help exchange_record", outbuff, "");
return -90;
}
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;
}
return rc;
}
@@
-415,14
+417,14
@@
static int cmd_find( char *args[], WRBUF outbuff)
wrbuf_puts(qry,restargs(args,1));
if (!zh)
onecommand("quickstart", outbuff, "");
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;
}
if (0==rc)
{
wrbuf_printf(outbuff, ZINT_FORMAT " hits found\n", hits);
nextrecno = 1;
}
- wrbuf_free(qry, 1);
+ wrbuf_destroy(qry);
return rc;
}
return rc;
}
@@
-436,17
+438,16
@@
static int cmd_show( char *args[], WRBUF outbuff)
ODR odr;
Z_RecordComposition *pcomp=0;
int i;
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");
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;
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++)
if (0==rc)
{
for (i=0;i<nrecs;i++)
@@
-808,7
+809,7
@@
void shell(void)
/* get rid of \n in line */
if ((nl_cp = strchr(buf, '\n')))
*nl_cp = '\0';
/* 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_rewind(outbuff);
rc=onecommand(buf, outbuff, prevout);
if (rc==0)
@@
-821,9
+822,9
@@
void shell(void)
wrbuf_printf(outbuff, " command returned %d\n",rc);
}
Zerrors(outbuff);
wrbuf_printf(outbuff, " command returned %d\n",rc);
}
Zerrors(outbuff);
- printf("%s\n", wrbuf_buf(outbuff));
+ printf("%s\n", wrbuf_cstr(outbuff));
} /* while */
} /* while */
- wrbuf_free(outbuff,1);
+ wrbuf_destroy(outbuff);
} /* shell() */
} /* shell() */
@@
-864,6
+865,7
@@
int main (int argc, char ** argv)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab