X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fotherinfo.c;h=9d7e0833dd749db16d39d635e310e5e09ae9ac35;hb=eb68779c8a1e2ea059b5cf1a790e5047e3190bf2;hp=2dc06f3f734799e67f6429b712316f07ca9b2b00;hpb=67945ae14416eb099fec28978f286ebba7f5313f;p=yaz-moved-to-github.git

diff --git a/src/otherinfo.c b/src/otherinfo.c
index 2dc06f3..9d7e083 100644
--- a/src/otherinfo.c
+++ b/src/otherinfo.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, 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.5 2006-01-16 15:53:28 adam Exp $
  */
 /**
  * \file otherinfo.c
@@ -73,7 +71,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 Odr_oid *oid, int categoryValue, int delete_flag)
 {
     int i;
     Z_OtherInformation *otherInformation;
@@ -94,6 +92,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];
         }
@@ -138,12 +137,10 @@ Z_OtherInformationUnit *yaz_oi_update (
         {
             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;
@@ -157,7 +154,7 @@ Z_OtherInformationUnit *yaz_oi_update (
 
 void yaz_oi_set_string_oid (
     Z_OtherInformation **otherInformation, ODR odr,
-    int *oid, int categoryValue,
+    const Odr_oid *oid, int categoryValue,
     const char *str)
 {
     Z_OtherInformationUnit *oi =
@@ -168,25 +165,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 Odr_oid *oid, int categoryValue, int delete_flag)
 {
     Z_OtherInformationUnit *oi;
     
@@ -197,24 +178,29 @@ char *yaz_oi_get_string_oid (
     return 0;
 }
 
-char *yaz_oi_get_string_oidval(Z_OtherInformation **otherInformation,
-                               int oidval, int categoryValue, int delete_flag)
+void yaz_oi_set_facetlist_oid (
+    Z_OtherInformation **otherInformation, ODR odr,
+    const Odr_oid *oid, int categoryValue,
+    Z_FacetList *facet_list)
 {
-    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);
+    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