X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcharneg.c;h=ff4bc47ff5e7a11005bc638b6570cab40a18c8eb;hb=c584380ce880fe0e0ba036f476f8a037763eac21;hp=ebd10fc53f429ae6cfea6bff39fb90be8dd9b7a5;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9;p=yaz-moved-to-github.git diff --git a/src/charneg.c b/src/charneg.c index ebd10fc..ff4bc47 100644 --- a/src/charneg.c +++ b/src/charneg.c @@ -1,8 +1,16 @@ -/* - $ $Id: charneg.c,v 1.1 2003-10-27 12:21:30 adam Exp $ - * Helper functions for Character Set and Language Negotiation - 3 +/* + * Copyright (C) 1995-2005, Index Data ApS + * See the file LICENSE for details. + * + * $Id: charneg.c,v 1.5 2005-06-25 15:46:03 adam Exp $ */ +/** + * \file charneg.c + * \brief Implements Z39.50 Charset negotiation utilities + * + * Helper functions for Character Set and Language Negotiation - 3 + */ #include #include #include @@ -35,7 +43,7 @@ static Z_External* z_ext_record2(ODR o, int oid_class, int oid_value, } p->u.octet_aligned->len = p->u.octet_aligned->size = len; memcpy(p->u.octet_aligned->buf, buf, len); - + return p; } @@ -100,7 +108,7 @@ static Z_OriginProposal_0 *z_get_OriginProposal_0(ODR o, const char *charset) p0->which = Z_OriginProposal_0_private; p0->u.zprivate = pc; - + pc->which = Z_PrivateCharacterSet_externallySpecified; pc->u.externallySpecified = z_ext_record2(o, CLASS_NEGOT, VAL_ID_CHARSET, charset); @@ -111,17 +119,17 @@ static Z_OriginProposal_0 *z_get_OriginProposal_0(ODR o, const char *charset) static Z_OriginProposal *z_get_OriginProposal( ODR o, const char **charsets, int num_charsets, const char **langs, int num_langs, int selected) -{ +{ int i; Z_OriginProposal *p = (Z_OriginProposal *) odr_malloc(o, sizeof(*p)); - + memset(p, 0, sizeof(*p)); p->recordsInSelectedCharSets = (bool_t *)odr_malloc(o, sizeof(bool_t)); *p->recordsInSelectedCharSets = (selected) ? 1:0; - if (charsets && num_charsets) { - + if (charsets && num_charsets) { + p->num_proposedCharSets = num_charsets; p->proposedCharSets = (Z_OriginProposal_0**) @@ -132,7 +140,7 @@ static Z_OriginProposal *z_get_OriginProposal( z_get_OriginProposal_0(o, charsets[i]); } if (langs && num_langs) { - + p->num_proposedlanguages = num_langs; p->proposedlanguages = @@ -141,7 +149,7 @@ static Z_OriginProposal *z_get_OriginProposal( for (i = 0; iproposedlanguages[i] = (char *)langs[i]; - + } } return p; @@ -154,7 +162,7 @@ static Z_CharSetandLanguageNegotiation *z_get_CharSetandLanguageNegotiation( (Z_CharSetandLanguageNegotiation *) odr_malloc(o, sizeof(*p)); memset(p, 0, sizeof(*p)); - + return p; } @@ -166,9 +174,9 @@ Z_External *yaz_set_proposal_charneg(ODR o, { Z_External *p = (Z_External *)odr_malloc(o, sizeof(*p)); oident oid; - + p->descriptor = 0; - p->indirect_reference = 0; + p->indirect_reference = 0; oid.proto = PROTO_Z3950; oid.oclass = CLASS_NEGOT; @@ -188,7 +196,7 @@ Z_External *yaz_set_proposal_charneg(ODR o, /* used by yaz_set_response_charneg */ static Z_TargetResponse *z_get_TargetResponse(ODR o, const char *charset, const char *lang, int selected) -{ +{ Z_TargetResponse *p = (Z_TargetResponse *) odr_malloc(o, sizeof(*p)); int form = get_form(charset); @@ -211,13 +219,13 @@ static Z_TargetResponse *z_get_TargetResponse(ODR o, const char *charset, (Z_PrivateCharacterSet *)odr_malloc(o, sizeof(*pc)); memset(pc, 0, sizeof(*pc)); - + p->which = Z_TargetResponse_private; p->u.zprivate = pc; - + pc->which = Z_PrivateCharacterSet_externallySpecified; pc->u.externallySpecified = - z_ext_record2(o, CLASS_NEGOT, VAL_ID_CHARSET, charset); + z_ext_record2(o, CLASS_NEGOT, VAL_ID_CHARSET, charset); } p->recordsInSelectedCharSets = (bool_t *)odr_malloc(o, sizeof(bool_t)); *p->recordsInSelectedCharSets = (selected) ? 1:0; @@ -232,9 +240,9 @@ Z_External *yaz_set_response_charneg(ODR o, const char *charset, { Z_External *p = (Z_External *)odr_malloc(o, sizeof(*p)); oident oid; - + p->descriptor = 0; - p->indirect_reference = 0; + p->indirect_reference = 0; oid.proto = PROTO_Z3950; oid.oclass = CLASS_NEGOT; @@ -252,22 +260,22 @@ Z_External *yaz_set_response_charneg(ODR o, const char *charset, /* Get negotiation from OtherInformation. Client&Server side */ Z_CharSetandLanguageNegotiation *yaz_get_charneg_record(Z_OtherInformation *p) { - Z_External *pext; int i; - - if(!p) + + if (!p) return 0; - - for (i=0; inum_elements; i++) { - + + for (i = 0; i < p->num_elements; i++) { + Z_External *pext; if ((p->list[i]->which == Z_OtherInfo_externallyDefinedInfo) && (pext = p->list[i]->information.externallyDefinedInfo)) { - + oident *ent = oid_getentbyoid(pext->direct_reference); - - if (ent && ent->value == VAL_CHARNEG3 && ent->oclass == CLASS_NEGOT && - pext->which == Z_External_charSetandLanguageNegotiation) { - + + if (ent && ent->value == VAL_CHARNEG3 + && ent->oclass == CLASS_NEGOT + && pext->which == Z_External_charSetandLanguageNegotiation) + { return pext->u.charNeg3; } } @@ -275,6 +283,41 @@ Z_CharSetandLanguageNegotiation *yaz_get_charneg_record(Z_OtherInformation *p) return 0; } +/* Delete negotiation from OtherInformation. Client&Server side */ +int yaz_del_charneg_record(Z_OtherInformation **p) +{ + int i; + + if (!*p) + return 0; + + for (i = 0; i < (*p)->num_elements; i++) { + Z_External *pext; + if (((*p)->list[i]->which == Z_OtherInfo_externallyDefinedInfo) && + (pext = (*p)->list[i]->information.externallyDefinedInfo)) { + + oident *ent = oid_getentbyoid(pext->direct_reference); + + if (ent && ent->value == VAL_CHARNEG3 + && ent->oclass == CLASS_NEGOT + && pext->which == Z_External_charSetandLanguageNegotiation) + { + --((*p)->num_elements); + if ((*p)->num_elements == 0) + *p = 0; + else + { + for(; i < (*p)->num_elements; i++) + (*p)->list[i] = (*p)->list[i+1]; + } + return 1; + } + } + } + return 0; +} + + /* Get charsets, langs, selected from negotiation.. Server side */ void yaz_get_proposal_charneg(NMEM mem, Z_CharSetandLanguageNegotiation *p, char ***charsets, int *num_charsets, @@ -351,7 +394,7 @@ void yaz_get_response_charneg(NMEM mem, Z_CharSetandLanguageNegotiation *p, char **charset, char **lang, int *selected) { Z_TargetResponse *res = p->u.response; - + if (charset && res->which == Z_TargetResponse_private && res->u.zprivate->which == Z_PrivateCharacterSet_externallySpecified) { @@ -364,7 +407,7 @@ void yaz_get_response_charneg(NMEM mem, Z_CharSetandLanguageNegotiation *p, memcpy (*charset, pext->u.octet_aligned->buf, pext->u.octet_aligned->len); (*charset)[pext->u.octet_aligned->len] = 0; - } + } } if (charset && res->which == Z_TargetResponse_iso10646) *charset = set_form (res->u.iso10646->encodingLevel); @@ -374,3 +417,11 @@ void yaz_get_response_charneg(NMEM mem, Z_CharSetandLanguageNegotiation *p, if(selected && res->recordsInSelectedCharSets) *selected = *res->recordsInSelectedCharSets; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +