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
Fixed bug #165: Use multi-and and multi-or always. WS cleanups.
[idzebra-moved-to-github.git]
/
data1
/
d1_attset.c
diff --git
a/data1/d1_attset.c
b/data1/d1_attset.c
index
4f3b032
..
f42c2f5
100644
(file)
--- a/
data1/d1_attset.c
+++ b/
data1/d1_attset.c
@@
-1,6
+1,6
@@
-/* $Id: d1_attset.c,v 1.2 2002-10-22 13:19:50 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: d1_attset.c,v 1.7 2005-01-15 19:38:18 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-25,8
+25,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <yaz/log.h>
#include <stdlib.h>
#include <yaz/log.h>
-#include <d1_attset.h>
-#include <data1.h>
+#include <idzebra/data1.h>
data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, char *name)
{
data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, char *name)
{
@@
-90,7
+89,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
if (argc < 3)
{
if (argc < 3)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # of args to att", file, lineno);
+ yaz_log(YLOG_WARN, "%s:%d: Bad # of args to att", file, lineno);
continue;
}
num = atoi (argv[1]);
continue;
}
num = atoi (argv[1]);
@@
-129,7
+128,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # of args to name", file, lineno);
+ yaz_log(YLOG_WARN, "%s:%d: Bad # of args to name", file, lineno);
continue;
}
}
continue;
}
}
@@
-139,14
+138,14
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
if (argc != 2)
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # of args to reference",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # of args to reference",
file, lineno);
continue;
}
name = argv[1];
if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
{
file, lineno);
continue;
}
name = argv[1];
if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
{
- yaz_log(LOG_WARN, "%s:%d: Unknown reference oid '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown reference oid '%s'",
file, lineno, name);
fclose(f);
return 0;
file, lineno, name);
fclose(f);
return 0;
@@
-154,7
+153,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
}
else if (!strcmp(cmd, "ordinal"))
{
}
else if (!strcmp(cmd, "ordinal"))
{
- yaz_log (LOG_WARN, "%s:%d: Directive ordinal ignored",
+ yaz_log (YLOG_WARN, "%s:%d: Directive ordinal ignored",
file, lineno);
}
else if (!strcmp(cmd, "include"))
file, lineno);
}
else if (!strcmp(cmd, "include"))
@@
-164,7
+163,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
if (argc != 2)
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # of args to include",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # of args to include",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-172,7
+171,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
if (!(attset = data1_get_attset (dh, name)))
{
if (!(attset = data1_get_attset (dh, name)))
{
- yaz_log(LOG_WARN, "%s:%d: Include of attset %s failed",
+ yaz_log(YLOG_WARN, "%s:%d: Include of attset %s failed",
file, lineno, name);
continue;
file, lineno, name);
continue;
@@
-185,7
+184,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
}
else
{
}
else
{
- yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, cmd);
}
}
file, lineno, cmd);
}
}