Happy new year

[yazpp-moved-to-github.git] / src / yaz-z-server.cpp

diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index 68bab4c..d184e71 100644 (file)
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -1,12 +1,14 @@
-/*
- * Copyright (c) 2000-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-z-server.cpp,v 1.23 2005-06-25 15:53:19 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <yaz/log.h>
-#include <yaz++/z-server.h>
+#include <yazpp/z-server.h>
+#include <yaz/oid_db.h>
 
 using namespace yazpp_1;
 
@@ -59,16 +61,16 @@ void Z_Server::recv_GDU (Z_GDU *apdu, int len)
 }
 
 void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len)
-{   
+{
     Z_Server_Facility_Info *f = m_facilities;
-    
+
     if (apdu_request->which == Z_APDU_initRequest)
     {
         Z_APDU *apdu_response = create_Z_PDU(Z_APDU_initResponse);
 
         Z_InitRequest *req = apdu_request->u.initRequest;
         Z_InitResponse *resp = apdu_response->u.initResponse;
-        
+
         if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
         {
             ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1);
@@ -112,13 +114,14 @@ void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len)
  * database record.
  */
 void Z_ServerUtility::create_databaseRecord (
-    ODR odr, Z_NamePlusRecord *rec, const char *dbname, int format,
+    ODR odr, Z_NamePlusRecord *rec, const char *dbname, const Odr_oid *format,
     const void *buf, int len)
 {
+    Odr_oid *oid = odr_oiddup(odr, format);
     rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0;
     rec->which = Z_NamePlusRecord_databaseRecord;
-    rec->u.databaseRecord = z_ext_record (odr, format,
-                                          (const char *) buf, len);
+    rec->u.databaseRecord = z_ext_record_oid(odr, oid,
+                                             (const char *) buf, len);
 }
 
 /*
@@ -128,11 +131,11 @@ void Z_ServerUtility::create_surrogateDiagnostics(
     ODR odr, Z_NamePlusRecord *rec, const char *dbname,
     int error, char *const addinfo)
 {
-    int *err = (int *)odr_malloc (odr, sizeof(*err));
+    Odr_int *err = (Odr_int *)odr_malloc (odr, sizeof(*err));
     Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (odr, sizeof(*drec));
     Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
         odr_malloc (odr, sizeof(*dr));
-    
+
     yaz_log(YLOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
     *err = error;
     rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0;
@@ -140,8 +143,7 @@ void Z_ServerUtility::create_surrogateDiagnostics(
     rec->u.surrogateDiagnostic = drec;
     drec->which = Z_DiagRec_defaultFormat;
     drec->u.defaultFormat = dr;
-    dr->diagnosticSetId =
-        yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+    dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1);
 
     dr->condition = err;
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
@@ -153,7 +155,7 @@ Z_Records *Z_ServerUtility::create_nonSurrogateDiagnostics (
 {
     Z_Records *rec = (Z_Records *)
         odr_malloc (odr, sizeof(*rec));
-    int *err = (int *)
+    Odr_int *err = (Odr_int *)
         odr_malloc (odr, sizeof(*err));
     Z_DiagRec *drec = (Z_DiagRec *)
         odr_malloc (odr, sizeof(*drec));
@@ -163,8 +165,7 @@ Z_Records *Z_ServerUtility::create_nonSurrogateDiagnostics (
     *err = error;
     rec->which = Z_Records_NSD;
     rec->u.nonSurrogateDiagnostic = dr;
-    dr->diagnosticSetId =
-        yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+    dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1);
 
     dr->condition = err;
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
@@ -179,15 +180,14 @@ void Z_ServerUtility::create_diagnostics (
     Z_DiagRec *drec = (Z_DiagRec *) odr_malloc (odr, sizeof(*drec));
     Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
         odr_malloc (odr, sizeof(*dr));
-    
+
     *num = 1;
     *dreca = (Z_DiagRec **) odr_malloc (odr, sizeof(*dreca));
     (*dreca)[0] = drec;
-        
+
     drec->which = Z_DiagRec_defaultFormat;
     drec->u.defaultFormat = dr;
-    dr->diagnosticSetId =
-        yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1);
+    dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1);
     dr->condition = odr_intdup (odr, error);
     dr->which = Z_DefaultDiagFormat_v2Addinfo;
     dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : "");
@@ -195,6 +195,7 @@ void Z_ServerUtility::create_diagnostics (
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab