X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fres.c;h=a65e5060b15da233e8740235fc2da77993890355;hp=b21e706e6f9f49994e850aa7a6bb0720ebb7fd1a;hb=2b1851bd5565e3d21f9cf9a37661a584c063b75f;hpb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f

diff --git a/util/res.c b/util/res.c
index b21e706..a65e506 100644
--- a/util/res.c
+++ b/util/res.c
@@ -1,85 +1,9 @@
 /*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: res.c,v $
- * Revision 1.25  1999-05-26 07:49:14  adam
- * C++ compilation.
- *
- * Revision 1.24  1999/02/02 14:51:42  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.23  1998/10/28 15:18:55  adam
- * Fix for DOS-formatted configuration files.
- *
- * Revision 1.22  1998/01/12 15:04:32  adam
- * Removed exit - call.
- *
- * Revision 1.21  1997/11/18 10:04:03  adam
- * Function res_trav returns number of 'hits'.
- *
- * Revision 1.20  1997/10/31 12:39:15  adam
- * Resouce name can be terminated with either white-space or colon.
- *
- * Revision 1.19  1997/10/27 14:27:59  adam
- * Fixed memory leak.
- *
- * Revision 1.18  1997/09/17 12:19:24  adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.17  1997/09/09 13:38:19  adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.16  1996/10/29 13:47:49  adam
- * Implemented res_get_match. Updated to use zebrautl instead of alexpath.
- *
- * Revision 1.15  1996/05/22 08:23:43  adam
- * Bug fix: trailing blanks in resource values where not removed.
- *
- * Revision 1.14  1996/04/26 11:51:20  adam
- * Resource names are matched by the yaz_matchstr routine instead of strcmp.
- *
- * Revision 1.13  1995/09/04  12:34:05  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.12  1995/01/24  16:40:32  adam
- * Bug fix.
- *
- * Revision 1.11  1994/10/05  16:54:52  adam
- * Minor changes.
- *
- * Revision 1.10  1994/10/05  10:47:31  adam
- * Small bug fix.
- *
- * Revision 1.9  1994/09/16  14:41:12  quinn
- * Added log warning to res_get_def
- *
- * Revision 1.8  1994/09/16  14:37:12  quinn
- * added res_get_def
- *
- * Revision 1.7  1994/09/06  13:01:03  quinn
- * Removed const from declaration of res_get
- *
- * Revision 1.6  1994/09/01  17:45:14  adam
- * Work on resource manager.
- *
- * Revision 1.5  1994/08/18  11:02:28  adam
- * Implementation of res_write.
- *
- * Revision 1.4  1994/08/18  10:02:01  adam
- * Module alexpath moved from res.c to alexpath.c. Minor changes in res-test.c
- *
- * Revision 1.3  1994/08/18  09:43:51  adam
- * Development of resource manager. Only missing is res_write.
- *
- * Revision 1.2  1994/08/18  08:23:26  adam
- * Res.c now use handles. xmalloc defines xstrdup.
- *
- * Revision 1.1  1994/08/17  15:34:23  adam
- * Initial version of resource manager.
- *
+ * $Id: res.c,v 1.29 2002-04-04 14:14:14 adam Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -92,7 +16,20 @@
 #endif
 
 #include <zebrautl.h>
-#include <yaz-util.h>
+#include <yaz/yaz-util.h>
+
+struct res_entry {
+    char *name;
+    char *value;
+    struct res_entry *next;
+};
+
+struct res_struct {
+    struct res_entry *first, *last;
+    char *name;
+    int  init;
+    Res def_res;
+};
 
 static struct res_entry *add_entry (Res r)
 {
@@ -219,7 +156,7 @@ static void reread (Res r)
     fclose (fr);
 }
 
-Res res_open (const char *name)
+Res res_open (const char *name, Res def_res)
 {
     Res r;
 #ifdef WIN32
@@ -229,18 +166,20 @@ Res res_open (const char *name)
 #endif
     {
         logf (LOG_LOG|LOG_ERRNO, "Cannot access resource file `%s'", name);
-	return NULL;
+	return 0;
     }
     r = (Res) xmalloc (sizeof(*r));
     r->init = 0;
     r->first = r->last = NULL;
     r->name = xstrdup (name);
+    r->def_res = def_res;
     return r;
 }
 
 void res_close (Res r)
 {
-    assert (r);
+    if (!r)
+        return;
     if (r->init)
     {
         struct res_entry *re, *re1;
@@ -262,13 +201,15 @@ char *res_get (Res r, const char *name)
 {
     struct res_entry *re;
 
-    assert (r);
+    if (!r)
+	return 0;
     if (!r->init)
         reread (r);
     for (re = r->first; re; re=re->next)
         if (re->value && !yaz_matchstr (re->name, name))
             return re->value;
-    return NULL;
+
+    return res_get (r->def_res, name);
 }
 
 char *res_get_def (Res r, const char *name, char *def)
@@ -288,6 +229,8 @@ int res_get_match (Res r, const char *name, const char *value, const char *s)
 {
     const char *cn = res_get (r, name);
 
+    if (!cn)
+	cn = s;
     if (cn && !yaz_matchstr (cn, value))
         return 1;
     return 0;
@@ -319,7 +262,8 @@ int res_trav (Res r, const char *prefix, void *p,
     int l = 0;
     int no = 0;
     
-    assert (r);
+    if (!r)
+        return 0;
     if (prefix)
         l = strlen(prefix);
     if (!r->init)
@@ -331,6 +275,8 @@ int res_trav (Res r, const char *prefix, void *p,
                 (*f)(p, re->name, re->value);
 		no++;
 	    }
+    if (!no)
+        return res_trav (r->def_res, prefix, p, f);
     return no;
 }