X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=fe56609934f347f6f9f7873ffd9d8cd689706347;hb=7f417885b90eff084fc83be569b98e30dad4a056;hp=417cc0a534e9dca47fbac3c2d3c635938d9f57f7;hpb=3d3d0cebd23fa527a7e9d5d728e3c744acb37580;p=idzebra-moved-to-github.git

diff --git a/util/res.c b/util/res.c
index 417cc0a..fe56609 100644
--- a/util/res.c
+++ b/util/res.c
@@ -1,4 +1,4 @@
-/* $Id: res.c,v 1.45 2005-09-13 11:51:11 adam Exp $
+/* $Id: res.c,v 1.49 2006-05-10 08:13:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -34,6 +34,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/yaz-util.h>
 #include <idzebra/res.h>
 
+#define YLOG_RES 0
+
 struct res_entry {
     char *name;
     char *value;
@@ -224,11 +226,9 @@ ZEBRA_RES res_read_file(Res r, const char *fname)
     fclose(fr);
     return ZEBRA_OK;
 }
-
 Res res_open(Res def_res, Res over_res)
 {
     Res r;
-
     r = (Res) xmalloc(sizeof(*r));
     r->first = r->last = NULL;
     r->def_res = def_res;
@@ -379,7 +379,7 @@ ZEBRA_RES res_write_file(Res r, const char *fname)
     if (!fr)
     {
         yaz_log(YLOG_FATAL|YLOG_ERRNO, "Cannot create `%s'", fname);
-        exit(1);
+	return ZEBRA_FAIL;
     }
 
     for (re = r->first; re; re=re->next)
@@ -428,3 +428,123 @@ ZEBRA_RES res_get_int(Res r, const char *name, int *val)
     }
     return ZEBRA_FAIL;
 }
+
+/* == pop ================================================================= */
+Res res_add_over (Res p, Res t)
+{
+    if ((!p) || (!t))
+	return (0);
+    
+    while (p->over_res)
+	p = p->over_res;
+    
+    p->over_res = t;
+    return (p);
+}
+
+void res_remove_over (Res r)
+{
+    if (!r)
+        return;
+    r->over_res = 0;
+}
+
+void res_close_over (Res r)
+{
+    if (!r)
+        return;
+    if (r->over_res)
+	res_close(r->over_res);
+    r->over_res = 0;
+}
+
+void res_add (Res r, const char *name, const char *value)
+{
+    struct res_entry *re;
+    assert (r);
+    if ((name) && (value)) 
+	yaz_log (YLOG_RES, "res_add res=%p, name=%s, value=%s", r, name, value);
+    
+    re = add_entry (r);
+    re->name = xstrdup (name);
+    re->value = xstrdup_env (value);
+}
+
+char **res_2_array (Res r)
+{
+    struct res_entry *re;
+    int i = 0;
+    char **list;
+    
+    if (!r)
+	return 0;
+    
+    list = xmalloc(sizeof(char *));
+    
+    for (re = r->first; re; re=re->next) {
+	list = xrealloc(list, ((i+3) * sizeof(char *)));
+	list[i++] = strdup(re->name);
+	if (re->value) 
+	    list[i++] = strdup(re->value);
+	else
+	    list[i++] = strdup("");
+	yaz_log(YLOG_RES, "res2array: %s=%s",re->name, re->value);
+    }
+    list[i++] = 0;
+    return (list);
+}
+
+char **res_get_array(Res r, const char* name)
+{
+    struct res_entry *re;
+    int i = 0;
+    char **list;
+    
+    if (!r)
+	return 0;
+    
+    list = xmalloc(sizeof(char *));
+    
+    for (re = r->first; re; re=re->next)
+	if (re->value && !yaz_matchstr (re->name, name))
+	{
+	    list = xrealloc(list, (i+2) * sizeof(char *));
+	    list[i++] = xstrdup(re->value);
+	}
+    
+    if (i == 0)
+	return (res_get_array(r->def_res, name));
+    
+    list[i++] = 0;
+    return (list);
+}
+
+void res_dump (Res r, int level) 
+{
+    struct res_entry *re;
+    
+    if (!r)
+	return;
+    
+    for (re = r->first; re; re=re->next) {
+	printf("%*s - %s:='%s'\n",level * 4,"",re->name,re->value);
+    }
+    
+    if (r->def_res) {
+	printf ("%*s DEF ",level * 4,"");
+	res_dump (r->def_res, level + 1);
+    }
+    
+    if (r->over_res) {
+	printf ("%*s OVER ",level * 4,"");
+	res_dump (r->over_res, level + 1);
+    }
+}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+