X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_load_balance.cpp;h=a534f601587be9a6e6e0d14f1495c056b7e7e965;hb=665559cbc22546e8df69be33a7d492294cab9fb1;hp=57e112387cb95fe3af1eadddb4a61d96d3683b2f;hpb=511c535c4938dfc01450e8748508899401a5e4ea;p=metaproxy-moved-to-github.git

diff --git a/src/filter_load_balance.cpp b/src/filter_load_balance.cpp
index 57e1123..a534f60 100644
--- a/src/filter_load_balance.cpp
+++ b/src/filter_load_balance.cpp
@@ -1,8 +1,20 @@
-/* $Id: filter_load_balance.cpp,v 1.5 2007-01-04 13:22:56 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 Index Data
 
-   See the LICENSE file for details
- */
+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"
 #include "session.hpp"
@@ -11,11 +23,16 @@
 #include "filter_load_balance.hpp"
 #include "util.hpp"
 
+
 #include <boost/thread/mutex.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <yaz/zgdu.h>
 
+// remove max macro if already defined (defined later in <limits>)
+#ifdef max
+#undef max
+#endif
+
 //#include <iostream>
 #include <list>
 #include <map>
@@ -81,7 +98,7 @@ yf::LoadBalance::~LoadBalance()
 {  // must have a destructor because of boost::scoped_ptr
 }
 
-void yf::LoadBalance::configure(const xmlNode *xmlnode)
+void yf::LoadBalance::configure(const xmlNode *xmlnode, bool test_only)
 {
     m_p->configure(xmlnode);
 }
@@ -168,7 +185,7 @@ void yf::LoadBalance::Impl::process(mp::Package &package)
                 
                 // copying new target into init package
                 mp::util::set_vhost_otherinfo(&(org_init->otherInfo), 
-                                              odr_en, target); 
+                                              odr_en, target, 1);
                 package.request() = gdu_req;
         }
             
@@ -227,14 +244,6 @@ void yf::LoadBalance::Impl::process(mp::Package &package)
     }
 }
             
-// getting timestamp for receiving of package
-//boost::posix_time::ptime receive_time
-//    = boost::posix_time::microsec_clock::local_time();
-// //<< receive_time << " "
-// //<< to_iso_string(receive_time) << " "
-//<< to_iso_extended_string(receive_time) << " "
-
-
 // statistic manipulating functions, 
 void yf::LoadBalance::Impl::add_dead(unsigned long session_id){
 
@@ -418,8 +427,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
  */
+