-/* $Id: res.c,v 1.46 2005-09-15 09:27:18 pop Exp $
- Copyright (C) 1995-2005
+/* $Id: res.c,v 1.56 2007-01-15 15:10:26 adam Exp $
+ Copyright (C) 1995-2007
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>
};
struct res_struct {
+ int ref_count;
struct res_entry *first, *last;
Res def_res;
Res over_res;
};
+static Res res_incref(Res r)
+{
+ if (r)
+ r->ref_count++;
+ return r;
+}
+
static struct res_entry *add_entry(Res r)
{
struct res_entry *resp;
fclose(fr);
return ZEBRA_OK;
}
+
Res res_open(Res def_res, Res over_res)
{
Res r;
r = (Res) xmalloc(sizeof(*r));
+
+ r->ref_count = 1;
r->first = r->last = NULL;
- r->def_res = def_res;
- r->over_res = over_res;
+ r->def_res = res_incref(def_res);
+ r->over_res = res_incref(over_res);
return r;
}
void res_close(Res r)
{
- if (!r)
- return;
- res_clear(r);
-
- xfree(r);
+ if (r && --(r->ref_count) == 0)
+ {
+ res_clear(r);
+ res_close(r->def_res);
+ res_close(r->over_res);
+ xfree(r);
+ }
}
const char *res_get_prefix(Res r, const char *name, const char *prefix,
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
struct res_entry *re;
assert(r);
+ if (!value)
+ return;
for (re = r->first; re; re=re->next)
if (re->value && !yaz_matchstr(re->name, name))
{
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)
Res res_add_over (Res p, Res t)
{
if ((!p) || (!t))
- return (0);
-
+ return (0);
+
while (p->over_res)
- p = p->over_res;
+ p = p->over_res;
p->over_res = t;
return (p);
if (!r)
return;
if (r->over_res)
- res_close(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);
+ assert(r);
+ assert(name);
+ assert(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;
-
+ 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 = 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);
+ 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);
+ 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;
-
- printf ("RES:\n", level * 4,"");
-
- 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);
- }
+ 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);
+ }
}
+
+int res_check(Res r_i, Res r_v)
+{
+ struct res_entry *e_i;
+ int errors = 0;
+
+ for (e_i = r_i->first; e_i; e_i = e_i->next)
+ {
+ struct res_entry *e_v;
+ for (e_v = r_v->first; e_v; e_v = e_v->next)
+ {
+ int prefix_allowed = 0;
+ int suffix_allowed = 0;
+ const char *name = e_i->name;
+ size_t name_len = strlen(e_i->name);
+ char namez[32];
+ const char *first_dot = 0;
+ const char *second_dot = 0;
+
+ if (strchr(e_v->value, 'p'))
+ prefix_allowed = 1;
+ if (strchr(e_v->value, 's'))
+ suffix_allowed = 1;
+
+ first_dot = strchr(name, '.');
+ if (prefix_allowed && first_dot)
+ {
+ name = first_dot+1;
+ name_len = strlen(name);
+ }
+ second_dot = strchr(name, '.');
+ if (suffix_allowed && second_dot)
+ {
+ name_len = second_dot - name;
+ }
+ if (name_len < sizeof(namez)-1)
+ {
+ memcpy(namez, name, name_len);
+ namez[name_len] = '\0';
+ if (!yaz_matchstr(namez, e_v->name))
+ break;
+ }
+ /* for case 'a.b' we have to check 'a' as well */
+ if (prefix_allowed && suffix_allowed && first_dot && !second_dot)
+ {
+ name = e_i->name;
+ name_len = first_dot - name;
+ if (name_len < sizeof(namez)-1)
+ {
+ memcpy(namez, name, name_len);
+ namez[name_len] = '\0';
+ if (!yaz_matchstr(namez, e_v->name))
+ break;
+ }
+ }
+ }
+ if (!e_v)
+ {
+ yaz_log(YLOG_WARN, "The following setting is unrecognized: %s",
+ e_i->name);
+ errors++;
+ }
+ }
+ return errors;
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff