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 -r1.3 -r1.4
--- openacs-4/packages/static-pages/static-pages.info	6 May 2001 20:26:41 -0000	1.3
+++ openacs-4/packages/static-pages/static-pages.info	4 Aug 2001 02:58:41 -0000	1.4
@@ -4,6 +4,7 @@
 <package key="static-pages" url="http://www.arsdgita.com/acs-repository/apm/packages/static-pages" type="apm_application">
     <package-name>Static Pages</package-name>
     <pretty-plural>Static Pages</pretty-plural>
+    <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
     <version name="4.2a" url="http://www.arsdigita.com/acs-repository/download/apm/static-pages-4.2a.apm">
@@ -33,21 +34,28 @@
             <file type="data_model" db_type="postgresql" path="sql/postgresql/static-pages-sws-drop.sql"/>
             <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_procs" path="tcl/static-pages-procs.tcl"/>
-            <file type="query_file" path="tcl/static-pages-procs.xql"/>
+            <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"/>
+            <file type="query_file" path="tcl/static-pages-procs.xql"/>
             <file type="content_page" path="www/admin/commentability-contain.tcl"/>
-            <file type="content_page" path="www/admin/commentability-toggle.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/admin/commentability-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/admin/commentability-postgresql.xql"/>
             <file type="query_file" db_type="oracle" path="www/admin/commentability-toggle-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/admin/commentability-toggle-postgresql.xql"/>
+            <file type="content_page" path="www/admin/commentability-toggle.tcl"/>
             <file type="content_page" path="www/admin/commentability.adp"/>
             <file type="content_page" path="www/admin/commentability.tcl"/>
+            <file type="query_file" path="www/admin/commentability.xql"/>
             <file type="content_page" path="www/admin/display-policy-toggle.tcl"/>
             <file type="query_file" path="www/admin/display-policy-toggle.xql"/>
             <file type="content_page" path="www/admin/fs-scan-progress.tcl"/>
             <file type="content_page" path="www/admin/fs-scan.adp"/>
             <file type="content_page" path="www/admin/fs-scan.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/admin/index-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/admin/index-postgresql.xql"/>
             <file type="content_page" path="www/admin/index.adp"/>
             <file type="content_page" path="www/admin/index.tcl"/>
             <file type="query_file" path="www/admin/index.xql"/>
@@ -63,6 +71,7 @@
             <file type="documentation" path="www/doc/xml/requirements.xml"/>
             <file type="content_page" path="www/index.tcl"/>
             <file type="content_page" path="www/page-visit.tcl"/>
+            <file type="query_file" path="www/page-visit.xql"/>
         </files>
         <parameters>
         <!-- No version parameters -->
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 -r1.5 -r1.6
--- openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql	27 Jul 2001 15:56:24 -0000	1.5
+++ openacs-4/packages/static-pages/sql/postgresql/static-pages-create.sql	4 Aug 2001 02:58:41 -0000	1.6
@@ -278,7 +278,7 @@
 		v_revision_id		integer;
 		v_is_live		boolean default ''t'';
 		v_mime_type		cr_revisions.mime_type%TYPE default ''text/html'';
-		v_storage_type		cr_items.storage_type%TYPE default ''text'';
+		v_storage_type		cr_items.storage_type%TYPE default ''file'';
         begin
                 -- Create content item; this also makes the content revision.
                 -- One might be tempted to set the content_type to static_page,
@@ -675,8 +675,8 @@
                 p_grantee_id	alias for $2;
                 p_privilege	alias for $3;
                 p_recursive_p	alias for $4;
-		v_file_row	static_pages.static_page_id%TYPE;
-		v_folder_row	sp_folders.folder_id%TYPE;
+		v_file_row	static_pages%ROWTYPE;
+		v_folder_row	sp_folders%ROWTYPE;
         begin
                 if recursive_p = ''t'' then
                         -- For each folder that is a descendant of item_id, grant.
@@ -687,13 +687,13 @@
 		where folder_id = p_item_id)
                          loop
                                 perform acs_permission__grant_permission(
-				v_folder_row,		-- object_id 
+				v_folder_row.folder_id,	-- object_id 
 				p_grantee_id,		-- grantee_id
 				p_privilege		-- privilege 
                                 );
                         end loop;
                         -- For each file that is a descendant of item_id, grant.
-                        for file_row in 
+                        for v_file_row in 
                                 select static_page_id from static_pages
                                 where folder_id in (
                                         select folder_id from sp_folders
@@ -702,8 +702,8 @@
 		where folder_id = p_item_id)
                                 )
                          loop
-                                acs_permission__grant_permission(
-				v_file_row,		-- object_id 
+                                perform acs_permission__grant_permission(
+				v_file_row.static_page_id,	-- object_id 
 				p_grantee_id,		-- grantee_id
 				p_privilege		-- privilege 
                                 );
@@ -729,8 +729,8 @@
                 p_grantee_id	alias for $2;
                 p_privilege	alias for $3;
                 p_recursive_p	alias for $4;
-		v_file_row	static_pages.static_page_id%TYPE;
-		v_folder_row	sp_folders.folder_id%TYPE;
+		v_file_row	static_pages%ROWTYPE;
+		v_folder_row	sp_folders%ROWTYPE;
         begin
                 if p_recursive_p = ''t'' then
                         -- For each folder that is a descendant of item_id, revoke.
@@ -741,7 +741,7 @@
 		where folder_id = p_item_id)
                          loop
                                 perform acs_permission__revoke_permission(
-				v_folder_row,		-- object_id 
+				v_folder_row.folder_id,	-- object_id 
 				p_grantee_id,		-- grantee_id
 				p_privilege		-- privilege 
                                 );
