projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DH compat 5
[yazpp-moved-to-github.git]
/
src
/
yaz-ir-assoc.cpp
diff --git
a/src/yaz-ir-assoc.cpp
b/src/yaz-ir-assoc.cpp
index
31689f4
..
e93694d
100644
(file)
--- 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) 1998-2012 Index Data and Mike Taylor
* See the file LICENSE for details.
* 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>
#include <assert.h>
#include <yaz/log.h>
@@
-205,7
+206,8
@@
int IR_Assoc::send_searchRequest(Yaz_Z_Query *query,
assert (req->otherInfo == 0);
if (m_cookie)
{
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);
}
assert (req->otherInfo);
}
@@
-222,10
+224,10
@@
int IR_Assoc::send_searchRequest(Yaz_Z_Query *query,
return send_Z_PDU(apdu, 0);
}
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;
{
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)
}
if (m_cookie)
- set_otherInformationString(&req->otherInfo, OID_STR_COOKIE,
+ set_otherInformationString(&req->otherInfo, yaz_oid_userinfo_cookie,
1, m_cookie);
if ( pRefId )
1, m_cookie);
if ( pRefId )
@@
-384,9
+386,11
@@
int IR_Assoc::send_initRequest(char* pRefId)
}
if (m_proxy && m_host)
}
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)
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);
}
return send_Z_PDU(apdu, 0);
}
@@
-415,9
+419,11
@@
int IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
}
if (m_proxy && m_host)
}
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)
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);
}
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
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab