X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Frouter_flexml.cpp;h=2af087fbe97a6023e175a1ef5be03c5e2422dd12;hb=665559cbc22546e8df69be33a7d492294cab9fb1;hp=f8307e93432f405206b8dbf1091b8122a7e237fb;hpb=85189f2d04df4cfc8b16ee78187fb89d00dfe3ff;p=metaproxy-moved-to-github.git diff --git a/src/router_flexml.cpp b/src/router_flexml.cpp index f8307e9..2af087f 100644 --- a/src/router_flexml.cpp +++ b/src/router_flexml.cpp @@ -1,7 +1,5 @@ -/* $Id: router_flexml.cpp,v 1.23 2008-02-20 15:07:52 adam Exp $ - Copyright (c) 2005-2007, Index Data. - -This file is part of Metaproxy. +/* This file is part of Metaproxy. + Copyright (C) 2005-2008 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 @@ -14,10 +12,9 @@ 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 Metaproxy; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +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" #include "xmlutil.hpp" @@ -28,6 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include +#include #include @@ -119,8 +117,8 @@ void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc, if (!m_factory->exist(type_value)) { - std::cout << "about to load " << type_value << ", path=" << - m_dl_path << "\n"; + yaz_log(YLOG_LOG, "Loading %s (dlpath %s)", + type_value.c_str(), m_dl_path.c_str()); m_factory->add_creator_dl(type_value, m_dl_path); } mp::filter::Base* filter_base = m_factory->create(type_value); @@ -211,8 +209,8 @@ void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc, { if (!m_factory->exist(type_value)) { - std::cout << "about to load " << type_value << ", path=" << - m_dl_path << "\n"; + yaz_log(YLOG_LOG, "Loading %s (dlpath %s)", + type_value.c_str(), m_dl_path.c_str()); m_factory->add_creator_dl(type_value, m_dl_path); } mp::filter::Base* filter_base = m_factory->create(type_value); @@ -389,8 +387,9 @@ mp::RouterFleXML::Pos::~Pos() /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +