X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_multi.cpp;h=4ee830c4d9109e4bd11b0c1a109dd973f219b2c8;hb=665559cbc22546e8df69be33a7d492294cab9fb1;hp=fb0e996cb2526254a61bbf161c2d3cc2c9318dd9;hpb=d5983974ddbd19a659ad65e272883feaba01f2d5;p=metaproxy-moved-to-github.git

diff --git a/src/filter_multi.cpp b/src/filter_multi.cpp
index fb0e996..4ee830c 100644
--- a/src/filter_multi.cpp
+++ b/src/filter_multi.cpp
@@ -1,7 +1,5 @@
-/* $Id: filter_multi.cpp,v 1.29 2007-11-26 21:21:12 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 <yaz/log.h>
 
@@ -332,8 +329,6 @@ void yf::Multi::FrontendSet::round_robin(int start, int number,
         // skip on each set.. before "present range"..
         p = p + skip;
         
-        std::cout << "\nSKIP min=" << min << " no_left=" << no_left << "\n\n";
-        
         std::list<int>::iterator psit = pos.begin();
         for (psit = pos.begin(); psit != pos.end(); psit++)
             *psit += min;
@@ -1053,7 +1048,7 @@ void yf::Multi::Frontend::scan2(mp::Package &package, Z_APDU *apdu_req)
         }
     }
 
-    if (true)
+    if (false)
     {
         std::cout << "BEFORE\n";
         ScanTermInfoList::iterator it = entries_before.begin();
@@ -1175,7 +1170,7 @@ void yf::Multi::process(mp::Package &package) const
     m_p->release_frontend(package);
 }
 
-void mp::filter::Multi::configure(const xmlNode * ptr)
+void mp::filter::Multi::configure(const xmlNode * ptr, bool test_only)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -1185,7 +1180,6 @@ void mp::filter::Multi::configure(const xmlNode * ptr)
         {
             std::string route = mp::xml::get_route(ptr);
             std::string target = mp::xml::get_text(ptr);
-            std::cout << "route=" << route << " target=" << target << "\n";
             m_p->m_target_route[target] = route;
         }
         else if (!strcmp((const char *) ptr->name, "hideunavailable"))
@@ -1231,8 +1225,9 @@ extern "C" {
 /*
  * 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
  */
+