X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffactory_static.cpp;h=ba76d6df5ddcf48fd29c7a2544567ca94ab7006c;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=26078b3dad0ab0b3ac125b17f68ab601424cea63;hpb=a370d3def5758d5f2d1d7113a27871655fc7cec5;p=metaproxy-moved-to-github.git

diff --git a/src/factory_static.cpp b/src/factory_static.cpp
index 26078b3..ba76d6d 100644
--- a/src/factory_static.cpp
+++ b/src/factory_static.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2013 Index Data
+   Copyright (C) Index Data
 
 Metaproxy 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
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef WIN32
 #include "filter_cgi.hpp"
 #endif
-#include "filter_cql_to_rpn.hpp"
+#include "filter_cql_rpn.hpp"
 #include "filter_frontend_net.hpp"
 #include "filter_http_client.hpp"
 #include "filter_http_file.hpp"
@@ -60,8 +60,6 @@ namespace mp = metaproxy_1;
 
 mp::FactoryStatic::FactoryStatic()
 {
-#ifdef HAVE_DLFCN_H
-#else
     struct metaproxy_1_filter_struct *buildins[] = {
         &metaproxy_1_filter_auth_simple,
         &metaproxy_1_filter_backend_test,
@@ -69,10 +67,11 @@ mp::FactoryStatic::FactoryStatic()
 #ifndef WIN32
         &metaproxy_1_filter_cgi,
 #endif
-        &metaproxy_1_filter_cql_to_rpn,
+        &metaproxy_1_filter_cql_rpn,
         &metaproxy_1_filter_frontend_net,
         &metaproxy_1_filter_http_client,
         &metaproxy_1_filter_http_file,
+        &metaproxy_1_filter_http_rewrite,
         &metaproxy_1_filter_http_rewrite1,
         &metaproxy_1_filter_limit,
         &metaproxy_1_filter_load_balance,
@@ -84,21 +83,18 @@ mp::FactoryStatic::FactoryStatic()
         &metaproxy_1_filter_sd_remove,
         &metaproxy_1_filter_session_shared,
         &metaproxy_1_filter_sort,
-        &metaproxy_1_filter_sru_to_z3950,
+        &metaproxy_1_filter_sru_z3950,
         &metaproxy_1_filter_template,
         &metaproxy_1_filter_virt_db,
         &metaproxy_1_filter_z3950_client,
         &metaproxy_1_filter_zeerex_explain,
         &metaproxy_1_filter_zoom,
-        &metaproxy_1_filter_http_rewrite,
         0
     };
     int i;
 
     for (i = 0; buildins[i]; i++)
         add_creator(buildins[i]->type, buildins[i]->creator);
-// WIN32
-#endif
 }