X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fcharset-converter.cpp;h=573f8e0e23b1787f0be86d195a2a746fda9c7122;hp=70c67433507e3fe5d71a0a88089adf6ac1b4ee52;hb=f5aa3da6fa8c40d6f8295514edf08477e3f3a054;hpb=6d0a5f50ed33c05340ef90443e5fcb2bfa61d585

diff --git a/src/charset-converter.cpp b/src/charset-converter.cpp
index 70c6743..573f8e0 100644
--- a/src/charset-converter.cpp
+++ b/src/charset-converter.cpp
@@ -1,7 +1,5 @@
-/* $Id: charset-converter.cpp,v 1.6 2007-03-20 07:54:27 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy 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 YAZ proxy; 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>
 #include <yaz/proto.h>
@@ -80,6 +77,7 @@ void Yaz_CharsetConverter::convert_type_1(char *buf_in, int len_in,
 {
     wrbuf_rewind(m_wrbuf);
     wrbuf_iconv_write(m_wrbuf, m_ct, buf_in, len_in);
+    wrbuf_iconv_reset(m_wrbuf, m_ct);
 
     *len_out = wrbuf_len(m_wrbuf);
     if (*len_out == 0)
@@ -146,9 +144,24 @@ void Yaz_CharsetConverter::convert_type_1(Z_RPNQuery *q, ODR o)
         }
     }
 }
+
+void Yaz_CharsetConverter::convert_term(Z_Term *q, ODR o)
+{
+    if (m_target_query_charset && m_client_query_charset)
+    {
+        m_ct = yaz_iconv_open(m_target_query_charset,
+                              m_client_query_charset);
+        if (m_ct)
+        {
+            convert_type_1(q, o);
+            yaz_iconv_close(m_ct);
+        }
+    }
+}
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab