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
Bump (c) year
[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
86ff26e
..
d79032b
100644
(file)
--- a/
src/yaz-my-server.cpp
+++ b/
src/yaz-my-server.cpp
@@
-1,17
+1,16
@@
-/*
- * 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.
* See the file LICENSE for details.
- *
- * $Id: yaz-my-server.cpp,v 1.19 2005-06-25 15:53:19 adam Exp $
*/
#include <stdlib.h>
#include <yaz/log.h>
#include <yaz/diagbib1.h>
#include <yaz/options.h>
*/
#include <stdlib.h>
#include <yaz/log.h>
#include <yaz/diagbib1.h>
#include <yaz/options.h>
-#include <yaz++/z-server.h>
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/z-server.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
+#include <yaz/oid_db.h>
using namespace yazpp_1;
using namespace yazpp_1;
@@
-43,7
+42,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);
@@
-123,7
+122,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)
@@
-131,8
+130,8
@@
void MyRetrieval::sr_record (const char *resultSetName,
yaz_log (YLOG_LOG, "MyServer::recv_Z_record");
const char *rec = get_record(position);
if (rec)
yaz_log (YLOG_LOG, "MyServer::recv_Z_record");
const char *rec = get_record(position);
if (rec)
- create_databaseRecord (odr_encode(), namePlusRecord, 0,
- VAL_USMARC, rec, strlen(rec));
+ create_databaseRecord(odr_encode(), namePlusRecord, 0,
+ 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);
@@
-246,6
+245,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