minor improvements

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@619 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog
index 0073631938e06a68b36597a2614199020e77ee4e..5fef80a15be83620a47f5f4a825c862189ac04fe 100644 (file)
--- a/SOGo/SoObjects/Appointments/ChangeLog
+++ b/SOGo/SoObjects/Appointments/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-02  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGoAppointmentFolder.m: changed debugLog to use NGLogging (v0.9.29)
+
 2005-03-01  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SOGoAppointmentFolder.m: significantly changed handling of cyclic

diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
index 7b62a57806f1fabae67cf75976d778fbf4084781..e12afff281371aef1014be95d2bbd64266bf7a9f 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -39,15 +39,19 @@
 
 @implementation SOGoAppointmentFolder
 
-static BOOL       debugOn = NO;
+static NGLogger   *logger = nil;
 static NSTimeZone *MET    = nil;
 
 + (void)initialize {
-  static BOOL didInit = NO;
+  NGLoggerManager *lm;
+  static BOOL     didInit = NO;
 
   if (didInit) return;
   didInit = YES;
 
+  lm      = [NGLoggerManager defaultLoggerManager];
+  logger  = [lm loggerForDefaultKey:@"SOGoAppointmentFolderDebugEnabled"];
+
   MET = [[NSTimeZone timeZoneWithAbbreviation:@"MET"] retain];
 }
 
@@ -76,6 +80,13 @@ static NSTimeZone *MET    = nil;
   [super dealloc];
 }
 
+
+/* logging */
+
+- (NGLogger *)debugLogger {
+  return logger;
+}
+
 /* selection */
 
 - (NSArray *)calendarUIDs {
@@ -292,12 +303,12 @@ static NSTimeZone *MET    = nil;
 
   /* prepare mandatory fields */
 
-  fields    = [NSMutableArray arrayWithArray:_fields];
+  fields = [NSMutableArray arrayWithArray:_fields];
   [fields addObject:@"uid"];
   [fields addObject:@"startdate"];
   [fields addObject:@"enddate"];
   
-  if (debugOn)
+  if (logger)
     [self debugWithFormat:@"should fetch (%@=>%@) ...", _startDate, _endDate];
   
   sql = [NSString stringWithFormat:@"(startdate < %d) AND (enddate > %d)"
@@ -311,8 +322,8 @@ static NSTimeZone *MET    = nil;
   records   = [_folder fetchFields:fields matchingQualifier:qualifier];
   if (records != nil) {
     records = [self fixupRecords:records fetchRange:r];
-    if (debugOn)
-      [self logWithFormat:@"fetched %i records: %@", [records count], records];
+    if (logger)
+      [self debugWithFormat:@"fetched %i records: %@", [records count], records];
     ma = [NSMutableArray arrayWithArray:records];
   }
 
@@ -327,8 +338,8 @@ static NSTimeZone *MET    = nil;
 
   records = [_folder fetchFields:fields matchingQualifier:qualifier];
   if (records != nil) {
-    if (debugOn)
-      [self logWithFormat:@"fetched %i cyclic records: %@",
+    if (logger)
+      [self debugWithFormat:@"fetched %i cyclic records: %@",
         [records count], records];
     records = [self fixupCyclicRecords:records fetchRange:r];
     if (!ma) ma = [NSMutableArray arrayWithCapacity:[records count]];
@@ -338,7 +349,8 @@ static NSTimeZone *MET    = nil;
     [self errorWithFormat:@"(%s): fetch failed!", __PRETTY_FUNCTION__];
     return nil;
   }
-
+  if (logger)
+    [self debugWithFormat:@"returning %i records", [ma count]];
   return ma;
 }
 

diff --git a/SOGo/SoObjects/Appointments/Version b/SOGo/SoObjects/Appointments/Version
index 78c27fd99d17d0c8032a41e8464a877755f7546d..c161c04f5cf898358ee30d6576b95e74547bda01 100644 (file)
--- a/SOGo/SoObjects/Appointments/Version
+++ b/SOGo/SoObjects/Appointments/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=28
+SUBMINOR_VERSION:=29
 
 # v0.9.28 requires NGiCal  v4.5.47
 # v0.9.26 requires libSOGo v0.9.30

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 29b175f8766294c7318dbc2b130b815b48d245f5..580cad8ba56316e57c6220f1f836c8ded4dc280e 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-02  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxCalDateLabel.m: fixed compile warning (v0.9.118)
+
 2005-03-01  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxCalDateLabel.m: fixed heuristics for month label (v0.9.117)

diff --git a/SOGo/UI/Scheduler/UIxCalDateLabel.m b/SOGo/UI/Scheduler/UIxCalDateLabel.m
index d594afc7df5b6d558b7d974ae37a94c5722eddf3..234d62d47efb001b15c9dacaa59e8a13727ffb40 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDateLabel.m
+++ b/SOGo/UI/Scheduler/UIxCalDateLabel.m
@@ -37,6 +37,7 @@
 @end
 
 #include "common.h"
+#include <NGiCal/NGiCal.h>
 
 @implementation UIxCalDateLabel
 

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 9094796553ada8e970b152f5f89d192efab992ec..c1893aaeecc22ac581a56caf35cbf9d67dbf71ec 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=117
+SUBMINOR_VERSION:=118
 
 # v0.9.115 requires NGiCal       v4.5.44
 # v0.9.113 requires libSOGo      v0.9.30