Index: openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-create.sql	5 Feb 2006 03:36:30 -0000	1.2
+++ openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-create.sql	6 Feb 2006 06:53:22 -0000	1.3
@@ -114,11 +114,13 @@
     values
       (v_template_demo_note_id, p_title, p_body);
 
-    PERFORM acs_permission__grant_permission(
-          v_template_demo_note_id,
-          p_creation_user,
-          ''admin''
-    );
+    if p_creation_user is not null then
+      PERFORM acs_permission__grant_permission(
+            v_template_demo_note_id,
+            p_creation_user,
+            ''admin''
+      );
+    end if;
 
     return v_template_demo_note_id;
 
@@ -160,5 +162,5 @@
 
 
 -- neophytosd
-\i template-demo-notes-sc-create.sql
-\i template-demo-notes-sample.sql
\ No newline at end of file
+
+\i template-demo-notes-sample.sql
Index: openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-drop.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-drop.sql	4 Feb 2006 01:54:41 -0000	1.1
+++ openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-drop.sql	6 Feb 2006 06:53:22 -0000	1.2
@@ -4,7 +4,6 @@
 --
 
 -- neophytosd
-\i template-demo-notes-sc-drop.sql 
 
 --drop functions
 drop function template_demo_note__new (integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer);
Index: openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-sample.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-sample.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-sample.sql	5 Feb 2006 04:38:00 -0000	1.2
+++ openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-sample.sql	6 Feb 2006 06:53:22 -0000	1.3
@@ -2,34 +2,21 @@
 as
 '
 declare
-    security_context_root integer;
-    a_sitewide_admin integer;
-    acs_templating_package_id int4;
+    security_context_root int4;
+    default_context int4;
+    registered_users int4;
+    unregistered_visitor int4;
+    owning_party int4;
+    context int4;
 begin
-    -- try to find a sitewide admin by finding a user 
-    -- with admin perm on the security context root object
-
     security_context_root := acs__magic_object_id(''security_context_root'');
+    default_context       := acs__magic_object_id(''default_context'');
+    registered_users      := acs__magic_object_id(''registered_users'');
+    unregistered_visitor  := acs__magic_object_id(''unregistered_visitor'');
 
-    select 
-        p.grantee_id into a_sitewide_admin
-    from
-        acs_permissions p
-    where
-        p.object_id = security_context_root
-      and
-        p.privilege = ''admin''
-    limit 1;
+    context := default_context;
+    owning_party := unregistered_visitor;
 
-    -- now, we want the object id of the acs templating package instance
-
-    select
-        p.package_id into acs_templating_package_id
-    from
-	apm_packages p
-    where
-        p.package_key = ''acs-templating'';
-
     perform template_demo_note__new
 	(
 		NULL,
@@ -38,9 +25,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -51,9 +38,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -64,9 +51,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -77,9 +64,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -90,9 +77,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -103,9 +90,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -116,9 +103,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -129,9 +116,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -142,9 +129,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -155,9 +142,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -168,9 +155,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -181,9 +168,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -194,9 +181,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -207,9 +194,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -220,9 +207,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -233,9 +220,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -246,9 +233,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -259,9 +246,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -272,9 +259,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -285,9 +272,9 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
     perform template_demo_note__new
@@ -298,17 +285,17 @@
 		''template_demo_note'',
 
 		now(),
-		a_sitewide_admin,
+		owning_party,
 		NULL,
-		acs_templating_package_id
+		context
 	);
 
-    return a_sitewide_admin;
+    return context;
 end;
 '
 language 'plpgsql';
 
--- select template__make_sample_data();
+select template__make_sample_data();
 
 drop function template__make_sample_data();
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-sc-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/sql/postgresql/template-demo-notes-sc-drop.sql'.
Fisheye: No comparison available.  Pass `N' to diff?