From fb05eb6860711de94725fcb87fc593aaa8d7e24a Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Wed, 13 Jul 2011 23:15:12 +0000 Subject: [PATCH] added some debug log git-svn-id: svn://ttmath.org/publicrep/ezc/trunk@357 e52654a7-88a9-db11-a3e9-0013d4bc506e --- src/Makefile.dep | 19 +++++++++++++++++++ src/generator.h | 12 +++++++++++- src/utf8.h | 5 ----- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/Makefile.dep b/src/Makefile.dep index 75fa86b..27225f9 100755 --- a/src/Makefile.dep +++ b/src/Makefile.dep @@ -5,5 +5,24 @@ edanticpattern.o: pattern.h item.h funinfo.h functions.h stringconv.h utf8.h edanticpattern.o: /home/tomek/roboczy/winix/core/log.h edanticpattern.o: /home/tomek/roboczy/winix/core/textstream.h edanticpattern.o: /home/tomek/roboczy/winix/core/misc.h +edanticpattern.o: /home/tomek/roboczy/winix/core/requesttypes.h +edanticpattern.o: /home/tomek/roboczy/winix/core/logmanipulators.h +edanticpattern.o: /home/tomek/roboczy/winix/core/slog.h +edanticpattern.o: /home/tomek/roboczy/winix/core/cur.h +edanticpattern.o: /home/tomek/roboczy/winix/core/request.h +edanticpattern.o: /usr/local/include/fcgiapp.h +edanticpattern.o: /home/tomek/roboczy/winix/core/error.h +edanticpattern.o: /home/tomek/roboczy/winix/core/config.h +edanticpattern.o: /home/tomek/roboczy/winix/core/confparser.h +edanticpattern.o: /home/tomek/roboczy/winix/core/htmlfilter.h +edanticpattern.o: /home/tomek/roboczy/winix/templates/htmltextstream.h +edanticpattern.o: /home/tomek/roboczy/winix/core/textstream.h +edanticpattern.o: /home/tomek/roboczy/winix/core/session.h +edanticpattern.o: /home/tomek/roboczy/winix/core/user.h +edanticpattern.o: /home/tomek/roboczy/winix/core/plugindata.h +edanticpattern.o: /home/tomek/roboczy/winix/core/rebus.h +edanticpattern.o: /home/tomek/roboczy/winix/core/mount.h +edanticpattern.o: /home/tomek/roboczy/winix/templates/locale.h +edanticpattern.o: /home/tomek/roboczy/winix/core/confparser.h edanticstringconv.o: stringconv.h edanticutf8.o: utf8.h diff --git a/src/generator.h b/src/generator.h index 1e29887..50dd578 100755 --- a/src/generator.h +++ b/src/generator.h @@ -781,7 +781,17 @@ void Generator::MakeTextContainer(Item & item) std::vector::iterator i = item.item_tab.begin(); for( ; i != item.item_tab.end() && !break_generating ; ++i ) - MakeText(**i); + { + if( *i == 0 ) + { + #ifdef EZC_HAS_SPECIAL_STREAM + // temporary for debugging + log << log1 << "Generator: something wrong !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << logend; + #endif + } + else + MakeText(**i); + } } diff --git a/src/utf8.h b/src/utf8.h index 8615f70..0331db3 100755 --- a/src/utf8.h +++ b/src/utf8.h @@ -92,11 +92,6 @@ size_t IntToUTF8(int z, std::ostream & utf8); /*! converting a wide string to UTF-8 string - - warning: current limitation - on MS Windows wide characters consist of two bytes only - and we tread them as UCS-2 (not UTF-16 with surrogate pairs as it should be trated) - so unicode characters above 0xffff value are ignored (depending on 'mode' parameter) */ bool WideToUTF8(const wchar_t * wide_string, size_t string_len, std::string & utf8, bool clear = true, int mode = 1); bool WideToUTF8(const wchar_t * wide_string, std::string & utf8, bool clear = true, int mode = 1);