X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconfig.h;h=3a184ff769f3fb32d24abbfc08e882a3b3fed842;hb=1e94296bc54fc9904caaac74089a44c801852360;hp=a276e12f17647c6a7509dd7e28fb5b258a136bf7;hpb=9a660575bb51d190608e5cdec416bb8a9acf3389;p=pazpar2-moved-to-github.git

diff --git a/src/config.h b/src/config.h
index a276e12..3a184ff 100644
--- a/src/config.h
+++ b/src/config.h
@@ -67,48 +67,13 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
+    char *zproxy_host;
+    int zproxy_port;
+    char *settings;
     struct conf_service *service;
     struct conf_server *next;
 };
 
-struct conf_queryprofile
-{
-    int dummy;
-};
-
-struct conf_retrievalmap
-{
-    enum {
-        Map_xslt
-    } type;
-    char *charset;
-    char *format;
-    xsltStylesheet *stylesheet;
-    struct conf_retrievalmap *next;
-};
-
-struct conf_retrievalprofile
-{
-    char *requestsyntax;
-    enum {
-        Nativesyn_xml,
-        Nativesyn_iso2709
-    } native_syntax;
-    enum {
-        Nativeform_na,
-        Nativeform_marc21,
-    } native_format;
-    char *native_encoding;
-    enum {
-        Nativemapto_na,
-        Nativemapto_marcxml,
-        Nativemapto_marcxchange
-    } native_mapto;
-    yaz_marc_t yaz_marc;
-    struct conf_retrievalmap *maplist;
-    struct conf_retrievalprofile *next;
-};
-
 struct conf_targetprofiles
 {
     enum {
@@ -120,9 +85,7 @@ struct conf_targetprofiles
 struct conf_config
 {
     struct conf_server *servers;
-    struct conf_queryprofile *queryprofiles;
     struct conf_targetprofiles *targetprofiles;
-    struct conf_retrievalprofile *retrievalprofiles;
 };
 
 #ifndef CONFIG_NOEXTERNS
@@ -132,6 +95,7 @@ extern struct conf_config *config;
 #endif
 
 int read_config(const char *fname);
+xsltStylesheet *conf_load_stylesheet(const char *fname);
 
 #endif