-/* $Id: database.c,v 1.16 2007-04-12 07:15:48 marc Exp $
+/* $Id: database.c,v 1.19 2007-04-18 12:41:38 quinn Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
if (offset == PZ_ID)
{
if (match_zurl(settings[offset]->value, v->value))
- return 1;
- else
- return 0;
+ break;
}
else
{
if (!strcmp(settings[offset]->value, v->value))
- return 1;
- else
- return 0;
+ break;
}
}
- return 0;
+ if (v)
+ return 1;
+ else
+ return 0;
}
int database_match_criteria(struct setting **settings, struct database_criterion *cl)
db->yaz_marc = yaz_marc_create();
yaz_marc_subfield_str(db->yaz_marc, "\t");
+
// See if a native encoding is specified
- if ((s = db->settings[PZ_ENCODING]))
+ if (db->settings[PZ_ENCODING])
+ encoding = db->settings[PZ_ENCODING]->value;
+
+ cm = yaz_iconv_open("utf-8", encoding);
+ if (!cm)
{
- encoding = s->value;
- break;
- }
- if (!(cm = yaz_iconv_open("utf-8", encoding)))
- {
- yaz_log(YLOG_FATAL, "Unable to map from %s to UTF-8", encoding);
+ yaz_log(YLOG_FATAL,
+ "Unable to map from %s to UTF-8 for target %s",
+ encoding, db->url);
exit(1);
}
yaz_marc_iconv(db->yaz_marc, cm);
- break;
}
}