From c72cbc18a086f9c4d45297880b7def49b6fbb212 Mon Sep 17 00:00:00 2001 From: znek Date: Wed, 2 Mar 2005 15:16:32 +0000 Subject: [PATCH] minor improvements git-svn-id: http://svn.opengroupware.org/SOGo/trunk@619 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/Appointments/ChangeLog | 4 +++ .../Appointments/SOGoAppointmentFolder.m | 30 +++++++++++++------ SOGo/SoObjects/Appointments/Version | 2 +- SOGo/UI/Scheduler/ChangeLog | 4 +++ SOGo/UI/Scheduler/UIxCalDateLabel.m | 1 + SOGo/UI/Scheduler/Version | 2 +- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog index 00736319..5fef80a1 100644 --- a/SOGo/SoObjects/Appointments/ChangeLog +++ b/SOGo/SoObjects/Appointments/ChangeLog @@ -1,3 +1,7 @@ +2005-03-02 Marcus Mueller + + * SOGoAppointmentFolder.m: changed debugLog to use NGLogging (v0.9.29) + 2005-03-01 Marcus Mueller * SOGoAppointmentFolder.m: significantly changed handling of cyclic diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m index 7b62a578..e12afff2 100644 --- 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 78c27fd9..c161c04f 100644 --- 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 29b175f8..580cad8b 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,7 @@ +2005-03-02 Marcus Mueller + + * UIxCalDateLabel.m: fixed compile warning (v0.9.118) + 2005-03-01 Marcus Mueller * 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 d594afc7..234d62d4 100644 --- a/SOGo/UI/Scheduler/UIxCalDateLabel.m +++ b/SOGo/UI/Scheduler/UIxCalDateLabel.m @@ -37,6 +37,7 @@ @end #include "common.h" +#include @implementation UIxCalDateLabel diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 90947965..c1893aae 100644 --- 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 -- 2.39.5