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 03018f7..156bfd9 100644 (file)
--- a/src/zget.c
+++ b/src/zget.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2004, Index Data.
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zget.c,v 1.7 2004-12-20 23:35:42 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)
 {
@@ -19,7 +20,7 @@ Z_InitRequest *zget_InitRequest(ODR o)
     r->options = (Odr_bitmask *)odr_malloc(o, sizeof(*r->options));
     ODR_MASK_ZERO(r->options);
     r->protocolVersion = (Odr_bitmask *)
-       odr_malloc(o, sizeof(*r->protocolVersion));
+        odr_malloc(o, sizeof(*r->protocolVersion));
 
     ODR_MASK_SET(r->options, Z_Options_search);
     ODR_MASK_SET(r->options, Z_Options_present);
@@ -41,7 +42,7 @@ Z_InitRequest *zget_InitRequest(ODR o)
 #ifdef YAZ_OS
     " " YAZ_OS
 #endif
-       ;
+        ;
     r->userInformationField = 0;
     r->otherInfo = 0;
     return r;
@@ -68,7 +69,7 @@ Z_InitResponse *zget_InitResponse(ODR o)
 #ifdef YAZ_OS
     " " YAZ_OS
 #endif
-       ;
+        ;
     r->userInformationField = 0;
     r->otherInfo = 0;
     return r;
@@ -147,7 +148,7 @@ Z_PresentResponse *zget_PresentResponse(ODR o)
 Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
 {
     Z_DeleteResultSetRequest *r = (Z_DeleteResultSetRequest *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
 
     r->referenceId = 0;
     r->deleteFunction = odr_intdup(o, Z_DeleteResultSetRequest_list);
@@ -160,7 +161,7 @@ Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
 Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
 {
     Z_DeleteResultSetResponse *r = (Z_DeleteResultSetResponse *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
     
     r->referenceId = 0;
     r->deleteOperationStatus = odr_intdup(o, Z_DeleteStatus_success);
@@ -206,7 +207,7 @@ Z_ScanResponse *zget_ScanResponse(ODR o)
 Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
 {
     Z_TriggerResourceControlRequest *r = (Z_TriggerResourceControlRequest *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
     
     r->referenceId = 0;
     r->requestedAction = odr_intdup(o, Z_TriggerResourceControlRequest_resourceReport);
@@ -219,7 +220,7 @@ Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
 Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
 {
     Z_ResourceControlRequest *r = (Z_ResourceControlRequest *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
 
     r->referenceId = 0;
     r->suspendedFlag = 0;
@@ -234,7 +235,7 @@ Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
 Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
 {
     Z_ResourceControlResponse *r = (Z_ResourceControlResponse *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
 
     r->referenceId = 0;
     r->continueFlag = odr_intdup(o, 1);
@@ -246,7 +247,7 @@ Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
 Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
 {
     Z_AccessControlRequest *r = (Z_AccessControlRequest *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
 
     r->referenceId = 0;
     r->which = Z_AccessControlRequest_simpleForm;
@@ -258,7 +259,7 @@ Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
 Z_AccessControlResponse *zget_AccessControlResponse(ODR o)
 {
     Z_AccessControlResponse *r = (Z_AccessControlResponse *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
 
     r->referenceId = 0;
     r->which = Z_AccessControlResponse_simpleForm;
@@ -296,7 +297,7 @@ Z_Close *zget_Close(ODR o)
 Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
 {
     Z_ResourceReportRequest *r = (Z_ResourceReportRequest *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
 
     r->referenceId = 0;
     r->opId = 0;
@@ -308,7 +309,7 @@ Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
 Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o)
 {
     Z_ResourceReportResponse *r = (Z_ResourceReportResponse *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
 
     r->referenceId = 0;
     r->resourceReportStatus = odr_intdup(o, Z_ResourceReportResponse_success);
@@ -345,7 +346,7 @@ Z_SortResponse *zget_SortResponse(ODR o)
 Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
 {
     Z_ExtendedServicesRequest *r = (Z_ExtendedServicesRequest *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
 
     r->referenceId = 0;
     r->function = odr_intdup(o, Z_ExtendedServicesRequest_create);
@@ -365,7 +366,7 @@ Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
 Z_ExtendedServicesResponse *zget_ExtendedServicesResponse(ODR o)
 {
     Z_ExtendedServicesResponse *r = (Z_ExtendedServicesResponse *)
-       odr_malloc(o, sizeof(*r));
+        odr_malloc(o, sizeof(*r));
 
     r->referenceId = 0;
     r->operationStatus = odr_intdup(o, Z_ExtendedServicesResponse_done);
@@ -486,7 +487,7 @@ Z_APDU *zget_APDU(ODR o, int which)
         break;
     case Z_APDU_extendedServicesResponse:
         r->u.extendedServicesResponse = zget_ExtendedServicesResponse(o);
-       break;
+        break;
     case Z_APDU_duplicateDetectionRequest:
         r->u.duplicateDetectionRequest = zget_DuplicateDetectionRequest(o);
         break;
@@ -494,19 +495,18 @@ Z_APDU *zget_APDU(ODR o, int which)
         r->u.duplicateDetectionResponse = zget_DuplicateDetectionResponse(o);
         break;
     default:
-        fprintf(stderr, "Bad APDU-type to zget_APDU");
-        exit(1);
+        return 0;
     }
     return r;
 }
 
 Z_DefaultDiagFormat *zget_DefaultDiagFormat(ODR o, int error,
-                                           const char *addinfo)
+                                            const char *addinfo)
 {
     Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) 
-       odr_malloc (o, sizeof(*dr));
+        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 : "");
@@ -532,15 +532,15 @@ Z_DiagRecs *zget_DiagRecs(ODR o, int error, const char *addinfo)
 }
 
 Z_NamePlusRecord *zget_surrogateDiagRec(ODR o, const char *dbname,
-                                       int error, const char *addinfo)
+                                        int error, const char *addinfo)
 {
     Z_NamePlusRecord *rec = (Z_NamePlusRecord *) odr_malloc (o, sizeof(*rec));
     Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (o, sizeof(*drec));
     
     if (dbname)
-       rec->databaseName = odr_strdup(o, dbname);
+        rec->databaseName = odr_strdup(o, dbname);
     else
-       rec->databaseName = 0;
+        rec->databaseName = 0;
     rec->which = Z_NamePlusRecord_surrogateDiagnostic;
     rec->u.surrogateDiagnostic = drec;
     drec->which = Z_DiagRec_defaultFormat;
@@ -551,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;
@@ -560,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);
@@ -579,9 +575,48 @@ 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);
+    x2->u.diag1 = d;
+    d->num = 1;
+    d->elements = (Z_DiagnosticFormat_s**) odr_malloc (odr, sizeof *d->elements);
+    d->elements[0] = (Z_DiagnosticFormat_s*) odr_malloc (odr, sizeof *d->elements[0]);
+    e = d->elements[0];
+
+    e->which = Z_DiagnosticFormat_s_defaultDiagRec;
+    e->u.defaultDiagRec = zget_DefaultDiagFormat(odr, error, addinfo);
+    e->message = 0;
+    return x;
+}
+
+Z_External *zget_init_diagnostics_octet(ODR odr, int error,
+                                        const char *addinfo)
+{
+    Z_External *x, *x2;
+    Z_OtherInformation *u;
+    Z_OtherInformationUnit *l;
+    Z_DiagnosticFormat *d;
+    Z_DiagnosticFormat_s *e;
+    char *octet_buf;
+    int octet_len;
+    ODR encode;
+
+    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]);
+    l = u->list[0];
+    l->category = 0;
+    l->which = Z_OtherInfo_externallyDefinedInfo;
+
+    x2 = (Z_External*) odr_malloc(odr, sizeof *x);
+    l->information.externallyDefinedInfo = x2;
+    x2->descriptor = 0;
+    x2->indirect_reference = 0;
+
+    x2->direct_reference = odr_oiddup(odr, yaz_oid_diagset_diag_1);
     x2->which = Z_External_diag1;
 
     d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
@@ -594,6 +629,33 @@ Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
     e->which = Z_DiagnosticFormat_s_defaultDiagRec;
     e->u.defaultDiagRec = zget_DefaultDiagFormat(odr, error, addinfo);
     e->message = 0;
+
+    encode = odr_createmem(ODR_ENCODE);
+
+    z_OtherInformation(encode, &u, 0, 0);
+
+    octet_buf = odr_getbuf(encode, &octet_len, 0);
+
+    x = (Z_External*) odr_malloc(odr, sizeof *x);
+    x->descriptor = 0;
+    x->indirect_reference = 0;  
+    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 = (unsigned char *) odr_malloc(odr, octet_len);
+    memcpy(x->u.octet_aligned->buf, octet_buf, octet_len);
+    x->u.octet_aligned->len = octet_len;
+
+    odr_destroy(encode);
+
     return x;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+