fixed various warnings

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 9fb88794eebc5470652850c469517a0af9db941a..e1b2122bd90540f04c543722be1c73dcd9febf74 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,15 @@
 2004-11-19  Helge Hess  <helge.hess@opengroupware.org>
 
+       * v4.5.93
+       
+       * WOApplication.m: print a note if debug logging is enabled
+
+       * WOComponentRequestHandler.m: removed usage of unavailabel
+         -logInfoWithFormat: (replaced with logWithFormat:)
+
+       * WOStatisticsStore.m: fixed a new warning due to incompatible pointer
+         types
+       
        * WOComponentRequestHandler.m: append session-id cookies to response,
          reject favicon requests, added some logs, minor cleanups (v4.5.92)
 

diff --git a/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble b/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble
deleted file mode 100644 (file)
index 73c51ce..0000000
--- a/sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble
+++ /dev/null
@@ -1,2 +0,0 @@
-# compile settings
-

diff --git a/sope-appserver/NGObjWeb/Templates/README-Templates.txt b/sope-appserver/NGObjWeb/Templates/README-Templates.txt
index 7fa9a680e65565df2fe2bec766103d181ab50e32..8b102c86acfc0e669c37aa75ca22158ade266c69 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/README-Templates.txt
+++ b/sope-appserver/NGObjWeb/Templates/README-Templates.txt
@@ -1,5 +1,3 @@
-# $Id$
-
 How Templates Work ...
 ======================
 

diff --git a/sope-appserver/NGObjWeb/Templates/WOxComponentElemBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxComponentElemBuilder.m
index def131a9208984a187403aaa052ddadc6921e3aa..df8c321a37f2bb08d2d7450e1bea5934a6073e5b 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WOxComponentElemBuilder.m
+++ b/sope-appserver/NGObjWeb/Templates/WOxComponentElemBuilder.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: WOxComponentElemBuilder.m 1 2004-08-20 10:08:27Z znek $
 
 #include <NGObjWeb/WOxElemBuilder.h>
 

diff --git a/sope-appserver/NGObjWeb/Templates/common.h b/sope-appserver/NGObjWeb/Templates/common.h
index c407f79dfa4cf8ca9aa90067f1ceffb9ad469332..b9f62a9d254b739899cd3dbfa35623a1b486ebe6 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/common.h
+++ b/sope-appserver/NGObjWeb/Templates/common.h
@@ -26,7 +26,7 @@
 #  include <NGExtensions/NSString+Ext.h>
 #endif
 
-#  include <NGExtensions/NGExtensions.h>
+#include <NGExtensions/NGExtensions.h>
 
 #define IS_DEPRECATED \
   [self warnWithFormat:@"used deprecated method: %s:%i.", \

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 043774601232b6a1364836f25c7442d64158ce79..83d960287e8faee2067eabc0dadac54cccb9a7df 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=92
+SUBMINOR_VERSION:=93
 
 # v4.5.91  requires libNGExtensions v4.5.134
 # v4.5.84  requires libNGExtensions v4.5.127

diff --git a/sope-appserver/NGObjWeb/WOApplication.m b/sope-appserver/NGObjWeb/WOApplication.m
index 19d76130a7a5e3863ddb495e05375385c351ad4b..afc3fd0be740196f87509fd37ca426a263c8ae4a 100644 (file)
--- a/sope-appserver/NGObjWeb/WOApplication.m
+++ b/sope-appserver/NGObjWeb/WOApplication.m
@@ -90,6 +90,8 @@ static NSString *rapidTurnAroundPath = nil;
   debugOn = [WOApplication isDebuggingEnabled];
   if (!debugOn)
     [[self logger] setLogLevel:NGLogLevelInfo];
+  else
+    NSLog(@"Note: WOApplication debugging is enabled.");
 
   if (classLock == nil) classLock = [[NSRecursiveLock alloc] init];
   ud = [NSUserDefaults standardUserDefaults];

diff --git a/sope-appserver/NGObjWeb/WOComponentRequestHandler.m b/sope-appserver/NGObjWeb/WOComponentRequestHandler.m
index a148ef815e03bd47886cb1007bc572bf6d1afd35..837c6b8b3947dc13fd00758cb026edbb9f9bdf7e 100644 (file)
--- a/sope-appserver/NGObjWeb/WOComponentRequestHandler.m
+++ b/sope-appserver/NGObjWeb/WOComponentRequestHandler.m
@@ -215,9 +215,7 @@
     else if ([newPage isKindOfClass:[WOComponent class]])
       [context setPage:newPage];
 
-#if DEBUG
     [self debugWithFormat:@"%s: new page: %@", __PRETTY_FUNCTION__, newPage];
-#endif
     
     /* generate response */
     
@@ -245,7 +243,7 @@
     [self logWithFormat:@"saving session %@", [session sessionID]];
     
     if ([session storesIDsInCookies]) {
-      [self logInfoWithFormat:@"add cookie to session: %@", session];
+      [self logWithFormat:@"add cookie to session: %@", session];
       [self addCookiesForSession:session
            toResponse:response
            inContext:context];

diff --git a/sope-appserver/NGObjWeb/WOStatisticsStore.m b/sope-appserver/NGObjWeb/WOStatisticsStore.m
index 57aeb8cdb1b122e7c5bd19f9357af3468b7a5f43..7f19c50f478a551e2d0371824989c6f4524c0e9e 100644 (file)
--- a/sope-appserver/NGObjWeb/WOStatisticsStore.m
+++ b/sope-appserver/NGObjWeb/WOStatisticsStore.m
@@ -394,7 +394,7 @@ static id mkdbl(double d) {
   else
     remoteHost = @"-";
   
-  now = [NSCalendarDate date];
+  now = [NSCalendarDate calendarDate];
   [now setTimeZone:gmt];
   
   [result appendString:remoteHost];