/*
- $ $Id: charneg.c,v 1.4 2002-07-25 12:50:17 adam Exp $
+ $ $Id: charneg.c,v 1.7 2002-10-04 19:06:25 adam Exp $
* Helper functions for Character Set and Language Negotiation - 3
*/
#include <yaz/otherinfo.h>
#include <yaz/z-charneg.h>
#include <yaz/charneg.h>
+#include <yaz/yaz-util.h>
static Z_External* z_ext_record2(ODR o, int oid_class, int oid_value,
const char *buf, int len)
p->indirect_reference = 0;
oid.proto = PROTO_Z3950;
- oid.oclass = oid_class;
- oid.value = oid_value;
+ oid.oclass = (enum oid_class) oid_class;
+ oid.value = (enum oid_value) oid_value;
p->direct_reference = odr_oiddup(o, oid_getoidbyent(&oid));
p->which = Z_External_octet;
int form = -1;
- if (!strcmp (charset, "UCS-2"))
+ if (!yaz_matchstr(charset, "UCS-2"))
form = 2;
- if (!strcmp (charset, "UCS-4"))
+ if (!yaz_matchstr(charset, "UCS-4"))
form = 4;
- if (!strcmp (charset, "UTF-16"))
+ if (!yaz_matchstr(charset, "UTF-16"))
form = 5;
- if (!strcmp (charset, "UTF-8"))
+ if (!yaz_matchstr(charset, "UTF-8"))
form = 8;
return form;