diff --git a/uppsrc/Core/XML.cpp b/uppsrc/Core/XML.cpp index 8e6c47b19..96d0d1af5 100644 --- a/uppsrc/Core/XML.cpp +++ b/uppsrc/Core/XML.cpp @@ -510,7 +510,7 @@ bool XmlParser::IsText() String XmlParser::ReadText() { if(!IsText()) - throw XmlError("Character data expected"); + return String(); String h = text; Next(); return h; diff --git a/uppsrc/Sql/SqlSchema.cpp b/uppsrc/Sql/SqlSchema.cpp index 5949e7db9..8497055dd 100644 --- a/uppsrc/Sql/SqlSchema.cpp +++ b/uppsrc/Sql/SqlSchema.cpp @@ -192,9 +192,10 @@ void SqlSchema::SaveNormal(const char *dir, const char *name) const { SqlSchema::SqlSchema(int dialect_) { dialect = dialect_; + maxidlen = 63; if(dialect == MSSQL) maxidlen = 128; - else + if(dialect == ORACLE) maxidlen = 24; } diff --git a/uppsrc/Web/httpsrv.cpp b/uppsrc/Web/httpsrv.cpp index 49f41ce62..a923a6a65 100644 --- a/uppsrc/Web/httpsrv.cpp +++ b/uppsrc/Web/httpsrv.cpp @@ -2,7 +2,7 @@ NAMESPACE_UPP -#define LLOG(x) // RLOG(x) +#define LLOG(x) // RLOG(x) #define SLOWWRITE 4 // KB/s, comment out to turn off diff --git a/uppsrc/Web/socket.cpp b/uppsrc/Web/socket.cpp index f203e011f..bc8a6382d 100644 --- a/uppsrc/Web/socket.cpp +++ b/uppsrc/Web/socket.cpp @@ -29,8 +29,8 @@ static bool LogSocketFlag = false; void LogSockets(bool ls) { LogSocketFlag = ls; } bool IsLogSockets() { return LogSocketFlag; } -#define SLOG(x) if(!LogSocketFlag) ; else RLOG("[" << GetSysTime() << " @ " << int(GetTickCount() % 10000u) << "] " << x) -#define LLOG(x) +#define SLOG(x) if(!LogSocketFlag) ; else RLOG("[" << GetSysTime() << " @ " << int(GetTickCount() % 10000u) << "] " << x) +#define LLOG(x) // LOG(x) #ifdef PLATFORM_POSIX @@ -615,7 +615,7 @@ String Socket::Read(int timeout, int maxlen) return Null; char buffer[SOCKBUFSIZE]; int count = data->Read(buffer, min(maxlen, sizeof(buffer))); - SLOG("recv(" << GetNumber() << ") -> " << count); + SLOG("recv(" << GetNumber() << ") -> " << count << ": " << String(buffer, max(count, 64))); if(data->IsError()) return String::GetVoid(); if(count <= 0) {