X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_query_rewrite.cpp;h=4828781d41329755165253fd9015be1dfb230d73;hb=690bbc42f9678b5f6b895ac5c4ce427b08ab6dd2;hp=6e77295d1687c732ec0a4e5395d81dd88b655a2a;hpb=73f37c91c144b070020df2f27472c09b62367acf;p=metaproxy-moved-to-github.git

diff --git a/src/filter_query_rewrite.cpp b/src/filter_query_rewrite.cpp
index 6e77295..4828781 100644
--- a/src/filter_query_rewrite.cpp
+++ b/src/filter_query_rewrite.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 Index Data
+   Copyright (C) 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
@@ -101,12 +101,7 @@ void yf::QueryRewrite::Rep::process(mp::Package &package) const
                 xmlDocPtr doc_input = 0;
                 yaz_query2xml(req->query, &doc_input);
 
-                if (!doc_input)
-                {
-                    error_code = YAZ_BIB1_MALFORMED_QUERY;
-                    addinfo = "converion from Query to XML failed";
-                }
-                else
+                if (doc_input)
                 {
                     xmlDocPtr doc_res = xsltApplyStylesheet(m_stylesheet,
                                                             doc_input, 0);
@@ -125,7 +120,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))
             {