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
Read-only sets uses common no write handler
[idzebra-moved-to-github.git]
/
data1
/
d1_varset.c
diff --git
a/data1/d1_varset.c
b/data1/d1_varset.c
index
94f157d
..
9bb9bf2
100644
(file)
--- a/
data1/d1_varset.c
+++ b/
data1/d1_varset.c
@@
-1,8
+1,5
@@
-/* $Id: d1_varset.c,v 1.9 2006-08-14 10:40:06 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 2004-2013 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
@@
-20,10
+17,13
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#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
+65,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")))
@@
-77,7
+77,7
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
if (!strcmp(argv[0], "class"))
{
data1_varclass *r;
if (!strcmp(argv[0], "class"))
{
data1_varclass *r;
-
+
if (argc != 3)
{
yaz_log(YLOG_WARN, "%s:%d: Bad # or args to class",
if (argc != 3)
{
yaz_log(YLOG_WARN, "%s:%d: Bad # or args to class",
@@
-142,23
+142,26
@@
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]);
continue;
}
}
{
yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
file, lineno, argv[1]);
continue;
}
}
- else
+ else
yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, argv[0]);
yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, argv[0]);
-
+
fclose(f);
return res;
}
/*
* Local variables:
* c-basic-offset: 4
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
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab