Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/acs-subsite/acs-subsite.info	27 Sep 2002 22:24:43 -0000	1.36
+++ openacs-4/packages/acs-subsite/acs-subsite.info	24 Oct 2002 21:34:04 -0000	1.37
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="4.6b" url="http://www.openacs.org/repository/download/apm/acs-subsite-4.6b.apm">
+    <version name="4.6.1b" url="http://www.openacs.org/repository/download/apm/acs-subsite-4.6.1b.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
@@ -17,11 +17,11 @@
         <owner>Rafael Schloming</owner>
         <owner>Michael Yoon</owner>
         <summary>Provides the ability to create subsite within the OpenACS Community System.</summary>
-        <release-date>2002-05-15</release-date>
+        <release-date>2002-10-24</release-date>
         <vendor url="http://www.openacs.org/">OpenACS</vendor>
         <description format="text/html">Aware of parties, groups, users, portraits, ...</description>
 
-        <provides url="acs-subsite" version="4.6b"/>
+        <provides url="acs-subsite" version="4.6.1b"/>
         <requires url="acs-content-repository" version="4.1"/>
         <requires url="acs-kernel" version="4.1"/>
         <requires url="acs-tcl" version="4.1"/>
Index: openacs-4/packages/acs-subsite/sql/oracle/host-node-map-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/host-node-map-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/sql/oracle/host-node-map-create.sql	10 Oct 2001 17:51:55 -0000	1.1
+++ openacs-4/packages/acs-subsite/sql/oracle/host-node-map-create.sql	24 Oct 2002 21:34:05 -0000	1.2
@@ -1,10 +1,11 @@
 -- @author Mark Dettinger (mdettinger@arsdigita.com)
+-- @author Eric Lorenzo (eric@openforce.net)
 
+-- This has not been tested against Oracle.
 create table host_node_map (
-   host                 varchar(200),
-   node_id              integer 
-			constraint host_node_map_node_id_fk
-                        references acs_objects (object_id)
-                        constraint host_node_map_node_id_pk
-                        primary key
+   host         varchar(200)
+                constraint host_node_map_pk primary key,
+   node_id      integer not null
+                constraint host_node_map_fk
+                           references acs_objects (object_id)
 );
Index: openacs-4/packages/acs-subsite/sql/oracle/upgrade/upgrade-4.6b-4.6.1b.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/upgrade/upgrade-4.6b-4.6.1b.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/sql/oracle/upgrade/upgrade-4.6b-4.6.1b.sql	24 Oct 2002 21:34:06 -0000	1.1
@@ -0,0 +1,6 @@
+-- @author Eric Lorenzo (eric@openforce.net)
+
+-- This has not been tested.
+alter table host_node_map drop primary key;
+
+alter table host_node_map add ( constraint host_node_map_pk primary key ( host ) );
\ No newline at end of file
Index: openacs-4/packages/acs-subsite/sql/postgresql/host-node-map-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/postgresql/host-node-map-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/sql/postgresql/host-node-map-create.sql	10 Oct 2001 18:04:35 -0000	1.1
+++ openacs-4/packages/acs-subsite/sql/postgresql/host-node-map-create.sql	24 Oct 2002 21:34:07 -0000	1.2
@@ -1,8 +1,10 @@
 -- @author Mark Dettinger (mdettinger@arsdigita.com)
+-- @author Eric Lorenzo (eric@openforce.net)
 
 create table host_node_map (
-   host                 varchar(200),
-   node_id              integer 
-			constraint host_node_map_pk primary key
-			constraint host_node_map_fk references acs_objects (object_id)
+   host         varchar(200)
+                constraint host_node_map_pk primary key,
+   node_id      integer not null
+                constraint host_node_map_fk
+                           references acs_objects (object_id)
 );
Index: openacs-4/packages/acs-subsite/sql/postgresql/upgrade/upgrade-4.6b-4.6.1b.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/postgresql/upgrade/upgrade-4.6b-4.6.1b.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/sql/postgresql/upgrade/upgrade-4.6b-4.6.1b.sql	24 Oct 2002 21:34:08 -0000	1.1
@@ -0,0 +1,24 @@
+-- packages/acs-subsite/sql/postgresql/upgrade/upgrade-4.5.1-4.5.2.sql
+--
+-- @author Eric Lorenzo (eric@openforce.net)
+-- @creation-date 2002-10-24
+-- @cvs-id $Id: upgrade-4.6b-4.6.1b.sql,v 1.1 2002/10/24 21:34:08 elorenzo Exp $
+
+
+-- Moving primary key constraint on host_node_map from node_id column
+-- to host column.  Fortunately, nothing references the table, so a
+-- simple drop-rebuild is feasable
+alter table host_node_map rename to host_node_map_old;
+
+create table host_node_map (
+   host       varchar(200)
+              constraint host_node_map_pk primary key,
+   node_id    integer not null
+              constraint host_node_map_fk references acs_objects (object_id)
+);
+
+insert into host_node_map ( host, node_id )
+   select host, node_id from host_node_map_old;
+
+drop table host_node_map_old;
+