@@ -757,7 +757,7 @@
                                 )
                          loop
                                 perform acs_permission__revoke_permission(
-				v_file_row,		-- object_id 
+				v_file_row.static_page_id,	-- object_id 
 				p_grantee_id,		-- grantee_id
 				p_privilege		-- privilege 
                                 );
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 -r1.2 -r1.3
--- openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql	6 May 2001 19:54:35 -0000	1.2
+++ openacs-4/packages/static-pages/tcl/static-pages-procs-oracle.xql	4 Aug 2001 02:58:41 -0000	1.3
@@ -99,7 +99,23 @@
       </querytext>
 </fullquery>
 
+<fullquery name="sp_change_matching_display.show_or_summarize_comments_matching">
+      <querytext>
 
+	    update static_pages set show_comments_p = :show_full_comments_p
+                where static_page_id in (
+		    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_change_matching_permissions.grant_or_revoke_matching_permissions">
       <querytext>
 
@@ -123,5 +139,17 @@
       </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>
+
 </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 -r1.4 -r1.5
--- openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql	31 Jul 2001 14:29:50 -0000	1.4
+++ openacs-4/packages/static-pages/tcl/static-pages-procs-postgresql.xql	4 Aug 2001 02:58:41 -0000	1.5
@@ -86,35 +86,62 @@
       </querytext>
 </fullquery>
 
-
-<fullquery name="sp_change_matching_permissions.grant_or_revoke_matching_permissions">
+<fullquery name="sp_change_matching_display.show_or_summarize_comments_matching">
       <querytext>
-FIX ME  provisional thought
-create function inline__0()
-returns integer as '
-        declare
-                v_file_row    static_pages.static_page_id%TYPE;
-        begin
-	    for v_file_row in (
+
+	    update static_pages set show_comments_p = :show_full_comments_p
+                where static_page_id in (
 		    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)
+			select folder_id from sp_folders where
+			 tree_sortkey like ( select tree_sortkey || '%'
+				from sp_folders
+				where folder_id = :root_folder_id)
+							)
 		    and filename like '%${contained_string}%'
-	    ) loop
-		    acs_permission__${grant_or_revoke}_permission(
-			    file_row.static_page_id,                    -- object_id
-			    acs__magic_object_id(''the_public''),       -- grantee_id
-			    ''general_comments_create''                 -- privilege
+	        )
+
+      </querytext>
+</fullquery>
+
+
+<fullquery name="sp_change_matching_permissions.grant_or_revoke_matching_permissions">
+	<querytext>
+	    begin
+
+		for file_row in (
+		    select static_page_id from static_pages
+		    where folder_id in (
+			select folder_id from sp_folders where
+			 tree_sortkey like ( select tree_sortkey || '%'
+				from sp_folders
+				where folder_id = :root_folder_id)
+   				) and
+			filename like '%${contained_string%'}
+		) loop
+
+		    PERFORM acs_permission__${grant_or_revoke}_permission(
+			    file_row.static_page_id,
+			    acs__magic_object_id('the_public'),
+			    'general_comments_create'
 		    );
 	    end loop;
-            return 0;
-end;' language 'plpgsql';
+	    end;
 
-select inline__0();
+	</querytext>
+</fullquery>
 
-drop function inline__0();
+<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
+		     where tree_sortkey like
+			(select tree_sortkey ||'%' from sp_folders
+				where folder_id = :root_folder_id)
+			) and filename like '%${contained_string}%'
+
       </querytext>
 </fullquery>
 
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 -r1.3 -r1.4
--- openacs-4/packages/static-pages/tcl/static-pages-procs.xql	31 Jul 2001 14:29:50 -0000	1.3
+++ openacs-4/packages/static-pages/tcl/static-pages-procs.xql	4 Aug 2001 02:58:41 -0000	1.4
@@ -56,23 +56,8 @@
 </fullquery>
 
 
-<fullquery name="sp_change_matching_display.show_or_summarize_comments_matching">
-      <querytext>
 
-	    update static_pages set show_comments_p = :show_full_comments_p
-                where static_page_id in (
-		    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
Index: openacs-4/packages/static-pages/www/admin/commentability-toggle-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/commentability-toggle-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/static-pages/www/admin/commentability-toggle-postgresql.xql	6 May 2001 15:08:33 -0000	1.1
+++ openacs-4/packages/static-pages/www/admin/commentability-toggle-postgresql.xql	4 Aug 2001 02:58:41 -0000	1.2
@@ -7,7 +7,7 @@
       <querytext>
 
 	    select static_page__revoke_permission(:item_id,acs__magic_object_id('the_public'),
-	    'general_comments_create', :recurse);
+	    'general_comments_create', :recurse)
     
       </querytext>
 </fullquery>
@@ -17,7 +17,7 @@
       <querytext>
 
 	    select static_page__grant_permission(:item_id,acs__magic_object_id('the_public'),
-		'general_comments_create', :recurse);
+		'general_comments_create', :recurse)
     
       </querytext>
 </fullquery>
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 -r1.1 -r1.2
--- openacs-4/packages/static-pages/www/admin/display-policy-toggle.xql	6 May 2001 15:08:33 -0000	1.1
+++ openacs-4/packages/static-pages/www/admin/display-policy-toggle.xql	4 Aug 2001 02:58:41 -0000	1.2
@@ -3,9 +3,8 @@
 
 <fullquery name="toggle_display_policy">      
       <querytext>
-      FIX ME DECODE (USE SQL92 CASE) 
     update static_pages
-        set show_comments_p = decode(show_comments_p,'t','f','t')
+        set show_comments_p = (CASE WHEN show_comments_p=TRUE THEN FALSE ELSE TRUE END)
         where static_page_id = :item_id
 
       </querytext>