projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mergekey changes - order + required/optional.
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.h
diff --git
a/src/pazpar2.h
b/src/pazpar2.h
index
c111848
..
b6771d1
100644
(file)
--- a/
src/pazpar2.h
+++ b/
src/pazpar2.h
@@
-52,6
+52,11
@@
enum pazpar2_error_code {
PAZPAR2_LAST_ERROR
};
PAZPAR2_LAST_ERROR
};
+enum pazpar2_database_criterion_type {
+ PAZPAR2_STRING_MATCH,
+ PAZPAR2_SUBSTRING_MATCH
+};
+
// Represents a (virtual) database on a host
struct database {
struct host *host;
// Represents a (virtual) database on a host
struct database {
struct host *host;
@@
-70,6
+75,7
@@
struct database_criterion_value {
struct database_criterion {
char *name;
struct database_criterion {
char *name;
+ enum pazpar2_database_criterion_type type;
struct database_criterion_value *values;
struct database_criterion *next;
};
struct database_criterion_value *values;
struct database_criterion *next;
};
@@
-88,9
+94,6
@@
struct session_database
{
struct database *database;
struct setting **settings;
{
struct database *database;
struct setting **settings;
-#ifdef RETIRED
- yaz_marc_t yaz_marc;
-#endif
struct database_retrievalmap *map;
struct session_database *next;
};
struct database_retrievalmap *map;
struct session_database *next;
};