#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <yaz/log.h>
#include "pazpar2.h"
#include "host.h"
memset(db, 0, sizeof(*db));
db->host = 0;
db->url = nmem_strdup(service->nmem, id);
- db->databases = xmalloc(2 * sizeof(char *));
+ db->databases = nmem_malloc(service->nmem, 2 * sizeof(char *));
db->databases[0] = nmem_strdup(service->nmem, dbname);
db->databases[1] = 0;
db->errors = 0;
return 0;
for (v = c->values; v; v = v->next)
{
- if (offset == PZ_ID)
+ if (c->type == PAZPAR2_STRING_MATCH)
{
- if (match_zurl(settings[offset]->value, v->value))
- break;
- }
- else
+ if (offset == PZ_ID)
+ {
+ if (match_zurl(settings[offset]->value, v->value))
+ break;
+ }
+ else
+ {
+ if (!strcmp(settings[offset]->value, v->value))
+ break;
+ }
+ }
+ else if (c->type == PAZPAR2_SUBSTRING_MATCH)
{
- if (!strcmp(settings[offset]->value, v->value))
+ if (strstr(settings[offset]->value, v->value))
break;
}
}