{
return new_database_inherit_settings(id, nmem, 0);
}
-struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings *service_settings)
+struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *service_settings)
{
struct database *db;
struct setting *idset;
if (service_settings && service_settings->num_settings > 0) {
yaz_log(YLOG_DEBUG, "copying settings from service to database %s settings", db->id);
db->num_settings = service_settings->num_settings;
- db->settings = nmem_malloc(nmem, sizeof(struct settings*) * db->num_settings);
+ db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings);
// Initialize database settings with service settings
- memcpy(db->settings, service_settings->settings, sizeof(struct settings*) * db->num_settings);
-
+ memcpy(db->settings, service_settings->settings, sizeof(*db->settings) * db->num_settings);
}
else {
yaz_log(YLOG_DEBUG, "No service settings to database %s ", db->id);
db->num_settings = PZ_MAX_EOF;
- db->settings = nmem_malloc(nmem, sizeof(struct settings*) * db->num_settings);
- memset(db->settings, 0, sizeof(struct settings*) * db->num_settings);
+ db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings);
+ memset(db->settings, 0, sizeof(*db->settings) * db->num_settings);
}
idset = nmem_malloc(nmem, sizeof(*idset));
idset->precedence = 0;
yaz_log(YLOG_DEBUG, "new database %s under service %s", id, service->id);
p = new_database_inherit_settings(id, service->nmem, service->settings);
-
p->next = service->databases;
service->databases = p;
struct session_database;
struct session;
struct conf_service;
-struct settings;
+struct settings_array;
struct database *create_database_for_service(const char *id,
struct conf_service *service);
int match_zurl(const char *zurl, const char *pattern);
struct database *new_database(const char *id, NMEM nmem);
// inherit values from (service) settings
-struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings *settings);
+struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *settings);
#endif
// Setup a dictionary from server.
service->dictionary = 0;
- service->settings = nmem_malloc(nmem, sizeof(struct settings));
+ service->settings = nmem_malloc(nmem, sizeof(*service->settings));
service->settings->num_settings = PZ_MAX_EOF;
service->settings->settings = nmem_malloc(nmem, sizeof(struct setting*) * service->settings->num_settings);
memset(service->settings->settings, 0, sizeof(struct setting*) * service->settings->num_settings);
int num_sortkeys;
struct conf_sortkey *sortkeys;
struct setting_dictionary *dictionary;
- struct settings *settings;
+ struct settings_array *settings;
struct conf_service *next;
char *id;
NMEM nmem;
}
}
-void expand_settings_array2(struct settings *settings, int offset, NMEM nmem)
+void expand_settings_array2(struct settings_array *settings, int offset, NMEM nmem)
{
assert(offset >= 0);
assert(settings);
}
}
-static void update_settings(struct setting *set, struct settings *settings, int offset, NMEM nmem)
+static void update_settings(struct setting *set, struct settings_array *settings, int offset, NMEM nmem)
{
struct setting **sp;
yaz_log(YLOG_LOG, "update service settings offset %d with %s=%s", offset, set->name, set->value);
struct setting *next;
};
-struct settings
+struct settings_array
{
// Array of pointer setting, index is looked up in setting_dictionary
struct setting **settings;
if [ -z "$SKIP_PAZPAR2" ] ; then
# remove log if starting pazpar2
- rm -f $PREFIX_pazpar2.log
+ rm -f ${PREFIX}_pazpar2.log
fi
CFG=${PREFIX}.cfg
<settings target="ID_1">
<set name="pz:limitmap:author" value="rpn:@attr 1=1003 @attr 6=3" />
- <set name="pz:limitmap:subject" value="rpn:@attr 1=21 @attr 6=3" />
+ <set name="pz:limitmap:subject" value="rpn:@attr 1=21 @attr 6=3" />
</settings>
<settings target="Target-1">
<set name="pz:limitmap:author" value="rpn:@attr 1=1003 @attr 6=3" />
<set name="pz:limitmap:subject" value="rpn:@attr 1=21 @attr 6=3" />
+ <set name="pz:limitmap:Mysubject" value="local:subject" />
</settings>
<?xml version="1.0" encoding="UTF-8"?>
-<settings target="Target-1">
- <set name="pz:limitmap:MySubject" value="local:subject" />
+<settings target="Target-2">
+ <set name="pz:limitmap:Mysubject" value="local:subject" />
</settings>
http://localhost:9763/search.pz2?session=1&command=bytarget
http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
test_solr_settings_4.xml http://localhost:9763/search.pz2?session=1&command=settings
-http://localhost:9763/search.pz2?session=1&command=search&query=water
+http://localhost:9763/search.pz2?session=1&command=search&query=water&maxrecs=200
3 http://localhost:9763/search.pz2?session=1&command=show
http://localhost:9763/search.pz2?session=1&command=bytarget
http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium