X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=c6567bd2a090eff0f0d0cc9ff2e1d4ab52910f37;hb=646158a86d80e5ef0221ef7d7ce2cfc6ba31eacc;hp=b9fd4b1eb5c28e854abae28e47eedabff8cf0157;hpb=c9944d28a6508d6393c8d13018cafcc86ca66ab4;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index b9fd4b1..c6567bd 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -56,10 +56,6 @@ struct conf_config
     database_hosts_t database_hosts;
 };
 
-
-static char *parse_settings(struct conf_config *config,
-                            NMEM nmem, xmlNode *node);
-
 static void conf_metadata_assign(NMEM nmem, 
                                  struct conf_metadata * metadata,
                                  const char *name,
@@ -70,7 +66,8 @@ static void conf_metadata_assign(NMEM nmem,
                                  int termlist,
                                  int rank,
                                  int sortkey_offset,
-                                 enum conf_metadata_mergekey mt)
+                                 enum conf_metadata_mergekey mt,
+                                 const char *facetrule)
 {
     assert(nmem && metadata && name);
     
@@ -90,6 +87,7 @@ static void conf_metadata_assign(NMEM nmem,
     metadata->rank = rank;    
     metadata->sortkey_offset = sortkey_offset;
     metadata->mergekey = mt;
+    metadata->facetrule = nmem_strdup_null(nmem, facetrule);
 }
 
 
@@ -104,7 +102,6 @@ static void conf_sortkey_assign(NMEM nmem,
     sortkey->type = type;
 }
 
-
 static struct conf_service *service_init(struct conf_server *server,
                                          int num_metadata, int num_sortkeys,
                                          const char *service_id)
@@ -117,25 +114,21 @@ static struct conf_service *service_init(struct conf_server *server,
     service->ref_count = 1;
     service->nmem = nmem;
     service->next = 0;
-    service->settings = 0;
     service->databases = 0;
     service->server = server;
     service->session_timeout = 60; /* default session timeout */
     service->z3950_session_timeout = 180;
     service->z3950_operation_timeout = 30;
 
-    service->relevance_pct = 0;
-    service->sort_pct = 0;
-    service->mergekey_pct = 0;
-    service->facet_pct = 0;
+    service->charsets = 0;
 
     service->id = service_id ? nmem_strdup(nmem, service_id) : 0;
     service->num_metadata = num_metadata;
     service->metadata = 0;
     if (service->num_metadata)
-      service->metadata 
-          = nmem_malloc(nmem, 
-                        sizeof(struct conf_metadata) * service->num_metadata);
+        service->metadata 
+            = nmem_malloc(nmem, 
+                          sizeof(struct conf_metadata) * service->num_metadata);
     service->num_sortkeys = num_sortkeys;
     service->sortkeys = 0;
     if (service->num_sortkeys)
@@ -157,7 +150,8 @@ static struct conf_metadata* conf_service_add_metadata(
     int termlist,
     int rank,
     int sortkey_offset,
-    enum conf_metadata_mergekey mt)
+    enum conf_metadata_mergekey mt,
+    const char *facetrule)
 {
     struct conf_metadata * md = 0;
 
@@ -168,11 +162,10 @@ static struct conf_metadata* conf_service_add_metadata(
     md = service->metadata + field_id;
     conf_metadata_assign(service->nmem, md, name, type, merge, setting,
                          brief, termlist, rank, sortkey_offset,
-                         mt);
+                         mt, facetrule);
     return md;
 }
 
-
 static struct conf_sortkey * conf_service_add_sortkey(
     struct conf_service *service,
     int field_id,
@@ -182,7 +175,7 @@ static struct conf_sortkey * conf_service_add_sortkey(
     struct conf_sortkey * sk = 0;
 
     if (!service || !service->sortkeys || !service->num_sortkeys
-        || field_id < 0  || !(field_id < service->num_sortkeys))
+        || field_id < 0 || !(field_id < service->num_sortkeys))
         return 0;
 
     //sk = &((service->sortkeys)[field_id]);
@@ -192,7 +185,6 @@ static struct conf_sortkey * conf_service_add_sortkey(
     return sk;
 }
 
-
 int conf_service_metadata_field_id(struct conf_service *service,
                                    const char * name)
 {
@@ -200,16 +192,13 @@ int conf_service_metadata_field_id(struct conf_service *service,
 
     if (!service || !service->metadata || !service->num_metadata)
         return -1;
-
-    for(i = 0; i < service->num_metadata; i++) {
+    
+    for (i = 0; i < service->num_metadata; i++)
         if (!strcmp(name, (service->metadata[i]).name))
             return i;
-    }
-   
     return -1;
 }
 
-
 int conf_service_sortkey_field_id(struct conf_service *service,
                                   const char * name)
 {
@@ -218,11 +207,9 @@ int conf_service_sortkey_field_id(struct conf_service *service,
     if (!service || !service->sortkeys || !service->num_sortkeys)
         return -1;
 
-    for(i = 0; i < service->num_sortkeys; i++) {
+    for (i = 0; i < service->num_sortkeys; i++)
         if (!strcmp(name, (service->sortkeys[i]).name))
             return i;
-    }
-   
     return -1;
 }
 
@@ -243,10 +230,7 @@ void service_destroy(struct conf_service *service)
     {
         if (!pazpar2_decref(&service->ref_count, service->mutex))
         {
-            pp2_charset_destroy(service->relevance_pct);
-            pp2_charset_destroy(service->sort_pct);
-            pp2_charset_destroy(service->mergekey_pct);
-            pp2_charset_destroy(service->facet_pct);
+            pp2_charset_fact_destroy(service->charsets);
             yaz_mutex_destroy(&service->mutex);
             nmem_destroy(service->nmem);
         }
@@ -266,7 +250,6 @@ static int parse_metadata(struct conf_service *service, xmlNode *n,
     enum conf_metadata_type type = Metadata_type_generic;
     enum conf_metadata_merge merge = Metadata_merge_no;
     enum conf_setting_type setting = Metadata_setting_no;
-    enum conf_sortkey_type sk_type = Metadata_sortkey_relevance;
     enum conf_metadata_mergekey mergekey_type = Metadata_mergekey_no;
     int brief = 0;
     int termlist = 0;
@@ -281,6 +264,7 @@ static int parse_metadata(struct conf_service *service, xmlNode *n,
     xmlChar *xml_rank = 0;
     xmlChar *xml_setting = 0;
     xmlChar *xml_mergekey = 0;
+    xmlChar *xml_icu_chain = 0;
     struct _xmlAttr *attr;
     for (attr = n->properties; attr; attr = attr->next)
     {
@@ -311,6 +295,9 @@ static int parse_metadata(struct conf_service *service, xmlNode *n,
         else if (!xmlStrcmp(attr->name, BAD_CAST "mergekey") &&
                  attr->children && attr->children->type == XML_TEXT_NODE)
             xml_mergekey = attr->children->content;
+        else if (!xmlStrcmp(attr->name, BAD_CAST "facetrule") &&
+                 attr->children && attr->children->type == XML_TEXT_NODE)
+            xml_icu_chain = attr->children->content;
         else
         {
             yaz_log(YLOG_FATAL, "Unknown metadata attribute '%s'", attr->name);
@@ -404,6 +391,7 @@ static int parse_metadata(struct conf_service *service, xmlNode *n,
     // add a sortkey if so specified
     if (xml_sortkey && strcmp((const char *) xml_sortkey, "no"))
     {
+        enum conf_sortkey_type sk_type;
         if (merge == Metadata_merge_no)
         {
             yaz_log(YLOG_FATAL, 
@@ -450,7 +438,7 @@ static int parse_metadata(struct conf_service *service, xmlNode *n,
                               (const char *) xml_name,
                               type, merge, setting,
                               brief, termlist, rank, sortkey_offset,
-                              mergekey_type);
+                              mergekey_type, (const char *) xml_icu_chain);
     (*md_node)++;
     return 0;
 }
@@ -524,61 +512,30 @@ static struct conf_service *service_create_static(struct conf_server *server,
         }
         else if (!strcmp((const char *) n->name, "settings"))
             got_settings++;
-        else if (!strcmp((const char *) n->name, "relevance"))
-        {
-            if (service->relevance_pct)
-            {
-                yaz_log(YLOG_LOG, "relevance may not repeat in service");
-                return 0;
-            }
-            else
-            {
-                service->relevance_pct = pp2_charset_create_xml(n);
-                if (!service->relevance_pct)
-                    return 0;
-            }
-        }
-        else if (!strcmp((const char *) n->name, "sort"))
+        else if (!strcmp((const char *) n->name, "icu_chain"))
         {
-            if (service->sort_pct)
+            if (!service->charsets)
+                service->charsets = pp2_charset_fact_create();
+            if (pp2_charset_fact_define(service->charsets, n, 0))
             {
-                yaz_log(YLOG_LOG, "sort may not repeat in service");
+                yaz_log(YLOG_FATAL, "ICU chain definition error");
                 return 0;
             }
-            else
-            {
-                service->sort_pct = pp2_charset_create_xml(n);
-                if (!service->sort_pct)
-                    return 0;
-            }
         }
-        else if (!strcmp((const char *) n->name, "mergekey"))
-        {
-            if (service->mergekey_pct)
-            {
-                yaz_log(YLOG_LOG, "mergekey may not repeat in service");
-                return 0;
-            }
-            else
-            {
-                service->mergekey_pct = pp2_charset_create_xml(n);
-                if (!service->mergekey_pct)
-                    return 0;
-            }
-        }
-        else if (!strcmp((const char *) n->name, "facet"))
+        else if (!strcmp((const char *) n->name, "relevance")
+                 || !strcmp((const char *) n->name, "sort")
+                 || !strcmp((const char *) n->name, "mergekey")
+                 || !strcmp((const char *) n->name, "facet"))
+
         {
-            if (service->facet_pct)
+            if (!service->charsets)
+                service->charsets = pp2_charset_fact_create();
+            if (pp2_charset_fact_define(service->charsets,
+                                        n->children, (const char *) n->name))
             {
-                yaz_log(YLOG_LOG, "facet may not repeat in service");
+                yaz_log(YLOG_FATAL, "ICU chain definition error");
                 return 0;
             }
-            else
-            {
-                service->facet_pct = pp2_charset_create_xml(n);
-                if (!service->facet_pct)
-                    return 0;
-            }
         }
         else if (!strcmp((const char *) n->name, (const char *) "metadata"))
         {
@@ -624,39 +581,17 @@ static struct conf_service *service_create_static(struct conf_server *server,
     return service;
 }
 
-static char *parse_settings(struct conf_config *config,
-                            NMEM nmem, xmlNode *node)
-{
-    xmlChar *src = xmlGetProp(node, (xmlChar *) "src");
-    char *r;
-
-    if (src)
-    {
-        WRBUF w = wrbuf_alloc();
-        conf_dir_path(config, w, (const char *) src);
-        r = nmem_strdup(nmem, wrbuf_cstr(w));
-        wrbuf_destroy(w);
-    }
-    else
-    {
-        yaz_log(YLOG_FATAL, "Must specify src in targetprofile");
-        return 0;
-    }
-    xmlFree(src);
-    return r;
-}
-
 static void inherit_server_settings(struct conf_service *s)
 {
     struct conf_server *server = s->server;
     if (!s->dictionary) /* service has no config settings ? */
     {
-        if (server->server_settings)
+        if (server->settings_fname)
         {
             /* inherit settings from server */
             init_settings(s);
-            settings_read_file(s, server->server_settings, 1);
-            settings_read_file(s, server->server_settings, 2);
+            settings_read_file(s, server->settings_fname, 1);
+            settings_read_file(s, server->settings_fname, 2);
         }
         else
         {
@@ -668,48 +603,17 @@ static void inherit_server_settings(struct conf_service *s)
     
     /* use relevance/sort/mergekey/facet from server if not defined
        for this service.. */
-    if (!s->relevance_pct)
-    {
-        if (server->relevance_pct)
-        {
-            s->relevance_pct = server->relevance_pct;
-            pp2_charset_incref(s->relevance_pct);
-        }
-        else
-            s->relevance_pct = pp2_charset_create_a_to_z();
-    }
-    
-    if (!s->sort_pct)
-    {
-        if (server->sort_pct)
-        {
-            s->sort_pct = server->sort_pct;
-            pp2_charset_incref(s->sort_pct);
-        }
-        else
-            s->sort_pct = pp2_charset_create_a_to_z();
-    }
-    
-    if (!s->mergekey_pct)
+    if (!s->charsets)
     {
-        if (server->mergekey_pct)
+        if (server->charsets)
         {
-            s->mergekey_pct = server->mergekey_pct;
-            pp2_charset_incref(s->mergekey_pct);
+            s->charsets = server->charsets;
+            pp2_charset_fact_incref(s->charsets);
         }
         else
-            s->mergekey_pct = pp2_charset_create_a_to_z();
-    }
-
-    if (!s->facet_pct)
-    {
-        if (server->facet_pct)
         {
-            s->facet_pct = server->facet_pct;
-            pp2_charset_incref(s->facet_pct);
+            s->charsets = pp2_charset_fact_create();
         }
-        else
-            s->facet_pct = pp2_charset_create(0);
     }
 }
 
@@ -721,7 +625,6 @@ struct conf_service *service_create(struct conf_server *server,
     if (service)
     {
         inherit_server_settings(service);
-        resolve_databases(service);
         assert(service->mutex == 0);
         pazpar2_mutex_create(&service->mutex, "conf");
     }
@@ -743,14 +646,11 @@ static struct conf_server *server_create(struct conf_config *config,
     server->service = 0;
     server->config = config;
     server->next = 0;
-    server->relevance_pct = 0;
-    server->sort_pct = 0;
-    server->mergekey_pct = 0;
-    server->facet_pct = 0;
-    server->server_settings = 0;
+    server->charsets = 0;
     server->http_server = 0;
     server->iochan_man = 0;
-    server->database_hosts = 0;
+    server->database_hosts = config->database_hosts;
+    server->settings_fname = 0;
 
     if (server_id)
     {
@@ -791,38 +691,49 @@ static struct conf_server *server_create(struct conf_config *config,
         }
         else if (!strcmp((const char *) n->name, "settings"))
         {
-            if (server->server_settings)
+            xmlChar *src = xmlGetProp(n, (xmlChar *) "src");
+            WRBUF w;
+            if (!src)
             {
-                yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
+                yaz_log(YLOG_FATAL, "Missing src attribute for settings");
                 return 0;
             }
-            if (!(server->server_settings = parse_settings(config, nmem, n)))
-                return 0;
-        }
-        else if (!strcmp((const char *) n->name, "relevance"))
-        {
-            server->relevance_pct = pp2_charset_create_xml(n);
-            if (!server->relevance_pct)
-                return 0;
-        }
-        else if (!strcmp((const char *) n->name, "sort"))
-        {
-            server->sort_pct = pp2_charset_create_xml(n);
-            if (!server->sort_pct)
+            if (server->settings_fname)
+            {
+                xmlFree(src);
+                yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
                 return 0;
+            }
+            w = wrbuf_alloc();
+            conf_dir_path(config, w, (const char *) src);
+            server->settings_fname = nmem_strdup(nmem, wrbuf_cstr(w));
+            wrbuf_destroy(w);
+            xmlFree(src);
         }
-        else if (!strcmp((const char *) n->name, "mergekey"))
+        else if (!strcmp((const char *) n->name, "icu_chain"))
         {
-            server->mergekey_pct = pp2_charset_create_xml(n);
-            if (!server->mergekey_pct)
+            if (!server->charsets)
+                server->charsets = pp2_charset_fact_create();
+            if (pp2_charset_fact_define(server->charsets, n, 0))
+            {
+                yaz_log(YLOG_FATAL, "ICU chain definition error");
                 return 0;
+            }
         }
-        else if (!strcmp((const char *) n->name, "facet"))
+        else if (!strcmp((const char *) n->name, "relevance")
+                 || !strcmp((const char *) n->name, "sort")
+                 || !strcmp((const char *) n->name, "mergekey")
+                 || !strcmp((const char *) n->name, "facet"))
         {
-            server->facet_pct = pp2_charset_create_xml(n);
-            if (!server->facet_pct)
+            if (!server->charsets)
+                server->charsets = pp2_charset_fact_create();
+            if (pp2_charset_fact_define(server->charsets,
+                                        n->children, (const char *) n->name))
+            {
+                yaz_log(YLOG_FATAL, "ICU chain definition error");
                 return 0;
-        }
+            }            
+        }            
         else if (!strcmp((const char *) n->name, "service"))
         {
             char *service_id = (char *)
@@ -976,6 +887,7 @@ struct conf_config *config_create(const char *fname, int verbose)
     config->servers = 0;
     config->no_threads = 0;
     config->iochan_man = 0;
+    config->database_hosts = database_hosts_create();
 
     config->confdir = wrbuf_alloc();
     if ((p = strrchr(fname, 
@@ -1026,10 +938,7 @@ void server_destroy(struct conf_server *server)
         service_destroy(s);
         s = s_next;
     }
-    pp2_charset_destroy(server->relevance_pct);
-    pp2_charset_destroy(server->sort_pct);
-    pp2_charset_destroy(server->mergekey_pct);
-    pp2_charset_destroy(server->facet_pct);
+    pp2_charset_fact_destroy(server->charsets);
     yaz_log(YLOG_LOG, "server_destroy server=%p", server);
     http_server_destroy(server->http_server);
 }
@@ -1045,9 +954,8 @@ void config_destroy(struct conf_config *config)
             struct conf_server *s_next = server->next;
             server_destroy(server);
             server = s_next;
+            database_hosts_destroy(&config->database_hosts);
         }
-        database_hosts_destroy(&config->database_hosts);
-
         wrbuf_destroy(config->confdir);
         nmem_destroy(config->nmem);
     }
@@ -1064,22 +972,18 @@ void config_process_events(struct conf_config *conf)
 {
     struct conf_server *ser;
     
-    conf->database_hosts = database_hosts_create();
     for (ser = conf->servers; ser; ser = ser->next)
     {
         struct conf_service *s = ser->service;
 
-        ser->database_hosts = conf->database_hosts;
-
         for (;s ; s = s->next)
         {
-            resolve_databases(s);
             assert(s->mutex == 0);
             pazpar2_mutex_create(&s->mutex, "service");
         }
         http_mutex_init(ser);
     }
-    iochan_man_events(conf->iochan_man);    
+    iochan_man_events(conf->iochan_man);
 }
 
 int config_start_listeners(struct conf_config *conf,