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
Support for yaz_mutex with flags
[pazpar2-moved-to-github.git]
/
src
/
settings.c
diff --git
a/src/settings.c
b/src/settings.c
index
db5d7ce
..
7ce16f0
100644
(file)
--- a/
src/settings.c
+++ b/
src/settings.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2010 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
@@
-31,7
+31,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <assert.h>
#include <stdio.h>
#include <sys/types.h>
#include <assert.h>
#include <stdio.h>
#include <sys/types.h>
-#include "direntz.h"
+#include <yaz/dirent.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <sys/stat.h>
@@
-41,7
+41,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/nmem.h>
#include <yaz/log.h>
#include <yaz/nmem.h>
#include <yaz/log.h>
-#include "pazpar2.h"
+#include "session.h"
#include "database.h"
#include "settings.h"
#include "database.h"
#include "settings.h"
@@
-67,6
+67,12
@@
static char *hard_settings[] = {
"pz:pqf_prefix",
"pz:sort",
"pz:recordfilter",
"pz:pqf_prefix",
"pz:sort",
"pz:recordfilter",
+ "pz:pqf_strftime",
+ "pz:negotiation_charset",
+ "pz:max_connections",
+ "pz:reuse_connections", // PZ_REUSE_CONNECTION
+ "pz:termlist_term_sort", // PZ_TERMLIST_TERM_SORT
+ "pz:termlist_term_count", // PZ_TERMLIST_TERM_COUNT
0
};
0
};