Index: openacs-4/packages/static-pages/static-pages.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/static-pages.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/static-pages/static-pages.info	4 Aug 2001 02:58:41 -0000	1.4
+++ openacs-4/packages/static-pages/static-pages.info	4 Sep 2001 17:04:10 -0000	1.5
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
 
 <package key="static-pages" url="http://www.arsdgita.com/acs-repository/apm/packages/static-pages" type="apm_application">
     <package-name>Static Pages</package-name>
@@ -35,7 +35,6 @@
             <file type="data_model" db_type="postgresql" path="sql/postgresql/static-pages-sws.sql"/>
             <file type="package_spec" path="static-pages.info"/>
             <file type="tcl_util" path="tcl/diff.tcl"/>
-            <file type="query_file" db_type="postgresql" path="tcl/new-static-pages-procs-postgresql.xql"/>
             <file type="query_file" db_type="oracle" path="tcl/static-pages-procs-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="tcl/static-pages-procs-postgresql.xql"/>
             <file type="tcl_procs" path="tcl/static-pages-procs.tcl"/>
Index: openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql	4 Aug 2001 02:58:41 -0000	1.6
+++ openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql	4 Sep 2001 17:04:10 -0000	1.7
@@ -214,8 +214,8 @@
 
 -- Here's where we get our session_ids:
 
-create sequence sp_session_id_seq;
-create view sp_session_id_sequence as select nextval('sp_session_id_seq') as nextval;
+create sequence sp_session_id_sequence;
+create view sp_session_id_seq as select nextval('sp_session_id_sequence') as nextval;
 
 
 -- this also creates the acs_object type
Index: openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql	4 Aug 2001 02:58:41 -0000	1.3
+++ openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql	4 Sep 2001 17:04:10 -0000	1.4
@@ -152,4 +152,11 @@
       </querytext>
 </fullquery>
 
+<fullquery name="sp_get_page_info_query.get_page_info">
+	<querytext>
+select '{'||content_item.get_title(:page_id)||'} '|| (CASE WHEN show_comments_p='t' then '1' else '0' END) from static_pages where static_page_id = :page_id
+
+</querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql	4 Aug 2001 02:58:41 -0000	1.5
+++ openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql	4 Sep 2001 17:04:10 -0000	1.6
@@ -151,11 +151,4 @@
 	</querytext>
 </fullquery>
 
-<fullquery name="sp_flush_page.get_page_info">
-      <querytext>
-select '{'||content_item__get_title(:page_id)||'} '||CASE WHEN show_comments_p='t' then '1' else '0' END from static_pages where static_page_id = :page_id
-      </querytext>
-</fullquery>
-
-
 </queryset>
