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
Rename struct settings_array
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.h
diff --git
a/src/pazpar2_config.h
b/src/pazpar2_config.h
index
64bb4ab
..
692d260
100644
(file)
--- a/
src/pazpar2_config.h
+++ b/
src/pazpar2_config.h
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2011 Index Data
+ Copyright (C) 2006-2012 Index Data
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
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
@@
-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
};
@@
-83,6
+83,9
@@
struct conf_metadata
enum conf_setting_type setting; // Value is to be taken from session/db settings?
enum conf_metadata_mergekey mergekey;
char *facetrule;
enum conf_setting_type setting; // Value is to be taken from session/db settings?
enum conf_metadata_mergekey mergekey;
char *facetrule;
+
+ char *limitmap; // Should be expanded into service-wide default e.g. pz:limitmap:<name>=value setting
+ char *facetmap; // Should be expanded into service-wide default e.g. pz:facetmap:<name>=value setting
};
};
@@
-108,6
+111,7
@@
struct conf_service
int num_sortkeys;
struct conf_sortkey *sortkeys;
struct setting_dictionary *dictionary;
int num_sortkeys;
struct conf_sortkey *sortkeys;
struct setting_dictionary *dictionary;
+ struct settings_array *settings;
struct conf_service *next;
char *id;
NMEM nmem;
struct conf_service *next;
char *id;
NMEM nmem;
@@
-119,6
+123,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;
};
@@
-134,7
+140,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;