X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-ir-assoc.cpp;h=0978e060c521bd5f3f74f5e85ed53299b1e37d8d;hp=31689f470cf5c7a19682576b51aa66d0d32ab12f;hb=d62e0baee8ee3cccced41746ef09fc3e01f401d5;hpb=d508100e993ab5c9a415bd1826b939875dcfe91c

diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp
index 31689f4..0978e06 100644
--- a/src/yaz-ir-assoc.cpp
+++ b/src/yaz-ir-assoc.cpp
@@ -1,10 +1,11 @@
-/*
- * Copyright (c) 1998-2003, 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-ir-assoc.cpp,v 1.28 2007-04-12 15:00:33 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 
 #include <yaz/log.h>
@@ -94,7 +95,7 @@ void IR_Assoc::set_databaseNames(const char *dblist, const char *sep)
 void IR_Assoc::set_preferredRecordSyntax (const char *syntax)
 {
     xfree(m_preferredRecordSyntax);
-    m_preferredRecordSyntax = 0;    
+    m_preferredRecordSyntax = 0;
     if (syntax && *syntax)
         m_preferredRecordSyntax = xstrdup(syntax);
 }
@@ -164,7 +165,7 @@ void IR_Assoc::recv_Z_PDU(Z_APDU *apdu, int len)
         recv_searchRequest(apdu->u.searchRequest);
         break;
     case Z_APDU_searchResponse:
-        yaz_log (m_log, "recv searchResponse"); 
+        yaz_log (m_log, "recv searchResponse");
         recv_searchResponse(apdu->u.searchResponse);
         break;
     case Z_APDU_presentRequest:
@@ -205,7 +206,8 @@ int IR_Assoc::send_searchRequest(Yaz_Z_Query *query,
     assert (req->otherInfo == 0);
     if (m_cookie)
     {
-        set_otherInformationString(&req->otherInfo, OID_STR_COOKIE, 1, m_cookie);
+        set_otherInformationString(&req->otherInfo, yaz_oid_userinfo_cookie,
+                                   1, m_cookie);
         assert (req->otherInfo);
     }
 
@@ -222,10 +224,10 @@ int IR_Assoc::send_searchRequest(Yaz_Z_Query *query,
     return send_Z_PDU(apdu, 0);
 }
 
-int IR_Assoc::send_presentRequest(int start, 
-                                      int number, 
-                                      char* pResultSetId,
-                                      char* pRefId)
+int IR_Assoc::send_presentRequest(Odr_int start,
+                                  Odr_int number,
+                                  char* pResultSetId,
+                                  char* pRefId)
 {
     Z_APDU *apdu = create_Z_PDU(Z_APDU_presentRequest);
     Z_PresentRequest *req = apdu->u.presentRequest;
@@ -252,7 +254,7 @@ int IR_Assoc::send_presentRequest(int start,
     }
 
     if (m_cookie)
-        set_otherInformationString(&req->otherInfo, OID_STR_COOKIE, 
+        set_otherInformationString(&req->otherInfo, yaz_oid_userinfo_cookie,
                                    1, m_cookie);
 
     if ( pRefId )
@@ -364,7 +366,7 @@ int IR_Assoc::send_initRequest(char* pRefId)
 {
     Z_APDU *apdu = create_Z_PDU(Z_APDU_initRequest);
     Z_InitRequest *req = apdu->u.initRequest;
-    
+
     ODR_MASK_SET(req->options, Z_Options_search);
     ODR_MASK_SET(req->options, Z_Options_present);
     ODR_MASK_SET(req->options, Z_Options_namedResultSets);
@@ -384,9 +386,11 @@ int IR_Assoc::send_initRequest(char* pRefId)
     }
 
     if (m_proxy && m_host)
-        set_otherInformationString(&req->otherInfo, OID_STR_PROXY, 1, m_host);
+        set_otherInformationString(&req->otherInfo, yaz_oid_userinfo_proxy,
+                                   1, m_host);
     if (m_cookie)
-        set_otherInformationString(&req->otherInfo, OID_STR_COOKIE, 1, m_cookie);
+        set_otherInformationString(&req->otherInfo, yaz_oid_userinfo_cookie,
+                                   1, m_cookie);
     return send_Z_PDU(apdu, 0);
 }
 
@@ -408,16 +412,18 @@ int IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
     {
         *req->deleteFunction = Z_DeleteResultSetRequest_all;
     }
-    
+
     if ( pRefId )
     {
         req->referenceId = getRefID(pRefId);
     }
 
     if (m_proxy && m_host)
-        set_otherInformationString(&req->otherInfo, OID_STR_PROXY, 1, m_host);
+        set_otherInformationString(&req->otherInfo, yaz_oid_userinfo_proxy,
+                                   1, m_host);
     if (m_cookie)
-        set_otherInformationString(&req->otherInfo, OID_STR_COOKIE, 1, m_cookie);
+        set_otherInformationString(&req->otherInfo, yaz_oid_userinfo_cookie,
+                                   1, m_cookie);
 
     return send_Z_PDU(apdu, 0);
 }
@@ -426,6 +432,7 @@ int IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab