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
Fixed an old-style declaration
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
f9b012c
..
ca6f4b5
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.135 2004-10-07 14:18:23 heikki Exp $
+/* $Id: zebraapi.c,v 1.139 2004-10-29 11:23:52 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-87,7
+87,6
@@
ZebraHandle zebra_open (ZebraService zs)
{
ZebraHandle zh;
const char *default_encoding;
{
ZebraHandle zh;
const char *default_encoding;
- ASSERTZS;
yaz_log(LOG_API,"zebra_open");
if (!zs)
yaz_log(LOG_API,"zebra_open");
if (!zs)
@@
-294,7
+293,6
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
zebraRankInstall (reg, rank1_class);
zebraRankInstall (reg, rankzv_class);
zebraRankInstall (reg, rank1_class);
zebraRankInstall (reg, rankzv_class);
- zebraRankInstall (reg, rankliv_class);
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
@@
-813,8
+811,6
@@
int zebra_search_RPN (ZebraHandle zh, ODR o,
if (zebra_begin_read (zh))
return 1;
if (zebra_begin_read (zh))
return 1;
- zebra_livcode_transform(zh, query);
-
resultSetAddRPN (zh, odr_extract_mem(o), query,
zh->num_basenames, zh->basenames, setname);
resultSetAddRPN (zh, odr_extract_mem(o), query,
zh->num_basenames, zh->basenames, setname);
@@
-897,6
+893,8
@@
int zebra_records_retrieve (ZebraHandle zh, ODR stream,
&recs[i].len,
&recs[i].base);
recs[i].errString = NULL;
&recs[i].len,
&recs[i].base);
recs[i].errString = NULL;
+ recs[i].score=poset[i].score;
+ recs[i].sysno=poset[i].sysno;
}
else
{
}
else
{
@@
-1588,8
+1586,8
@@
int zebra_begin_trans (ZebraHandle zh, int rw)
int zebra_end_trans (ZebraHandle zh)
{
int zebra_end_trans (ZebraHandle zh)
{
- ASSERTZH;
ZebraTransactionStatus dummy;
ZebraTransactionStatus dummy;
+ ASSERTZH;
yaz_log(LOG_API,"zebra_end_trans");
return zebra_end_transaction(zh, &dummy);
}
yaz_log(LOG_API,"zebra_end_trans");
return zebra_end_transaction(zh, &dummy);
}