From 6caae163f0a2f51649ce8654f1a9a58b75cdbf47 Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 30 Jun 2004 12:51:57 +0000
Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/trunk@122
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 OGoContentStore/ChangeLog                         |  2 ++
 OGoContentStore/GNUmakefile.preamble              |  2 ++
 .../Appointments/SOGoAppointmentFolder.h          |  7 +++++++
 .../Appointments/SOGoAppointmentFolder.m          | 15 +++++++++++++++
 SOGo/UI/Scheduler/ChangeLog                       |  2 ++
 SOGo/UI/Scheduler/UIxAppointmentEditor.m          |  6 +++---
 SOGo/UI/Scheduler/UIxAppointmentView.wox          |  2 +-
 SOGo/UI/Scheduler/UIxCalMonthOverview.wox         |  4 ++--
 SOGo/UI/Scheduler/UIxCalMonthView.h               |  6 +++---
 SOGo/UI/Scheduler/UIxCalView.h                    |  6 +++---
 SOGo/UI/Scheduler/UIxCalView.m                    | 12 ++----------
 SOGo/UI/Scheduler/UIxCalWeekOverview.wox          |  2 +-
 SOGo/UI/Scheduler/UIxCalWeekView.h                |  6 +++---
 SOGo/UI/Scheduler/bundle-info.plist               |  3 ---
 14 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index 197bb36b..e1fd12d8 100644
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,5 +1,7 @@
 2004-06-30  Helge Hess  <helge.hess@opengroupware.org>
 
+	* GNUmakefile.preamble: fix link path
+
 	* GNUmakefile (libOGoContentStore_HEADER_FILES_INSTALL_DIR): install
 	  headers in OGoContentStore
 
diff --git a/OGoContentStore/GNUmakefile.preamble b/OGoContentStore/GNUmakefile.preamble
index 8ed35e95..e99d298a 100644
--- a/OGoContentStore/GNUmakefile.preamble
+++ b/OGoContentStore/GNUmakefile.preamble
@@ -16,6 +16,8 @@ ocs_cat_TOOL_LIBS   += $(OCS_TOOL_LIBS)
 
 ADDITIONAL_INCLUDE_DIRS += -I. -I..
 
+ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
+
 ifeq ($(FOUNDATION_LIB),apple)
 libOGoContentStore_PREBIND_ADDR="0xC7700000"
 libOGoContentStore_LDFLAGS += -seg1addr $(libOGoContentStore_PREBIND_ADDR)
diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h
index 08907a0f..f143020f 100644
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h
@@ -25,12 +25,19 @@
 
 #include <SOGo/SOGoFolder.h>
 
+@class NSString, NSArray, NSCalendarDate;
+
 @interface SOGoAppointmentFolder : SOGoFolder
 {
 }
 
 + (NSString *)globallyUniqueObjectId;
 
+/* fetching */
+
+- (NSArray *)fetchCoreInfosFrom:(NSCalendarDate *)_startDate
+  to:(NSCalendarDate *)_endDate;
+
 @end
 
 #endif /* __Appointments_SOGoAppointmentFolder_H__ */
diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
index 47f00f06..9ae531e5 100644
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -94,4 +94,19 @@ printf( "%x", *(int *) &f);
   return [NSException exceptionWithHTTPStatus:404 /* Not Found */];
 }
 
+/* fetching */
+
+- (NSArray *)fetchCoreInfosFrom:(NSCalendarDate *)_startDate
+  to:(NSCalendarDate *)_endDate 
+{
+  id appointments;
+  
+  [self logWithFormat:@"should fetch (%@ => %@) ...", _startDate, _endDate];
+  
+#warning TODO: IMPLEMENT!
+  
+  [self logWithFormat:@"fetched %i records.", [appointments count]];
+  return appointments;
+}
+
 @end /* SOGoAppointmentFolder */
diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index d74d8131..4a3d7891 100644
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,7 @@
 2004-06-30  Helge Hess  <helge.hess@opengroupware.org>
 
+	* all files: removed ZideStore references
+
 	* UIxCalView.h, UIxAppointmentView.h, UIxAppointmentEditor.m,
 	  UIxCalSelectTab.m: include UIxComponent from SOGoUI
 
diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index 5eeba542..43eabf86 100644
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -106,7 +106,7 @@
 
 - (NSString *)iCalStringTemplate {
     static NSString *iCalStringTemplate = \
-    @"BEGIN:VCALENDAR\nMETHOD:REQUEST\nPRODID:OpenGroupware.org ZideStore 1.2\n" \
+    @"BEGIN:VCALENDAR\nMETHOD:REQUEST\nPRODID:OpenGroupware.org SOGo 0.9\n" \
     @"VERSION:2.0\nBEGIN:VEVENT\nCLASS:PRIVATE\nSTATUS:CONFIRMED\n" \
     @"DTSTART:%@\nDTEND:%@\n" \
     @"TRANSP:OPAQUE\n" \
@@ -119,8 +119,8 @@
                          hours:1 minutes:0 seconds:0];
     
     template = [NSString stringWithFormat:iCalStringTemplate,
-                                          [startDate icalString],
-                                          [endDate icalString]];
+			   [startDate icalString],
+			   [endDate icalString]];
     
     return template;
 }
diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.wox b/SOGo/UI/Scheduler/UIxAppointmentView.wox
index 90dfd7bc..2764e2e9 100644
--- a/SOGo/UI/Scheduler/UIxAppointmentView.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentView.wox
@@ -141,7 +141,7 @@
           <uix:tab const:key="debug"
                    const:label="DEBUG"
                    var:href="debugTabLink">
-            OGo ZideStore Server - <var:string value="name"/>
+            SOGo Server - <var:string value="name"/>
             <br />
             Client: <var:string value="clientObject"/>
             <br />
diff --git a/SOGo/UI/Scheduler/UIxCalMonthOverview.wox b/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
index 402e739b..4abc89bc 100644
--- a/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
@@ -130,7 +130,7 @@
   </tr>
   <tr bgcolor="#F5F5E9">
   <td align="left" width="10"><var:entity const:name="nbsp"/></td>
-  <td align="right"><img border="0" alt="" src="/ZideStore/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"/></td>
+  <td align="right"><img border="0" alt="" src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"/></td>
   </tr>
   <tr>
   <td colspan="2" bgcolor="#F5F5E9">
@@ -146,7 +146,7 @@
 
 <!--
     <hr />
-    OGo ZideStore Server - <var:string value="name"/>
+    SOGo Server - <var:string value="name"/>
     <br />
     Client: <var:string value="clientObject"/>
     <br />
diff --git a/SOGo/UI/Scheduler/UIxCalMonthView.h b/SOGo/UI/Scheduler/UIxCalMonthView.h
index 5caf1d4c..de02a4c8 100644
--- a/SOGo/UI/Scheduler/UIxCalMonthView.h
+++ b/SOGo/UI/Scheduler/UIxCalMonthView.h
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef __ZideStoreUI_UIxCalMonthView_H__
-#define __ZideStoreUI_UIxCalMonthView_H__
+#ifndef __SOGo_UIxCalMonthView_H__
+#define __SOGo_UIxCalMonthView_H__
 
 #include "UIxCalView.h"
 
@@ -20,4 +20,4 @@
 
 @end
 
-#endif /* __ZideStoreUI_UIxCalMonthView_H__ */
+#endif /* __SOGo_UIxCalMonthView_H__ */
diff --git a/SOGo/UI/Scheduler/UIxCalView.h b/SOGo/UI/Scheduler/UIxCalView.h
index cf3e8816..b75ce1f7 100644
--- a/SOGo/UI/Scheduler/UIxCalView.h
+++ b/SOGo/UI/Scheduler/UIxCalView.h
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef __ZideStoreUI_UIxCalView_H__
-#define __ZideStoreUI_UIxCalView_H__
+#ifndef __SOGo_UIxCalView_H__
+#define __SOGo_UIxCalView_H__
 
 #include <SOGoUI/UIxComponent.h>
 
@@ -60,4 +60,4 @@
 
 @end
 
-#endif /* __ZideStoreUI_UIxCalView_H__ */
+#endif /* __SOGo_UIxCalView_H__ */
diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index 732181ea..333c3664 100644
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -164,17 +164,9 @@
   return [[self startDate] tomorrow];
 }
 
-- (NSArray *)fetchGIDs {
-#warning ZIDESTORE FETCH BACKEND
-#if 0
-  return [[self aptManager] gidsOfAppointmentSet:[self aptSetID]
-                            from:[self startDate] to:[self endDate]];
-#else
-  return nil;
-#endif
-}
-
 - (NSArray *)fetchCoreInfos {
+  return [[self clientObject] fetchCoreInfosFrom:[self startDate] 
+			      to:[self endDate]];
   NSArray *gids;
   
   if (self->appointments)
diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
index 7d590c2d..37417854 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
@@ -133,7 +133,7 @@
   </tr>
   <tr bgcolor="#F5F5E9">
   <td align="left" width="10"><var:entity const:name="nbsp"/></td>
-  <td align="right"><img border="0" alt="" src="/ZideStore/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"/></td>
+  <td align="right"><img border="0" alt="" src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"/></td>
   </tr>
   <tr>
   <td colspan="2" bgcolor="#F5F5E9">
diff --git a/SOGo/UI/Scheduler/UIxCalWeekView.h b/SOGo/UI/Scheduler/UIxCalWeekView.h
index f32b4340..e867846c 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekView.h
+++ b/SOGo/UI/Scheduler/UIxCalWeekView.h
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef __ZideStoreUI_UIxCalWeekView_H__
-#define __ZideStoreUI_UIxCalWeekView_H__
+#ifndef __SOGo_UIxCalWeekView_H__
+#define __SOGo_UIxCalWeekView_H__
 
 #include "UIxCalView.h"
 
@@ -16,4 +16,4 @@
     
 @end
 
-#endif /* __ZideStoreUI_UIxCalWeekView_H__ */
+#endif /* __SOGo_UIxCalWeekView_H__ */
diff --git a/SOGo/UI/Scheduler/bundle-info.plist b/SOGo/UI/Scheduler/bundle-info.plist
index 44a5c522..88337ce9 100644
--- a/SOGo/UI/Scheduler/bundle-info.plist
+++ b/SOGo/UI/Scheduler/bundle-info.plist
@@ -9,11 +9,8 @@
   };
 
   provides = {
-    ZideStoreProducts = ( { name = SchedulerUIProduct; } );
-    
     classes = (
     );
-
     WOComponents = (
     );
   };
-- 
2.39.5