Index: openacs-4/packages/edit-this-page/edit-this-page.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/edit-this-page.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/edit-this-page/edit-this-page.info	2 Nov 2001 06:19:04 -0000	1.3
+++ openacs-4/packages/edit-this-page/edit-this-page.info	18 Nov 2001 18:57:58 -0000	1.4
@@ -24,6 +24,7 @@
             <file path="Changes"/>
             <file type="package_spec" path="edit-this-page.info"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/edit-this-page-create.sql"/>
+            <file type="data_model_drop" db_type="oracle" path="sql/oracle/edit-this-page-drop.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/edit-this-page-create.sql"/>
             <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/edit-this-page-drop.sql"/>
             <file type="tcl_util" path="tcl/etp-gc.tcl"/>
@@ -46,6 +47,8 @@
             <file type="template" path="templates/journal-issue.tcl"/>
             <file type="template" path="templates/news-content.adp"/>
             <file type="template" path="templates/news-content.tcl"/>
+            <file type="query_file" db_type="oracle" path="templates/news-index-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="templates/news-index-postgresql.xql"/>
             <file type="template" path="templates/news-index.adp"/>
             <file type="template" path="templates/news-index.tcl"/>
             <file type="content_page" path="www/etp-create-2.tcl"/>
@@ -112,9 +115,9 @@
             <file type="content_page" path="www/index.vuh"/>
         </files>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subtopic_application"  default="default" description="Name of the ETP application to use when creating a subtopic"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="cache_max_age"  default="600" description="number of seconds to keep requested page attributes in the cache"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="application"  default="default" description="Name of the ETP application to use (default, faq, news, or create your own with the etp::define_applicaton procedure)"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="cache_max_age"  default="600" description="number of seconds to keep requested page attributes in the cache"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subtopic_application"  default="default" description="Name of the ETP application to use when creating a subtopic"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/edit-this-page/templates/news-index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-index-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/edit-this-page/templates/news-index-oracle.xql	18 Nov 2001 18:57:58 -0000	1.1
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+   <partialquery name="archive_where_clause">
+      <querytext>
+         sysdate between to_date(attributes.release_date, 'YYYY-MM-DD') and
+           to_date(attributes.archive_date, 'YYYY-MM-DD')
+      </querytext>
+   </partialquery>
+
+   <partialquery name="no_archive_where_clause">
+      <querytext>
+         sysdate >= to_date(attributes.archive_date, 'YYYY-MM-DD')
+      </querytext>
+   </partialquery>
+
+   <partialquery name="orderby_clause">
+      <querytext>
+         to_date(attributes.release_date, 'YYYY-MM-DD') desc
+      </querytext>
+   </partialquery>
+</queryset>
Index: openacs-4/packages/edit-this-page/templates/news-index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-index-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/edit-this-page/templates/news-index-postgresql.xql	18 Nov 2001 18:57:58 -0000	1.1
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+   <partialquery name="archive_where_clause">
+      <querytext>
+         current_timestamp between to_date(attributes.release_date, 'YYYY-MM-DD') and
+           to_date(attributes.archive_date, 'YYYY-MM-DD')
+      </querytext>
+   </partialquery>
+
+   <partialquery name="no_archive_where_clause">
+      <querytext>
+         current_timestamp >= to_date(attributes.archive_date, 'YYYY-MM-DD')
+      </querytext>
+   </partialquery>
+
+   <partialquery name="orderby_clause">
+      <querytext>
+         to_date(attributes.release_date, 'YYYY-MM-DD') desc
+      </querytext>
+   </partialquery>
+
+</queryset>
Index: openacs-4/packages/edit-this-page/templates/news-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/templates/news-index.tcl	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/templates/news-index.tcl	18 Nov 2001 18:57:58 -0000	1.2
@@ -20,12 +20,12 @@
 }
 
 if { $archive_p == "f" } {
-    set where "sysdate() between to_date(attributes.release_date, 'YYYY-MM-DD') and to_date(attributes.archive_date, 'YYYY-MM-DD')"
+    set where [db_map archive_where_clause]
 } else {
-    set where "sysdate() >= to_date(attributes.archive_date, 'YYYY-MM-DD')"
+    set where [db_map no_archive_where_clause]
 }
 
-set orderby "to_date(attributes.release_date, 'YYYY-MM-DD') desc"
+set orderby [db_map orderby_clause]
 
 etp::get_page_attributes
 etp::get_content_items -where $where -orderby $orderby release_date archive_date
Index: openacs-4/packages/edit-this-page/www/etp-edit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-edit-oracle.xql	31 Oct 2001 04:29:03 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-edit-oracle.xql	18 Nov 2001 18:57:58 -0000	1.2
@@ -15,7 +15,7 @@
 
 <fullquery name="get_extended_attribute">
 <querytext>
-	select etp_get_attribute_value(r.revision_id, :attribute_id) as value,
+	select etp.get_attribute_value(r.revision_id, :attribute_id) as value,
 	       r.title as page_title
 	  from cr_items i, cr_revisions r
 	 where i.parent_id = etp.get_folder_id(:package_id)
Index: openacs-4/packages/edit-this-page/www/etp-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-edit-postgresql.xql	2 Nov 2001 01:51:24 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-edit-postgresql.xql	18 Nov 2001 18:57:58 -0000	1.2
@@ -15,7 +15,7 @@
 
 <fullquery name="get_extended_attribute">
 <querytext>
-	select etp_get_attribute_value(r.revision_id, :attribute_id) as value,
+	select etp__get_attribute_value(r.revision_id, :attribute_id) as value,
 	       r.title as page_title
 	  from cr_items i, cr_revisions r
 	 where i.parent_id = etp__get_folder_id(:package_id)