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

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index 197bb36b6f0cbbfafe49798988ee2e6d764c1ef8..e1fd12d875db0041fa22b8f3d91073f6e7992d57 100644 (file)
--- 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 8ed35e953e9abae92ab8d05a5bccbef01a0ad3bb..e99d298a71f950cc3b6fd98eaa96383ec7dbc4f0 100644 (file)
--- 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 08907a0fb272299716e9caabbb6ff937bd652096..f143020f5f19e7bc0b958fa00d895bec41bef5a0 100644 (file)
--- 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 47f00f06c013d6cb1696f23a41efcf7f0df01b4a..9ae531e56a63c719fd56f153631670fab4b103f9 100644 (file)
--- 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 d74d813121fa875883827bc26d53904dcaed4355..4a3d7891482b78c46a79e162d3b6e32d88b26b77 100644 (file)
--- 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 5eeba542c4660900afa60c9cbd6f4c975ccf5f2b..43eabf86688d4ddbf2301ebe31edef83dfee3fd5 100644 (file)
--- 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 90dfd7bcf29d0f5f314eab86a98e41d61eb6de92..2764e2e95edb3edd3bf93a04010e015783731cb2 100644 (file)
--- 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 402e739bc00277d85f79e318ca25b5a6cb7e7cb2..4abc89bcf6e52f90555fb1b3ec548ec1d8255f86 100644 (file)
--- 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 5caf1d4ca1d929a7f5089463f03248c58217fd2c..de02a4c85b39b0baaf082d0758e8850d40ef9ce3 100644 (file)
--- 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 cf3e8816048790b7c13f6c18fa32d47d254895a5..b75ce1f7575bd8d325f4a071cf258a9471af2910 100644 (file)
--- 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 732181ea216b6b7c72d6b62fa15fd31fa9ad83cf..333c366428497ec00cb867f3bd71ce3f584557ab 100644 (file)
--- 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 7d590c2d4403bbed28836c55b795e872a00f0df2..37417854feaf062dbd8bc189f27101c0acda899a 100644 (file)
--- 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 f32b43403e8a9b3b3977a2a02d9afb7a8e8edc33..e867846c20b3870ab63d8eef4733f9a3d8454ff3 100644 (file)
--- 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 44a5c522d2102522e7690fb6097ba00b7f316839..88337ce95041d817f2364a4891f5d36d3fe9b9e5 100644 (file)
--- a/SOGo/UI/Scheduler/bundle-info.plist
+++ b/SOGo/UI/Scheduler/bundle-info.plist
@@ -9,11 +9,8 @@
   };
 
   provides = {
-    ZideStoreProducts = ( { name = SchedulerUIProduct; } );
-    
     classes = (
     );
-
     WOComponents = (
     );
   };