From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 8 Oct 2012 13:35:27 +0000 (+0200)
Subject: query_rewrite: no charset for error queries
X-Git-Tag: v1.3.48~2
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=00ee71c307a1330c3365e39cec662992a05f3857;p=metaproxy-moved-to-github.git

query_rewrite: no charset for error queries

Avoid performing charset for query conversion errors. The
resulting Type-1 query is invalid in this case.
---

diff --git a/src/filter_query_rewrite.cpp b/src/filter_query_rewrite.cpp
index 6e77295..9bf1eac 100644
--- a/src/filter_query_rewrite.cpp
+++ b/src/filter_query_rewrite.cpp
@@ -125,7 +125,7 @@ void yf::QueryRewrite::Rep::process(mp::Package &package) const
                     xmlFreeDoc(doc_input);
                 }
             }
-            if (charset_to.length() && charset_from.length() &&
+            if (!error_code && charset_to.length() && charset_from.length() &&
                 (req->query->which == Z_Query_type_1
                  || req->query->which == Z_Query_type_101))
             {