X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fotherinfo.c;h=7aac192497f847849a3a7fdbb7c2f13074315c20;hb=be821514c869d68186361b5aab6bbfd1aa60e087;hp=2dc06f3f734799e67f6429b712316f07ca9b2b00;hpb=67945ae14416eb099fec28978f286ebba7f5313f;p=yaz-moved-to-github.git diff --git a/src/otherinfo.c b/src/otherinfo.c index 2dc06f3..7aac192 100644 --- a/src/otherinfo.c +++ b/src/otherinfo.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 1995-2005, Index Data ApS + * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: otherinfo.c,v 1.5 2006-01-16 15:53:28 adam Exp $ + * $Id: otherinfo.c,v 1.7 2007-04-12 13:52:57 adam Exp $ */ /** * \file otherinfo.c @@ -73,7 +73,7 @@ void yaz_oi_APDU(Z_APDU *apdu, Z_OtherInformation ***oip) Z_OtherInformationUnit *yaz_oi_update ( Z_OtherInformation **otherInformationP, ODR odr, - int *oid, int categoryValue, int delete_flag) + const int *oid, int categoryValue, int delete_flag) { int i; Z_OtherInformation *otherInformation; @@ -157,7 +157,7 @@ Z_OtherInformationUnit *yaz_oi_update ( void yaz_oi_set_string_oid ( Z_OtherInformation **otherInformation, ODR odr, - int *oid, int categoryValue, + const int *oid, int categoryValue, const char *str) { Z_OtherInformationUnit *oi = @@ -168,25 +168,9 @@ void yaz_oi_set_string_oid ( oi->information.characterInfo = odr_strdup (odr, str); } -void yaz_oi_set_string_oidval ( - Z_OtherInformation **otherInformation, ODR odr, - int oidval, int categoryValue, - const char *str) -{ - int oid[OID_SIZE]; - struct oident ent; - ent.proto = PROTO_Z3950; - ent.oclass = CLASS_USERINFO; - ent.value = (oid_value) oidval; - if (!oid_ent_to_oid (&ent, oid)) - return ; - yaz_oi_set_string_oid(otherInformation, - odr, oid, categoryValue, str); -} - char *yaz_oi_get_string_oid ( Z_OtherInformation **otherInformation, - int *oid, int categoryValue, int delete_flag) + const int *oid, int categoryValue, int delete_flag) { Z_OtherInformationUnit *oi; @@ -197,21 +181,6 @@ char *yaz_oi_get_string_oid ( return 0; } -char *yaz_oi_get_string_oidval(Z_OtherInformation **otherInformation, - int oidval, int categoryValue, int delete_flag) -{ - int oid[OID_SIZE]; - struct oident ent; - ent.proto = PROTO_Z3950; - ent.oclass = CLASS_USERINFO; - ent.value = (oid_value) oidval; - - if (!oid_ent_to_oid (&ent, oid)) - return 0; - return yaz_oi_get_string_oid (otherInformation, oid, categoryValue, - delete_flag); -} - /* * Local variables: * c-basic-offset: 4