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.109.2.9 -r1.109.2.10
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	5 Jan 2016 17:23:57 -0000	1.109.2.9
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	2 Feb 2016 13:14:09 -0000	1.109.2.10
@@ -7,7 +7,7 @@
   <initial-install-p>t</initial-install-p>
   <singleton-p>t</singleton-p>
 
-  <version name="5.9.1d1" url="http://openacs.org/repository/download/apm/acs-content-repository-5.9.1d1.apm">
+  <version name="5.9.1d2" url="http://openacs.org/repository/download/apm/acs-content-repository-5.9.1d2.apm">
     <owner url="http://openacs.org">OpenACS</owner>
     <summary>The canonical repository for OpenACS content.</summary>
     <release-date>2015-10-04</release-date>
@@ -19,7 +19,7 @@
     <license>GPL</license>
     <maturity>3</maturity>
 
-    <provides url="acs-content-repository" version="5.9.1d1"/>
+    <provides url="acs-content-repository" version="5.9.1d2"/>
     <requires url="acs-kernel" version="5.9.0"/>
     <requires url="acs-tcl" version="5.9.1d2"/>
     <requires url="acs-service-contract" version="5.9.0"/>
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql,v
diff -u -r1.31 -r1.31.10.1
--- openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	11 Jun 2008 00:10:04 -0000	1.31
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	2 Feb 2016 13:14:09 -0000	1.31.10.1
@@ -1076,7 +1076,8 @@
 
 procedure set_live_revision (
   revision_id    in cr_revisions.revision_id%TYPE,
-  publish_status in cr_items.publish_status%TYPE default 'ready'
+  publish_status in cr_items.publish_status%TYPE default 'ready',
+  publish_date   in cr_revisions.publish_date%TYPE default sysdate
 ) is
 begin
 
@@ -1096,7 +1097,7 @@
   update
     cr_revisions
   set
-    publish_date = sysdate
+    publish_date = set_live_revision.publish_date
   where
     revision_id = set_live_revision.revision_id;
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.9.1d1-5.9.1d2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql,v
diff -u -r1.72.2.2 -r1.72.2.3
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	25 Sep 2015 10:45:05 -0000	1.72.2.2
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	2 Feb 2016 13:14:09 -0000	1.72.2.3
@@ -1930,53 +1930,14 @@
 $$ LANGUAGE plpgsql stable strict;
 
 
-select define_function_args('content_item__set_live_revision','revision_id,publish_status;ready');
+select define_function_args('content_item__set_live_revision','revision_id,publish_status;ready,publish_date;now()');
 --
--- procedure content_item__set_live_revision/1
+-- procedure content_item__set_live_revision/1,2,3
 --
 CREATE OR REPLACE FUNCTION content_item__set_live_revision(
-   set_live_revision__revision_id integer
-) RETURNS integer AS $$
---
--- content_item__set_live_revision/1 maybe obsolete, when we define proper defaults for /2
---
-DECLARE
-  set_live_revision__publish_status cr_items.publish_status%TYPE default 'ready';
-BEGIN
-
-  update
-    cr_items
-  set
-    live_revision = set_live_revision__revision_id,
-    publish_status = set_live_revision__publish_status
-  where
-    item_id = (select
-                 item_id
-               from
-                 cr_revisions
-               where
-                 revision_id = set_live_revision__revision_id);
-
-  update
-    cr_revisions
-  set
-    publish_date = now()
-  where
-    revision_id = set_live_revision__revision_id;
-
-  return 0; 
-END;
-$$ LANGUAGE plpgsql;
-
-
-select define_function_args('content_item__set_live_revision','revision_id,publish_status;ready');
---
--- procedure content_item__set_live_revision/2
---
-CREATE OR REPLACE FUNCTION content_item__set_live_revision(
    set_live_revision__revision_id integer,
-   set_live_revision__publish_status varchar -- default 'ready'
-
+   set_live_revision__publish_status varchar default 'ready',
+   set_live_revision__publish_date timestamptz default now()
 ) RETURNS integer AS $$
 DECLARE
 BEGIN
@@ -1997,7 +1958,7 @@
   update
     cr_revisions
   set
-    publish_date = now()
+    publish_date = set_live_revision__publish_date
   where
     revision_id = set_live_revision__revision_id;
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.9.1d1-5.9.1d2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?