X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_varset.c;h=5661a6b667f417a2172c7800c70bb27453034e2c;hp=94f1cfdacea4c7b27c89945308c22a24b87b699c;hb=4eb3b54bb2ca9af74f39f000d3d40dba99ded887;hpb=519fefb91135ad52134b9fc4e82b3874f5525a2b diff --git a/data1/d1_varset.c b/data1/d1_varset.c index 94f1cfd..5661a6b 100644 --- a/data1/d1_varset.c +++ b/data1/d1_varset.c @@ -1,60 +1,31 @@ -/* - * Copyright (c) 1995-1999, Index Data. - * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: d1_varset.c,v $ - * Revision 1.1 2002-10-22 12:53:33 adam - * data1 part of zebra - * - * Revision 1.11 2002/04/04 20:49:46 adam - * New functions yaz_is_abspath, yaz_path_fopen_base - * - * Revision 1.10 1999/11/30 13:47:12 adam - * Improved installation. Moved header files to include/yaz. - * - * Revision 1.9 1999/08/27 09:40:32 adam - * Renamed logf function to yaz_log. Removed VC++ project files. - * - * Revision 1.8 1998/10/13 16:09:54 adam - * Added support for arbitrary OID's for tagsets, schemas and attribute sets. - * Added support for multiple attribute set references and tagset references - * from an abstract syntax file. - * Fixed many bad logs-calls in routines that read the various - * specifications regarding data1 (*.abs,*.att,...) and made the messages - * consistent whenever possible. - * Added extra 'lineno' argument to function readconf_line. - * - * Revision 1.7 1998/02/11 11:53:35 adam - * Changed code so that it compiles as C++. - * - * Revision 1.6 1997/09/17 12:10:39 adam - * YAZ version 1.4. - * - * Revision 1.5 1997/09/05 09:50:58 adam - * Removed global data1_tabpath - uses data1_get_tabpath() instead. - * - * Revision 1.4 1997/05/14 06:54:04 adam - * C++ support. - * - * Revision 1.3 1995/11/01 16:34:58 quinn - * Making data1 look for tables in data1_tabpath - * - * Revision 1.2 1995/11/01 13:54:50 quinn - * Minor adjustments - * - * Revision 1.1 1995/11/01 11:56:09 quinn - * Added Retrieval (data management) functions en masse. - * - * - */ +/* $Id: d1_varset.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. + +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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 +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. +*/ #include #include #include #include -#include +#include data1_vartype *data1_getvartypebyct (data1_handle dh, data1_varset *set, char *zclass, char *type) @@ -68,14 +39,20 @@ 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; - 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; } - yaz_log(LOG_WARN, "Unknown variant class %s", zclass); + yaz_log(YLOG_WARN, "Unknown variant class %s", zclass); return 0; } +data1_vartype *data1_getvartypeby_absyn (data1_handle dh, data1_absyn *absyn, + char *zclass, char *type) +{ + return data1_getvartypebyct(dh, absyn->varset, zclass, type); +} + data1_varset *data1_read_varset (data1_handle dh, const char *file) { NMEM mem = data1_nmem_get (dh); @@ -93,7 +70,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file) 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))) @@ -103,7 +80,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file) 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; } @@ -123,13 +100,13 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file) 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) { - 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; } @@ -139,7 +116,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]))) { - 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; @@ -151,7 +128,7 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file) { 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; } @@ -161,19 +138,19 @@ data1_varset *data1_read_varset (data1_handle dh, const char *file) { 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; } if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE) { - yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'", + yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'", 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);