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.56.2.2 -r1.56.2.3
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	4 Jun 2005 18:51:12 -0000	1.56.2.2
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	8 Jun 2005 21:12:11 -0000	1.56.2.3
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="5.2.0a1" url="http://openacs.org/repository/download/apm/acs-content-repository-5.2.0a1.apm">
+    <version name="5.2.0a2" url="http://openacs.org/repository/download/apm/acs-content-repository-5.2.0a2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
 
         <summary>The canonical repository for OpenACS content.</summary>
@@ -21,7 +21,7 @@
          other CMS backing functionality.  Utilized by Bug Tracker, File Storage, and other packages.
         </description>
 
-        <provides url="acs-content-repository" version="5.2.0a1"/>
+        <provides url="acs-content-repository" version="5.2.0a2"/>
         <requires url="acs-kernel" version="5.2.0a1"/>
         <requires url="acs-service-contract" version="5.2.0a1"/>
         <requires url="search" version="5.2.0a1"/>
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-type.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-type.sql,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-content-repository/sql/oracle/content-type.sql	14 Feb 2005 17:23:10 -0000	1.6
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-type.sql	8 Jun 2005 21:12:11 -0000	1.6.2.1
@@ -534,7 +534,8 @@
                    item_id       => content_symlink.resolve(:new.item_id),
                    creation_ip   => :new.creation_ip,
                    creation_user => :new.creation_user, 
-                   text          => :new.text
+                   text          => :new.text,
+                   package_id    => :new.object_package_id
     );
 
   else
@@ -548,7 +549,8 @@
                    item_id       => content_symlink.resolve(:new.item_id),
                    creation_ip   => :new.creation_ip,
                    creation_user => :new.creation_user, 
-                   data          => :new.data
+                   data          => :new.data,
+                   package_id    => :new.object_package_id
     );
 
   end if;';
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.2.0a1-5.2.0a2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql,v
diff -u -r1.40 -r1.40.2.1
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql	13 Jan 2005 13:55:12 -0000	1.40
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql	8 Jun 2005 21:12:11 -0000	1.40.2.1
@@ -594,7 +594,8 @@
                                      new.revision_id,
                                      now(),
                                      new.creation_user, 
-                                     new.creation_ip
+                                     new.creation_ip,
+                                     new.object_package_id
                 ));
                 '';
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.0a1-5.2.0a2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	7 Jun 2005 13:14:10 -0000	1.9.2.1
+++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl	8 Jun 2005 21:12:11 -0000	1.9.2.2
@@ -25,7 +25,6 @@
     {-content_type}
     {-creation_user}
     {-creation_ip}
-    {-context_id}
     {-package_id}
     {-attributes}
     {-is_live "f"}
@@ -66,8 +65,6 @@
 
     @param is_live
 
-    @param context_id defaults to item_id if not specified. Use empty string for NULL context_id
-
     @param attributes A list of lists of pairs of additional attributes and
     their values to pass to the constructor. Each pair is a list of two
      elements: key => value such as
@@ -89,9 +86,6 @@
     if {![exists_and_not_null content_type]} {
 	set content_type [::content::item::content_type -item_id $item_id]
     }
-    if {![info exists context_id]} {
-        set context_id $item_id
-    }
     if {![info exists package_id]} {
         set package_id [ad_conn package_id]
     }
@@ -134,8 +128,8 @@
     set table_name "${table_name}i"
 
     set query_text "insert into ${table_name}
-                    (revision_id, object_type, creation_user, creation_date, creation_ip, title, description, item_id, context_id, package_id, mime_type $attribute_names)
-            values (:revision_id, :content_type, :creation_user, :creation_date, :creation_ip, :title, :description, :item_id, :context_id, :package_id, :mime_type $attribute_values)"
+                    (revision_id, object_type, creation_user, creation_date, creation_ip, title, description, item_id, object_package_id, mime_type $attribute_names)
+            values (:revision_id, :content_type, :creation_user, :creation_date, :creation_ip, :title, :description, :item_id, :package_id, :mime_type $attribute_values)"
     db_transaction {
         if {[string equal "" $revision_id]} {
 	    set revision_id [db_nextval "acs_object_id_seq"]