X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=15e65e58238cbecc19907b3cde3f0ab252e9b477;hb=c154b6ebab028dc512c43403864a8e4a7fc2b178;hp=89ee5c6011d199ca1dc65b197033c17c209876ef;hpb=cd3f39bbae63668b8806ed205132da166e73102f;p=idzebra-moved-to-github.git

diff --git a/util/res.c b/util/res.c
index 89ee5c6..15e65e5 100644
--- a/util/res.c
+++ b/util/res.c
@@ -1,6 +1,6 @@
-/* $Id: res.c,v 1.37 2004-07-26 13:59:25 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: res.c,v 1.44 2005-08-17 21:28:07 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -26,12 +26,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #ifdef WIN32
 #include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#include <zebrautl.h>
 #include <yaz/yaz-util.h>
+#include <idzebra/res.h>
 
 struct res_entry {
     char *name;
@@ -151,7 +152,7 @@ static void reread (Res r)
     fr = fopen (r->name, "r");
     if (!fr)
     {
-        logf (LOG_WARN|LOG_ERRNO, "Cannot open `%s'", r->name);
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot open `%s'", r->name);
 	return ;
     }
     val_buf = (char*) xmalloc (val_max);
@@ -207,7 +208,7 @@ static void reread (Res r)
                         val_size--;
                     val_buf[val_size] = '\0';
 		    resp->value = xstrdup_env(val_buf);
-                    logf (LOG_DEBUG, "(name=%s,value=%s)",
+                    yaz_log (YLOG_DEBUG, "(name=%s,value=%s)",
                          resp->name, resp->value);
                     break;
                 }
@@ -254,7 +255,7 @@ Res res_open (const char *name, Res def_res, Res over_res)
         if (access (name, R_OK))
 #endif
         {
-            logf (LOG_WARN|LOG_ERRNO, "Cannot open `%s'", name);
+            yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot open `%s'", name);
 	    return 0;
         }
     }
@@ -270,10 +271,8 @@ Res res_open (const char *name, Res def_res, Res over_res)
     return r;
 }
 
-void res_close (Res r)
+void res_clear (Res r)
 {
-    if (!r)
-        return;
     if (r->init)
     {
         struct res_entry *re, *re1;
@@ -287,6 +286,16 @@ void res_close (Res r)
             xfree (re);
         }
     }
+    r->init = 0;
+    r->first = r->last = NULL;
+}
+
+void res_close (Res r)
+{
+    if (!r)
+        return;
+    res_clear(r);
+
     xfree (r->name);
     xfree (r);
 }
@@ -340,7 +349,7 @@ const char *res_get_def (Res r, const char *name, const char *def)
 
     if (!(t = res_get (r, name)))
     {
-    	logf (LOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def);
+    	yaz_log (YLOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def);
     	return def;
     }
     else
@@ -416,7 +425,7 @@ int res_write (Res r)
     fr = fopen (r->name, "w");
     if (!fr)
     {
-        logf (LOG_FATAL|LOG_ERRNO, "Cannot create `%s'", r->name);
+        yaz_log (YLOG_FATAL|YLOG_ERRNO, "Cannot create `%s'", r->name);
         exit (1);
     }
 
@@ -455,3 +464,14 @@ int res_write (Res r)
     return 0;
 }
 
+ZEBRA_RES res_get_int(Res r, const char *name, int *val)
+{
+    const char *cp = res_get(r, name);
+    if (cp)
+    {
+	if (sscanf(cp, "%d", val) == 1)
+	    return ZEBRA_OK;
+	yaz_log(YLOG_WARN, "Expected integer for resource %s", name);
+    }
+    return ZEBRA_FAIL;
+}