-/* $Id: res.c,v 1.45 2005-09-13 11:51:11 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: res.c,v 1.51 2006-08-14 10:40:34 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
#include <yaz/yaz-util.h>
#include <idzebra/res.h>
+#define YLOG_RES 0
+
struct res_entry {
char *name;
char *value;
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;
if (!(t = res_get(r, name)))
{
- yaz_log(YLOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def);
+ if (def)
+ yaz_log(YLOG_DEBUG, "Using default resource %s:%s", name, def);
return def;
}
else
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)
}
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
+ */
+