hotfix

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

diff --git a/sope-appserver/NGObjWeb/WOContext.m b/sope-appserver/NGObjWeb/WOContext.m
index 67fbd1737476ea8ced0c1202c1bdb01104645610..1b08905714c11bcb38125af53de59abf160276f1 100644 (file)
--- a/sope-appserver/NGObjWeb/WOContext.m
+++ b/sope-appserver/NGObjWeb/WOContext.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -28,7 +29,7 @@
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WOSession.h>
-#import <EOControl/EONull.h>
+#include <Foundation/NSNull.h>
 #include "WOElementID.h"
 #include "common.h"
 #include <time.h>
@@ -101,7 +102,8 @@ static NSString *WOApplicationSuffix = nil;
     char buf[24];
     self->qpJoin = @"&amp;";
     
-    sprintf(buf, "%03x%08x%08x", ++contextCount, (int)time(NULL), (int)self);
+    sprintf(buf, "%03x%08x%08x", ++contextCount, (int)time(NULL),
+           (unsigned int)(unsigned long)self);
     self->ctxId = [[NSString alloc] initWithCString:buf];
     
     /* per default close tags in XML style */
@@ -288,19 +290,26 @@ static NSString *WOApplicationSuffix = nil;
   [super dealloc];
 }
 
+/* session */
+
 - (void)setSession:(WOSession *)_session {
   ASSIGN(self->session, _session);
 }
+- (void)setNewSession:(WOSession *)_session {
+  [self setSession:_session];
+  self->wcFlags.hasNewSession = 1;
+}
 
 - (id)session {
-  // in WO4 -session creates a new session if none is associated
+  /* in WO4 -session creates a new session if none is associated */
   
   if (self->session == nil) {
     [[self application] _initializeSessionInContext:self];
     
-    if (self->session == nil)
+    if (self->session == nil) {
       [self logWithFormat:@"%s: missing session for context ..",
               __PRETTY_FUNCTION__];
+    }
   }
   
   return self->session;
@@ -335,6 +344,11 @@ static NSString *WOApplicationSuffix = nil;
 - (BOOL)hasSession {
   return (self->session != nil) ? YES : NO;
 }
+- (BOOL)hasNewSession {
+  if (!self->wcFlags.hasNewSession)
+    return NO;
+  return [self hasSession];
+}
 
 - (BOOL)savePageRequired {
   return self->wcFlags.savePageRequired ? YES : NO;
@@ -615,7 +629,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     return;
   else if (WOGetKVCGetMethod(self, _key) == NULL) {
     if (_value == nil)
-      _value = [EONull null];
+      _value = [NSNull null];
     
     if (self->variables == nil) {
       self->variables =
@@ -655,11 +669,11 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     sid = [[self session] sessionID];
   
   return [NSString stringWithFormat:
-                     @"<0x%08X[%@]: %@ app=%@ sn=%@ eid=%@ rqeid=%@>",
-                     (unsigned)self, NSStringFromClass([self class]),
+                     @"<0x%p[%@]: %@ app=%@ sn=%@ eid=%@ rqeid=%@>",
+                     self, NSStringFromClass([self class]),
                      [self  contextID],
                      [app name],
-                     sid ? sid : @"none",
+                    sid != nil ? sid : (NSString *)@"none",
                      [self  elementID],
                      [self  senderID]];
 }
@@ -750,7 +764,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
        else [qs appendString:self->qpJoin];
 
        // TODO: code duplication ...
-       value = ![value isNotNull] ? nil : [value stringValue];
+       value = ![value isNotNull] ? (NSString *)nil : [value stringValue];
        key   = [key   stringByEscapingURL];
        value = [value stringByEscapingURL];
     
@@ -768,7 +782,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     if (isFirst) isFirst = NO;
     else [qs appendString:self->qpJoin];
     
-    value = ![value isNotNull] ? nil : [value stringValue];
+    value = ![value isNotNull] ? (NSString *)nil : [value stringValue];
     key   = [key   stringByEscapingURL];
     value = [value stringByEscapingURL];
     
@@ -811,11 +825,20 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
   //   26% -urlWithRequestHandler...
   //   21% -elementID (was 40% !! :-)
   //   ~20% mutable string ops
+  
+  /* 
+     This makes the request handler save the page in the session at the
+     end of the request (only necessary if the page generates URLs which
+     refer the context).
+  */
+  self->wcFlags.savePageRequired = 1;
+  
   if (newCURLStyle) {
+    // TODO: who uses that? Its not enabled per default
+    // TODO: what does this do?
     NSMutableString *qs;
     NSString *p;
   
-    self->wcFlags.savePageRequired = 1;
     qs = [MutableStrClass stringWithCapacity:64];
   
     [qs appendString:WORequestValueSenderID];
@@ -846,8 +869,19 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     static NSMutableString *url = nil; // THREAD
     static IMP addStr = NULL;
     NSString *s;
+    NSString *coRqhKey;
+
+    coRqhKey = [WOAppClass componentRequestHandlerKey];
+
+    /* 
+       Optimization: use relative URL if the request already was a component
+                     action (with a valid session)
+    */
+    if (!self->wcFlags.hasNewSession) {
+      if ([[self->request requestHandlerKey] isEqualToString:coRqhKey])
+       return [self->elementID elementID];
+    }
     
-    self->wcFlags.savePageRequired = 1;
     if (url == nil) {
       url = [[MutableStrClass alloc] initWithCapacity:256];
       addStr = [url methodForSelector:@selector(appendString:)];
@@ -855,7 +889,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     }
     else
       [url setString:@"/"];
-  
+    
     /*
       Note: component actions *always* require sessions to be able to locate
       the request component !
@@ -864,8 +898,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     addStr(url, @selector(appendString:), @"/");
     addStr(url, @selector(appendString:), [self->elementID elementID]);
   
-    s = [self urlWithRequestHandlerKey:
-               [WOAppClass componentRequestHandlerKey]
+    s = [self urlWithRequestHandlerKey:coRqhKey
              path:url queryString:nil];
     return s;
   }
@@ -1005,8 +1038,9 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
 /* languages for resource lookup (non-WO) */
 
 - (NSArray *)resourceLookupLanguages {
-  return [self hasSession] ? [[self session] languages]
-                           : [[self request] browserLanguages];
+  return [self hasSession] 
+    ? [[self session] languages]
+    : [[self request] browserLanguages];
 }
 
 
@@ -1073,7 +1107,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     self->cycleContext = [[NSMutableArray alloc] initWithCapacity:8];
   
   /* add to cursor stack */
-  [self->cycleContext addObject:(_obj ? _obj : [NSNull null])];
+  [self->cycleContext addObject:(_obj != nil ? _obj : (id)[NSNull null])];
   
   /* set active cursor */
   [self setObject:_obj forKey:@"_"];