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
Use thread-safe rpn2cql and cql2rpn from YAZ YPP-14
[yazpp-moved-to-github.git]
/
src
/
yaz-my-server.cpp
diff --git
a/src/yaz-my-server.cpp
b/src/yaz-my-server.cpp
index
70e9fb4
..
5663a1e
100644
(file)
--- a/
src/yaz-my-server.cpp
+++ b/
src/yaz-my-server.cpp
@@
-1,10
+1,11
@@
-/*
- * Copyright (c) 1998-2001, 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: yaz-my-server.cpp,v 1.21 2007-04-12 15:00:33 adam Exp $
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <yaz/log.h>
#include <yaz/diagbib1.h>
#include <stdlib.h>
#include <yaz/log.h>
#include <yaz/diagbib1.h>
@@
-44,7
+45,7
@@
public:
Z_PresentResponse *presentResponse);
void sr_record (const char *resultSetName,
int position,
Z_PresentResponse *presentResponse);
void sr_record (const char *resultSetName,
int position,
- int *format,
+ Odr_oid *format,
Z_RecordComposition *comp,
Z_NamePlusRecord *namePlusRecord,
Z_Records *records);
Z_RecordComposition *comp,
Z_NamePlusRecord *namePlusRecord,
Z_Records *records);
@@
-124,7
+125,7
@@
void MyRetrieval::sr_present (Z_PresentRequest *presentRequest,
void MyRetrieval::sr_record (const char *resultSetName,
int position,
void MyRetrieval::sr_record (const char *resultSetName,
int position,
- int *format,
+ Odr_oid *format,
Z_RecordComposition *comp,
Z_NamePlusRecord *namePlusRecord,
Z_Records *records)
Z_RecordComposition *comp,
Z_NamePlusRecord *namePlusRecord,
Z_Records *records)
@@
-133,7
+134,7
@@
void MyRetrieval::sr_record (const char *resultSetName,
const char *rec = get_record(position);
if (rec)
create_databaseRecord(odr_encode(), namePlusRecord, 0,
const char *rec = get_record(position);
if (rec)
create_databaseRecord(odr_encode(), namePlusRecord, 0,
- OID_STR_USMARC, rec, strlen(rec));
+ yaz_oid_recsyn_usmarc, rec, strlen(rec));
else
create_surrogateDiagnostics(odr_encode(), namePlusRecord, 0,
YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, 0);
else
create_surrogateDiagnostics(odr_encode(), namePlusRecord, 0,
YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, 0);
@@
-192,16
+193,17
@@
int main(int argc, char **argv)
char *arg;
char *prog = *argv;
const char *addr = "tcp:@:9999";
char *arg;
char *prog = *argv;
const char *addr = "tcp:@:9999";
+ const char *cert_fname = 0;
char *apdu_log = 0;
char *apdu_log = 0;
-
+
SocketManager mySocketManager;
SocketManager mySocketManager;
-
+
PDU_Assoc *my_PDU_Assoc = 0;
PDU_Assoc *my_PDU_Assoc = 0;
-
+
MyServer *z = 0;
int ret;
MyServer *z = 0;
int ret;
-
- while ((ret = options("a:v:T", argv, argc, &arg)) != -2)
+
+ while ((ret = options("a:C:v:T", argv, argc, &arg)) != -2)
{
switch (ret)
{
{
switch (ret)
{
@@
-211,6
+213,9
@@
int main(int argc, char **argv)
case 'a':
apdu_log = xstrdup(arg);
break;
case 'a':
apdu_log = xstrdup(arg);
break;
+ case 'C':
+ cert_fname = xstrdup(arg);
+ break;
case 'v':
yaz_log_init_level (yaz_log_mask_str(arg));
break;
case 'v':
yaz_log_init_level (yaz_log_mask_str(arg));
break;
@@
-230,7
+235,9
@@
int main(int argc, char **argv)
#else
my_PDU_Assoc = new PDU_Assoc(&mySocketManager);
#endif
#else
my_PDU_Assoc = new PDU_Assoc(&mySocketManager);
#endif
-
+
+ my_PDU_Assoc->set_cert_fname(cert_fname);
+
z = new MyServer(my_PDU_Assoc);
z->server(addr);
if (apdu_log)
z = new MyServer(my_PDU_Assoc);
z->server(addr);
if (apdu_log)
@@
-247,6
+254,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