projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test
[yaz-moved-to-github.git]
/
retrieval
/
d1_attset.c
diff --git
a/retrieval/d1_attset.c
b/retrieval/d1_attset.c
index
44dec99
..
7a078b6
100644
(file)
--- a/
retrieval/d1_attset.c
+++ b/
retrieval/d1_attset.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_attset.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_attset.c,v $
- * Revision 1.1 1995-11-01 11:56:07 quinn
+ * Revision 1.3 1995-12-13 17:14:26 quinn
+ * *** empty log message ***
+ *
+ * Revision 1.2 1995/11/01 16:34:55 quinn
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.1 1995/11/01 11:56:07 quinn
* Added Retrieval (data management) functions en masse.
*
*
* Added Retrieval (data management) functions en masse.
*
*
@@
-18,6
+24,8
@@
#include <xmalloc.h>
#include <log.h>
#include <d1_attset.h>
#include <xmalloc.h>
#include <log.h>
#include <d1_attset.h>
+#include <data1.h>
+#include <tpath.h>
data1_att *data1_getattbyname(data1_attset *s, char *name)
{
data1_att *data1_getattbyname(data1_attset *s, char *name)
{
@@
-27,7
+35,7
@@
data1_att *data1_getattbyname(data1_attset *s, char *name)
{
/* scan local set */
for (r = s->atts; r; r = r->next)
{
/* scan local set */
for (r = s->atts; r; r = r->next)
- if (!strcmp(r->name, name))
+ if (!data1_matchstr(r->name, name))
return r;
/* scan included sets */
if (s->children && (r = data1_getattbyname(s->children, name)))
return r;
/* scan included sets */
if (s->children && (r = data1_getattbyname(s->children, name)))
@@
-43,7
+51,7
@@
data1_attset *data1_read_attset(char *file)
data1_att **attp;
FILE *f;
data1_att **attp;
FILE *f;
- if (!(f = fopen(file, "r")))
+ if (!(f = yaz_path_fopen(data1_tabpath, file, "r")))
{
logf(LOG_WARN|LOG_ERRNO, "%s", file);
return 0;
{
logf(LOG_WARN|LOG_ERRNO, "%s", file);
return 0;