X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffactory_filter.cpp;h=89db983cc64573f8af2cc56e596256af5d39b637;hb=e9530d6289df9b848e4901d7c73f5a2f27706d66;hp=d48d2dda580f2901e51cff0d60f9c4d397cf64c7;hpb=0e4bd2f722c9cf0a83e7e4ef3d936c60c9419add;p=metaproxy-moved-to-github.git

diff --git a/src/factory_filter.cpp b/src/factory_filter.cpp
index d48d2dd..89db983 100644
--- a/src/factory_filter.cpp
+++ b/src/factory_filter.cpp
@@ -1,8 +1,20 @@
-/* $Id: factory_filter.cpp,v 1.2 2006-01-05 16:39:37 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 Index Data
 
-%LICENSE%
- */
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 
@@ -16,7 +28,9 @@
 #include <string>
 #include <map>
 
-namespace yp2 {
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1 {
     class FactoryFilter::Rep {
         typedef std::map<std::string, CreateFilterCallback> CallbackMap;
         typedef std::map<std::string, CreateFilterCallback>::iterator 
@@ -29,42 +43,53 @@ namespace yp2 {
     };
 }
 
-yp2::FactoryFilter::NotFound::NotFound(const std::string message)
+mp::FactoryFilter::NotFound::NotFound(const std::string message)
     : std::runtime_error(message)
 {
 }
 
-yp2::FactoryFilter::Rep::Rep()
+mp::FactoryFilter::Rep::Rep()
 {
 }
 
-yp2::FactoryFilter::Rep::~Rep()
+mp::FactoryFilter::Rep::~Rep()
 {
 }
 
-yp2::FactoryFilter::FactoryFilter() : m_p(new yp2::FactoryFilter::Rep)
+mp::FactoryFilter::FactoryFilter() : m_p(new mp::FactoryFilter::Rep)
 {
 
 }
 
-yp2::FactoryFilter::~FactoryFilter()
+mp::FactoryFilter::~FactoryFilter()
 {
 
 }
 
-bool yp2::FactoryFilter::add_creator(std::string fi,
+bool mp::FactoryFilter::add_creator(std::string fi,
                                      CreateFilterCallback cfc)
 {
     return m_p->m_fcm.insert(Rep::CallbackMap::value_type(fi, cfc)).second;
 }
 
 
-bool yp2::FactoryFilter::drop_creator(std::string fi)
+bool mp::FactoryFilter::drop_creator(std::string fi)
 {
     return m_p->m_fcm.erase(fi) == 1;
 }
 
-yp2::filter::Base* yp2::FactoryFilter::create(std::string fi)
+bool mp::FactoryFilter::exist(std::string fi)
+{
+    Rep::CallbackMap::const_iterator it = m_p->m_fcm.find(fi);
+    
+    if (it == m_p->m_fcm.end())
+    {
+        return false;
+    }
+    return true;
+}
+
+mp::filter::Base* mp::FactoryFilter::create(std::string fi)
 {
     Rep::CallbackMap::const_iterator it = m_p->m_fcm.find(fi);
     
@@ -76,16 +101,25 @@ yp2::filter::Base* yp2::FactoryFilter::create(std::string fi)
     return (it->second());
 }
 
+bool mp::FactoryFilter::have_dl_support()
+{
 #if HAVE_DLFCN_H
-bool yp2::FactoryFilter::add_creator_dyn(const std::string &fi,
-                                         const std::string &path)
+    return true;
+#else
+    return false;
+#endif
+}
+
+bool mp::FactoryFilter::add_creator_dl(const std::string &fi,
+                                        const std::string &path)
 {
+#if HAVE_DLFCN_H
     if (m_p->m_fcm.find(fi) != m_p->m_fcm.end())
     {
         return true;
     }
 
-    std::string full_path = path + "/yp2_filter_" + fi + ".so";
+    std::string full_path = path + "/metaproxy_filter_" + fi + ".so";
     void *dl_handle = dlopen(full_path.c_str(), RTLD_GLOBAL|RTLD_NOW);
     if (!dl_handle)
     {
@@ -95,7 +129,7 @@ bool yp2::FactoryFilter::add_creator_dyn(const std::string &fi,
         return false;
     }
 
-    std::string full_name = "yp2_filter_" + fi;
+    std::string full_name = "metaproxy_1_filter_" + fi;
     
     void *dlsym_ptr = dlsym(dl_handle, full_name.c_str());
     if (!dlsym_ptr)
@@ -103,10 +137,12 @@ bool yp2::FactoryFilter::add_creator_dyn(const std::string &fi,
         std::cout << "dlsym " << full_name << " failed\n";
         return false;
     }
-    struct yp2_filter_struct *s = (struct yp2_filter_struct *) dlsym_ptr;
+    struct metaproxy_1_filter_struct *s = (struct metaproxy_1_filter_struct *) dlsym_ptr;
     return add_creator(fi, s->creator);
-}
+#else
+    return false;
 #endif
+}
 
 /*
  * Local variables: