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
added more statistics to rank function, renamed variables to better names
[idzebra-moved-to-github.git]
/
index
/
attribute.c
diff --git
a/index/attribute.c
b/index/attribute.c
index
f13833f
..
cfeb007
100644
(file)
--- a/
index/attribute.c
+++ b/
index/attribute.c
@@
-1,6
+1,6
@@
-/* $Id: attribute.c,v 1.18 2004-12-13 20:51:30 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: attribute.c,v 1.21 2006-02-22 08:42:16 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-20,13
+20,11
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
-
#include <stdio.h>
#include <yaz/log.h>
#include <idzebra/res.h>
#include <stdio.h>
#include <yaz/log.h>
#include <idzebra/res.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
#include "index.h"
static data1_att *getatt(data1_attset *p, int att, const char *sattr)
#include "index.h"
static data1_att *getatt(data1_attset *p, int att, const char *sattr)
@@
-58,8
+56,13
@@
int att_getentbyatt(ZebraHandle zi, attent *res, oid_value set, int att,
zebraExplain_loadAttsets (zi->reg->dh, zi->res);
p = data1_attset_search_id (zi->reg->dh, set);
}
zebraExplain_loadAttsets (zi->reg->dh, zi->res);
p = data1_attset_search_id (zi->reg->dh, set);
}
- if (!p)
- return -2;
+ if (!p) /* set undefined */
+ {
+ if (sattr)
+ return -1; /* return bad string attribute */
+ else
+ return -2; /* return bad set */
+ }
if (!(r = getatt(p, att, sattr)))
return -1;
res->attset_ordinal = r->parent->reference;
if (!(r = getatt(p, att, sattr)))
return -1;
res->attset_ordinal = r->parent->reference;