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
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.h
diff --git
a/src/pazpar2_config.h
b/src/pazpar2_config.h
index
c8ea60e
..
f5fb27d
100644
(file)
--- a/
src/pazpar2_config.h
+++ b/
src/pazpar2_config.h
@@
-27,10
+27,10
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "charsets.h"
#include "http.h"
#include "database.h"
#include "charsets.h"
#include "http.h"
#include "database.h"
+#include "host.h"
enum conf_metadata_type {
Metadata_type_generic, // Generic text field
enum conf_metadata_type {
Metadata_type_generic, // Generic text field
- Metadata_type_number, // A number
Metadata_type_year, // A number
Metadata_type_date // A number
};
Metadata_type_year, // A number
Metadata_type_date // A number
};
@@
-110,7
+110,6
@@
struct conf_service
struct setting_dictionary *dictionary;
struct conf_service *next;
char *id;
struct setting_dictionary *dictionary;
struct conf_service *next;
char *id;
- char *settings;
NMEM nmem;
int session_timeout;
int z3950_session_timeout;
NMEM nmem;
int session_timeout;
int z3950_session_timeout;
@@
-120,6
+119,8
@@
struct conf_service
/* duplicated from conf_server */
pp2_charset_fact_t charsets;
/* duplicated from conf_server */
pp2_charset_fact_t charsets;
+ struct service_xslt *xslt_list;
+
struct database *databases;
struct conf_server *server;
};
struct database *databases;
struct conf_server *server;
};
@@
-135,7
+136,7
@@
struct conf_server
char *proxy_host;
int proxy_port;
char *myurl;
char *proxy_host;
int proxy_port;
char *myurl;
- char *server_settings;
+ char *settings_fname;
char *server_id;
pp2_charset_fact_t charsets;
char *server_id;
pp2_charset_fact_t charsets;