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
solr and dbc tests
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.c
diff --git
a/src/pazpar2_config.c
b/src/pazpar2_config.c
index
79e7ad2
..
b11148d
100644
(file)
--- a/
src/pazpar2_config.c
+++ b/
src/pazpar2_config.c
@@
-45,7
+45,6
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "settings.h"
#include "eventl.h"
#include "http.h"
#include "settings.h"
#include "eventl.h"
#include "http.h"
-#include "session.h"
struct conf_config
{
struct conf_config
{
@@
-282,8
+281,6
@@
void service_destroy(struct conf_service *service)
void service_incref(struct conf_service *service)
{
void service_incref(struct conf_service *service)
{
- yaz_log(YLOG_LOG, "service_incref. p=%p cnt=%d", service,
- service->ref_count);
pazpar2_incref(&service->ref_count, service->mutex);
}
pazpar2_incref(&service->ref_count, service->mutex);
}
@@
-987,7
+984,7
@@
struct conf_service *locate_service(struct conf_server *server,
return s;
}
return s;
}
-void info_service_metadata(struct conf_service *service, WRBUF w)
+static void info_service_metadata(struct conf_service *service, WRBUF w)
{
int i;
struct conf_metadata *md;
{
int i;
struct conf_metadata *md;
@@
-1020,6
+1017,9
@@
void info_service_metadata(struct conf_service *service, WRBUF w)
case Metadata_sortkey_relevance:
wrbuf_puts(w, "relevance");
break;
case Metadata_sortkey_relevance:
wrbuf_puts(w, "relevance");
break;
+ case Metadata_sortkey_relevance_h:
+ wrbuf_puts(w, "relevance_h");
+ break;
case Metadata_sortkey_numeric:
wrbuf_puts(w, "numeric");
break;
case Metadata_sortkey_numeric:
wrbuf_puts(w, "numeric");
break;
@@
-1082,7
+1082,7
@@
void info_service_metadata(struct conf_service *service, WRBUF w)
}
}
}
}
-void info_service_databases(struct conf_service *service, WRBUF w)
+static void info_service_databases(struct conf_service *service, WRBUF w)
{
struct database *db;
struct setting *s;
{
struct database *db;
struct setting *s;
@@
-1287,7
+1287,6
@@
void server_destroy(struct conf_server *server)
s = s_next;
}
pp2_charset_fact_destroy(server->charsets);
s = s_next;
}
pp2_charset_fact_destroy(server->charsets);
- yaz_log(YLOG_LOG, "server_destroy server=%p", server);
http_server_destroy(server->http_server);
}
http_server_destroy(server->http_server);
}