projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WRBUF: size_t for sizes, void funcs.
[yaz-moved-to-github.git]
/
include
/
yaz
/
retrieval.h
diff --git
a/include/yaz/retrieval.h
b/include/yaz/retrieval.h
index
e7463d2
..
66bc877
100644
(file)
--- a/
include/yaz/retrieval.h
+++ b/
include/yaz/retrieval.h
@@
-1,5
+1,5
@@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data.
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@
-24,7
+24,6
@@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $Id: retrieval.h,v 1.9 2007-02-08 10:51:23 adam Exp $ */
/**
* \file retrieval.h
/**
* \file retrieval.h
@@
-37,7
+36,7
@@
#include <stddef.h>
#include <yaz/wrbuf.h>
#include <yaz/yconfig.h>
#include <stddef.h>
#include <yaz/wrbuf.h>
#include <yaz/yconfig.h>
-
+#include <yaz/oid_util.h>
#include <yaz/record_conv.h>
YAZ_BEGIN_CDECL
#include <yaz/record_conv.h>
YAZ_BEGIN_CDECL
@@
-55,6
+54,7
@@
YAZ_EXPORT yaz_retrieval_t yaz_retrieval_create(void);
*/
YAZ_EXPORT void yaz_retrieval_destroy(yaz_retrieval_t p);
*/
YAZ_EXPORT void yaz_retrieval_destroy(yaz_retrieval_t p);
+#if YAZ_HAVE_XML2
/** configures retrieval
\param p retrieval handle
\param node xmlNode pointer (root element of XML config)
/** configures retrieval
\param p retrieval handle
\param node xmlNode pointer (root element of XML config)
@@
-87,7
+87,7
@@
YAZ_EXPORT void yaz_retrieval_destroy(yaz_retrieval_t p);
*/
YAZ_EXPORT
int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *node);
*/
YAZ_EXPORT
int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *node);
-
+#endif
/** performs retrieval request based on schema and format
\param p retrieval handle
/** performs retrieval request based on schema and format
\param p retrieval handle
@@
-106,11
+106,11
@@
int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *node);
*/
YAZ_EXPORT
int yaz_retrieval_request(yaz_retrieval_t p,
*/
YAZ_EXPORT
int yaz_retrieval_request(yaz_retrieval_t p,
- const char *schema, int *syntax,
- const char **match_schema, int **match_syntax,
+ const char *schema, Odr_oid *syntax,
+ const char **match_schema, Odr_oid **match_syntax,
yaz_record_conv_t *rc,
const char **backend_schema,
yaz_record_conv_t *rc,
const char **backend_schema,
- int **backend_syntax);
+ Odr_oid **backend_syntax);
/** returns error string (for last error)
\param p record conversion handle
/** returns error string (for last error)
\param p record conversion handle
@@
-133,6
+133,7
@@
YAZ_END_CDECL
/*
* 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