X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fotherinfo.c;h=f7a8e5fb503099afd7acce8c5bd2a76db5c6eb0c;hp=802c10c4fe442c96e15b8f6c646fb7386ebb481c;hb=8cb8947e3a7bff4dbf8f124871cb4905df1adce7;hpb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0 diff --git a/src/otherinfo.c b/src/otherinfo.c index 802c10c..f7a8e5f 100644 --- a/src/otherinfo.c +++ b/src/otherinfo.c @@ -1,11 +1,15 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2008 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** * \file otherinfo.c * \brief Implements Z39.50 OtherInfo utilities */ +#if HAVE_CONFIG_H +#include +#endif + #include #include @@ -69,7 +73,7 @@ void yaz_oi_APDU(Z_APDU *apdu, Z_OtherInformation ***oip) } } -Z_OtherInformationUnit *yaz_oi_update ( +Z_OtherInformationUnit *yaz_oi_update( Z_OtherInformation **otherInformationP, ODR odr, const Odr_oid *oid, int categoryValue, int delete_flag) { @@ -92,6 +96,7 @@ Z_OtherInformationUnit *yaz_oi_update ( { if (!oid) { + /* DS: Want does this do? Returns the first element without a category */ if (!otherInformation->list[i]->category) return otherInformation->list[i]; } @@ -129,7 +134,7 @@ Z_OtherInformationUnit *yaz_oi_update ( for (i = 0; inum_elements; i++) newlist[i] = otherInformation->list[i]; otherInformation->list = newlist; - + otherInformation->list[i] = (Z_OtherInformationUnit*) odr_malloc (odr, sizeof(Z_OtherInformationUnit)); if (oid) @@ -138,14 +143,14 @@ Z_OtherInformationUnit *yaz_oi_update ( odr_malloc (odr, sizeof(Z_InfoCategory)); otherInformation->list[i]->category->categoryTypeId = (Odr_oid*) odr_oiddup (odr, oid); - otherInformation->list[i]->category->categoryValue = + otherInformation->list[i]->category->categoryValue = odr_intdup(odr, categoryValue); } else otherInformation->list[i]->category = 0; otherInformation->list[i]->which = Z_OtherInfo_characterInfo; otherInformation->list[i]->information.characterInfo = 0; - + otherInformation->num_elements = i+1; return otherInformation->list[i]; } @@ -169,7 +174,7 @@ char *yaz_oi_get_string_oid ( const Odr_oid *oid, int categoryValue, int delete_flag) { Z_OtherInformationUnit *oi; - + if ((oi = yaz_oi_update(otherInformation, 0, oid, categoryValue, delete_flag)) && oi->which == Z_OtherInfo_characterInfo) @@ -177,9 +182,11 @@ char *yaz_oi_get_string_oid ( return 0; } + /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab