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 ord_list_print.
[idzebra-moved-to-github.git]
/
data1
/
d1_varset.c
diff --git
a/data1/d1_varset.c
b/data1/d1_varset.c
index
bc0c8dd
..
e2d5189
100644
(file)
--- a/
data1/d1_varset.c
+++ b/
data1/d1_varset.c
@@
-1,8
+1,5
@@
-/* $Id: d1_varset.c,v 1.10 2007-01-15 15:10:14 adam Exp $
- Copyright (C) 1995-2007
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1995-2008 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
@@
-23,7
+20,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
#include <yaz/log.h>
#include <d1_absyn.h>
#include <yaz/log.h>
#include <d1_absyn.h>
@@
-65,7
+62,7
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
char *argv[50],line[512];
res->name = 0;
char *argv[50],line[512];
res->name = 0;
- res->reference = VAL_NONE;
+ res->oid = 0;
res->classes = 0;
if (!(f = data1_path_fopen(dh, file, "r")))
res->classes = 0;
if (!(f = data1_path_fopen(dh, file, "r")))
@@
-142,7
+139,9
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
file, lineno);
continue;
}
file, lineno);
continue;
}
- if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
+ res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+ CLASS_VARSET, argv[1], mem);
+ if (!res->oid)
{
yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
file, lineno, argv[1]);
{
yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
file, lineno, argv[1]);