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 clean-local sections to fix make distcheck
[idzebra-moved-to-github.git]
/
data1
/
d1_tagset.c
diff --git
a/data1/d1_tagset.c
b/data1/d1_tagset.c
index
a33753c
..
b55dfaa
100644
(file)
--- a/
data1/d1_tagset.c
+++ b/
data1/d1_tagset.c
@@
-1,5
+1,5
@@
-/* $Id: d1_tagset.c,v 1.8 2006-08-14 10:40:06 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: d1_tagset.c,v 1.10 2007-04-16 08:44:31 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-26,6
+26,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/log.h>
#include <idzebra/data1.h>
#include <yaz/log.h>
#include <idzebra/data1.h>
+#include <yaz/oid_db.h>
/*
* We'll probably want to add some sort of hashed index to these lookup-
/*
* We'll probably want to add some sort of hashed index to these lookup-
@@
-108,7
+109,7
@@
data1_tagset *data1_empty_tagset (data1_handle dh)
data1_tagset *res =
(data1_tagset *) nmem_malloc(data1_nmem_get (dh), sizeof(*res));
res->name = 0;
data1_tagset *res =
(data1_tagset *) nmem_malloc(data1_nmem_get (dh), sizeof(*res));
res->name = 0;
- res->reference = VAL_NONE;
+ res->oid = 0;
res->tags = 0;
res->type = 0;
res->children = 0;
res->tags = 0;
res->type = 0;
res->children = 0;
@@
-211,7
+212,9
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
continue;
}
name = argv[1];
continue;
}
name = argv[1];
- if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
+ res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+ CLASS_TAGSET, name, mem);
+ if (!res->oid)
{
yaz_log(YLOG_WARN, "%s:%d: Unknown tagset ref '%s'",
file, lineno, name);
{
yaz_log(YLOG_WARN, "%s:%d: Unknown tagset ref '%s'",
file, lineno, name);