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
Update news
[yazpp-moved-to-github.git]
/
src
/
yaz-my-client.cpp
diff --git
a/src/yaz-my-client.cpp
b/src/yaz-my-client.cpp
index
e359be3
..
0121dc6
100644
(file)
--- a/
src/yaz-my-client.cpp
+++ b/
src/yaz-my-client.cpp
@@
-1,8
+1,6
@@
-/*
- * Copyright (c) 1998-2007, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2010 Index Data and Mike Taylor
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: yaz-my-client.cpp,v 1.27 2007-04-12 15:00:33 adam Exp $
*/
#include <stdlib.h>
*/
#include <stdlib.h>
@@
-113,14
+111,10
@@
void usage(char *prog)
char *MyClient::get_cookie(Z_OtherInformation **otherInfo)
{
char *MyClient::get_cookie(Z_OtherInformation **otherInfo)
{
- Z_OtherInformationUnit *oi;
-
- const int *oid =
- yaz_string_to_oid(yaz_oid_std(), CLASS_USERINFO, OID_STR_COOKIE);
+ Z_OtherInformationUnit *oi =
+ update_otherInformation(otherInfo, 0, yaz_oid_userinfo_cookie, 1, 1);
- if (oid &&
- (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) &&
- oi->which == Z_OtherInfo_characterInfo)
+ if (oi && oi->which == Z_OtherInfo_characterInfo)
return oi->information.characterInfo;
return 0;
}
return oi->information.characterInfo;
return 0;
}
@@
-159,7
+153,7
@@
void MyClient::recv_diagrecs(Z_DiagRec **pp, int num)
}
else
r = p->u.defaultFormat;
}
else
r = p->u.defaultFormat;
- printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition));
+ printf(" [" ODR_INT_PRINTF "] %s", *r->condition, diagbib1_str(*r->condition));
switch (r->which)
{
case Z_DefaultDiagFormat_v2Addinfo:
switch (r->which)
{
case Z_DefaultDiagFormat_v2Addinfo:
@@
-283,7
+277,7
@@
void MyClient::recv_searchResponse(Z_SearchResponse *searchResponse)
else
{
printf ("Ok\n");
else
{
printf ("Ok\n");
- printf ("Hits: %d\n", *searchResponse->resultCount);
+ printf ("Hits: " ODR_INT_PRINTF "\n", *searchResponse->resultCount);
}
recv_records (searchResponse->records);
}
}
recv_records (searchResponse->records);
}
@@
-558,6
+552,7
@@
int main(int argc, char **argv)
/*
* 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