- 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 *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;