increased element nesting depth

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

diff --git a/sope-appserver/NGObjWeb/WOResourceManager.m b/sope-appserver/NGObjWeb/WOResourceManager.m
index 2c20ee2575ff3414c1a54cd66d59a2f39ee40291..5474d179cb533c6b9bf03d2cbe4e3e4106ddfb12 100644 (file)
--- a/sope-appserver/NGObjWeb/WOResourceManager.m
+++ b/sope-appserver/NGObjWeb/WOResourceManager.m
@@ -280,7 +280,7 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path)
 }
 
 - (NSString *)resourcesPathForFramework:(NSString *)_fw {
-  if (_fw == nil) 
+  if (_fw == nil || (_fw == rapidTurnAroundPath)) 
     return [self resourcesPath];
   
 #if RSRCDIR_CONTENTS
@@ -767,32 +767,31 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path)
            _nameOrURL, _framework];
   }
 
+  /* look for .wox component */
     
-    /* look for .wox component */
+  path = [self pathForResourceNamed:
+                [self resourceNameForComponentNamed:*name_]
+              inFramework:_framework
+              languages:_languages];
     
-    path = [self pathForResourceNamed:
-                   [self resourceNameForComponentNamed:*name_]
-                 inFramework:_framework
-                 languages:_languages];
-    
-    if (debugComponentLookup)
-      [self logWithFormat:@"  path: '%@'", path];
+  if (debugComponentLookup)
+    [self logWithFormat:@"  .wox path: '%@'", path];
     
-    /* look for .wo component */
+  /* look for .wo component */
     
-    if ([path length] == 0) {
-      path = [self pathToComponentNamed:*name_
-                   inFramework:_framework
-                   languages:_languages];
-      if (debugComponentLookup)
-        [self logWithFormat:@"  path: '%@'", path];
-    }
+  if ([path length] == 0) {
+    path = [self pathToComponentNamed:*name_
+                inFramework:_framework
+                languages:_languages];
+    if (debugComponentLookup)
+      [self logWithFormat:@"  .wo  path: '%@'", path];
+  }
     
-    /* make URL from path */
+  /* make URL from path */
     
-    *url_ = ([path length] > 0)
-      ? [[[UrlClass alloc] initFileURLWithPath:path] autorelease]
-      : nil;
+  *url_ = ([path length] > 0)
+    ? [[[UrlClass alloc] initFileURLWithPath:path] autorelease]
+    : nil;
 }
 
 - (WOComponentDefinition *)definitionForFileURL:(NSURL *)componentURL
@@ -1056,7 +1055,8 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path)
   WOComponentDefinition *cdef;
   
   cdef = [self __definitionForComponent:_name languages:_languages];
-  if (cdef == nil) return nil;
+  if (cdef == nil)
+    return nil;
   
   return (WOElement *)[cdef template];
 }
@@ -1087,9 +1087,14 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path)
 /* description */
 
 - (NSString *)description {
-  return [NSString stringWithFormat:@"<%@[0x%08X]: path=%@>",
-                     [self class], self, self->base];
-                   
+  NSMutableString *ms;
+
+  ms = [NSMutableString stringWithCapacity:32];
+  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+  if ([self->base length] > 0)
+    [ms appendFormat:@" path='%@'", self->base];
+  [ms appendString:@">"];
+  return ms;
 }
 
 /* KeyedData */