From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 14 May 2013 19:32:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/mp_434'
X-Git-Tag: v1.3.56~10^2~1
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=068b205511080cca73129afc44bf44894f4fbca2;p=metaproxy-moved-to-github.git

Merge remote-tracking branch 'origin/mp_434'

Conflicts:
	etc/config1.xml
	src/Makefile.am
---

068b205511080cca73129afc44bf44894f4fbca2
diff --cc etc/config1.xml
index 43b3e27,d7ff628..583a508
--- a/etc/config1.xml
+++ b/etc/config1.xml
@@@ -22,7 -22,9 +22,10 @@@
        <filter type="log">
          <message>log</message>
        </filter>
 +      <filter type="sd_remove"/>
+       <filter type="present_chunk">
+         <chunk>2</chunk>
+       </filter>
        <filter refid="backend"/>
        <filter type="bounce"/>
      </route>
diff --cc src/factory_static.cpp
index fcd039c,1d0e5a8..044e2a7
--- a/src/factory_static.cpp
+++ b/src/factory_static.cpp
@@@ -42,9 -41,9 +42,10 @@@ Foundation, Inc., 51 Franklin St, Fift
  #include "filter_load_balance.hpp"
  #include "filter_log.hpp"
  #include "filter_multi.hpp"
+ #include "filter_present_chunk.hpp"
  #include "filter_query_rewrite.hpp"
  #include "filter_record_transform.hpp"
 +#include "filter_sd_remove.hpp"
  #include "filter_session_shared.hpp"
  #include "filter_sort.hpp"
  #include "filter_sru_to_z3950.hpp"
@@@ -75,9 -72,9 +76,10 @@@ mp::FactoryStatic::FactoryStatic(
          &metaproxy_1_filter_load_balance,
          &metaproxy_1_filter_log,
          &metaproxy_1_filter_multi,
+         &metaproxy_1_filter_present_chunk,
          &metaproxy_1_filter_query_rewrite,
          &metaproxy_1_filter_record_transform,
 +        &metaproxy_1_filter_sd_remove,
          &metaproxy_1_filter_session_shared,
          &metaproxy_1_filter_sort,
          &metaproxy_1_filter_sru_to_z3950,
diff --cc xml/schema/metaproxy.rnc
index e4ff7ef,c817401..1562fb2
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@@ -35,9 -34,9 +35,10 @@@ include "filter_limit.rnc
  include "filter_load_balance.rnc"
  include "filter_log.rnc"
  include "filter_multi.rnc"
+ include "filter_present_chunk.rnc"
  include "filter_query_rewrite.rnc"
  include "filter_record_transform.rnc"
 +include "filter_sd_remove.rnc"
  include "filter_session_shared.rnc"
  include "filter_sort.rnc"
  include "filter_sru_z3950.rnc"
@@@ -86,9 -84,9 +87,10 @@@ filter 
      | filter_load_balance
      | filter_log
      | filter_multi
+     | filter_present_chunk
      | filter_query_rewrite
      | filter_record_transform
 +    | filter_sd_remove
      | filter_session_shared
      | filter_sort
      | filter_sru_z3950