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
Version 2.0.45
[idzebra-moved-to-github.git]
/
data1
/
d1_tagset.c
diff --git
a/data1/d1_tagset.c
b/data1/d1_tagset.c
index
fdf2309
..
4ecb002
100644
(file)
--- a/
data1/d1_tagset.c
+++ b/
data1/d1_tagset.c
@@
-1,8
+1,5
@@
-/* $Id: d1_tagset.c,v 1.5 2004-12-13 20:51:28 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2010 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-15,9
+12,9
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
*/
#include <stdio.h>
@@
-26,6
+23,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#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
+106,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
+209,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);
@@
-260,3
+260,12
@@
data1_tagset *data1_read_tagset (data1_handle dh, const char *file, int type)
fclose(f);
return res;
}
fclose(f);
return res;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+