Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.33.2.20 -r1.33.2.21
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	21 Dec 2004 18:22:30 -0000	1.33.2.20
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	22 Dec 2004 16:13:15 -0000	1.33.2.21
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.1.4d2" url="http://openacs.org/repository/download/apm/acs-content-repository-5.1.4d2.apm">
+    <version name="5.1.4d3" url="http://openacs.org/repository/download/apm/acs-content-repository-5.1.4d3.apm">
         <owner url="mailto:dcwickstrom@earthlink.net">Dan Wickstrom</owner>
         <summary>The canonical repository for OpenACS content.</summary>
         <release-date>2004-11-26</release-date>
@@ -17,7 +17,7 @@
          other CMS backing functionality.  Utilized by Bug Tracker, File Storage, and other packages.
         </description>
 
-        <provides url="acs-content-repository" version="5.1.4d2"/>
+        <provides url="acs-content-repository" version="5.1.4d3"/>
         <requires url="acs-kernel" version="5.1.0"/>
         <requires url="acs-service-contract" version="5.1.0"/>
         <requires url="search" version="5.1.0"/>
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql,v
diff -u -r1.33.2.3 -r1.33.2.4
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	21 Dec 2004 18:22:30 -0000	1.33.2.3
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	22 Dec 2004 16:13:15 -0000	1.33.2.4
@@ -115,8 +115,6 @@
 
 -- function new -- accepts security_inherit_p DaveB
 
-select define_function_args('content_folder__new','name,label,description,parent_id,context_id,folder_id,creation_date;now,creation_user,creation_ip,security_inherit_p;t');
-
 create or replace function content_folder__new (varchar,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar, boolean)
 returns integer as '
 declare
@@ -134,6 +132,43 @@
   v_context_id                acs_objects.context_id%TYPE;
 begin
 
+        perform content_folder__new (
+                new__name,
+                new__label,
+                new__description,
+                new__parent_id,
+                new__context_id,
+                new__folder_id,
+                new__creation_date,
+                new__creation_user,
+                new__creation_ip,
+                new__security_inherit_p,
+                null
+        );
+
+  return null; 
+end;' language 'plpgsql';
+
+select define_function_args('content_folder__new','name,label,description,parent_id,context_id,folder_id,creation_date;now,creation_user,creation_ip,security_inherit_p;t,package_id');
+
+create or replace function content_folder__new (varchar,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar, boolean,integer)
+returns integer as '
+declare
+  new__name                   alias for $1;  
+  new__label                  alias for $2;  
+  new__description            alias for $3;  -- default null
+  new__parent_id              alias for $4;  -- default null
+  new__context_id             alias for $5;  -- default null
+  new__folder_id              alias for $6;  -- default null
+  new__creation_date          alias for $7;  -- default now()
+  new__creation_user          alias for $8;  -- default null
+  new__creation_ip            alias for $9;  -- default null
+  new__security_inherit_p     alias for $10;  -- default true
+  new__package_id             alias for $11; -- default null
+  v_folder_id                 cr_folders.folder_id%TYPE;
+  v_context_id                acs_objects.context_id%TYPE;
+begin
+
   -- set the context_id
   if new__context_id is null then
     v_context_id := new__parent_id;
@@ -169,9 +204,9 @@
         ''content_folder'');
 
     insert into cr_folders (
-      folder_id, label, description
+      folder_id, label, description, package_id
     ) values (
-      v_folder_id, new__label, new__description
+      v_folder_id, new__label, new__description, new__package_id
     );
 
     -- inherit the attributes of the parent folder
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.1.4d2-5.1.4d3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?