From 775bf7d99438335ba135b673dfb3e19fe9bcba24 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 2 Feb 2007 12:16:38 +0000 Subject: [PATCH] Use YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS everywhere where this diagnostic is returned. Put more appropriate addinfo in case of filter load failure during retrieval. --- index/recgrs.c | 9 +++++---- index/retrieve.c | 14 ++++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/index/recgrs.c b/index/recgrs.c index d665864..5b0a783 100644 --- a/index/recgrs.c +++ b/index/recgrs.c @@ -1,4 +1,4 @@ -/* $Id: recgrs.c,v 1.14 2007-01-22 18:15:03 adam Exp $ +/* $Id: recgrs.c,v 1.15 2007-02-02 12:16:38 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include +#include #include #include @@ -1114,7 +1115,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, node = (*grs_read)(&gri); if (!node) { - p->diagnostic = 14; + p->diagnostic = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; nmem_destroy (mem); return 0; } @@ -1190,7 +1191,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, onode = node; if (!(node = data1_map_record(p->dh, onode, map, mem))) { - p->diagnostic = 14; + p->diagnostic = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; nmem_destroy (mem); return 0; } @@ -1219,7 +1220,7 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p, onode = node; if (!(node = data1_map_record(p->dh, onode, map, mem))) { - p->diagnostic = 14; + p->diagnostic = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; nmem_destroy (mem); return 0; } diff --git a/index/retrieve.c b/index/retrieve.c index f683530..1d99883 100644 --- a/index/retrieve.c +++ b/index/retrieve.c @@ -1,4 +1,4 @@ -/* $Id: retrieve.c,v 1.63 2007-01-15 15:10:17 adam Exp $ +/* $Id: retrieve.c,v 1.64 2007-02-02 12:16:38 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -41,8 +41,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA static int zebra_create_record_stream(ZebraHandle zh, Record *rec, - struct ZebraRecStream *stream){ - + struct ZebraRecStream *stream) +{ RecordAttr *recordAttr = rec_init_attr(zh->reg->zei, *rec); if ((*rec)->size[recInfo_storeData] > 0) @@ -65,7 +65,7 @@ static int zebra_create_record_stream(ZebraHandle zh, yaz_log (YLOG_WARN|YLOG_ERRNO, "Retrieve fail; missing file: %s", full_rep); rec_free(rec); - return 14; + return YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; } zebra_create_stream_fd(stream, fd, recordAttr->recordOffset); } @@ -650,6 +650,12 @@ int zebra_record_fetch(ZebraHandle zh, zint sysno, int score, if (!(rt = recType_byName(zh->reg->recTypes, zh->res, file_type, &clientData))) { + char addinfo_str[100]; + + sprintf(addinfo_str, "Could not handle record type %.40s", + file_type); + + *addinfo = odr_strdup(odr, addinfo_str); return_code = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; } else -- 1.7.10.4