X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-my-server.cpp;h=635d4deb2e7cef209e8fabd488dceca0909286d5;hb=d588f1d530f53c4d38a4a5f954545b06b2751968;hp=86ff26e5f9aca8a3b728fc9ca9927c76c154a552;hpb=7411ed6df7fc0b535f83503f73d70e80f390e295;p=yazpp-moved-to-github.git

diff --git a/src/yaz-my-server.cpp b/src/yaz-my-server.cpp
index 86ff26e..635d4de 100644
--- a/src/yaz-my-server.cpp
+++ b/src/yaz-my-server.cpp
@@ -2,16 +2,17 @@
  * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-my-server.cpp,v 1.19 2005-06-25 15:53:19 adam Exp $
+ * $Id: yaz-my-server.cpp,v 1.23 2007-05-08 12:04:50 adam Exp $
  */
 
 #include <stdlib.h>
 #include <yaz/log.h>
 #include <yaz/diagbib1.h>
 #include <yaz/options.h>
-#include <yaz++/z-server.h>
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/z-server.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
+#include <yaz/oid_db.h>
 
 using namespace yazpp_1;
 
@@ -43,7 +44,7 @@ public:
                          Z_PresentResponse *presentResponse);
     void sr_record (const char *resultSetName,
                     int position,
-                    int *format,
+                    Odr_oid *format,
                     Z_RecordComposition *comp,
                     Z_NamePlusRecord *namePlusRecord,
                     Z_Records *records);
@@ -123,7 +124,7 @@ void MyRetrieval::sr_present (Z_PresentRequest *presentRequest,
 
 void MyRetrieval::sr_record (const char *resultSetName,
                              int position,
-                             int *format,
+                             Odr_oid *format,
                              Z_RecordComposition *comp,
                              Z_NamePlusRecord *namePlusRecord,
                              Z_Records *records)
@@ -131,8 +132,8 @@ void MyRetrieval::sr_record (const char *resultSetName,
     yaz_log (YLOG_LOG, "MyServer::recv_Z_record");
     const char *rec = get_record(position);
     if (rec)
-        create_databaseRecord (odr_encode(), namePlusRecord, 0,
-                               VAL_USMARC, rec, strlen(rec));
+        create_databaseRecord(odr_encode(), namePlusRecord, 0,
+                              yaz_oid_recsyn_usmarc, rec, strlen(rec));
     else
         create_surrogateDiagnostics(odr_encode(), namePlusRecord, 0,
                                     YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, 0);