Index: openacs-4/packages/static-pages/tcl/static-pages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/static-pages/tcl/static-pages-procs.tcl	31 Jul 2001 14:29:50 -0000	1.3
+++ openacs-4/packages/static-pages/tcl/static-pages-procs.tcl	4 Sep 2001 17:04:10 -0000	1.4
@@ -55,7 +55,7 @@
     @author Brandoch Calef (bcalef@arsdigita.com)
     @creation-date 2001-02-07
 } {
-    set sync_session_id [db_nextval sp_session_id_sequence]
+    set sync_session_id [db_nextval sp_session_id_seq]
 
     set fs_trimmed [string trimright $fs_root "/"]
     set fs_trimmed_length [string length $fs_trimmed]
Index: openacs-4/packages/static-pages/tcl/static-pages-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-procs.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/static-pages/tcl/static-pages-procs.xql	4 Aug 2001 02:58:41 -0000	1.4
+++ openacs-4/packages/static-pages/tcl/static-pages-procs.xql	4 Sep 2001 17:04:10 -0000	1.5
@@ -41,42 +41,4 @@
       </querytext>
 </fullquery>
 
-
-<fullquery name="sp_change_matching_display.matching_static_page">
-      <querytext>
-
-	select static_page_id from static_pages
-	     where folder_id in (
-		     select folder_id from sp_folders
-		     start with folder_id = :root_folder_id
-		     connect by parent_id = prior folder_id)
-	     and filename like '%${contained_string}%'
-
-      </querytext>
-</fullquery>
-
-
-
-
-<fullquery name="sp_serve_html_page.get_page_info">
-	<querytext>
-select '{'||content_item__get_title(:page_id)||'} '|| (CASE WHEN show_comments_p='t' then '1' else '0' END) from static_pages where static_page_id = :page_id
-	</querytext>
-</fullquery>
-
-<fullquery name="sp_flush_page.get_page_info">
-      <querytext>
-select '{'||content_item__get_title(:page_id)||'} '|| (CASE WHEN show_comments_p='t' then '1' else '0' END) from static_pages where static_page_id = :page_id
-      </querytext>
-</fullquery>
-
-
-<fullquery name="sp_flush_page.get_page_info">
-      <querytext>
-select '{'||content_item__get_title(:page_id)||'} '|| (CASE WHEN show_comments_p='t' then '1' else '0' END) from static_pages where static_page_id = :page_id
-
-      </querytext>
-</fullquery>
-
-
 </queryset>
Index: openacs-4/packages/static-pages/www/admin/commentability-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/commentability-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/static-pages/www/admin/commentability-oracle.xql	27 Jul 2001 15:43:31 -0000	1.1
+++ openacs-4/packages/static-pages/www/admin/commentability-oracle.xql	4 Sep 2001 17:04:10 -0000	1.2
@@ -3,7 +3,6 @@
 	<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 <fullquery name="select_static_page">      
       <querytext>
-      FIX ME DECODE (USE SQL92 CASE) 
 	select spf.folder_id,
 		decode(spf.folder_id,:root_folder_id,'[acs_root_dir]/www/',content_item.get_title(spf.folder_id)||'/') as folder_name,
 		static_page.five_n_spaces(lev) as spaces,
Index: openacs-4/packages/static-pages/www/admin/commentability.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/Attic/commentability.xql,v
diff -u -N
--- openacs-4/packages/static-pages/www/admin/commentability.xql	6 May 2001 15:08:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-
-<fullquery name="select_static_page">      
-      <querytext>
-      FIX ME DECODE (USE SQL92 CASE) 
-	select spf.folder_id,
-		decode(spf.folder_id,:root_folder_id,'[acs_root_dir]/www/',content_item.get_title(spf.folder_id)||'/') as folder_name,
-		static_page.five_n_spaces(lev) as spaces,
-		static_page_id,
-                substr(filename,instr(filename,'/',-1)+1) as filename,
-                decode(p_file.grantee_id,NULL,'not commentable','commentable') as file_permission,
-		decode(show_comments_p,'t','comments displayed','comments summarized') as display_policy,
-                decode(p_folder.grantee_id,NULL,'children not commentable','children commentable') as folder_permission
-from static_pages sp,
-   (select folder_id,level as lev from sp_folders
-    start with folder_id = :root_folder_id
-    connect by parent_id = prior folder_id) spf,
-   acs_permissions p_file,
-   acs_permissions p_folder
-where spf.folder_id=sp.folder_id(+)
-  and p_file.grantee_id(+) = acs.magic_object_id('the_public')
-  and p_file.privilege(+) = 'general_comments_create'
-  and p_file.object_id(+) = static_page_id
-  and p_folder.grantee_id(+) = acs.magic_object_id('the_public')
-  and p_folder.privilege(+) = 'general_comments_create'
-  and p_folder.object_id(+) = spf.folder_id
-
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/static-pages/www/admin/display-policy-toggle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/Attic/display-policy-toggle.xql,v
diff -u -N
--- openacs-4/packages/static-pages/www/admin/display-policy-toggle.xql	4 Aug 2001 02:58:41 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-
-<fullquery name="toggle_display_policy">      
-      <querytext>
-    update static_pages
-        set show_comments_p = (CASE WHEN show_comments_p=TRUE THEN FALSE ELSE TRUE END)
-        where static_page_id = :item_id
-
-      </querytext>
-</fullquery>
-
- 
-</queryset>