X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fotherinfo.c;h=f7a8e5fb503099afd7acce8c5bd2a76db5c6eb0c;hp=fe2b637acc30f9db1400e31c42c3188f32c4b10c;hb=8cb8947e3a7bff4dbf8f124871cb4905df1adce7;hpb=8d691989077a0addcbd840d769dce6700f3d9622

diff --git a/src/otherinfo.c b/src/otherinfo.c
index fe2b637..f7a8e5f 100644
--- a/src/otherinfo.c
+++ b/src/otherinfo.c
@@ -1,13 +1,15 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: otherinfo.c,v 1.6 2007-01-03 08:42:15 adam Exp $
  */
 /**
  * \file otherinfo.c
  * \brief Implements Z39.50 OtherInfo utilities
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
@@ -71,9 +73,9 @@ 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,
-    int *oid, int categoryValue, int delete_flag)
+    const Odr_oid *oid, int categoryValue, int delete_flag)
 {
     int i;
     Z_OtherInformation *otherInformation;
@@ -94,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];
         }
@@ -131,25 +134,23 @@ Z_OtherInformationUnit *yaz_oi_update (
         for (i = 0; i<otherInformation->num_elements; i++)
             newlist[i] = otherInformation->list[i];
         otherInformation->list = newlist;
-        
+
         otherInformation->list[i] = (Z_OtherInformationUnit*)
             odr_malloc (odr, sizeof(Z_OtherInformationUnit));
         if (oid)
         {
             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;
         otherInformation->list[i]->which = Z_OtherInfo_characterInfo;
         otherInformation->list[i]->information.characterInfo = 0;
-        
+
         otherInformation->num_elements = i+1;
         return otherInformation->list[i];
     }
@@ -157,7 +158,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,28 +169,12 @@ 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;
-    
+
     if ((oi = yaz_oi_update(otherInformation, 0, oid, categoryValue,
                             delete_flag)) &&
         oi->which == Z_OtherInfo_characterInfo)
@@ -197,24 +182,11 @@ 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
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab