Code updates which makes things compile as C++. Mostly type casts were

[yaz-moved-to-github.git] / src / zget.c

diff --git a/src/zget.c b/src/zget.c
index 27d243a..156bfd9 100644 (file)
--- a/src/zget.c
+++ b/src/zget.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: zget.c,v 1.11 2005-06-25 15:46:06 adam Exp $
+ * $Id: zget.c,v 1.15 2007-05-06 20:12:20 adam Exp $
  */
 /**
  * \file zget.c
@@ -10,6 +10,7 @@
  */
 
 #include <yaz/proto.h>
+#include <yaz/oid_db.h>
 
 Z_InitRequest *zget_InitRequest(ODR o)
 {
@@ -505,7 +506,7 @@ Z_DefaultDiagFormat *zget_DefaultDiagFormat(ODR o, int error,
     Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) 
         odr_malloc (o, sizeof(*dr));
     
-    dr->diagnosticSetId = yaz_oidval_to_z3950oid (o, CLASS_DIAGSET, VAL_BIB1);
+    dr->diagnosticSetId = odr_oiddup(o, yaz_oid_diagset_bib_1);
     dr->condition = odr_intdup(o, error);
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
     dr->u.v2Addinfo = odr_strdup (o, addinfo ? addinfo : "");
@@ -550,7 +551,6 @@ Z_NamePlusRecord *zget_surrogateDiagRec(ODR o, const char *dbname,
 Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
 {
     Z_External *x, *x2;
-    oident oid;
     Z_OtherInformation *u;
     Z_OtherInformationUnit *l;
     Z_DiagnosticFormat *d;
@@ -559,13 +559,10 @@ Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
     x = (Z_External*) odr_malloc(odr, sizeof *x);
     x->descriptor = 0;
     x->indirect_reference = 0;  
-    oid.proto = PROTO_Z3950;
-    oid.oclass = CLASS_USERINFO;
-    oid.value = VAL_USERINFO1;
-    x->direct_reference = odr_oiddup(odr, oid_getoidbyent(&oid));
+    x->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_userinfo_1);
     x->which = Z_External_userInfo1;
 
-    u = odr_malloc(odr, sizeof *u);
+    u = (Z_OtherInformation *) odr_malloc(odr, sizeof *u);
     x->u.userInfo1 = u;
     u->num_elements = 1;
     u->list = (Z_OtherInformationUnit**) odr_malloc(odr, sizeof *u->list);
@@ -578,9 +575,7 @@ Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
     l->information.externallyDefinedInfo = x2;
     x2->descriptor = 0;
     x2->indirect_reference = 0;
-    oid.oclass = CLASS_DIAGSET;
-    oid.value = VAL_DIAG1;
-    x2->direct_reference = odr_oiddup(odr, oid_getoidbyent(&oid));
+    x2->direct_reference = odr_oiddup(odr, yaz_oid_diagset_diag_1);
     x2->which = Z_External_diag1;
 
     d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
@@ -600,7 +595,6 @@ Z_External *zget_init_diagnostics_octet(ODR odr, int error,
                                         const char *addinfo)
 {
     Z_External *x, *x2;
-    oident oid;
     Z_OtherInformation *u;
     Z_OtherInformationUnit *l;
     Z_DiagnosticFormat *d;
@@ -609,7 +603,7 @@ Z_External *zget_init_diagnostics_octet(ODR odr, int error,
     int octet_len;
     ODR encode;
 
-    u = odr_malloc(odr, sizeof *u);
+    u = (Z_OtherInformation *) odr_malloc(odr, sizeof *u);
     u->num_elements = 1;
     u->list = (Z_OtherInformationUnit**) odr_malloc(odr, sizeof *u->list);
     u->list[0] = (Z_OtherInformationUnit*) odr_malloc(odr, sizeof *u->list[0]);
@@ -621,10 +615,8 @@ Z_External *zget_init_diagnostics_octet(ODR odr, int error,
     l->information.externallyDefinedInfo = x2;
     x2->descriptor = 0;
     x2->indirect_reference = 0;
-    oid.oclass = CLASS_DIAGSET;
-    oid.proto = PROTO_Z3950;
-    oid.value = VAL_DIAG1;
-    x2->direct_reference = odr_oiddup(odr, oid_getoidbyent(&oid));
+
+    x2->direct_reference = odr_oiddup(odr, yaz_oid_diagset_diag_1);
     x2->which = Z_External_diag1;
 
     d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
@@ -647,14 +639,10 @@ Z_External *zget_init_diagnostics_octet(ODR odr, int error,
     x = (Z_External*) odr_malloc(odr, sizeof *x);
     x->descriptor = 0;
     x->indirect_reference = 0;  
-    oid.proto = PROTO_Z3950;
-    oid.oclass = CLASS_USERINFO;
-    oid.value = VAL_USERINFO1;
-    x->direct_reference = odr_oiddup(odr, oid_getoidbyent(&oid));
-
+    x->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_userinfo_1);
     x->which = Z_External_octet;
     x->u.octet_aligned = (Odr_oct *) odr_malloc(odr, sizeof(Odr_oct));
-    x->u.octet_aligned->buf = odr_malloc(odr, octet_len);
+    x->u.octet_aligned->buf = (unsigned char *) odr_malloc(odr, octet_len);
     memcpy(x->u.octet_aligned->buf, octet_buf, octet_len);
     x->u.octet_aligned->len = octet_len;