-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
- *
- * $Id: otherinfo.c,v 1.7 2007-04-12 13:52:57 adam Exp $
*/
/**
* \file otherinfo.c
Z_OtherInformationUnit *yaz_oi_update (
Z_OtherInformation **otherInformationP, ODR odr,
- const int *oid, int categoryValue, int delete_flag)
+ const Odr_oid *oid, int categoryValue, int delete_flag)
{
int i;
Z_OtherInformation *otherInformation;
{
if (!oid)
{
+ /* DS: Want does this do? Returns the first element without a category */
if (!otherInformation->list[i]->category)
return otherInformation->list[i];
}
{
otherInformation->list[i]->category = (Z_InfoCategory*)
odr_malloc (odr, sizeof(Z_InfoCategory));
- otherInformation->list[i]->category->categoryTypeId = (int*)
+ otherInformation->list[i]->category->categoryTypeId = (Odr_oid*)
odr_oiddup (odr, oid);
- otherInformation->list[i]->category->categoryValue = (int*)
- odr_malloc (odr, sizeof(int));
- *otherInformation->list[i]->category->categoryValue =
- categoryValue;
+ otherInformation->list[i]->category->categoryValue =
+ odr_intdup(odr, categoryValue);
}
else
otherInformation->list[i]->category = 0;
void yaz_oi_set_string_oid (
Z_OtherInformation **otherInformation, ODR odr,
- const int *oid, int categoryValue,
+ const Odr_oid *oid, int categoryValue,
const char *str)
{
Z_OtherInformationUnit *oi =
char *yaz_oi_get_string_oid (
Z_OtherInformation **otherInformation,
- const int *oid, int categoryValue, int delete_flag)
+ const Odr_oid *oid, int categoryValue, int delete_flag)
{
Z_OtherInformationUnit *oi;
return 0;
}
+void yaz_oi_set_facetlist_oid (
+ Z_OtherInformation **otherInformation, ODR odr,
+ const Odr_oid *oid, int categoryValue,
+ Z_FacetList *facet_list)
+{
+ Z_External *z_external = 0;
+ Z_OtherInformationUnit *oi =
+ yaz_oi_update(otherInformation, odr, oid, categoryValue, 0);
+ if (!oi)
+ return;
+ oi->which = Z_OtherInfo_externallyDefinedInfo;
+ z_external = odr_malloc(odr, sizeof(*z_external));
+ z_external->which = Z_External_userFacets;
+ z_external->direct_reference = odr_oiddup(odr, oid);
+ z_external->indirect_reference = 0;
+ z_external->u.facetList = facet_list;
+ oi->information.externallyDefinedInfo = z_external;
+}
+
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab