Fixed bad dereferencing of null settings

[pazpar2-moved-to-github.git] / src / pazpar2.h

diff --git a/src/pazpar2.h b/src/pazpar2.h
index a20db30..85360a7 100644 (file)
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -1,3 +1,24 @@
+/* $Id: pazpar2.h,v 1.22 2007-04-11 02:14:15 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
 
@@ -77,7 +98,8 @@ struct database {
     struct database_retrievalmap *map;
 };
 
-// Normalization filter chain. Turns incoming record into internal representation
+// Normalization filter. Turns incoming record into internal representation
+// Simple sequence of stylesheets run in series.
 struct database_retrievalmap {
     xsltStylesheet *stylesheet;
     struct database_retrievalmap *next;
@@ -112,7 +134,7 @@ 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;
     int hits;
@@ -154,13 +176,14 @@ struct named_termlist
 struct session_database
 {
     struct database *database;
-    struct setting *settings;
+    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 session_nmem;  // Nmem for session-permanent storage
@@ -236,6 +259,7 @@ 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);
 
 #endif