X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2.h;h=d111196bb4c37c1dc99f175245b0c8a5a1aa7a7c;hb=b9e747558f5ecc8403ce00c810c139417d8933cc;hp=50b0a1b5677a44cd8de8f3689ef859d723dc8fa8;hpb=96548165dec8715083c5156ce80d8ea623d088bb;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 50b0a1b..d111196 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,3 +1,24 @@
+/* $Id: pazpar2.h,v 1.28 2007-04-20 04:32:33 quinn Exp $
+   Copyright (c) 2006-2007, Index Data.
+
+This file is part of Pazpar2.
+
+Pazpar2 is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Pazpar2; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
+
 #ifndef PAZPAR2_H
 #define PAZPAR2_H
 
@@ -15,31 +36,36 @@ struct record;
 
 #include "termlists.h"
 #include "relevance.h"
+#include "reclists.h"
 #include "eventl.h"
 #include "config.h"
 
 struct client;
 
+union data_types {
+    char *text;
+    struct {
+        int min;
+        int max;
+    } number;
+};
+
 struct record_metadata {
-    union {
-        char *text;
-        struct {
-            int year1;
-            int year2;
-        } year;
-    } data;
+    union data_types data;
     struct record_metadata *next; // next item of this name
 };
 
 struct record {
     struct client *client;
     struct record_metadata **metadata; // Array mirrors list of metadata fields in config
+    union data_types **sortkeys;       // Array mirrors list of sortkey fields in config
     struct record *next;  // Next in cluster of merged records
 };
 
 struct record_cluster
 {
     struct record_metadata **metadata; // Array mirrors list of metadata fields in config
+    union data_types **sortkeys;
     char *merge_key;
     int relevance;
     int *term_frequency_vec;
@@ -63,11 +89,30 @@ struct database {
     char *url;
     char **databases;
     int errors;
-    struct conf_queryprofile *qprofile;
-    struct conf_retrievalprofile *rprofile;
+    struct zr_explain *explain;
+    struct setting **settings;
     struct database *next;
+    yaz_marc_t yaz_marc;
+    struct database_retrievalmap *map;
+};
+
+// Normalization filter. Turns incoming record into internal representation
+// Simple sequence of stylesheets run in series.
+struct database_retrievalmap {
+    xsltStylesheet *stylesheet;
+    struct database_retrievalmap *next;
 };
 
+struct database_criterion_value {
+    char *value;
+    struct database_criterion_value *next;
+};
+
+struct database_criterion {
+    char *name;
+    struct database_criterion_value *values;
+    struct database_criterion *next;
+};
 
 // Represents a physical, reusable  connection to a remote Z39.50 host
 struct connection {
@@ -87,9 +132,10 @@ struct connection {
 
 // Represents client state for a connection to one search target
 struct client {
-    struct database *database;
+    struct session_database *database;
     struct connection *connection;
     struct session *session;
+    char *pquery; // Current search
     int hits;
     int records;
     int setno;
@@ -124,12 +170,22 @@ struct named_termlist
     struct termlist *termlist;
 };
 
+// Represents a database as viewed from one session, possibly with settings overriden
+// for that session (to support authorization/authentication)
+struct session_database
+{
+    struct database *database;
+    struct setting **settings;
+    struct session_database *next;
+};
+
 // End-user session
 struct session {
-    struct client *clients;
+    struct session_database *databases;  // All databases, settings overriden
+    struct client *clients;              // Clients connected for current search
     int requestid; 
-    char query[1024];
-    NMEM nmem;          // Nmem for each operation (i.e. search)
+    NMEM session_nmem;  // Nmem for session-permanent storage
+    NMEM nmem;          // Nmem for each operation (i.e. search, result set, etc)
     WRBUF wrbuf;        // Wrbuf for scratch(i.e. search)
     int num_termlists;
     struct named_termlist termlists[SESSION_MAX_TERMLISTS];
@@ -160,7 +216,8 @@ struct statistics {
 };
 
 struct hitsbytarget {
-    char id[256];
+    char *id;
+    char *name;
     int hits;
     int diagnostic;
     int records;
@@ -171,6 +228,8 @@ struct hitsbytarget {
 struct parameters {
     char proxy_override[128];
     char listener_override[128];
+    char zproxy_override[128];
+    char settings_path_override[128];
     struct conf_server *server;
     int dump_records;
     int timeout;		/* operations timeout, in seconds */
@@ -181,26 +240,33 @@ struct parameters {
     int session_timeout;
     int toget;
     int chunk;
-    CCL_bibset ccl_filter;
-    yaz_marc_t yaz_marc;
     ODR odr_out;
     ODR odr_in;
 };
 
 struct hitsbytarget *hitsbytarget(struct session *s, int *count);
-int select_targets(struct session *se);
-struct session *new_session();
+int select_targets(struct session *se, struct database_criterion *crit);
+struct session *new_session(NMEM nmem);
 void destroy_session(struct session *s);
 int load_targets(struct session *s, const char *fn);
 void statistics(struct session *s, struct statistics *stat);
-char *search(struct session *s, char *query);
-struct record_cluster **show(struct session *s, int start, int *num, int *total,
-                     int *sumhits, NMEM nmem_show);
+char *search(struct session *s, char *query, char *filter);
+struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, int start,
+        int *num, int *total, int *sumhits, NMEM nmem_show);
 struct record_cluster *show_single(struct session *s, int id);
 struct termlist_score **termlist(struct session *s, const char *name, int *num);
 void session_set_watch(struct session *s, int what, session_watchfun fun, void *data);
 int session_active_clients(struct session *s);
+void session_apply_setting(struct session *se, char *dbname, char *setting, char *value);
+char *session_setting_oneval(struct session_database *db, int offset);
+
+void start_http_listener(void);
+void start_proxy(void);
+void start_zproxy(void);
 
+extern struct parameters global_parameters;
+void pazpar2_add_channel(IOCHAN c);
+void pazpar2_event_loop(void);
 #endif
 
 /*