Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2...

diff --combined src/settings.c
index ccf7b61,e7d5b3d..dcd941f
--- 1/src/settings.c
--- 2/src/settings.c
+++ b/src/settings.c
@@@ -145,7 -145,7 +145,7 @@@ int settings_lookup_offset(struct conf_
      return settings_index_lookup(service->dictionary, name, 0);
  }
  
- static char *settings_name(struct conf_service *service, int offset)
+ char *settings_name(struct conf_service *service, int offset)
  {
      assert(offset < service->dictionary->num);
      return service->dictionary->dict[offset];
@@@ -368,7 -368,7 +368,7 @@@ void expand_settings_array2(struct sett
      }
  }
  
- void update_settings(struct setting *set, struct settings *settings, int offset, NMEM nmem)
+ static void update_settings(struct setting *set, struct settings *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);
@@@ -505,6 -505,8 +505,6 @@@ static void initialize_hard_settings(st
  void initialize_soft_settings(struct conf_service *service)
  {
      int i;
 -    yaz_log(YLOG_LOG, "Init soft settings");
 -
      for (i = 0; i < service->num_metadata; i++)
      {
          struct conf_metadata *md = &service->metadata[i];
@@@ -514,22 -516,20 +514,22 @@@
  
          // Also create setting for some metadata attributes.
          if (md->limitmap) {
 -            yaz_log(YLOG_LOG, "Metadata %s has limitmap: %s ",md->name,  md->limitmap);
 +            int index; 
              WRBUF wrbuf = wrbuf_alloc();
 +            yaz_log(YLOG_DEBUG, "Metadata %s has limitmap: %s ",md->name,  md->limitmap);
              wrbuf_printf(wrbuf, "pz:limitmap:%s", md->name);
 -            int index = settings_create_offset(service, wrbuf_cstr(wrbuf));
 +            index = settings_create_offset(service, wrbuf_cstr(wrbuf));
              if (index >= 0) {
 -                yaz_log(YLOG_LOG, "Service %s default %s=%s",
 -                        (service->id ? service->id: "unknown"), wrbuf_cstr(wrbuf), md->limitmap);
                  struct setting new;
 +                int offset;
 +                yaz_log(YLOG_DEBUG, "Service %s default %s=%s",
 +                        (service->id ? service->id: "unknown"), wrbuf_cstr(wrbuf), md->limitmap);
                  new.name = (char *) wrbuf_cstr(wrbuf);
                  new.value = md->limitmap;
                  new.next = 0;
                  new.target = 0;
                  new.precedence = 0;
 -                int offset = settings_create_offset(service, new.name);
 +                offset = settings_create_offset(service, new.name);
                  update_settings(&new, service->settings, offset, service->nmem);
              }
              wrbuf_destroy(wrbuf);