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.34 -r1.35
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	27 Mar 2004 13:23:30 -0000	1.34
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	27 Mar 2004 15:58:03 -0000	1.35
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="5.2.0d1" url="http://openacs.org/repository/download/apm/acs-content-repository-5.2.0d1.apm">
+    <version name="5.2.0d2" url="http://openacs.org/repository/download/apm/acs-content-repository-5.2.0d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The canonical repository for OpenACS content.</summary>
         <release-date>2004-03-10</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.2.0d1"/>
+        <provides url="acs-content-repository" version="5.2.0d2"/>
         <requires url="acs-kernel" version="5.2.0d2"/>
         <requires url="acs-service-contract" version="5.1.0d1"/>
         <requires url="search" version="5.1.0d1"/>
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.35 -r1.36
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	12 Mar 2004 19:19:46 -0000	1.35
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	27 Mar 2004 15:58:03 -0000	1.36
@@ -406,7 +406,7 @@
     PERFORM content_item__rename(rename__folder_id, rename__name);
   end if;
 
-  if rename__label is not null and rename_label != '''' then
+  if rename__label is not null and rename__label != '''' then
     update acs_objects
     set title = rename__label
     where object_id = rename__folder_id;
Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.0d1-5.2.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.0d1-5.2.0d2.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.0d1-5.2.0d2.sql	27 Mar 2004 15:58:03 -0000	1.1
@@ -0,0 +1,39 @@
+-- this one had a rename__label as rename_label so replace it.
+create or replace function content_folder__rename (integer,varchar,varchar,varchar)
+returns integer as '
+declare
+  rename__folder_id              alias for $1;  
+  rename__name                   alias for $2;  -- default null  
+  rename__label                  alias for $3;  -- default null
+  rename__description            alias for $4;  -- default null
+  v_name_already_exists_p        integer;
+begin
+
+  if rename__name is not null and rename__name != '''' then
+    PERFORM content_item__rename(rename__folder_id, rename__name);
+  end if;
+
+  if rename__label is not null and rename__label != '''' then
+    update acs_objects
+    set title = rename__label
+    where object_id = rename__folder_id;
+  end if;
+
+  if rename__label is not null and rename__label != '''' and 
+     rename__description is not null and rename__description != '''' then 
+
+    update cr_folders
+      set label = rename__label,
+      description = rename__description
+      where folder_id = rename__folder_id;
+
+  else if(rename__label is not null and rename__label != '''') and 
+         (rename__description is null or rename__description = '''') then  
+    update cr_folders
+      set label = rename__label
+      where folder_id = rename__folder_id;
+
+  end if; end if;
+
+  return 0; 
+end;' language 'plpgsql';