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
Scan with limiting result set
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
0ff0880
..
ab5cf26
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,5
+1,5
@@
-/* $Id: zebraapi.c,v 1.88 2003-03-04 23:30:20 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zebraapi.c,v 1.91 2003-03-06 11:58:08 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-846,7
+846,7
@@
void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
}
rpn_scan (zh, stream, zapt, attributeset,
zh->num_basenames, zh->basenames, position,
}
rpn_scan (zh, stream, zapt, attributeset,
zh->num_basenames, zh->basenames, position,
- num_entries, entries, is_partial);
+ num_entries, entries, is_partial, 0, 0);
zebra_end_read (zh);
}
zebra_end_read (zh);
}
@@
-1136,8
+1136,14
@@
int zebra_begin_trans (ZebraHandle zh, int rw)
(zh->trans_no++);
if (zh->trans_w_no)
return 0;
(zh->trans_no++);
if (zh->trans_w_no)
return 0;
+ if (zh->trans_no != 1)
+ {
+ zh->errCode = 2;
+ zh->errString = "write trans not allowed within read trans";
+ return -1;
+ }
zh->trans_w_no = zh->trans_no;
zh->trans_w_no = zh->trans_no;
-
+
zh->errCode=0;
yaz_log (LOG_LOG, "zebra_begin_trans");
zh->errCode=0;
yaz_log (LOG_LOG, "zebra_begin_trans");