X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2.h;h=b6771d1161810d6879382913bee39a2a937c6ba8;hb=b2807317725db68d786503711be67ecf163115b7;hp=caeba3fee5c0cc076874e91ab4800bc7edba1de9;hpb=6daff87a18a4b0affde2b418d61940cdec57c93e;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index caeba3f..b6771d1 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -26,11 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/yaz-ccl.h>
 
 #include "termlists.h"
-#include "relevance.h"
 #include "reclists.h"
-#include "eventl.h"
 #include "pazpar2_config.h"
-#include "parameters.h"
 #include "http.h"
 
 struct record;
@@ -55,6 +52,11 @@ enum pazpar2_error_code {
     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;
@@ -73,6 +75,7 @@ struct database_criterion_value {
 
 struct database_criterion {
     char *name;
+    enum pazpar2_database_criterion_type type;
     struct database_criterion_value *values;
     struct database_criterion *next;
 };
@@ -91,9 +94,6 @@ struct session_database
 {
     struct database *database;
     struct setting **settings;
-#ifdef RETIRED
-    yaz_marc_t yaz_marc;
-#endif
     struct database_retrievalmap *map;
     struct session_database *next;
 };