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
Merge branch 'master' into yaz4
[yaz-moved-to-github.git]
/
include
/
yaz
/
prt-ext.h
diff --git
a/include/yaz/prt-ext.h
b/include/yaz/prt-ext.h
index
33917db
..
be28a40
100644
(file)
--- a/
include/yaz/prt-ext.h
+++ b/
include/yaz/prt-ext.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: prt-ext.h,v 1.17 2007-04-13 09:55:41 adam Exp $ */
/**
* \file prt-ext.h
/**
* \file prt-ext.h
@@
-50,11
+49,7
@@
YAZ_BEGIN_CDECL
*/
typedef struct Z_ext_typeent
{
*/
typedef struct Z_ext_typeent
{
-#if 0
- oid_value dref; /* the direct-reference OID value. */
-#else
- int oid[OID_SIZE]; /* the direct-reference OID */
-#endif
+ Odr_oid oid[OID_SIZE]; /* the direct-reference OID */
int what; /* discriminator value for the external CHOICE */
Odr_fun fun; /* decoder function */
} Z_ext_typeent;
int what; /* discriminator value for the external CHOICE */
Odr_fun fun; /* decoder function */
} Z_ext_typeent;
@@
-63,7
+58,7
@@
typedef struct Z_ext_typeent
struct Z_External
{
Odr_oid *direct_reference;
struct Z_External
{
Odr_oid *direct_reference;
- int *indirect_reference;
+ Odr_int *indirect_reference;
char *descriptor;
int which;
/* Generic types */
char *descriptor;
int which;
/* Generic types */
@@
-97,6
+92,11
@@
struct Z_External
#define Z_External_multisrch2 26
#define Z_External_CQL 27
#define Z_External_OCLCUserInfo 28
#define Z_External_multisrch2 26
#define Z_External_CQL 27
#define Z_External_OCLCUserInfo 28
+#define Z_External_persistentResultSet 29
+#define Z_External_persistentQuery 30
+#define Z_External_periodicQuerySchedule 31
+#define Z_External_exportSpecification 32
+#define Z_External_exportInvocation 33
union
{
/* Generic types */
union
{
/* Generic types */
@@
-136,6
+136,12
@@
struct Z_External
Z_MultipleSearchTerms_2 *multipleSearchTerms_2;
Z_InternationalString *cql;
Z_OCLC_UserInformation *oclc;
Z_MultipleSearchTerms_2 *multipleSearchTerms_2;
Z_InternationalString *cql;
Z_OCLC_UserInformation *oclc;
+ Z_PRPersistentResultSet *persistentResultSet;
+
+ Z_PQueryPersistentQuery *persistentQuery;
+ Z_PQSPeriodicQuerySchedule *periodicQuerySchedule;
+ Z_ESExportSpecification *exportSpecification;
+ Z_EIExportInvocation *exportInvocation;
} u;
};
} u;
};
@@
-143,18
+149,21
@@
struct Z_External
/** \brief codec for BER EXTERNAL */
YAZ_EXPORT int z_External(ODR o, Z_External **p, int opt, const char *name);
/** \brief returns type information for OID (NULL if not known) */
/** \brief codec for BER EXTERNAL */
YAZ_EXPORT int z_External(ODR o, Z_External **p, int opt, const char *name);
/** \brief returns type information for OID (NULL if not known) */
-YAZ_EXPORT Z_ext_typeent *z_ext_getentbyref(const int *oid);
+YAZ_EXPORT Z_ext_typeent *z_ext_getentbyref(const Odr_oid *oid);
/** \brief encodes EXTERNAL record based on OID (NULL if not known) */
/** \brief encodes EXTERNAL record based on OID (NULL if not known) */
-YAZ_EXPORT Z_External *z_ext_record_oid(ODR o, const int *oid,
+YAZ_EXPORT Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid,
+ const char *buf, int len);
+/** \brief encodes EXTERNAL record as ANY */
+YAZ_EXPORT Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid,
const char *buf, int len);
/** \brief encodes EXTERNAL XML record */
const char *buf, int len);
/** \brief encodes EXTERNAL XML record */
-Z_External *z_ext_record_xml(ODR o, const char *buf, int len);
+YAZ_EXPORT Z_External *z_ext_record_xml(ODR o, const char *buf, int len);
/** \brief encodes EXTERNAL SUTRS record */
/** \brief encodes EXTERNAL SUTRS record */
-Z_External *z_ext_record_sutrs(ODR o, const char *buf, int len);
+YAZ_EXPORT Z_External *z_ext_record_sutrs(ODR o, const char *buf, int len);
/** \brief encodes EXTERNAL USMARC/MARC21 record */
/** \brief encodes EXTERNAL USMARC/MARC21 record */
-Z_External *z_ext_record_usmarc(ODR o, const char *buf, int len);
+YAZ_EXPORT Z_External *z_ext_record_usmarc(ODR o, const char *buf, int len);
YAZ_END_CDECL
YAZ_END_CDECL
@@
-162,6
+171,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