-/*
- * Copyright (c) 1998-2001, 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-my-client.cpp,v 1.12 2002-10-28 12:16:09 adam Exp $
*/
+#include <stdlib.h>
#include <yaz/log.h>
#include <yaz/options.h>
#include <yaz/diagbib1.h>
#include <yaz/marcdisp.h>
-#include <yaz++/ir-assoc.h>
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/ir-assoc.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
+#include <yaz/oid_db.h>
extern "C" {
#if HAVE_READLINE_READLINE_H
#endif
}
-class YAZ_EXPORT MyClient : public Yaz_IR_Assoc {
+using namespace yazpp_1;
+
+class YAZ_EXPORT MyClient : public IR_Assoc {
private:
int m_interactive_flag;
char m_thisCommand[1024];
char m_lastCommand[1024];
int m_setOffset;
- Yaz_SocketManager *m_socketManager;
+ SocketManager *m_socketManager;
public:
- MyClient(IYaz_PDU_Observable *the_PDU_Observable,
- Yaz_SocketManager *the_SocketManager);
- IYaz_PDU_Observer *sessionNotify(
- IYaz_PDU_Observable *the_PDU_Observable, int fd);
- int args(Yaz_SocketManager *socketManager, int argc, char **argv);
- int interactive(Yaz_SocketManager *socketManager);
+ MyClient(IPDU_Observable *the_PDU_Observable,
+ SocketManager *the_SocketManager);
+ IPDU_Observer *sessionNotify(
+ IPDU_Observable *the_PDU_Observable, int fd);
+ int args(SocketManager *socketManager, int argc, char **argv);
+ int interactive(SocketManager *socketManager);
int wait();
void recv_initResponse(Z_InitResponse *initResponse);
void recv_searchResponse(Z_SearchResponse *searchResponse);
void recv_diagrecs(Z_DiagRec **pp, int num);
void recv_namePlusRecord (Z_NamePlusRecord *zpr, int offset);
void recv_record(Z_DatabaseRecord *record, int offset,
- const char *databaseName);
- void recv_textRecord(int type, const char *buf, size_t len);
+ const char *databaseName);
+ void recv_textRecord(const char *buf, size_t len);
void recv_genericRecord(Z_GenericRecord *r);
- void display_genericRecord(Z_GenericRecord *r, int level);
- void display_variant(Z_Variant *v, int level);
void connectNotify();
void failNotify();
void timeoutNotify();
char *get_cookie (Z_OtherInformation **oi);
int processCommand(const char *cmd);
- const char *MyClient::getCommand();
+ const char *getCommand();
int cmd_open(char *host);
int cmd_connect(char *host);
int cmd_quit(char *args);
set_lastReceived(-1);
}
-IYaz_PDU_Observer *MyClient::sessionNotify(
- IYaz_PDU_Observable *the_PDU_Observable, int fd)
+IPDU_Observer *MyClient::sessionNotify(IPDU_Observable *the_PDU_Observable,
+ int fd)
{
return new MyClient(the_PDU_Observable, m_socketManager);
}
-MyClient::MyClient(IYaz_PDU_Observable *the_PDU_Observable,
- Yaz_SocketManager *the_socketManager) :
- Yaz_IR_Assoc (the_PDU_Observable)
+MyClient::MyClient(IPDU_Observable *the_PDU_Observable,
+ SocketManager *the_socketManager) :
+ IR_Assoc (the_PDU_Observable)
{
m_setOffset = 1;
m_interactive_flag = 1;
char *MyClient::get_cookie(Z_OtherInformation **otherInfo)
{
- int oid[OID_SIZE];
- Z_OtherInformationUnit *oi;
- struct oident ent;
- ent.proto = PROTO_Z3950;
- ent.oclass = CLASS_USERINFO;
- ent.value = (oid_value) VAL_COOKIE;
-
- if (oid_ent_to_oid (&ent, oid) &&
- (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) &&
- oi->which == Z_OtherInfo_characterInfo)
- return oi->information.characterInfo;
+ Z_OtherInformationUnit *oi =
+ update_otherInformation(otherInfo, 0, yaz_oid_userinfo_cookie, 1, 1);
+
+ if (oi && oi->which == Z_OtherInfo_characterInfo)
+ return oi->information.characterInfo;
return 0;
}
printf ("Got InitResponse. Status ");
if (*initResponse->result)
{
- printf ("Ok\n");
-
- const char *p = get_cookie (&initResponse->otherInfo);
- if (p)
- {
- printf ("cookie = %s\n", p);
- set_cookie(p);
- }
+ printf ("Ok\n");
+
+ const char *p = get_cookie (&initResponse->otherInfo);
+ if (p)
+ {
+ printf ("cookie = %s\n", p);
+ set_cookie(p);
+ }
}
else
- printf ("Fail\n");
+ printf ("Fail\n");
}
void MyClient::recv_diagrecs(Z_DiagRec **pp, int num)
{
int i;
- oident *ent;
Z_DefaultDiagFormat *r;
printf("Diagnostic message(s) from database:\n");
for (i = 0; i<num; i++)
{
- Z_DiagRec *p = pp[i];
- if (p->which != Z_DiagRec_defaultFormat)
- {
- printf("Diagnostic record not in default format.\n");
- return;
- }
- else
- r = p->u.defaultFormat;
- if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
- ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1)
- printf("Missing or unknown diagset\n");
- printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition));
-#ifdef ASN_COMPILED
- switch (r->which)
- {
- case Z_DefaultDiagFormat_v2Addinfo:
- printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo);
- break;
- case Z_DefaultDiagFormat_v3Addinfo:
- printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo);
- break;
- }
-#else
- if (r->addinfo && *r->addinfo)
- printf(" -- '%s'\n", r->addinfo);
- else
- printf("\n");
-#endif
+ Z_DiagRec *p = pp[i];
+ if (p->which != Z_DiagRec_defaultFormat)
+ {
+ printf("Diagnostic record not in default format.\n");
+ return;
+ }
+ else
+ r = p->u.defaultFormat;
+ printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition));
+ switch (r->which)
+ {
+ case Z_DefaultDiagFormat_v2Addinfo:
+ printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo);
+ break;
+ case Z_DefaultDiagFormat_v3Addinfo:
+ printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo);
+ break;
+ }
}
}
-void MyClient::recv_textRecord(int type, const char *buf, size_t len)
+void MyClient::recv_textRecord(const char *buf, size_t len)
{
fwrite (buf, 1, len, stdout);
fputc ('\n', stdout);
}
-void MyClient::display_variant(Z_Variant *v, int level)
-{
- int i;
-
- for (i = 0; i < v->num_triples; i++)
- {
- printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass,
- *v->triples[i]->type);
- if (v->triples[i]->which == Z_Triple_internationalString)
- printf(",value=%s\n", v->triples[i]->value.internationalString);
- else
- printf("\n");
- }
-}
-
-void MyClient::display_genericRecord(Z_GenericRecord *r, int level)
-{
- int i;
-
- if (!r)
- return;
- for (i = 0; i < r->num_elements; i++)
- {
- Z_TaggedElement *t;
-
- printf("%*s", level * 4, "");
- t = r->elements[i];
- printf("(");
- if (t->tagType)
- printf("%d,", *t->tagType);
- else
- printf("?,");
- if (t->tagValue->which == Z_StringOrNumeric_numeric)
- printf("%d) ", *t->tagValue->u.numeric);
- else
- printf("%s) ", t->tagValue->u.string);
- if (t->content->which == Z_ElementData_subtree)
- {
- printf("\n");
- display_genericRecord(t->content->u.subtree, level+1);
- }
- else if (t->content->which == Z_ElementData_string)
- printf("%s\n", t->content->u.string);
- else if (t->content->which == Z_ElementData_numeric)
- printf("%d\n", *t->content->u.numeric);
- else if (t->content->which == Z_ElementData_oid)
- {
- int *ip = t->content->u.oid;
- oident *oent;
-
- if ((oent = oid_getentbyoid(t->content->u.oid)))
- printf("OID: %s\n", oent->desc);
- else
- {
- printf("{");
- while (ip && *ip >= 0)
- printf(" %d", *(ip++));
- printf(" }\n");
- }
- }
- else if (t->content->which == Z_ElementData_noDataRequested)
- printf("[No data requested]\n");
- else if (t->content->which == Z_ElementData_elementEmpty)
- printf("[Element empty]\n");
- else if (t->content->which == Z_ElementData_elementNotThere)
- printf("[Element not there]\n");
- else
- printf("??????\n");
- if (t->appliedVariant)
- display_variant(t->appliedVariant, level+1);
- if (t->metaData && t->metaData->supportedVariants)
- {
- int c;
-
- printf("%*s---- variant list\n", (level+1)*4, "");
- for (c = 0; c < t->metaData->num_supportedVariants; c++)
- {
- printf("%*svariant #%d\n", (level+1)*4, "", c);
- display_variant(t->metaData->supportedVariants[c], level + 2);
- }
- }
- }
-}
-
void MyClient::recv_genericRecord(Z_GenericRecord *r)
{
- display_genericRecord(r, 0);
+ WRBUF w = wrbuf_alloc();
+ yaz_display_grs1(w, r, 0);
+ fwrite(wrbuf_buf(w), 1, wrbuf_len(w), stdout);
+ wrbuf_destroy(w);
}
void MyClient::recv_record(Z_DatabaseRecord *record, int offset,
- const char *databaseName)
+ const char *databaseName)
{
Z_External *r = (Z_External*) record;
- oident *ent = oid_getentbyoid(r->direct_reference);
-
/*
* Tell the user what we got.
*/
if (r->direct_reference)
{
- printf("Record type: ");
- if (ent)
- printf("%s\n", ent->desc);
- }
- /* Check if this is a known, ASN.1 type tucked away in an octet string */
- Z_ext_typeent *etype = z_ext_getentbyref(ent->value);
- if (ent && (r->which == Z_External_octet || r->which == Z_External_single)
- && (etype = z_ext_getentbyref(ent->value)))
-
- {
- void *rr;
- /*
- * Call the given decoder to process the record.
- */
- odr_setbuf(odr_decode(), (char*)record->u.octet_aligned->buf,
- record->u.octet_aligned->len, 0);
- if (!(*etype->fun)(odr_decode(), (char **)&rr, 0, 0))
- {
- odr_perror(odr_decode(), "Decoding constructed record.");
- fprintf(stderr, "[Near %d]\n", odr_offset(odr_decode()));
- fprintf(stderr, "Packet dump:\n---------\n");
- odr_dumpBER(stderr, (char*)record->u.octet_aligned->buf,
- record->u.octet_aligned->len);
- fprintf(stderr, "---------\n");
- }
- if (etype->what == Z_External_sutrs)
- {
- Z_SUTRS *sutrs = (Z_SUTRS *) rr;
- recv_textRecord ((int) VAL_SUTRS, (const char *) sutrs->buf,
- (size_t) sutrs->len);
- }
- return;
+ char name_oid_str[OID_STR_MAX];
+ const char *name_oid = yaz_oid_to_string_buf(r->direct_reference, 0,
+ name_oid_str);
+ printf("Record type: %s\n", name_oid ? name_oid : "unknown");
}
if (r->which == Z_External_octet && record->u.octet_aligned->len)
{
- switch (ent->value)
- {
- case VAL_ISO2709:
- case VAL_UNIMARC:
- case VAL_INTERMARC:
- case VAL_USMARC:
- case VAL_UKMARC:
- case VAL_NORMARC:
- case VAL_LIBRISMARC:
- case VAL_DANMARC:
- case VAL_FINMARC:
- case VAL_MAB:
- case VAL_CANMARC:
- case VAL_SBN:
- case VAL_PICAMARC:
- case VAL_AUSMARC:
- case VAL_IBERMARC:
- case VAL_CATMARC:
- case VAL_MALMARC:
- case VAL_JPMARC:
- case VAL_SWEMARC:
- case VAL_SIGLEMARC:
- case VAL_ISDSMARC:
- case VAL_RUSMARC:
- marc_display((char*) record->u.octet_aligned->buf,0);
- break;
- default:
- recv_textRecord((int) ent->value,
- (const char *) record->u.octet_aligned->buf,
- (size_t) record->u.octet_aligned->len);
- }
+ if (yaz_oid_is_iso2709(r->direct_reference))
+ {
+ yaz_marc_t mt = yaz_marc_create();
+
+ const char *result_buf;
+ size_t result_size;
+ yaz_marc_decode_buf(mt, (const char *)
+ record->u.octet_aligned->buf,
+ record->u.octet_aligned->len,
+ &result_buf, &result_size);
+ fwrite(result_buf, 1, result_size, stdout);
+ yaz_marc_destroy(mt);
+ }
+ else
+ {
+ recv_textRecord((const char *) record->u.octet_aligned->buf,
+ (size_t) record->u.octet_aligned->len);
+ }
}
- else if (ent && ent->value == VAL_SUTRS && r->which == Z_External_sutrs)
- recv_textRecord((int) VAL_SUTRS, (const char *) r->u.sutrs->buf,
- (size_t) r->u.sutrs->len);
- else if (ent && ent->value == VAL_GRS1 && r->which == Z_External_grs1)
+ else if (r->which == Z_External_sutrs)
+ recv_textRecord((const char *) r->u.sutrs->buf,
+ (size_t) r->u.sutrs->len);
+ else if (r->which == Z_External_grs1)
recv_genericRecord(r->u.grs1);
else
{
void MyClient::recv_namePlusRecord (Z_NamePlusRecord *zpr, int offset)
{
if (zpr->databaseName)
- printf("[%s]", zpr->databaseName);
+ printf("[%s]", zpr->databaseName);
if (zpr->which == Z_NamePlusRecord_surrogateDiagnostic)
recv_diagrecs(&zpr->u.surrogateDiagnostic, 1);
else
void MyClient::recv_records (Z_Records *records)
{
-#ifdef ASN_COMPILED
Z_DiagRec dr, *dr_p = &dr;
-#endif
if (!records)
- return;
+ return;
int i;
switch (records->which)
{
case Z_Records_DBOSD:
for (i = 0; i < records->u.databaseOrSurDiagnostics->num_records; i++)
recv_namePlusRecord(records->u.databaseOrSurDiagnostics->
- records[i], i + m_setOffset);
- m_setOffset += records->u.databaseOrSurDiagnostics->num_records;
- break;
+ records[i], i + m_setOffset);
+ m_setOffset += records->u.databaseOrSurDiagnostics->num_records;
+ break;
case Z_Records_NSD:
-#ifdef ASN_COMPILED
- dr.which = Z_DiagRec_defaultFormat;
- dr.u.defaultFormat = records->u.nonSurrogateDiagnostic;
- recv_diagrecs (&dr_p, 1);
-#else
- recv_diagrecs (&records->u.nonSurrogateDiagnostic, 1);
-#endif
- break;
+ dr.which = Z_DiagRec_defaultFormat;
+ dr.u.defaultFormat = records->u.nonSurrogateDiagnostic;
+ recv_diagrecs (&dr_p, 1);
+ break;
case Z_Records_multipleNSD:
- recv_diagrecs (records->u.multipleNonSurDiagnostics->diagRecs,
- records->u.multipleNonSurDiagnostics->num_diagRecs);
- break;
+ recv_diagrecs (records->u.multipleNonSurDiagnostics->diagRecs,
+ records->u.multipleNonSurDiagnostics->num_diagRecs);
+ break;
}
}
printf ("Got SearchResponse. Status ");
if (!*searchResponse->searchStatus)
{
- printf ("Fail\n");
+ printf ("Fail\n");
}
else
{
- printf ("Ok\n");
- printf ("Hits: %d\n", *searchResponse->resultCount);
+ printf ("Ok\n");
+ printf ("Hits: %d\n", *searchResponse->resultCount);
}
recv_records (searchResponse->records);
}
set_lastReceived(0);
while (m_socketManager->processEvent() > 0)
{
- if (get_lastReceived())
- return 1;
+ if (get_lastReceived())
+ return 1;
}
return 0;
}
client (host);
timeout (10);
wait ();
- timeout (0);
+ timeout (-1);
return 1;
}
client (host);
timeout (10);
wait ();
- timeout (0);
+ timeout (-1);
send_initRequest();
wait ();
return 1;
int MyClient::cmd_init(char *args)
{
if (send_initRequest() >= 0)
- wait();
+ wait();
else
- close();
+ close();
return 1;
}
if (query.set_rpn(args) <= 0)
{
- printf ("Bad RPN query\n");
- return 1;
+ printf ("Bad RPN query\n");
+ return 1;
}
if (send_searchRequest(&query) >= 0)
- wait();
+ wait();
else
- printf ("Not connected\n");
+ printf ("Not connected\n");
return 1;
}
sscanf (args, "%d %d", &start, &number);
m_setOffset = start;
if (send_presentRequest(start, number) >= 0)
- wait();
+ wait();
else
- printf ("Not connected\n");
+ printf ("Not connected\n");
return 1;
}
cmdArgs[0] = '\0';
cmdStr[0] = '\0';
static struct {
- char *cmd;
+ const char *cmd;
int (MyClient::*fun)(char *arg);
- char *ad;
+ const char *ad;
} cmd[] = {
- {"open", &MyClient::cmd_open, "<host>[':'<port>][/<database>]"},
- {"connect", &MyClient::cmd_connect, "<host>[':'<port>][/<database>]"},
- {"quit", &MyClient::cmd_quit, ""},
- {"close", &MyClient::cmd_close, ""},
- {"find", &MyClient::cmd_find, "<query>"},
- {"show", &MyClient::cmd_show, "[<start> [<number>]]"},
- {"cookie", &MyClient::cmd_cookie, "<cookie>"},
- {"init", &MyClient::cmd_init, ""},
- {"format", &MyClient::cmd_format, "<record-syntax>"},
- {"proxy", &MyClient::cmd_proxy, "<host>:[':'<port>]"},
- {0,0,0}
+ {"open", &MyClient::cmd_open, "<host>[':'<port>][/<database>]"},
+ {"connect", &MyClient::cmd_connect, "<host>[':'<port>][/<database>]"},
+ {"quit", &MyClient::cmd_quit, ""},
+ {"close", &MyClient::cmd_close, ""},
+ {"find", &MyClient::cmd_find, "<query>"},
+ {"show", &MyClient::cmd_show, "[<start> [<number>]]"},
+ {"cookie", &MyClient::cmd_cookie, "<cookie>"},
+ {"init", &MyClient::cmd_init, ""},
+ {"format", &MyClient::cmd_format, "<record-syntax>"},
+ {"proxy", &MyClient::cmd_proxy, "<host>:[':'<port>]"},
+ {0,0,0}
};
if (sscanf(commandLine, "%s %[^;]", cmdStr, cmdArgs) < 1)
- return 1;
+ return 1;
int i;
for (i = 0; cmd[i].cmd; i++)
- if (!strncmp(cmd[i].cmd, cmdStr, strlen(cmdStr)))
- break;
+ if (!strncmp(cmd[i].cmd, cmdStr, strlen(cmdStr)))
+ break;
int res = 1;
if (cmd[i].cmd) // Invoke command handler
- res = (this->*cmd[i].fun)(cmdArgs);
+ res = (this->*cmd[i].fun)(cmdArgs);
else // Dump help screen
{
- printf("Unknown command: %s.\n", cmdStr);
- printf("Currently recognized commands:\n");
- for (i = 0; cmd[i].cmd; i++)
- printf(" %s %s\n", cmd[i].cmd, cmd[i].ad);
+ printf("Unknown command: %s.\n", cmdStr);
+ printf("Currently recognized commands:\n");
+ for (i = 0; cmd[i].cmd; i++)
+ printf(" %s %s\n", cmd[i].cmd, cmd[i].ad);
}
return res;
}
char *line_in;
line_in=readline(C_PROMPT);
if (!line_in)
- return 0;
+ return 0;
#if HAVE_READLINE_HISTORY_H
if (*line_in)
- add_history(line_in);
+ add_history(line_in);
#endif
strncpy(m_thisCommand,line_in, 1023);
m_thisCommand[1023] = '\0';
printf (C_PROMPT);
fflush(stdout);
if (!fgets(m_thisCommand, 1023, stdin))
- return 0;
+ return 0;
#endif
// Remove trailing whitespace
char *cp = m_thisCommand + strlen(m_thisCommand);
while (cp != m_thisCommand && strchr("\t \n", cp[-1]))
- cp--;
+ cp--;
*cp = '\0';
cp = m_thisCommand;
// Remove leading spaces...
while (*cp && strchr ("\t \n", *cp))
- cp++;
+ cp++;
// Save command if non-empty
if (*cp != '\0')
- strcpy (m_lastCommand, cp);
+ strcpy (m_lastCommand, cp);
return m_lastCommand;
}
-int MyClient::interactive(Yaz_SocketManager *socketManager)
+int MyClient::interactive(SocketManager *socketManager)
{
const char *cmd;
if (!m_interactive_flag)
- return 0;
+ return 0;
while ((cmd = getCommand()))
{
- if (!processCommand(cmd))
- break;
+ if (!processCommand(cmd))
+ break;
}
return 0;
}
-int MyClient::args(Yaz_SocketManager *socketManager, int argc, char **argv)
+int MyClient::args(SocketManager *socketManager, int argc, char **argv)
{
char *host = 0;
char *proxy = 0;
{
case 0:
if (host)
- {
- usage(prog);
- return 1;
- }
- host = arg;
+ {
+ usage(prog);
+ return 1;
+ }
+ host = arg;
break;
case 'p':
- if (proxy)
- {
- usage(prog);
- return 1;
- }
- set_proxy(arg);
- break;
- case 'c':
- set_cookie(arg);
- break;
- case 'v':
- yaz_log_init_level (yaz_log_mask_str(arg));
- break;
- case 'q':
- m_interactive_flag = 0;
- break;
+ if (proxy)
+ {
+ usage(prog);
+ return 1;
+ }
+ set_proxy(arg);
+ break;
+ case 'c':
+ set_cookie(arg);
+ break;
+ case 'v':
+ yaz_log_init_level (yaz_log_mask_str(arg));
+ break;
+ case 'q':
+ m_interactive_flag = 0;
+ break;
default:
- usage(prog);
- return 1;
+ usage(prog);
+ return 1;
}
}
if (host)
{
- client (host);
+ client (host);
timeout (10);
- wait ();
- timeout (0);
- send_initRequest();
- wait ();
+ wait ();
+ timeout (-1);
+ send_initRequest();
+ wait ();
}
return 0;
}
int main(int argc, char **argv)
{
- Yaz_SocketManager mySocketManager;
- Yaz_PDU_Assoc *some = new Yaz_PDU_Assoc(&mySocketManager);
+ SocketManager mySocketManager;
+ PDU_Assoc *some = new PDU_Assoc(&mySocketManager);
MyClient z(some, &mySocketManager);
if (z.args(&mySocketManager, argc, argv))
- exit (1);
+ exit (1);
if (z.interactive(&mySocketManager))
- exit (1);
+ exit (1);
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yazpp-moved-to-github.git / blobdiff