Index: openacs-4/contrib/obsolete-packages/acs-content/acs-content.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-content/acs-content.info,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/obsolete-packages/acs-content/acs-content.info 23 Sep 2002 23:31:59 -0000 1.5
+++ openacs-4/contrib/obsolete-packages/acs-content/acs-content.info 16 Jan 2003 13:29:08 -0000 1.6
@@ -27,7 +27,6 @@
Note: These are the groups to which the user has been granted Index: openacs-4/packages/acs-admin/www/users/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-admin/www/users/one.tcl 18 Nov 2002 18:01:17 -0000 1.6 +++ openacs-4/packages/acs-admin/www/users/one.tcl 16 Jan 2003 13:28:06 -0000 1.7 @@ -23,13 +23,15 @@ user_finite_state_links:onevalue } -if ![db_0or1row user_info "select first_names, last_name, email, coalesce(screen_name,'< none set up >') as screen_name, creation_date, creation_ip, last_visit, member_state, email_verified_p +if ![db_0or1row user_info "select first_names, last_name, email, coalesce(screen_name,'< none set up >') as screen_name, creation_date, creation_ip, last_visit, member_state, email_verified_p, url from cc_users where user_id = :user_id"] { ad_return_complaint 1 "
After installation is complete we recommend that you remove this privilege using the following command:
alter user your_acs_postgres_user nocreatuser\;
If you upgrade to PostgreSQL 7.2 you can avoid the need to grant this privilege." - set my_error_p 1 - } - if { [catch { ns_db dml $db "drop function __test__();" } errmsg] } { - append my_errors "
\n" - set my_error_p 1 - } - } - } - ns_db releasehandle $db if { [info exists my_error_p] } { Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v diff -u -r1.29 -r1.30 --- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 30 Nov 2002 17:14:16 -0000 1.29 +++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 16 Jan 2003 13:28:42 -0000 1.30 @@ -414,7 +414,7 @@ db_qd_log Debug "NO FULLQUERY FOR $statement_name --> using default SQL" if { [empty_string_p $sql] } { # The default SQL is empty, that implies a bug somewhere in the code. - error "No fullquery for $statement_name and default SQL is empty." + error "No fullquery for $statement_name and default SQL empty - query for statement missing" } } Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl 30 Nov 2002 17:16:03 -0000 1.3 +++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.tcl 16 Jan 2003 13:29:27 -0000 1.4 @@ -5,27 +5,36 @@ # # Walter McGinnis (wtem@olywa.net), 2001-09-23 # based on original photo-album package code by Tom Baginski +# +# JCD 2002-12-96 This should be fixed since on oracle anyway, being in a +# transaction does not mean that you get read level consistency across +# queries. End result is that someone can do an insert into the +# delete list and the delete_files query will whack it and the file +# will then never be deleted. Oops. + ad_proc -private cr_delete_scheduled_files {} { - Tries to delete all the files in cr_files_to_delete. - Makes sure file isn't being used by another revision prior to deleting it. + Tries to delete all the files in cr_files_to_delete. Makes sure + file isn't being used by another revision prior to deleting it. Should be scheduled daily. - This proc is extremely simple, and does not have any concurrancy checks to make sure another - version of the proc is running/deleting a file. - Will add some concurancy checks to a future revision. - Right now go with short and sweet, count on scheduling to prevent conflicts + + This proc is extremely simple, and does not have any concurrancy + checks to make sure another version of the proc is + running/deleting a file. Will add some concurancy checks to a + future revision. Right now go with short and sweet, count on + scheduling to prevent conflicts } { db_transaction { # subselect makes sure there isn't a parent revision still lying around - db_foreach fetch_paths "" { + db_foreach fetch_paths { *SQL* } { # try to remove file from filesystem set file "[cr_fs_path $storage_area_key]/${path}" ns_log Debug "cr_delete_scheduled_files: deleting $file" ns_unlink -nocomplain "$file" - } - # now that all scheduled files deleted, clear table - db_dml delete_files "" + } + # now that all scheduled files deleted, clear table + db_dml delete_files { *SQL* } } } Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.xql 30 Nov 2002 17:16:03 -0000 1.3 +++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-procs.xql 16 Jan 2003 13:29:27 -0000 1.4 @@ -1,6 +1,16 @@$errmsg
For Everyone - - OpenACS 4.5 Release Notes + - OpenACS 4.6 Release Notes - Older Release Notes For OpenACS-admins @@ -115,7 +115,7 @@ Questions or comments about the documentation?
Please visit the -OpenACS bboards +OpenACS forums or shoot email at vinod@kurup.com or rmello at fslc.usu.edu. Index: openacs-4/packages/acs-core-docs/www/files/acs-pgbackup-init.txt =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/files/acs-pgbackup-init.txt,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-core-docs/www/files/acs-pgbackup-init.txt 30 Nov 2002 17:16:33 -0000 1.2 +++ openacs-4/packages/acs-core-docs/www/files/acs-pgbackup-init.txt 16 Jan 2003 13:30:35 -0000 1.3 @@ -4,7 +4,7 @@ # created. # Original version by Don Baccus (dhogaza@pacifier.com> # Modified for openacs4 by Vinod Kurup-# Last modified: 14 Nov 2002 +# Last modified: 02 Jan 2003 # This version: ftp only. proc acs_pgbackup {} { @@ -16,16 +16,22 @@ set bak "[file dirname [ns_info pageroot]]/backup" set servername "[ns_info server]" - set pguser "-U [db_get_username]" + set pguser "[db_get_username]" set day [clock format [clock seconds] -format %d] set data "${servername}_${day}.dmp" # make the backup directory - ns_mkdir $bak + if ![file exists $bak] { + if [catch {ns_mkdir $bak} errmsg] { + ns_log Error "mkdir failed: $errmsg" + ns_sendmail [ad_system_owner] [ad_system_owner] "[ad_system_name] : mkdir failed..." "$errmsg" + return + } + } ns_log Notice "Backup of [ad_system_name] starting." ns_log Notice "pg_dump beginning..." - if [catch {append msg [exec "pg_dump" $pguser $servername ">$bak/$data"]} errmsg] { + if [catch {append msg [exec "pg_dump" "-U" "$pguser" "$servername" ">$bak/$data"]} errmsg] { ns_log Error "pg_dump failed: $errmsg" ns_sendmail [ad_system_owner] [ad_system_owner] "[ad_system_name] : pg_dump failed..." "$errmsg" return @@ -52,7 +58,7 @@ # Replicate the above code to make remote copies to other systems ns_log Notice "vacuum beginning..." - if [catch {append msg [exec "vacuumdb" $pguser "-q" "-z" "$servername"]} errmsg] { + if [catch {append msg [exec "vacuumdb" "-U" "$pguser" "-q" "-z" "$servername"]} errmsg] { ns_log Error "vacuum failed: $errmsg" ns_sendmail [ad_system_owner] [ad_system_owner] "[ad_system_name] : vacuum failed..." "$errmsg" } @@ -62,7 +68,11 @@ } if { ! [nsv_exists acs_pgbackup scheduled_p] } { - ns_schedule_daily 0 0 acs_pgbackup + ad_schedule_proc \ + -thread t \ + -schedule_proc ns_schedule_daily \ + "00 00" \ + acs_pgbackup nsv_set acs_pgbackup scheduled_p 1 ns_log Notice "Backup has been scheduled." } Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml 22 Sep 2002 01:01:52 -0000 1.1 +++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml 16 Jan 2003 13:30:55 -0000 1.2 @@ -15,8 +15,8 @@ of code and trying to understand exactly what went wrong. It is geared towards developers who understand the general permissions system to the extent that is described in the - - OpenACS 4.x Permisisons documentation , ++ OpenACS 4.x Permissions documentation , but who haven't had the opportunity to take a long, careful look at the system internals. Index: openacs-4/packages/acs-core-docs/www/xml/files/acs-pgbackup-init.txt =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/files/Attic/acs-pgbackup-init.txt,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-core-docs/www/xml/files/acs-pgbackup-init.txt 30 Nov 2002 17:17:14 -0000 1.2 +++ openacs-4/packages/acs-core-docs/www/xml/files/acs-pgbackup-init.txt 16 Jan 2003 13:31:13 -0000 1.3 @@ -4,7 +4,7 @@ # created. # Original version by Don Baccus (dhogaza@pacifier.com> # Modified for openacs4 by Vinod Kurup-# Last modified: 14 Nov 2002 +# Last modified: 02 Jan 2003 # This version: ftp only. proc acs_pgbackup {} { @@ -16,16 +16,22 @@ set bak "[file dirname [ns_info pageroot]]/backup" set servername "[ns_info server]" - set pguser "-U [db_get_username]" + set pguser "[db_get_username]" set day [clock format [clock seconds] -format %d] set data "${servername}_${day}.dmp" # make the backup directory - ns_mkdir $bak + if ![file exists $bak] { + if [catch {ns_mkdir $bak} errmsg] { + ns_log Error "mkdir failed: $errmsg" + ns_sendmail [ad_system_owner] [ad_system_owner] "[ad_system_name] : mkdir failed..." "$errmsg" + return + } + } ns_log Notice "Backup of [ad_system_name] starting." ns_log Notice "pg_dump beginning..." - if [catch {append msg [exec "pg_dump" $pguser $servername ">$bak/$data"]} errmsg] { + if [catch {append msg [exec "pg_dump" "-U" "$pguser" "$servername" ">$bak/$data"]} errmsg] { ns_log Error "pg_dump failed: $errmsg" ns_sendmail [ad_system_owner] [ad_system_owner] "[ad_system_name] : pg_dump failed..." "$errmsg" return @@ -52,7 +58,7 @@ # Replicate the above code to make remote copies to other systems ns_log Notice "vacuum beginning..." - if [catch {append msg [exec "vacuumdb" $pguser "-q" "-z" "$servername"]} errmsg] { + if [catch {append msg [exec "vacuumdb" "-U" "$pguser" "-q" "-z" "$servername"]} errmsg] { ns_log Error "vacuum failed: $errmsg" ns_sendmail [ad_system_owner] [ad_system_owner] "[ad_system_name] : vacuum failed..." "$errmsg" } @@ -62,7 +68,11 @@ } if { ! [nsv_exists acs_pgbackup scheduled_p] } { - ns_schedule_daily 0 0 acs_pgbackup + ad_schedule_proc \ + -thread t \ + -schedule_proc ns_schedule_daily \ + "00 00" \ + acs_pgbackup nsv_set acs_pgbackup scheduled_p 1 ns_log Notice "Backup has been scheduled." } Index: openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 10 Aug 2002 19:46:38 -0000 1.4 +++ openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 16 Jan 2003 13:31:28 -0000 1.5 @@ -13,20 +13,20 @@ Please report bugs using our - - Software Development Manager at the+ Bug Tracker at theOpenACS website . The latest - information on installing this release under Oracle 8.1.6/7 - or PostgreSQL 7.1.* can be found there as well. Currently the + information on installing this release under Oracle 8.1.7 + or PostgreSQL 7.2.* can be found there as well. Currently the toolkit will not install under Oracle 9i due to Oracle having made "delete" an illegal name for PL/SQL procedures and functions.You may want to begin by reading our installation documentation for - @@ -70,168 +70,17 @@or . Note - that the Windows documentation is not current for OpenACS &version;, - but an alternative is to use John Sequeira's . Note that the Windows documentation is + not current for OpenACS &version;, but an alternative is to use John + Sequeira's Oasis VM project .Testing Notes - Here are some notes from our testing group. While not quite up to - date it should give you some ideas of where things stand. - -- Summarised Testing Status + OpenMSG has organized the + OpenACS &version; testing process with test servers provided by +Hub.org . Visit theacceptance test server to + see the current status of various packages. This may not be a + permanent link. If it's not working, do a search of theOpenACS forums . -Skin -Minimal -Release w/caution -Comments: + -Package: Page -Test Coverage: Minimal -Release w/caution -Comments: - -Package: Bboard -Test Coverage: Reasonable -Suggested Status: Alpha -Comments: - -Package: Static Pages -Test Coverage: Minimal -Suggested Status: Release w/caution -Comments: - -Package: Ticket Tracker -Test Coverage: Reasonable -Suggested Status: Alpha -Comments: Don tested personally - -Package: Ticket Tracker Lite -Test Coverage: Unknown -Suggested Status: -Comments: - -Package: Acs-lang -Test Coverage: Reasonable -Suggested Status: Alpha -Comments: Oracle only - -Package: Simple-survey -Test Coverage: Reasonable -Suggested Status: Alpha -Comments: - -Package: Portal -Test Coverage: Extensive -Suggested Status: Alpha -Comments: - -Package: Notes -Test Coverage: Extensive -Suggested Status: Alpha -Comments: - -Package: Bookmarks -Test Coverage: Extensive -Suggested Status: Alpha -Comments: - -Package: Clickthrough -Test Coverage: Extensive -Suggested Status: Alpha -Comments: - -Package: Acs-mail -Test Coverage: Reasonable -Suggested Status: Release w/caution -Comments: - -Package: Acs-messaging -Test Coverage: Reasonable -Suggested Status: Release w/caution -Comments: - -Package: File manager -Test Coverage: Minimal -Suggested Status: Release w/caution -Comments: - -Package: File Storage -Test Coverage: Minimal -Suggested Status: Release w/caution -Comments: - -Package: Site-wide-search -Test Coverage: Minimal -Suggested Status: Release w/caution -Comments: - -Package: General Comments -Test Coverage: Extensive -Suggested Status: Alpha -Comments: - -Package: Acs-events -Test Coverage: None -Suggested Status: -Comments: Automated Testing - -Package: Acs-datetime -Test Coverage: None -Suggested Status: -Comments: Automated Testing - -Package: Acs-tcl -Test Coverage: Reasonable -Suggested Status: Release w/caution -Comments: Automated Testing - -Package: Acs-templating -Test Coverage: Reasonable -Suggested Status: Release w/caution -Comments: Automated Testing - -Package: Acs-util -Test Coverage: Reasonable -Suggested Status: Release w/caution -Comments: Automated Testing - -Package: Acs-Content-repository -Test Coverage: Minimal -Suggested Status: Release w/caution -Comments: Automated Testing - -Package: Acs-content -Test Coverage: Minimal -Suggested Status: Release w/caution -Comments: Automated Testing - -Package: Acs-kernel -Test Coverage: Reasonable -Suggested Status: Alpha -Comments: Automated Testing - -Package: Acs-subsite -Test Coverage: Reasonable -Suggested Status: Alpha -Comments: - -Package: Acs-bootstrap-installer -Test Coverage: Extensive -Suggested Status: Alpha -Comments: Developers have used this extensively - -Package: Acs-api-browser -Test Coverage: Minimal -Suggested Status: Release w/caution -Comments: Automated Testing - -Package: Acs-workflow -Test Coverage: Minimal -Suggested Status: Release w/caution -Comments: - -Package: calendar -Test Coverage: Minimal -Suggested Status: Alpha -Comments: Don tested personally -Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml 30 Nov 2002 17:17:46 -0000 1.7 +++ openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml 16 Jan 2003 13:31:43 -0000 1.8 @@ -35,8 +35,15 @@ ($Id$) - The OpenACS PostgreSQL driver is available from OpenACS + + The OpenACS PostgreSQL driver (nspostgres.so) is available from +SourceForge. If + you do decide to use nspostgres.so, you have to remember to + change the AOLserver config file to point to nspostgres.so + instead of postgres.so. This guide uses Mat Kovach's distro + (i.e. postgres.so) ++ Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/oracle.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/oracle.xml,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-core-docs/www/xml/install-guide/oracle.xml 30 Nov 2002 17:17:46 -0000 1.7 +++ openacs-4/packages/acs-core-docs/www/xml/install-guide/oracle.xml 16 Jan 2003 13:31:43 -0000 1.8 @@ -68,6 +68,17 @@ + + + See +these + instructions to download the 8.1.7.4 patchset. Note + that you can't back out of an Oracle patchset once it's + installed. You have to reinstall the whole thing from scratch. + +After the download is complete, untar the file @@ -110,7 +121,10 @@ For additional resources/documentation, please see this @@ -508,15 +522,6 @@thread . + url="http://openacs.org/bboard/q-and-a-fetch-msg.tcl?msg_id=0003o2&topic_id=11&topic=OpenACS">thread + andAndrew + Piskorski's mini-guide ..- - - Install the compat-glibc, compat-egcs, compat-libs RPM for - 2.1.3. - - -- - Execute the following command: /usr/i386-glib21-linux/bin/i386-glibc21-linux-env.sh Index: openacs-4/packages/acs-datetime/acs-datetime.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/acs-datetime.info,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-datetime/acs-datetime.info 22 Nov 2002 13:13:42 -0000 1.9 +++ openacs-4/packages/acs-datetime/acs-datetime.info 16 Jan 2003 13:32:10 -0000 1.10 @@ -7,7 +7,7 @@f t -+ oracle postgresql Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 2 Sep 2002 13:18:46 -0000 1.8 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 16 Jan 2003 13:32:34 -0000 1.9 @@ -200,7 +200,10 @@ } proc_doc ds_comment { value } { Adds a comment to the developer-support information for the current request. } { - ds_add comment $value + + if { [ds_enabled_p] } { + ds_add comment $value + } } proc ds_sweep_data {} { Index: openacs-4/packages/acs-interface/acs-interface.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-interface/acs-interface.info,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-interface/acs-interface.info 23 Sep 2002 23:32:02 -0000 1.5 +++ openacs-4/packages/acs-interface/acs-interface.info 16 Jan 2003 13:32:47 -0000 1.6 @@ -23,7 +23,6 @@- Index: openacs-4/packages/acs-kernel/acs-kernel.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v diff -u -r1.19 -r1.20 --- openacs-4/packages/acs-kernel/acs-kernel.info 30 Nov 2002 17:18:57 -0000 1.19 +++ openacs-4/packages/acs-kernel/acs-kernel.info 16 Jan 2003 13:33:05 -0000 1.20 @@ -7,7 +7,7 @@ t t -+ oracle postgresql @@ -83,6 +83,7 @@+ @@ -139,6 +140,7 @@ + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-4.6-4.6.1.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql 21 Dec 2002 22:31:17 -0000 1.7 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql 16 Jan 2003 13:34:10 -0000 1.8 @@ -141,7 +141,7 @@ return magic_object_id__object_id; -end;' language 'plpgsql'; +end;' language 'plpgsql' with(isstrict,iscachable); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-person/acs-person.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-person/Attic/acs-person.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-person/acs-person.info 30 Nov 2002 17:20:25 -0000 1.3 +++ openacs-4/packages/acs-person/acs-person.info 16 Jan 2003 13:35:16 -0000 1.4 @@ -53,6 +53,9 @@ + + + Index: openacs-4/packages/acs-service-contract/acs-service-contract.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/acs-service-contract.info,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-service-contract/acs-service-contract.info 30 Nov 2002 17:21:13 -0000 1.9 +++ openacs-4/packages/acs-service-contract/acs-service-contract.info 16 Jan 2003 13:35:54 -0000 1.10 @@ -19,6 +19,7 @@ OpenACS + 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.39 -r1.40 --- openacs-4/packages/acs-subsite/acs-subsite.info 9 Dec 2002 13:18:26 -0000 1.39 +++ openacs-4/packages/acs-subsite/acs-subsite.info 16 Jan 2003 13:36:29 -0000 1.40 @@ -89,6 +89,7 @@ @@ -36,8 +37,8 @@ - + @@ -69,9 +70,9 @@ + - + @@ -264,8 +265,6 @@ - - @@ -462,8 +461,6 @@ - - @@ -473,12 +470,13 @@ + + - @@ -569,8 +567,6 @@ - - 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.2 -r1.3 --- openacs-4/packages/acs-subsite/sql/oracle/host-node-map-create.sql 24 Oct 2002 21:34:05 -0000 1.2 +++ openacs-4/packages/acs-subsite/sql/oracle/host-node-map-create.sql 16 Jan 2003 13:37:08 -0000 1.3 @@ -1,11 +1,11 @@ -- @author Mark Dettinger (mdettinger@arsdigita.com) --- @author Eric Lorenzo (eric@openforce.net) +-- $Id$ -- This has not been tested against Oracle. 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) + host varchar(200) + constraint host_node_map_host_pk primary key + constraint host_node_map_host_nn not null, + node_id integer + constraint host_node_map_node_id_fk references site_nodes ); 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.2 -r1.3 --- openacs-4/packages/acs-subsite/sql/postgresql/host-node-map-create.sql 24 Oct 2002 21:34:07 -0000 1.2 +++ openacs-4/packages/acs-subsite/sql/postgresql/host-node-map-create.sql 16 Jan 2003 13:37:46 -0000 1.3 @@ -1,10 +1,10 @@ -- @author Mark Dettinger (mdettinger@arsdigita.com) --- @author Eric Lorenzo (eric@openforce.net) +-- $Id$ 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) + host varchar(200) + constraint host_node_map_host_pk primary key + constraint host_node_map_host_nn not null, + node_id integer + constraint host_node_map_node_id_fk references site_nodes );