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.46
[idzebra-moved-to-github.git]
/
data1
/
d1_varset.c
diff --git
a/data1/d1_varset.c
b/data1/d1_varset.c
index
06c47d2
..
bbae245
100644
(file)
--- a/
data1/d1_varset.c
+++ b/
data1/d1_varset.c
@@
-1,8
+1,5
@@
-/* $Id: d1_varset.c,v 1.3 2004-09-28 10:15:03 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-2011 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,20
+12,20
@@
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 <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>
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
#include <yaz/log.h>
#include <d1_absyn.h>
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
- char *zclass, char *type)
+ const char *zclass, const char *type)
{
data1_varclass *c;
data1_vartype *t;
{
data1_varclass *c;
data1_vartype *t;
@@
-39,11
+36,11
@@
data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set,
for (t = c->types; t; t = t->next)
if (!data1_matchstr(t->name, type))
return t;
for (t = c->types; t; t = t->next)
if (!data1_matchstr(t->name, type))
return t;
- yaz_log(LOG_WARN, "Unknown variant type %s in class %s",
+ yaz_log(YLOG_WARN, "Unknown variant type %s in class %s",
type, zclass);
return 0;
}
type, zclass);
return 0;
}
- yaz_log(LOG_WARN, "Unknown variant class %s", zclass);
+ yaz_log(YLOG_WARN, "Unknown variant class %s", zclass);
return 0;
}
return 0;
}
@@
-65,12
+62,12
@@
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")))
{
- yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
return 0;
}
while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
return 0;
}
while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
@@
-80,7
+77,7
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
if (argc != 3)
{
if (argc != 3)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # or args to class",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # or args to class",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-100,13
+97,13
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
if (!typep)
{
if (!typep)
{
- yaz_log(LOG_WARN, "%s:%d: Directive class must precede type",
+ yaz_log(YLOG_WARN, "%s:%d: Directive class must precede type",
file, lineno);
continue;
}
if (argc != 4)
{
file, lineno);
continue;
}
if (argc != 4)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # or args to type",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # or args to type",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-116,7
+113,7
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
r->type = atoi(argv[1]);
if (!(r->datatype = data1_maptype (dh, argv[3])))
{
r->type = atoi(argv[1]);
if (!(r->datatype = data1_maptype (dh, argv[3])))
{
- yaz_log(LOG_WARN, "%s:%d: Unknown datatype '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown datatype '%s'",
file, lineno, argv[3]);
fclose(f);
return 0;
file, lineno, argv[3]);
fclose(f);
return 0;
@@
-128,7
+125,7
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for name",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for name",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-138,21
+135,32
@@
data1_varset *data1_read_varset (data1_handle dh, const char *file)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for reference",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for reference",
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(LOG_WARN, "%s:%d: Unknown reference '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
file, lineno, argv[1]);
continue;
}
}
else
file, lineno, argv[1]);
continue;
}
}
else
- yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, argv[0]);
fclose(f);
return res;
}
file, lineno, argv[0]);
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
+ */
+