projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
65ffa52
)
Check for open register in begin_trans
author
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 13 May 2003 13:52:12 +0000
(13:52 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 13 May 2003 13:52:12 +0000
(13:52 +0000)
index/zebraapi.c
patch
|
blob
|
history
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
4362409
..
22e60a5
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.98 2003-04-24 19:46:59 adam Exp $
+/* $Id: zebraapi.c,v 1.99 2003-05-13 13:52:12 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
@@
-196,9
+196,9
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
assert (res);
assert (res);
- yaz_log (LOG_DEBUG, "zebra_register_open rw = %d useshadow=%d p=%p",
+ yaz_log (LOG_LOG, "zebra_register_open rw = %d useshadow=%d p=%p",
rw, useshadow, reg);
rw, useshadow, reg);
-
+
reg->dh = data1_createx (DATA1_FLAG_XML);
if (!reg->dh)
return 0;
reg->dh = data1_createx (DATA1_FLAG_XML);
if (!reg->dh)
return 0;
@@
-377,7
+377,7
@@
void zebra_admin_start (ZebraHandle zh)
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
{
ASSERTZS;
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
{
ASSERTZS;
- yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg);
+ yaz_log(LOG_LOG, "zebra_register_close p=%p", reg);
reg->stop_flag = 0;
zebra_chdir (zs);
if (reg->records)
reg->stop_flag = 0;
zebra_chdir (zs);
if (reg->records)
@@
-1152,6
+1152,9
@@
int zebra_begin_trans (ZebraHandle zh, int rw)
zh->errString = "zebra_begin_trans: write trans not allowed within read trans";
return -1;
}
zh->errString = "zebra_begin_trans: write trans not allowed within read trans";
return -1;
}
+ if (zh->reg)
+ zebra_register_close (zh->service, zh->reg);
+
zh->trans_w_no = zh->trans_no;
zh->errCode=0;
zh->trans_w_no = zh->trans_no;
zh->errCode=0;
@@
-1344,6
+1347,8
@@
int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
zebra_flush_reg (zh);
zebra_flush_reg (zh);
+ resultSetInvalidate (zh);
+
zebra_register_close (zh->service, zh->reg);
zh->reg = 0;
zebra_register_close (zh->service, zh->reg);
zh->reg = 0;