projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed cout stmt.
[metaproxy-moved-to-github.git]
/
src
/
filter_http_file.cpp
diff --git
a/src/filter_http_file.cpp
b/src/filter_http_file.cpp
index
1b9f0a4
..
bf24d2e
100644
(file)
--- a/
src/filter_http_file.cpp
+++ b/
src/filter_http_file.cpp
@@
-1,23
+1,34
@@
-/* $Id: filter_http_file.cpp,v 1.4 2006-03-16 10:40:59 adam Exp $
- Copyright (c) 2005-2006, 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.
-#include "config.hpp"
+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"
#include "filter.hpp"
#include "package.hpp"
#include "filter.hpp"
#include "package.hpp"
-
-#include <boost/thread/mutex.hpp>
-
#include "util.hpp"
#include "filter_http_file.hpp"
#include "util.hpp"
#include "filter_http_file.hpp"
+#include <yaz/zgdu.h>
+
+#include <boost/thread/mutex.hpp>
+
#include <list>
#include <map>
#include <list>
#include <map>
-
-#include <yaz/zgdu.h>
+#include <iostream>
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
@@
-201,7
+212,7
@@
void yf::HttpFile::process(mp::Package &package) const
package.move();
}
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)
{
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
@@
-236,9
+247,9
@@
void mp::filter::HttpFile::configure(const xmlNode * ptr)
if (a_node->type != XML_ELEMENT_NODE)
continue;
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);
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
a.m_url_path_prefix = mp::xml::get_text(a_node);
else
throw mp::filter::FilterException