X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_http_file.cpp;h=5f60385e64ac391c2b6613663d0bfcfdb58f8bd7;hb=6fd7e5f149b80e35897f151b5190769135c7fe5e;hp=c7410e5f6a4e44f87c44f7749eacd3415ed8fa92;hpb=37fffd3a8b6beed00546396ff40c06046905b022;p=metaproxy-moved-to-github.git

diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp
index c7410e5..5f60385 100644
--- a/src/filter_http_file.cpp
+++ b/src/filter_http_file.cpp
@@ -1,7 +1,22 @@
-/* $Id: filter_http_file.cpp,v 1.6 2006-08-29 10:34:32 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_http_file.cpp,v 1.10 2008-02-20 15:07:51 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-   See the LICENSE file for details
+This file is part of Metaproxy.
+
+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 Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #include "config.hpp"
@@ -200,7 +215,7 @@ void yf::HttpFile::process(mp::Package &package) const
         package.move();
 }
 
-void mp::filter::HttpFile::configure(const xmlNode * ptr)
+void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -235,9 +250,9 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr)
                 if (a_node->type != XML_ELEMENT_NODE)
                     continue;
                 
-                if (mp::xml::is_element_yp2(a_node, "documentroot"))
+                if (mp::xml::is_element_mp(a_node, "documentroot"))
                     a.m_file_root = mp::xml::get_text(a_node);
-                else if (mp::xml::is_element_yp2(a_node, "prefix"))
+                else if (mp::xml::is_element_mp(a_node, "prefix"))
                     a.m_url_path_prefix = mp::xml::get_text(a_node);
                 else
                     throw mp::filter::FilterException