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

diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp
index 31689f4..ad35d00 100644
--- a/src/yaz-ir-assoc.cpp
+++ b/src/yaz-ir-assoc.cpp
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 1998-2003, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2009 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 $
  */
 
 #include <assert.h>
@@ -205,7 +203,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 +221,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 +251,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 )
@@ -384,9 +383,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);
 }
 
@@ -415,9 +416,11 @@ int IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, 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);
 }
@@ -426,6 +429,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