major improvements in resource/template lookup with SoProduct's

[sope] / sope-appserver / NGObjWeb / WOMessage.m

diff --git a/sope-appserver/NGObjWeb/WOMessage.m b/sope-appserver/NGObjWeb/WOMessage.m
index e3fb0019051427b9df160e22c98eb97d11911972..6d6170f65a7d0cbc89f95111b620bfb765660659 100644 (file)
--- a/sope-appserver/NGObjWeb/WOMessage.m
+++ b/sope-appserver/NGObjWeb/WOMessage.m
@@ -1,20 +1,20 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
@@ -53,12 +53,18 @@ static WOMessageProfileInfo profiletot = { 0, 0, 0, 0, 0 };
   
   printProfile = [ud boolForKey:@"WOProfileResponse"];
 
+  if ([ud boolForKey:@"WOMessageUseUTF8"]) {
+    defaultEncoding = NSUTF8StringEncoding;
+  }
+  else {
 #ifdef __APPLE__
-  //#warning default encoding is ISO Latin 1 ...
-  defaultEncoding = NSISOLatin1StringEncoding;
+    //#warning default encoding is ISO Latin 1 ...
+    // TODO: why are we doing this?
+    defaultEncoding = NSISOLatin1StringEncoding;
 #else
-  defaultEncoding = [NSStringClass defaultCStringEncoding];
+    defaultEncoding = [NSStringClass defaultCStringEncoding];
 #endif
+  }
 }
 
 static inline void _ensureBody(WOMessage *self) {
@@ -139,8 +145,8 @@ static __inline__ NSMutableData *_checkBody(WOMessage *self) {
   [old release];
   
   if (self->version != nil && ![_httpVersion hasPrefix:@"HTTP/"]) {
-    [self logWithFormat:
-            @"WARNING: you apparently passed in an invalid HTTP version: '%@'",
+    [self warnWithFormat:
+            @"you apparently passed in an invalid HTTP version: '%@'",
             _httpVersion];
   }
 }
@@ -398,8 +404,8 @@ static __inline__ NSMutableData *_checkBody(WOMessage *self) {
       NSString *s;
     
 #if DEBUG
-      [self logWithFormat:
-              @"WARNING: using NSString to add a character %i,0x%08X"
+      [self warnWithFormat:
+              @"using NSString to add a character %i,0x%08X"
               @"(slow, encoding=%i).", _c, _c, self->contentEncoding];
 #endif
       
@@ -508,8 +514,9 @@ static __inline__ NSMutableData *_checkBody(WOMessage *self) {
   }
 #endif
   if (cdata == NULL) {
-    NSLog(@"ERROR(%s): could not convert string non-lossy to encoding %i !",
-          __PRETTY_FUNCTION__, self->contentEncoding);
+    [self errorWithFormat:
+            @"(%s): could not convert string non-lossy to encoding %i !",
+            __PRETTY_FUNCTION__, self->contentEncoding];
     cdata = [_value dataUsingEncoding:self->contentEncoding
                     allowLossyConversion:YES];
   }