bind rq handler debug logging to WODebuggingEnabled

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@405 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 40cb1bc5eee297c1b6404734c9862dd1693dbeb2..272df32b2f32105f3c3677b5ad024a706397256a 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-22  Helge Hess  <helge.hess@skyrix.com>
+
+       * v4.5.97
+
+       * WOContext.m: move some categories into main class implementation
+
+       * WORequestHandler.m: bind default logger to WODebuggingEnabled
+
 2004-11-21  Helge Hess  <helge.hess@opengroupware.org>
 
        * WODirectActionRequestHandler.m: minor code cleanups (v4.5.96)

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 2949dc7a309c4b61c9f49f4c1eeb8a771700e546..c42a489867199b695a70cd134d7c8e5f6f6970ea 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=96
+SUBMINOR_VERSION:=97
 
 # v4.5.91  requires libNGExtensions v4.5.134
 # v4.5.84  requires libNGExtensions v4.5.127

diff --git a/sope-appserver/NGObjWeb/WOContext.m b/sope-appserver/NGObjWeb/WOContext.m
index cc757e1f4c690469878f27487e15c9251080767b..a9187d550dffcbe690248013d2c5092f6f1f2cdd 100644 (file)
--- a/sope-appserver/NGObjWeb/WOContext.m
+++ b/sope-appserver/NGObjWeb/WOContext.m
@@ -650,9 +650,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
                      [self  senderID]];
 }
 
-@end /* WOContext */
-
-@implementation WOContext(ElementIDs)
+/* ElementIDs */
 
 - (NSString *)elementID {
   return [self->elementID elementID];
@@ -685,9 +683,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
   return [self->reqElementID consumeElementID];
 }
 
-@end /* WOContext(ElementIDs) */
-
-@implementation WOContext(URLs)
+/* URLs */
 
 - (void)_generateCompleteURLs {
   /* described in Apple TIL article 70101 */
@@ -818,7 +814,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
   queryString:(NSString *)_query
 {
   if (testNSURLs) { /* use NSURLs for processing */
-    NSURL    *rqUrl;
+    NSURL *rqUrl;
     
     if ([_path hasPrefix:@"/"]) {
 #if DEBUG
@@ -855,7 +851,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
   
     url = [MutableStrClass stringWithCapacity:256];
     addStr = [url methodForSelector:@selector(appendString:)];
-  
+
     /* static part */
     if (self->urlPrefix == nil) {
       if (!relativeURLs) {
@@ -869,7 +865,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
          addStr(url, @selector(appendString:), tmp);
        }
       }
-  
+
       addStr(url, @selector(appendString:), [self->request adaptorPrefix]);
       addStr(url, @selector(appendString:), @"/");
       tmp = [[self request] applicationName];
@@ -944,9 +940,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
 #endif
 }
 
-@end /* WOContext(URLs) */
-
-@implementation WOContext(DeprecatedMethodsInWO4)
+/* DeprecatedMethodsInWO4 */
 
 - (WOApplication *)application {
   if (self->application == nil)
@@ -995,6 +989,8 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
 
 @end /* WOContext(DeprecatedMethodsInWO4) */
 
+
+
 @implementation WOComponent(Cursors)
 
 - (void)pushCursor:(id)_obj {

diff --git a/sope-appserver/NGObjWeb/WORequestHandler.m b/sope-appserver/NGObjWeb/WORequestHandler.m
index ac3e8fe851b4f10705a07bab5fd83cb0d6949fee..e4d2caa9a2291f500f28f3a2e65c1f50c7b98f3e 100644 (file)
--- a/sope-appserver/NGObjWeb/WORequestHandler.m
+++ b/sope-appserver/NGObjWeb/WORequestHandler.m
@@ -66,7 +66,7 @@ static NGLogger *perfLogger        = nil;
   NSDateClass = [NSDate class];
 
   lm         = [NGLoggerManager defaultLoggerManager];
-  logger     = [lm loggerForClass:self];
+  logger     = [lm loggerForDefaultKey:@"WODebuggingEnabled"];
   perfLogger = [lm loggerForDefaultKey:@"WOProfileRequestHandler"];
 
   ud                 = [NSUserDefaults standardUserDefaults];