projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WRBUF updates
[metaproxy-moved-to-github.git]
/
src
/
gduutil.cpp
diff --git
a/src/gduutil.cpp
b/src/gduutil.cpp
index
c154b67
..
e0b971f
100644
(file)
--- a/
src/gduutil.cpp
+++ b/
src/gduutil.cpp
@@
-1,5
+1,5
@@
-/* $Id: gduutil.cpp,v 1.14 2006-10-04 11:21:47 marc Exp $
- Copyright (c) 2005-2006, Index Data.
+/* $Id: gduutil.cpp,v 1.18 2007-03-20 07:57:54 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
See the LICENSE file for details
*/
See the LICENSE file for details
*/
@@
-16,7
+16,10
@@
namespace mp = metaproxy_1;
// Doxygen doesn't like mp::gdu, so we use this instead
namespace mp = metaproxy_1;
// Doxygen doesn't like mp::gdu, so we use this instead
-namespace mp_gdu = metaproxy_1::gdu;
+namespace mp_util = metaproxy_1::util;
+
+
+
std::ostream& std::operator<<(std::ostream& os, Z_GDU& zgdu)
{
std::ostream& std::operator<<(std::ostream& os, Z_GDU& zgdu)
{
@@
-179,8
+182,8
@@
std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu)
WRBUF wr = wrbuf_alloc();
yaz_query_to_wrbuf(wr, sr->query);
WRBUF wr = wrbuf_alloc();
yaz_query_to_wrbuf(wr, sr->query);
- os << wrbuf_buf(wr);
- wrbuf_free(wr, 1);
+ os << wrbuf_cstr(wr);
+ wrbuf_destroy(wr);
}
break;
case Z_APDU_searchResponse:
}
break;
case Z_APDU_searchResponse:
@@
-234,11
+237,12
@@
std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu)
os << " " <<(oid_getentbyoid(pr->preferredRecordSyntax))->desc;
else
os << " -";
os << " " <<(oid_getentbyoid(pr->preferredRecordSyntax))->desc;
else
os << " -";
- //elements
- //if (pr->)
- // os << " " << *(pr->);
- //else
- // os << " -";
+ const char * msg = 0;
+ if (pr->recordComposition
+ && (msg = mp_util::record_composition_to_esn(pr->recordComposition)))
+ os << " " << msg;
+ else
+ os << " -";
}
break;
case Z_APDU_presentResponse:
}
break;
case Z_APDU_presentResponse:
@@
-332,8
+336,8
@@
std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu)
{
WRBUF wr = wrbuf_alloc();
yaz_scan_to_wrbuf(wr, sr->termListAndStartPoint, VAL_NONE);
{
WRBUF wr = wrbuf_alloc();
yaz_scan_to_wrbuf(wr, sr->termListAndStartPoint, VAL_NONE);
- os << wrbuf_buf(wr);
- wrbuf_free(wr, 1);
+ os << wrbuf_cstr(wr);
+ wrbuf_destroy(wr);
}
else
os << " -";
}
else
os << " -";