Index: openacs-4/packages/calendar/www/cal-dayview-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-dayview-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-dayview-oracle.xql	23 Sep 2001 14:45:00 -0000	1.1
+++ openacs-4/packages/calendar/www/cal-dayview-oracle.xql	16 Oct 2001 18:18:36 -0000	1.2
@@ -9,7 +9,7 @@
 	select   to_char(start_date, 'HH24') as start_hour,
          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,
+         nvl(e.name, a.name) as name,
          e.event_id as item_id
 from     acs_activities a,
          acs_events e,
@@ -38,7 +38,7 @@
 	select   to_char(start_date, 'HH24') as start_hour,
          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,
+         nvl(e.name, a.name) as name,
          e.event_id as item_id
 from     acs_activities a,
          acs_events e,
Index: openacs-4/packages/calendar/www/cal-weekview-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-weekview-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-weekview-oracle.xql	23 Sep 2001 15:12:41 -0000	1.2
+++ openacs-4/packages/calendar/www/cal-weekview-oracle.xql	16 Oct 2001 18:18:36 -0000	1.3
@@ -33,8 +33,7 @@
 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(:sunday_of_the_week,'YYYY-MM-DD') and
+and      trunc(start_date) between to_date(:sunday_of_the_week,'YYYY-MM-DD') and
          to_date(:saturday_of_the_week,'YYYY-MM-DD')
 and      e.event_id
 in       (
@@ -47,33 +46,4 @@
 </fullquery>
 
  
-<fullquery name="get_day_items">      
-      <querytext>
-      
-select   to_char(start_date, 'J') as start_date,
-         to_char(start_date, 'HH24:MI') as pretty_start_date,
-         to_char(end_date, 'HH24:MI') as pretty_end_date,
-         nvl(e.name, a.name) as name,
-         e.event_id as item_id
-from     acs_activities a,
-         acs_events e,
-         timespans s,
-         time_intervals t
-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(:sunday_of_the_week,'YYYY-MM-DD') and
-         to_date(:saturday_of_the_week,'YYYY-MM-DD')
-and      e.event_id
-in       (
-         select  cal_item_id
-         from    cal_items
-         where   on_which_calendar = :calendar_id
-         )
-
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/calendar/www/cal-weekview-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-weekview-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/calendar/www/cal-weekview-postgresql.xql	23 Sep 2001 15:12:41 -0000	1.5
+++ openacs-4/packages/calendar/www/cal-weekview-postgresql.xql	16 Oct 2001 18:18:36 -0000	1.6
@@ -17,7 +17,6 @@
       </querytext>
 </fullquery>
 
- 
 <fullquery name="get_day_items">      
       <querytext>
       
@@ -33,7 +32,7 @@
 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
+and      start_date::date between
          to_date(:sunday_of_the_week,'YYYY-MM-DD') and
          to_date(:saturday_of_the_week,'YYYY-MM-DD')
 and      e.event_id
@@ -47,33 +46,4 @@
 </fullquery>
 
  
-<fullquery name="get_day_items">      
-      <querytext>
-      
-select   to_char(start_date, 'J') as start_date,
-         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
-from     acs_activities a,
-         acs_events e,
-         timespans s,
-         time_intervals t
-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(:sunday_of_the_week,'YYYY-MM-DD') and
-         to_date(:saturday_of_the_week,'YYYY-MM-DD')
-and      e.event_id
-in       (
-         select  cal_item_id
-         from    cal_items
-         where   on_which_calendar = :calendar_id
-         )
-
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/calendar/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/index.adp	23 Sep 2001 15:12:41 -0000	1.2
+++ openacs-4/packages/calendar/www/index.adp	16 Oct 2001 18:18:36 -0000	1.3
@@ -8,7 +8,7 @@
 
 
 <master src="master">
-<property name="title">ArsDigita Calendar for @name@  @user_id@</property>
+<property name="title">Calendar for @name@</property>
 <property name="context_bar"></property>
 
 <table>
@@ -48,14 +48,3 @@
   </tr>
 </table>
 </if>
-
-
-
-
-
-
-
-
-
-
-
Index: openacs-4/packages/news/news.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/news.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/news/news.info	16 Oct 2001 10:10:19 -0000	1.3
+++ openacs-4/packages/news/news.info	16 Oct 2001 18:18:36 -0000	1.4
@@ -22,7 +22,6 @@
         <requires url="acs-content" version="4.0"/>
         <requires url="acs-content-repository" version="4.0.1"/>
         <requires url="acs-datetime" version="4.0"/>
-        <requires url="acs-interface" version="4.0.1"/>
         <requires url="acs-kernel" version="4.0"/>
         <requires url="general-comments" version="4.0"/>
 
@@ -107,12 +106,12 @@
             <file type="query_file" path="www/preview.xql"/>
         </files>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DisplayMax"  default="10" description="Number of news item headlines displayed per page at most."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ApprovalPolicy"  default="wait" description="Approval policy of submitted news items. It must be either of [open|wait|closed]. Submission by the administrator are ApprovalPolicy = 'open'.This approval policy applies only, if we let 'registered users' upload news items."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowSearchInterfaceP"  default="1" description="Interfacing to site-wide-search with a Search-box. (SWS is required)."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ActiveDays"  default="14" description="Default days between release date and archive date."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaxFileSizekB"  default="1024" description="maximum filesize in kB"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SolicitCommentsP"  default="1" description="Whether we allow comments on news items."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaxFileSizekB"  default="1024" description="maximum filesize in kB"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ActiveDays"  default="14" description="Default days between release date and archive date."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowSearchInterfaceP"  default="1" description="Interfacing to site-wide-search with a Search-box. (SWS is required)."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ApprovalPolicy"  default="wait" description="Approval policy of submitted news items. It must be either of [open|wait|closed]. Submission by the administrator are ApprovalPolicy = 'open'.This approval policy applies only, if we let 'registered users' upload news items."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DisplayMax"  default="10" description="Number of news item headlines displayed per page at most."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/news/sql/oracle/news-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/sql/oracle/news-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/news/sql/oracle/news-create.sql	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/news/sql/oracle/news-create.sql	16 Oct 2001 18:18:36 -0000	1.2
@@ -905,11 +905,3 @@
 
 -- plsql for searches: will be covered by site-wide search
 -- no additional code necessary for news  items right now.
-
-
-
-
-
-
-
-
Index: openacs-4/packages/news/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/index.tcl	15 Oct 2001 13:41:03 -0000	1.2
+++ openacs-4/packages/news/www/index.tcl	16 Oct 2001 18:18:36 -0000	1.3
@@ -86,7 +86,6 @@
 set count 0
 
 # use template::query to limit result to allowed number of rows.
-set db [ns_db gethandle]
 
 db_multirow news_items item_list "
 select item_id,