Index: openacs-4/packages/calendar-portlet/calendar-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/calendar-portlet.info,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/calendar-portlet/calendar-portlet.info	9 Jul 2002 21:42:15 -0000	1.12
+++ openacs-4/packages/calendar-portlet/calendar-portlet.info	18 Jul 2002 18:24:54 -0000	1.13
@@ -43,6 +43,7 @@
             <file type="content_page" path="www/calendar-list-portlet.adp"/>
             <file type="content_page" path="www/calendar-list-portlet.tcl"/>
             <file type="query_file" db_type="oracle" path="www/calendar-portlet-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/calendar-portlet-postgresql.xql"/>
             <file type="content_page" path="www/calendar-portlet.adp"/>
             <file type="content_page" path="www/calendar-portlet.tcl"/>
         </files>
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/Attic/calendar-portlet-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet-postgresql.xql	18 Jul 2002 18:24:54 -0000	1.1
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="select_day_items">
+<querytext>
+    select   
+      to_char(start_date, 'HH24:MI') as pretty_start_date,
+      to_char(end_date, 'HH24:MI') as pretty_end_date,
+      coalesce(e.name, a.name) as name,
+      e.event_id as item_id,
+      c.calendar_name as calendar_name
+    from
+      acs_activities a,
+      acs_events e,
+      timespans s,
+      time_intervals t,
+      cal_items ci,
+      calendars c
+    where    
+      e.timespan_id = s.timespan_id
+      and  s.interval_id = t.interval_id
+      and  e.activity_id = a.activity_id
+      and  start_date between
+        to_date(:current_date,:date_format) and
+        to_date(:current_date,:date_format) + (24 - 1/3600)/24
+      and e.event_id = ci.cal_item_id
+      and c.calendar_id = ci.on_which_calendar
+      and c.calendar_id in ($list_of_calendar_ids)
+    UNION
+    select 
+      pretty_start_date,
+      pretty_end_date,
+      to_char(NULL) as name,
+      0 as item_id,
+      to_char(NULL) as calendar_name
+    from hours_of_the_day
+    order by pretty_start_date
+
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs-oracle.xql	18 Jul 2002 18:24:46 -0000	1.1
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="dotlrn_calendar::clone.copy_cal_item_types">
+  <querytext>
+
+    insert into cal_item_types
+    (item_type_id, calendar_id, type)
+    select acs_object_id_seq.nextval, :calendar_id, type
+    from cal_item_types
+    where calendar_id = :old_calendar_id
+
+  </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs-postgresql.xql	18 Jul 2002 18:24:46 -0000	1.1
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="dotlrn_calendar::clone.copy_cal_item_types">
+  <querytext>
+
+    insert into cal_item_types
+    (item_type_id, calendar_id, type)
+    select nextval('t_acs_object_id_seq'), :calendar_id, type
+    from cal_item_types
+    where calendar_id = :old_calendar_id
+
+  </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/Attic/dotlrn-calendar-procs.xql,v
diff -u -N
--- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.xql	29 May 2002 23:00:25 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-
-<fullquery name="dotlrn_calendar::clone.copy_cal_item_types">
-  <querytext>
-
-    insert into cal_item_types
-    (item_type_id, calendar_id, type)
-    select acs_object_id_seq.nextval, :calendar_id, type
-    from cal_item_types
-    where calendar_id = :old_calendar_id
-
-  </querytext>
-</fullquery>
-
-</queryset>