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
Remove 'and Mike Taylor' clause from copyright
[yazpp-moved-to-github.git]
/
zlint
/
test-init-07.cpp
diff --git
a/zlint/test-init-07.cpp
b/zlint/test-init-07.cpp
index
eb72b30
..
ac47bab
100644
(file)
--- a/
zlint/test-init-07.cpp
+++ b/
zlint/test-init-07.cpp
@@
-1,10
+1,11
@@
-/*
- * Copyright (c) 2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: test-init-07.cpp,v 1.4 2005-06-25 15:53:21 adam Exp $
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/log.h>
#include <yaz/charneg.h>
#include <yaz/otherinfo.h>
#include <yaz/log.h>
#include <yaz/charneg.h>
#include <yaz/otherinfo.h>
@@
-27,7
+28,7
@@
Zlint_code Zlint_test_init_07::init(Zlint *z)
Z_OtherInformation **oi;
z->msg_check_for("for character set negotiation");
Z_OtherInformation **oi;
z->msg_check_for("for character set negotiation");
-
+
/* set all options.. see what target really supports .. */
ODR_MASK_SET(init->protocolVersion, Z_ProtocolVersion_3);
yaz_oi_APDU(apdu, &oi);
/* set all options.. see what target really supports .. */
ODR_MASK_SET(init->protocolVersion, Z_ProtocolVersion_3);
yaz_oi_APDU(apdu, &oi);
@@
-47,13
+48,13
@@
Zlint_code Zlint_test_init_07::init(Zlint *z)
"ISO-8859-1"
};
char *yazLang = 0;
"ISO-8859-1"
};
char *yazLang = 0;
-
+
if ((p0=yaz_oi_update(oi, z->odr_encode(), NULL, 0, 0))) {
ODR_MASK_SET(init->options, Z_Options_negotiationModel);
if ((p0=yaz_oi_update(oi, z->odr_encode(), NULL, 0, 0))) {
ODR_MASK_SET(init->options, Z_Options_negotiationModel);
-
+
p0->which = Z_OtherInfo_externallyDefinedInfo;
p0->information.externallyDefinedInfo =
p0->which = Z_OtherInfo_externallyDefinedInfo;
p0->information.externallyDefinedInfo =
-
+
yaz_set_proposal_charneg(
z->odr_encode(),
negotiationCharset, 5,
yaz_set_proposal_charneg(
z->odr_encode(),
negotiationCharset, 5,
@@
-75,20
+76,18
@@
Zlint_code Zlint_test_init_07::recv_gdu(Zlint *z, Z_GDU *gdu)
gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_initResponse)
{
Z_InitResponse *init = gdu->u.z3950->u.initResponse;
gdu->u.z3950 && gdu->u.z3950->which == Z_APDU_initResponse)
{
Z_InitResponse *init = gdu->u.z3950->u.initResponse;
- int ver = z->initResponseGetVersion(init);
- int result = init->result ? *init->result : 0;
if (ODR_MASK_GET(init->options, Z_Options_negotiationModel))
{
Z_CharSetandLanguageNegotiation *p =
yaz_get_charneg_record(init->otherInfo);
if (ODR_MASK_GET(init->options, Z_Options_negotiationModel))
{
Z_CharSetandLanguageNegotiation *p =
yaz_get_charneg_record(init->otherInfo);
-
+
if (p) {
if (p) {
-
+
char *charset=NULL, *lang=NULL;
int selected;
NMEM m = nmem_create();
char *charset=NULL, *lang=NULL;
int selected;
NMEM m = nmem_create();
-
+
yaz_get_response_charneg(m, p, &charset, &lang,
&selected);
z->msg_check_ok();
yaz_get_response_charneg(m, p, &charset, &lang,
&selected);
z->msg_check_ok();
@@
-110,6
+109,7
@@
Zlint_code Zlint_test_init_07::recv_gdu(Zlint *z, Z_GDU *gdu)
/*
* 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