X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=74fa36c048f717e3472efd10c583e05695bf0779;hb=eb8857cfa2ceaa2635f14888b95d6f71b8def045;hp=0ff088076e3d76c848506eb8e4a8b1664a63b476;hpb=fc9684841bbfad0b625e7365b99bae7b7df737df;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 0ff0880..74fa36c 100644 --- 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.90 2003-03-05 00:08:04 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 Index Data Aps This file is part of the Zebra server. @@ -1136,8 +1136,14 @@ int zebra_begin_trans (ZebraHandle zh, int rw) (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->errCode=0; yaz_log (LOG_LOG, "zebra_begin_trans");