--- parser3/src/main/pa_pool.C 2001/12/27 19:57:09 1.47 +++ parser3/src/main/pa_pool.C 2002/08/01 11:41:19 1.55 @@ -1,12 +1,12 @@ /** @file Parser: pool class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: pa_pool.C,v 1.47 2001/12/27 19:57:09 paf Exp $ + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ +static const char* IDENT_POOL_C="$Date: 2002/08/01 11:41:19 $"; + #include "pa_pool.h" #include "pa_exception.h" #include "pa_common.h" @@ -36,7 +36,7 @@ void Pool::set_source_charset(Charset& a } Charset& Pool::get_source_charset() { if(!source_charset) - throw Exception(0, 0, + throw Exception(0, 0, "no source charset defined yet"); return *source_charset; @@ -47,7 +47,7 @@ void Pool::set_client_charset(Charset& a } Charset& Pool::get_client_charset() { if(!client_charset) - throw Exception(0, 0, + throw Exception(0, 0, "no client charset defined yet"); return *client_charset; @@ -55,6 +55,14 @@ Charset& Pool::get_client_charset() { #ifdef XML +const char *Pool::transcode_cstr(xmlChar *s) { + return get_source_charset().transcode_cstr(s); +} + +String& Pool::transcode(xmlChar *s) { + return get_source_charset().transcode(s); +} + const char *Pool::transcode_cstr(GdomeDOMString *s) { return get_source_charset().transcode_cstr(s); } @@ -63,7 +71,11 @@ String& Pool::transcode(GdomeDOMString * return get_source_charset().transcode(s); } -GdomeDOMString *Pool::transcode(const String& s) { +xmlChar *Pool::transcode_buf2xchar(const char *buf, size_t buf_size) { + return get_source_charset().transcode_buf2xchar(buf, buf_size); +} + +GdomeDOMString_auto_ptr Pool::transcode(const String& s) { return get_source_charset().transcode(s); }