Index: openacs-4/readme.txt
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/readme.txt,v
diff -u -N -r1.8 -r1.9
--- openacs-4/readme.txt	11 Nov 2003 12:56:12 -0000	1.8
+++ openacs-4/readme.txt	11 Dec 2003 21:39:42 -0000	1.9
@@ -1,6 +1,6 @@
 This is the OpenACS - the Open Architecture Community System.
 
-Version 5.0.0 beta 1
+Version 5.0.0 beta 4
 
 --------------
 
Index: openacs-4/contrib/obsolete-packages/library/library.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/library/library.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/library/library.info	2 Jul 2003 12:19:40 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/library/library.info	11 Dec 2003 21:39:43 -0000	1.2
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="library" url="http://www.arsdigita.com/acs-repository/apm/packages/library" type="apm_application">
+<package key="library" url="http://openacs.org/repository/apm/packages/library" type="apm_application">
     <package-name>Library</package-name>
     <pretty-plural>Libraries</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="0.1d" url="http://www.arsdigita.com/acs-repository/download/apm/library-0.1d.apm">
+    <version name="0.1d" url="http://openacs.org/repository/download/apm/library-0.1d.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:dirk@arsdigita.com">Dirk Gomez</owner>
+        <owner url="http://www.dirkgomez.de/">Dirk Gomez</owner>
         <summary>Red Hat Knowledge Library for ACS4.0</summary>
         <description format="text/plain">Red Hat Knowledge Library for ACS4.0</description>
 
Index: openacs-4/contrib/packages/acknowledgement/acknowledgement.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/acknowledgement/acknowledgement.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/acknowledgement/acknowledgement.info	10 Oct 2003 14:46:42 -0000	1.1
+++ openacs-4/contrib/packages/acknowledgement/acknowledgement.info	11 Dec 2003 21:39:42 -0000	1.2
@@ -12,7 +12,7 @@
         <owner url="mailto:peter.alberer@wu-wien.ac.at">Peter Alberer</owner>
         <summary>Ask system users for acknowledgements</summary>
         <release-date>2003-10-08</release-date>
-        <description format="text/plain">Ask system users for acknowledgements</description>
+        <description format="text/plain">Ask system users for acknowledgements such as acceptance of a privacy policy or terms of use.  The users acceptance is logged and can be checked via a simple API call.</description>
 
         <!-- No dependency information -->
 
Index: openacs-4/contrib/packages/acs-mail-lite/acs-mail-lite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/acs-mail-lite/Attic/acs-mail-lite.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/acs-mail-lite/acs-mail-lite.info	1 Oct 2003 05:29:13 -0000	1.1
+++ openacs-4/contrib/packages/acs-mail-lite/acs-mail-lite.info	11 Dec 2003 21:39:42 -0000	1.2
@@ -12,7 +12,7 @@
         <owner url="mailto:thentschel@sussdorff-roy.com">Timo Hentschel</owner>
         <summary>Simplified reliable email transmission.</summary>
         <release-date>2003-06-16</release-date>
-        <description format="text/html">This package provides a simple ns_sendmail-like interface for sending messages, but queues messages in the database to ensure reliable sending and make sending a message 'transactional'.</description>
+        <description format="text/html">This package provides a simple ns_sendmail-like interface for sending messages, but queues messages in the database to ensure reliable sending and make sending a message 'transactional'. Modified version of the canonical acs-mail-lite package from openacs.</description>
 
         <provides url="acs-mail-lite" version="0.3"/>
 
Index: openacs-4/contrib/packages/bcds/bcds.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcds/bcds.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcds/bcds.info	14 May 2003 15:30:01 -0000	1.1
+++ openacs-4/contrib/packages/bcds/bcds.info	11 Dec 2003 21:39:42 -0000	1.2
@@ -9,8 +9,8 @@
     
     <version name="0.1d" url="http://openacs.org/repository/download/apm/bcds-0.1d.apm">
         <owner url="mailto:">ghost bear</owner>
-        <summary>A presentation system for Content Repository.</summary>
-        <description format="text/html">A presentation system for Content Repository.  Normally used together with Basic Content Management System</description>
+        <summary>A presentation system for the Content Repository.</summary>
+        <description format="text/html">A presentation system for Content Repository.  Normally used together with Basic Content Management System (BCMS).</description>
 
         <!-- No dependency information -->
 
Index: openacs-4/contrib/packages/bcms/bcms.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms/bcms.info,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/bcms/bcms.info	3 Dec 2003 16:38:26 -0000	1.3
+++ openacs-4/contrib/packages/bcms/bcms.info	11 Dec 2003 21:39:42 -0000	1.4
@@ -9,9 +9,9 @@
     
     <version name="0.3" url="http://openacs.org/repository/download/apm/bcms-0.3.apm">
         <owner>Jun Yamog</owner>
-        <summary>Basic CMS is a small layer on top of Content Repository to manipulate its data model</summary>
+        <summary>Basic CMS is a thin layer on top of Content Repository to manipulate its data model.</summary>
         <release-date>2003-04-26</release-date>
-        <description format="text/plain">Basic CMS is a small layer on top of Content Repository to manipulate its data model</description>
+        <description format="text/plain">Basic CMS is a thin layer on top of Content Repository to manipulate its data model.</description>
 
         <provides url="bcms" version="0.3"/>
         <requires url="acs-content-repository" version="5.0d2"/>
Index: openacs-4/contrib/packages/bcms-ui-wizard/bcms-ui-wizard.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/bcms-ui-wizard.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/bcms-ui-wizard.info	14 May 2003 15:36:17 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/bcms-ui-wizard.info	11 Dec 2003 21:39:42 -0000	1.2
@@ -11,7 +11,7 @@
         <owner url="mailto:">Jun Yamog</owner>
         <summary>A BCMS UI implementation that makes use of wizard</summary>
         <release-date>2003-04-26</release-date>
-        <description format="text/html">A BCMS UI implementation that makes use of wizard</description>
+        <description format="text/html">A BCMS UI implementation that makes use of wizard.</description>
 
         <requires url="bcms" version="0.2"/>
 
Index: openacs-4/contrib/packages/classified-ads/classified-ads.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/classified-ads.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/contrib/packages/classified-ads/classified-ads.info	21 Aug 2003 02:02:51 -0000	1.4
+++ openacs-4/contrib/packages/classified-ads/classified-ads.info	11 Dec 2003 21:39:42 -0000	1.5
@@ -10,7 +10,7 @@
     <version name="0.5" url="http://openacs.org/repository/download/apm/classified-ads-0.5.apm">
         <owner url="mailto:rmello@fslc.usu.edu">Roberto Mello</owner>
         <owner url="mailto:deds@infiniteinfo.com">Deds Castillo</owner>
-        <summary>Classified Ads Package</summary>
+        <summary>User entered classified ads.</summary>
         <release-date>2003-08-08</release-date>
         <vendor url="http://www.infiniteinfo.com">Infiniteinfo</vendor>
         <description format="text/plain">This package implements a generic classified ads module using the content repository. It features categorization, adding of custom fields, etc.</description>
Index: openacs-4/contrib/packages/events/events.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/events.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/contrib/packages/events/events.info	13 Oct 2003 13:23:47 -0000	1.6
+++ openacs-4/contrib/packages/events/events.info	11 Dec 2003 21:39:42 -0000	1.7
@@ -13,7 +13,7 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:michael@steigman.net">Michael Steigman</owner>
-        <summary>This software module gives organizations a way to register people for events such as a lecture series or a social gathering online.</summary>
+        <summary>Event registration and management such as a lecture series or a social gathering online.</summary>
         <description format="text/html">Organizations often have a number of set events which they like to repeat. For example, a company may have a certain presentation which it makes over and over. A photoraphy club may hold monthly outings. A marathon race could occur annually. The Events package provides a way to coordinate activities, venues, and users via a web page. This is a port of the ACS Classic 3.x events package originally written by Arsdigita. See package documentation for more info.
         </description>
 
Index: openacs-4/contrib/packages/form-to-mail/form-to-mail.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/form-to-mail/form-to-mail.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/form-to-mail/form-to-mail.info	30 Jul 2003 21:09:55 -0000	1.1
+++ openacs-4/contrib/packages/form-to-mail/form-to-mail.info	11 Dec 2003 21:39:42 -0000	1.2
@@ -12,14 +12,12 @@
         <owner url="http://www.redmonk.net/monkinetic">Steve Ivy</owner>
         <summary>Form-to-Email Handling</summary>
         <release-date>2003-07-09</release-date>
-        <description format="text/html">&lt;p&gt;The Form-To-Mail package is designed to work somewhat like formmail.pl - the user enters information into an HTML form on a page, and upon submitting the page the data is collected and emailed to an address
- of the administrator&amp;#39;s choosing.
-&lt;/p&gt;
-          &lt;p&gt;Form-to-Mail (FTM) is designed with reuse, and hopefully some security, in mind. Email addresses such as sender and recipient are configured by the administrator, stored in the database, and cannnot be overridden by form variables, whic
-h limits abuse of the form by third parties.
-&lt;/p&gt;
-          &lt;p&gt;FTM is designed to be included on other pages in the site, and provides a facility for adding custom form elements to the form, using a .tcl file that can be as simple or complex as the developer requires. The package uses a single inst
-ance to generate the included HTML form, and to process the submitted form.
+        <description format="text/html">&lt;p&gt;The Form-To-Mail package is designed to work somewhat like formmail.pl - the user enters information into an HTML form on a page, and upon submitting the page the data is collected and emailed to an address
+ of the administrator&amp;#39;s choosing.
+&lt;/p&gt;
+          &lt;p&gt;Form-to-Mail (FTM) is designed with reuse, and hopefully some security, in mind. Email addresses such as sender and recipient are configured by the administrator, stored in the database, and cannnot be overridden by form variables, which limits abuse of the form by third parties.
+&lt;/p&gt;
+          &lt;p&gt;FTM is designed to be included on other pages in the site, and provides a facility for adding custom form elements to the form, using a .tcl file that can be as simple or complex as the developer requires. The package uses a single instance to generate the included HTML form, and to process the submitted form.
 &lt;/p&gt;</description>
 
         <provides url="form-to-mail" version="1.0b1"/>
Index: openacs-4/contrib/packages/general-comments/general-comments.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/Attic/general-comments.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/general-comments/general-comments.info	5 Jun 2003 00:48:39 -0000	1.2
+++ openacs-4/contrib/packages/general-comments/general-comments.info	11 Dec 2003 21:39:42 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="general-comments" url="http://www.arsdgita.com/acs-repository/apm/packages/general-comments" type="apm_application">
+<package key="general-comments" url="http://openacs.org/apm/packages/general-comments" type="apm_application">
     <package-name>General Comments</package-name>
     <pretty-plural>General Comments</pretty-plural>
     <initial-install-p>f</initial-install-p>
@@ -14,10 +14,10 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
-        <summary>Provides commenting facility on objects.</summary>
+        <summary>CONTRIB: Provides commenting facility on objects.</summary>
         <release-date>2003-01-30</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
-
+        <description format="text/html">Modified version of the standard general comments package</description>
         <provides url="general-comments" version="4.2"/>
         <requires url="acs-kernel" version="4.6"/>
 
Index: openacs-4/contrib/packages/irc-logger/irc-logger.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/irc-logger/irc-logger.info,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/irc-logger/irc-logger.info	10 Mar 2003 20:27:32 -0000	1.3
+++ openacs-4/contrib/packages/irc-logger/irc-logger.info	11 Dec 2003 21:39:42 -0000	1.4
@@ -13,7 +13,7 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:bart.teeuwisse@thecodemill.biz">Bart Teeuwisse</owner>
-        <summary>The IRC logger places the log files of logger (a Perl script by Dave Beckett) into ETP for integration with OpenACS.</summary>
+        <summary>The IRC logger uses the logger perl script to feed ETP for integration with OpenACS.</summary>
         <release-date>2003-02-21</release-date>
         <vendor url="http://www.thecodemill.biz/">the Code Mill</vendor>
         <description format="text/html">The IRC logger places the log files of &lt;a href=&quot;http://cvs.ilrt.org/cvsweb/redland/logger/&quot;&gt;logger&lt;/a&gt; (a Perl script by Dave Beckett) into ETP for integration with OpenACS. Besides logger, this package also depends on &lt;a href=&quot;http://www.tdom.org/&quot;&gt;tDOM&lt;/a&gt; (high performance XML data processing with easy and powerful Tcl scripting functionality).</description>
Index: openacs-4/contrib/packages/jabber/jabber.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/jabber/Attic/jabber.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/jabber/jabber.info	1 Oct 2003 04:35:33 -0000	1.1
+++ openacs-4/contrib/packages/jabber/jabber.info	11 Dec 2003 21:39:43 -0000	1.2
@@ -13,7 +13,7 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:msussdorff@sussdorff-roy.com">Sussdorff-Roy GbR</owner>
-        <summary>Package for comunication based on Jabber Server.</summary>
+        <summary>Package for Messaging based on the Jabber Server.</summary>
         <release-date>2003-03-06</release-date>
         <vendor url="http://www.sussdorff-roy.com">Sussdorff-Roy GbR</vendor>
         <description format="text/plain">This package allows users to communicate through the different IM services with other users using the jabber server.</description>
Index: openacs-4/contrib/packages/mail-links/mail-links.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/mail-links/mail-links.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/mail-links/mail-links.info	1 Oct 2003 04:58:31 -0000	1.1
+++ openacs-4/contrib/packages/mail-links/mail-links.info	11 Dec 2003 21:39:43 -0000	1.2
@@ -10,8 +10,8 @@
 
     <version name="0.1d" url="http://openacs.org/repository/download/apm/mail-links-0.1d.apm">
         <owner url="mailto:timo@studio-k4.de">Timo Hentschel</owner>
-        <summary>The Clickthrough package provides a service that allows a site to monitor how its users exit the site, by recording which email-links are followed to external sites.</summary>
-        <description format="text/plain">The Clickthrough package provides a service that allows a site to monitor how its users exit the site, by recording which email-links are followed to external sites.</description>
+        <summary>Record which email-links are followed to external sites.</summary>
+        <description format="text/plain">The Mail Clickthrough package provides a service that allows a site to monitor how its users exit the site, by recording which email-links are followed to external sites.</description>
 
         <provides url="mail-links" version="0.1d"/>
         <requires url="acs-kernel" version="4.6.2"/>
Index: openacs-4/contrib/packages/mailing-lists/mailing-lists.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/mailing-lists/mailing-lists.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/mailing-lists/mailing-lists.info	1 Oct 2003 05:38:54 -0000	1.2
+++ openacs-4/contrib/packages/mailing-lists/mailing-lists.info	11 Dec 2003 21:39:43 -0000	1.3
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="mailing-lists" url="http://www.arsdigita.com/acs-repository/apm/packages/mailing-lists/" type="apm_application">
+<package key="mailing-lists" url="http://openacs.org/repository/apm/packages/mailing-lists/" type="apm_application">
     <package-name>Mailing List</package-name>
     <pretty-plural>Mailing Lists</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.0" url="http://www.arsdigita.com/acs-repository/download/apm/mailing-lists.apm">
+    <version name="1.0" url="http://openacs.org/repository/download/apm/mailing-lists.apm">
         <owner url="mailto:timo@studio-k4.de">Timo Hentschel</owner>
-        <summary>ACS 4 mailing list package.</summary>
+        <summary>Mailing list management.</summary>
         <release-date>2003-02-27</release-date>
-        <vendor url="http://www.sussdorff-roy.de/">Sussdorff-Roy</vendor>
+        <vendor url="http://www.sussdorff-roy.com">Sussdorff-Roy GbR</vendor>
         <description format="text/plain">First version of mailing lists.</description>
 
         <provides url="mailing-lists" version="1.0"/>
Index: openacs-4/contrib/packages/photobook/photobook.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/photobook/photobook.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/photobook/photobook.info	3 Nov 2003 20:10:55 -0000	1.1
+++ openacs-4/contrib/packages/photobook/photobook.info	11 Dec 2003 21:39:43 -0000	1.2
@@ -12,13 +12,13 @@
         <owner url="http://xarg.net/">Jeff Davis</owner>
         <summary>Enter, manage, and present user data appropriate for a &quot;face book&quot;</summary>
         <release-date>2003-11-03</release-date>
-        <description format="text/plain">Enter, manage, and present user data appropriate for 
-generation of a &quot;facebook&quot; or general user profile.
-Allows upload of a photo portrait as well as general education/work history.
-
-PLEASE NOTE - although this module is in use at Sloan, it is far from finished.  Sloan still plans to add many features, including the ability to dynamically manage fields and categories, and awareness of user types.  In addition the package needs to be internationalized and ported to Postgres.  There is also Sloan-specific code here, related to the Email For Life program, which needs to be parameterized or removed.
-
-In short, this package is provided more for looking at than for using;  it will change significantly in future releases.  </description>
+        <description format="text/plain">Enter, manage, and present user data appropriate for 
+generation of a &quot;facebook&quot; or general user profile.
+Allows upload of a photo portrait as well as general education/work history.
+&lt;p&gt;
+PLEASE NOTE - although this module is in use at Sloan, it is far from finished.  Sloan still plans to add many features, including the ability to dynamically manage fields and categories, and awareness of user types.  In addition the package needs to be internationalized and ported to Postgres.  There is also Sloan-specific code here, related to the Email For Life program, which needs to be parameterized or removed.
+&lt;p&gt;
+In short, this package is provided more for looking at than for using and will change significantly in future releases.</description>
 
         <!-- No dependency information -->
 
Index: openacs-4/contrib/packages/populate/populate.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/populate/populate.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/populate/populate.info	27 Jan 2003 20:23:01 -0000	1.1
+++ openacs-4/contrib/packages/populate/populate.info	11 Dec 2003 21:39:43 -0000	1.2
@@ -13,8 +13,8 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
-        <summary>Populate database</summary>
-        <description format="text/plain">This package provides a convenient web-based UI which allows one to populate the database with large numbers of users, groups, etc.</description>
+        <summary>Populate database with test data.</summary>
+        <description format="text/plain">This package provides a convenient web-based UI which allows one to populate the database with large numbers of users, groups, etc for scalability testing.</description>
 
         <!-- No dependency information -->
 
Index: openacs-4/contrib/packages/populate/tcl/populate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/populate/tcl/populate-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/populate/tcl/populate-procs.tcl	17 Feb 2003 03:04:55 -0000	1.2
+++ openacs-4/contrib/packages/populate/tcl/populate-procs.tcl	11 Dec 2003 21:39:44 -0000	1.3
@@ -25,7 +25,8 @@
              apm_package_create_instance -package_id $package_id subsite_$package_id $context_id acs-subsite
              site_node::mount -node_id $node_id -object_id $package_id
              site_node::update_cache -node_id $node_id
-             apm_package_call_post_instantiation_proc $package_id acs-subsite
+             apm_invoke_callback_proc -package_key acs-subsite -type "after-instantiate" -arg_list [list package_id $package_id]
+             # apm_package_call_post_instantiation_proc $package_id acs-subsite
          }
 
          # Fill in the subtree
Index: openacs-4/contrib/packages/portal/portal.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/portal.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/portal.info	31 Oct 2002 04:06:25 -0000	1.2
+++ openacs-4/contrib/packages/portal/portal.info	11 Dec 2003 21:39:44 -0000	1.3
@@ -16,7 +16,7 @@
         <owner url="mailto:yon@openforce.net">yon</owner>
         <summary>Portals</summary>
         <release-date>2001-02-20</release-date>
-        <vendor url="http://openforce.net/">OpenForce, Inc.</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/plain">Portals are used to aggregate content from different sources within a single page.  Props to Ian Baker for &quot;Portal&quot;.</description>
 
         <provides url="portal" version="0.9"/>
Index: openacs-4/contrib/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v
diff -u -N -r1.12 -r1.13
--- openacs-4/contrib/packages/project-manager/project-manager.info	8 Oct 2003 21:37:09 -0000	1.12
+++ openacs-4/contrib/packages/project-manager/project-manager.info	11 Dec 2003 21:39:44 -0000	1.13
@@ -9,26 +9,27 @@
     
     <version name="0.25d" url="http://openacs.org/repository/download/apm/project-manager-0.25d.apm">
         <owner url="mailto:jader@bread.com">Jade Rubick</owner>
-        <summary>Project management for OpenACS</summary>
+        <summary>Project management tool for OpenACS</summary>
         <release-date>2003-10-08</release-date>
-        <description format="text/plain">http://openacs.org/projects/dotwrk/project_management/</description>
+        <description format="text/plain">Track tasks, estimates and actual progress for a project.  See the &lt;a href="http://openacs.org/projects/dotwrk/project_management/"&gt;project page&lt;/a&gt; for more information.</description>
 
         <provides url="project-manager" version="0.25d"/>
         <requires url="acs-templating" version="4.6.4"/>
+        <requires url="categories" version="0.1d"/>
         <requires url="general-comments" version="4.0"/>
 
         <callbacks>
-            <callback type="after-instantiate"  proc="project_manager::install::package_instantiate"/>
             <callback type="before-uninstantiate"  proc="project_manager::install::package_uninstantiate"/>
+            <callback type="after-instantiate"  proc="project_manager::install::package_instantiate"/>
         </callbacks>
         <parameters>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ProjectName"  default="Project" description="What projects should be refered to as" section_name="terminology"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TaskName"  default="Task" description="What tasks should be refered to as" section_name="terminology"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseGoalP"  default="1" description="If set to 1, then shows the option of including project goals" section_name="projects"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseUserProjectCodesP"  default="1" description="If set to 1, then the user can set user-specified project codes. Otherwise, not shown" section_name="projects"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseUncertainCompletionTimesP"  default="1" description="Uses PERT-style completion times, which factors in uncertainty into calculations and allows for probability estimates for on-time project completion. Set to 1 to use." section_name="PERT"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="taskname"  default="task" description="Lower case terminology for task" section_name="terminology"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseUserProjectCodesP"  default="1" description="If set to 1, then the user can set user-specified project codes. Otherwise, not shown" section_name="projects"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="projectname"  default="project" description="Lower case terminology for project" section_name="terminology"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ProjectName"  default="Project" description="What projects should be refered to as" section_name="terminology"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TaskName"  default="Task" description="What tasks should be refered to as" section_name="terminology"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="taskname"  default="task" description="Lower case terminology for task" section_name="terminology"/>
         </parameters>
 
     </version>
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-drop.sql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-drop.sql	15 Sep 2003 23:09:56 -0000	1.10
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-drop.sql	11 Dec 2003 21:39:44 -0000	1.11
@@ -1,151 +1,159 @@
--- packages/project-manager/sql/project-manager-drop.sql
--- drop script
---
--- @author jade@bread.com
--- @creation-date 2003-05-15
--- @cvs-id $Id$
---
-
---------
--- TASKS
---------
-
--- task dependency types
-drop table pm_task_dependency_types cascade;
-drop table pm_task_dependency cascade;
-drop sequence pm_task_dependency_seq;
-drop sequence pm_tasks_number_seq;
-
--------------
--- WORKGROUPS
--------------
-
-drop sequence pm_workgroup_seq;
-drop table pm_workgroup_parties;
-drop table pm_workgroup;
-
-------------
--- PROCESSES
-------------
-
-drop sequence pm_process_seq;
-drop sequence pm_process_task_seq;
-drop sequence pm_process_task_dependency_seq;
-
-drop table pm_process_task_assignment;
-drop table pm_process_task_dependency;
-drop table pm_process_task;
-drop table pm_process;
-
----------
--- OTHERS
----------
-drop table pm_default_roles;
-drop table pm_project_assignment;
-drop table pm_task_assignment;
-drop table pm_roles;
-drop sequence pm_role_seq;
-
-
-create function inline_0 ()
-returns integer as '
-declare
-    v_item RECORD;
-        
-begin
-        for v_item in select 
-                item_id
-                from 
-                cr_items
-                where 
-                content_type = ''pm_task''
-        LOOP
-                PERFORM pm_task__delete_task_item(v_item.item_id);
-        end loop;
-
-    return 0;
-end;
-' language 'plpgsql';
-
-select inline_0();
-drop function inline_0();
-
-select drop_package('pm_task');
-
-
------------
--- PROJECTS
------------
-
---drop permissions
-delete from acs_permissions where object_id in (select project_id from pm_projects);
-
--- unregister content_types from folder
-create function inline_0 ()
-returns integer as '
-declare
-    v_folder_id	  cr_folders.folder_id%TYPE;
-    v_item_id     cr_items.item_id%TYPE;
-    v_item_cursor RECORD;
-begin
-
-    -- delete all contents of projects folder
-    FOR v_item_cursor IN
-        select
-        item_id
-        from
-        cr_items
-        where
-        content_type = ''pm_project''
-    LOOP
-       	PERFORM pm_project__delete_project_item(v_item_cursor.item_id);
-    END LOOP;
-
-    select content_item__get_id(''projects'', null, ''f'') into v_folder_id from dual;
-
-    -- unregister_content_types
-    PERFORM content_folder__unregister_content_type (
-        v_folder_id,		-- folder_id
-        ''pm_project'',		-- content_type
-        ''t''			-- include_subtypes
-    );
-
-    -- this table must not hold reference to ''pm_project'' type
-    delete from cr_folder_type_map where content_type = ''pm_project'';
-
-    -- delete projects folder
-    PERFORM content_folder__delete(v_folder_id);
-
-    -- delete the content folders
-    FOR v_item_cursor IN
-        select f.folder_id 
-        from   cr_folders f, 
-               cr_items   i
-        where  f.folder_id = i.item_id and 
-               description = ''Project Repository''
-    LOOP
-       	PERFORM content_item__delete(v_item_cursor.folder_id);
-    END LOOP;
-
-    return 0;
-end;
-' language 'plpgsql';
-
-select inline_0();
-drop function inline_0();
-
--- drop package, which drops all functions created with define_function_args
-select drop_package('pm_project');
-
---drop table
-drop table pm_projects cascade;
-
-select content_type__drop_type('pm_task', 't', 'f');
-
-drop table pm_tasks cascade;
-drop table pm_tasks_revisions cascade;
-
-select content_type__drop_type('pm_project', 't', 'f');
-
--- note that the Project Repository folder is not deleted
-
+-- packages/project-manager/sql/project-manager-drop.sql
+-- drop script
+--
+-- @author jade@bread.com
+-- @creation-date 2003-05-15
+-- @cvs-id $Id$
+--
+
+--------
+-- TASKS
+--------
+
+-- task dependency types
+drop table pm_task_dependency_types cascade;
+drop table pm_task_dependency cascade;
+drop sequence pm_task_dependency_seq;
+drop sequence pm_tasks_number_seq;
+
+-------------
+-- WORKGROUPS
+-------------
+
+drop sequence pm_workgroup_seq;
+drop table pm_workgroup_parties;
+drop table pm_workgroup;
+
+------------
+-- PROCESSES
+------------
+
+drop sequence pm_process_seq;
+drop sequence pm_process_task_seq;
+drop sequence pm_process_task_dependency_seq;
+
+drop table pm_process_task_assignment;
+drop table pm_process_task_dependency;
+drop table pm_process_task;
+drop table pm_process;
+
+---------
+-- OTHERS
+---------
+drop table pm_default_roles;
+drop table pm_project_assignment;
+drop table pm_task_assignment;
+drop table pm_roles;
+drop sequence pm_role_seq;
+
+
+create function inline_0 ()
+returns integer as '
+declare
+    v_item RECORD;
+        
+begin
+        for v_item in select 
+                item_id
+                from 
+                cr_items
+                where 
+                content_type = ''pm_task''
+        LOOP
+                PERFORM pm_task__delete_task_item(v_item.item_id);
+        end loop;
+
+    return 0;
+end;
+' language 'plpgsql';
+
+select inline_0();
+drop function inline_0();
+
+select drop_package('pm_task');
+
+
+-----------
+-- PROJECTS
+-----------
+
+--drop permissions
+delete from acs_permissions where object_id in (select project_id from pm_projects);
+
+-- unregister content_types from folder
+create function inline_0 ()
+returns integer as '
+declare
+    v_folder_id	  cr_folders.folder_id%TYPE;
+    v_item_id     cr_items.item_id%TYPE;
+    v_item_cursor RECORD;
+begin
+
+    -- delete all contents of projects folder
+    FOR v_item_cursor IN
+        select
+        item_id
+        from
+        cr_items
+        where
+        content_type = ''pm_project''
+    LOOP
+       	PERFORM pm_project__delete_project_item(v_item_cursor.item_id);
+    END LOOP;
+
+    select content_item__get_id(''projects'', null, ''f'') into v_folder_id from dual;
+
+    -- unregister_content_types
+    PERFORM content_folder__unregister_content_type (
+        v_folder_id,		-- folder_id
+        ''pm_project'',		-- content_type
+        ''t''			-- include_subtypes
+    );
+
+    -- this table must not hold reference to ''pm_project'' type
+    delete from cr_folder_type_map where content_type = ''pm_project'';
+
+    -- delete projects folder
+    PERFORM content_folder__delete(v_folder_id);
+
+    -- delete the content folders
+    FOR v_item_cursor IN
+        select f.folder_id 
+        from   cr_folders f, 
+               cr_items   i
+        where  f.folder_id = i.item_id and 
+               description = ''Project Repository''
+    LOOP
+       	PERFORM content_item__delete(v_item_cursor.folder_id);
+    END LOOP;
+
+    return 0;
+end;
+' language 'plpgsql';
+
+select inline_0();
+drop function inline_0();
+
+-- drop package, which drops all functions created with define_function_args
+select drop_package('pm_project');
+
+--drop table
+drop table pm_projects cascade;
+
+drop sequence pm_project_status_seq;
+drop table pm_project_status;
+
+drop table pm_project_category_map;
+
+drop sequence pm_project_category_seq;
+drop table pm_project_category;
+
+select content_type__drop_type('pm_task', 't', 'f');
+
+drop table pm_tasks cascade;
+drop table pm_tasks_revisions cascade;
+
+select content_type__drop_type('pm_project', 't', 'f');
+
+-- note that the Project Repository folder is not deleted
+
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-functions-create.sql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql	26 Nov 2003 13:33:23 -0000	1.9
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql	11 Dec 2003 21:39:44 -0000	1.10
@@ -36,30 +36,30 @@
 create function pm_project__new_root_folder (integer)
 returns integer as '
 declare
-	p_package_id		alias for $1;
+        p_package_id            alias for $1;
 
-	v_folder_id		cr_folders.folder_id%TYPE;
-	v_folder_name		cr_items.name%TYPE;
+        v_folder_id             cr_folders.folder_id%TYPE;
+        v_folder_name           cr_items.name%TYPE;
 begin
 
         -- raise notice ''in new root folder'';
 
-	-- Set the folder name
-	v_folder_name := pm_project__new_unique_name (p_package_id);
+        -- Set the folder name
+        v_folder_name := pm_project__new_unique_name (p_package_id);
 
-	v_folder_id := content_folder__new (
-	    v_folder_name,				-- name
-	    ''Projects'',				-- label
-	    ''Project Repository'',			-- description
-	    null                                        -- parent_id
-	);
+        v_folder_id := content_folder__new (
+            v_folder_name,                              -- name
+            ''Projects'',                               -- label
+            ''Project Repository'',                     -- description
+            null                                        -- parent_id
+        );
 
-	-- Register the standard content types
+        -- Register the standard content types
         PERFORM content_folder__register_content_type (
                 v_folder_id,            -- folder_id
                 ''pm_project'',         -- content_type
                 ''f''                   -- include_subtypes
-	);
+        );
 
         -- there is no facility in the API for adding in the package_id,
         -- so we have to do it ourselves
@@ -68,9 +68,9 @@
         set package_id = p_package_id 
         where folder_id = v_folder_id;
 
-	-- TODO: Handle Permissions here for this folder.
+        -- TODO: Handle Permissions here for this folder.
 
-	return v_folder_id;
+        return v_folder_id;
 end;' language 'plpgsql';
 
 
@@ -83,32 +83,32 @@
 create function pm_project__get_root_folder (integer, boolean)
 returns integer as '
 declare
-	p_package_id		alias for $1;
+        p_package_id            alias for $1;
         p_create_if_not_present_p alias for $2;
 
-	v_folder_id		cr_folders.folder_id%TYPE;
-	v_count			integer;
+        v_folder_id             cr_folders.folder_id%TYPE;
+        v_count                 integer;
 begin
 
         -- raise notice ''in get root folder p_create_if_not_present_p = %'',p_create_if_not_present_p;
 
-	select count(*) into v_count
-	from cr_folders
-	where package_id = p_package_id;
+        select count(*) into v_count
+        from cr_folders
+        where package_id = p_package_id;
 
         -- raise notice ''count is % for package_id %'', v_count, p_package_id;
 
-	if v_count > 1 then
+        if v_count > 1 then
                 raise exception ''More than one project repository for this application instance'';
-	elsif v_count = 1 then
+        elsif v_count = 1 then
                 select folder_id into v_folder_id
                 from cr_folders 
                 where package_id = p_package_id;
-	else
+        else
                 if p_create_if_not_present_p = true then
-        		-- Must be a new instance.  Create a new root folder.
+                        -- Must be a new instance.  Create a new root folder.
                         raise notice ''creating a new root repository folder'';
-	        	v_folder_id := pm_project__new_root_folder(p_package_id);
+                        v_folder_id := pm_project__new_root_folder(p_package_id);
                 else
                         -- raise notice ''setting to null'';
                         v_folder_id := null;
@@ -117,7 +117,7 @@
 
         -- raise notice ''v_folder_id is %'', v_folder_id;
 
-	return v_folder_id;
+        return v_folder_id;
 
 end; ' language 'plpgsql';
 
@@ -130,49 +130,51 @@
 -- is null.  Otherwise a project folder will be created as a sub-folder
 -- of an existing project folder.
 
-select define_function_args('pm_project__new_project_item', 'project_id, project_name, project_code, parent_id, goal, description, planned_start_date, planned_end_date, actual_start_date, actual_end_date, ongoing_p, creation_date, creation_user, creation_ip, package_id');
+select define_function_args('pm_project__new_project_item', 'project_id, project_name, project_code, parent_id, goal, description, planned_start_date, planned_end_date, actual_start_date, actual_end_date, ongoing_p, status_id, creation_date, creation_user, creation_ip, package_id');
 
 create function pm_project__new_project_item (
-	integer,        -- project_id
-	varchar,        -- project_name
-	varchar,        -- project_code
-	integer,        -- parent_id
-	varchar,        -- goal
-	varchar,        -- description
-	timestamptz,    -- planned_start_date
-	timestamptz,    -- planned_end_date
-	timestamptz,    -- actual_start_date
-	timestamptz,    -- actual_end_date
-	char(1),        -- ongoing_p
-	timestamptz,    -- creation_date
-	integer,        -- creation_user
-	varchar,        -- creation_ip
-	integer         -- package_id
+        integer,        -- project_id
+        varchar,        -- project_name
+        varchar,        -- project_code
+        integer,        -- parent_id
+        varchar,        -- goal
+        varchar,        -- description
+        timestamptz,    -- planned_start_date
+        timestamptz,    -- planned_end_date
+        timestamptz,    -- actual_start_date
+        timestamptz,    -- actual_end_date
+        char(1),        -- ongoing_p
+        integer,        -- status_id
+        timestamptz,    -- creation_date
+        integer,        -- creation_user
+        varchar,        -- creation_ip
+        integer         -- package_id
 ) returns integer 
 as '
 declare
-	p_project_id				alias for $1;
-	p_project_name				alias for $2;
-	p_project_code				alias for $3;
-	p_parent_id				alias for $4;
-	p_goal					alias for $5;
-	p_description				alias for $6;
-	p_planned_start_date			alias for $7;
-	p_planned_end_date			alias for $8;
-	p_actual_start_date			alias for $9;
-	p_actual_end_date			alias for $10;
-	p_ongoing_p				alias for $11;
-	p_creation_date				alias for $12;
-	p_creation_user				alias for $13;
-	p_creation_ip				alias for $14;
-	p_package_id				alias for $15;
+        p_project_id                            alias for $1;
+        p_project_name                          alias for $2;
+        p_project_code                          alias for $3;
+        p_parent_id                             alias for $4;
+        p_goal                                  alias for $5;
+        p_description                           alias for $6;
+        p_planned_start_date                    alias for $7;
+        p_planned_end_date                      alias for $8;
+        p_actual_start_date                     alias for $9;
+        p_actual_end_date                       alias for $10;
+        p_ongoing_p                             alias for $11;
+        p_status_id                             alias for $12;
+        p_creation_date                         alias for $13;
+        p_creation_user                         alias for $14;
+        p_creation_ip                           alias for $15;
+        p_package_id                            alias for $16;
 
-	v_item_id		cr_items.item_id%TYPE;
-	v_revision_id		cr_revisions.revision_id%TYPE;
-	v_id			cr_items.item_id%TYPE;
-	v_parent_id		cr_items.parent_id%TYPE;
+        v_item_id               cr_items.item_id%TYPE;
+        v_revision_id           cr_revisions.revision_id%TYPE;
+        v_id                    cr_items.item_id%TYPE;
+        v_parent_id             cr_items.parent_id%TYPE;
 begin
-	select acs_object_id_seq.nextval into v_id from dual;
+        select acs_object_id_seq.nextval into v_id from dual;
 
         v_parent_id := pm_project__get_root_folder (p_package_id, ''t'');
 
@@ -185,64 +187,64 @@
 
         -- raise notice ''v_parent_id (%) p_parent_id (%)'', v_parent_id, p_parent_id;
 
-	v_item_id := content_item__new (
-		v_id::varchar,	        -- name
-		v_parent_id,		-- parent_id
-		v_id,			-- item_id
-		null,			-- locale
-		now(),			-- creation_date
-		p_creation_user,	-- creation_user
-		p_parent_id,		-- context_id
-		p_creation_ip,		-- creation_ip
-		''content_item'',	-- item_subtype
-		''pm_project'',		-- content_type
-		p_project_name,		-- title
-		p_description,		-- description
-		''text/plain'',		-- mime_type
-		null,			-- nls_language
-		null			-- data
-	);
+        v_item_id := content_item__new (
+                v_id::varchar,          -- name
+                v_parent_id,            -- parent_id
+                v_id,                   -- item_id
+                null,                   -- locale
+                now(),                  -- creation_date
+                p_creation_user,        -- creation_user
+                p_parent_id,            -- context_id
+                p_creation_ip,          -- creation_ip
+                ''content_item'',       -- item_subtype
+                ''pm_project'',         -- content_type
+                p_project_name,         -- title
+                p_description,          -- description
+                ''text/plain'',         -- mime_type
+                null,                   -- nls_language
+                null                    -- data
+        );
 
-	v_revision_id := content_revision__new (
-		p_project_name,		-- title
-		p_description,		-- description
-		now(),			-- publish_date
-		''text/plain'',		-- mime_type
-		NULL,			-- nls_language
-		NULL,			-- data
-		v_item_id,		-- item_id
-		NULL,			-- revision_id
-		now(),			-- creation_date
-		p_creation_user,	-- creation_user
-		p_creation_ip		-- creation_ip
-	);
+        v_revision_id := content_revision__new (
+                p_project_name,         -- title
+                p_description,          -- description
+                now(),                  -- publish_date
+                ''text/plain'',         -- mime_type
+                NULL,                   -- nls_language
+                NULL,                   -- data
+                v_item_id,              -- item_id
+                NULL,                   -- revision_id
+                now(),                  -- creation_date
+                p_creation_user,        -- creation_user
+                p_creation_ip           -- creation_ip
+        );
 
-	PERFORM content_item__set_live_revision (v_revision_id);
+        PERFORM content_item__set_live_revision (v_revision_id);
 
-	insert into pm_projects (
-		project_id, project_code, 
-		goal, planned_start_date, 
-		planned_end_date, actual_start_date, actual_end_date, 
-		ongoing_p, estimated_finish_date, 
+        insert into pm_projects (
+                project_id, project_code, 
+                goal, planned_start_date, 
+                planned_end_date, actual_start_date, actual_end_date, 
+                ongoing_p, estimated_finish_date, 
                 earliest_finish_date, latest_finish_date,
                 actual_hours_completed, 
-                estimated_hours_total) 
-	values (
-		v_revision_id, p_project_code, 
-		p_goal, p_planned_start_date, 
-		p_planned_end_date, p_actual_start_date, 
-		p_actual_end_date, p_ongoing_p, p_planned_end_date,
+                estimated_hours_total, status_id) 
+        values (
+                v_revision_id, p_project_code, 
+                p_goal, p_planned_start_date, 
+                p_planned_end_date, p_actual_start_date, 
+                p_actual_end_date, p_ongoing_p, p_planned_end_date,
                 p_planned_end_date, p_planned_end_date, ''0'',
-                ''0''
+                ''0'', p_status_id
                 );
 
-	PERFORM acs_permission__grant_permission(
-		v_revision_id,
-		p_creation_user,
-		''admin''
-	);
+        PERFORM acs_permission__grant_permission(
+                v_revision_id,
+                p_creation_user,
+                ''admin''
+        );
 
-	return v_revision_id;
+        return v_revision_id;
 end;' language 'plpgsql';
 
 
@@ -253,13 +255,13 @@
 create or replace function pm_project__delete_project_item (integer)
 returns integer as '
 declare
-	p_project_id				alias for $1;
+        p_project_id                            alias for $1;
         v_child                                 cr_items%ROWTYPE;
 begin
         raise NOTICE ''Deleting pm_project...'';
 
-	delete from acs_permissions
-		where object_id = p_project_id;
+        delete from acs_permissions
+                where object_id = p_project_id;
 
         for v_child in select 
                 item_id
@@ -272,90 +274,92 @@
                 PERFORM pm_project__delete_project_item(v_child.item_id);
         end loop;
 
-	delete from pm_projects
-		where project_id = p_project_id;
+        delete from pm_projects
+                where project_id = p_project_id;
 
         PERFORM content_item__delete(p_project_id);
         return 0;
 end;' language 'plpgsql';
 
 
-select define_function_args('pm_project__new_project_revision', 'item_id, project_name, project_code, parent_id, goal, description, planned_start_date, planned_end_date, actual_start_date, actual_end_date, ongoing_p, creation_date, creation_user, creation_ip, package_id');
+select define_function_args('pm_project__new_project_revision', 'item_id, project_name, project_code, parent_id, goal, description, planned_start_date, planned_end_date, actual_start_date, actual_end_date, ongoing_p, status_id, creation_date, creation_user, creation_ip, package_id');
 
 create function pm_project__new_project_revision (
-	integer,        -- item_id
-	varchar,        -- project_name
-	varchar,        -- project_code
-	integer,        -- parent_id
-	varchar,        -- goal
-	varchar,        -- description
-	timestamptz,    -- planned_start_date
-	timestamptz,    -- planned_end_date
-	timestamptz,    -- actual_start_date
-	timestamptz,    -- actual_end_date
-	char(1),        -- ongoing_p
-	timestamptz,    -- creation_date
-	integer,        -- creation_user
-	varchar,        -- creation_ip
+        integer,        -- item_id
+        varchar,        -- project_name
+        varchar,        -- project_code
+        integer,        -- parent_id
+        varchar,        -- goal
+        varchar,        -- description
+        timestamptz,    -- planned_start_date
+        timestamptz,    -- planned_end_date
+        timestamptz,    -- actual_start_date
+        timestamptz,    -- actual_end_date
+        char(1),        -- ongoing_p
+        integer,        -- status_id
+        timestamptz,    -- creation_date
+        integer,        -- creation_user
+        varchar,        -- creation_ip
         integer         -- package_id
 ) returns integer 
 as '
 declare
-	p_item_id                               alias for $1;
-	p_project_name				alias for $2;
-	p_project_code				alias for $3;
-	p_parent_id				alias for $4;
-	p_goal					alias for $5;
-	p_description				alias for $6;
-	p_planned_start_date			alias for $7;
-	p_planned_end_date			alias for $8;
-	p_actual_start_date			alias for $9;
-	p_actual_end_date			alias for $10;
-	p_ongoing_p				alias for $11;
-	p_creation_date				alias for $12;
-	p_creation_user				alias for $13;
-	p_creation_ip				alias for $14;
-	p_package_id				alias for $15;
+        p_item_id                               alias for $1;
+        p_project_name                          alias for $2;
+        p_project_code                          alias for $3;
+        p_parent_id                             alias for $4;
+        p_goal                                  alias for $5;
+        p_description                           alias for $6;
+        p_planned_start_date                    alias for $7;
+        p_planned_end_date                      alias for $8;
+        p_actual_start_date                     alias for $9;
+        p_actual_end_date                       alias for $10;
+        p_ongoing_p                             alias for $11;
+        p_status_id                             alias for $12;
+        p_creation_date                         alias for $13;
+        p_creation_user                         alias for $14;
+        p_creation_ip                           alias for $15;
+        p_package_id                            alias for $16;
 
-	v_revision_id		cr_revisions.revision_id%TYPE;
+        v_revision_id           cr_revisions.revision_id%TYPE;
 begin
 
         -- the item_id is the project_id
 
-	v_revision_id := content_revision__new (
-		p_project_name,		-- title
-		p_description,		-- description
-		now(),			-- publish_date
-		''text/plain'',		-- mime_type
-		NULL,			-- nls_language
-		NULL,			-- data
-		p_item_id,              -- item_id
-		NULL,			-- revision_id
-		now(),			-- creation_date
-		p_creation_user,	-- creation_user
-		p_creation_ip		-- creation_ip
-	);
+        v_revision_id := content_revision__new (
+                p_project_name,         -- title
+                p_description,          -- description
+                now(),                  -- publish_date
+                ''text/plain'',         -- mime_type
+                NULL,                   -- nls_language
+                NULL,                   -- data
+                p_item_id,              -- item_id
+                NULL,                   -- revision_id
+                now(),                  -- creation_date
+                p_creation_user,        -- creation_user
+                p_creation_ip           -- creation_ip
+        );
 
-	PERFORM content_item__set_live_revision (v_revision_id);
+        PERFORM content_item__set_live_revision (v_revision_id);
 
-	insert into pm_projects (
-		project_id, project_code, 
-		goal, planned_start_date, 
-		planned_end_date, actual_start_date, actual_end_date, 
-		ongoing_p) 
-	values (
-		v_revision_id, p_project_code, 
-		p_goal, p_planned_start_date, 
-		p_planned_end_date, p_actual_start_date, 
-		p_actual_end_date, p_ongoing_p);
+        insert into pm_projects (
+                project_id, project_code, 
+                goal, planned_start_date, 
+                planned_end_date, actual_start_date, actual_end_date, 
+                ongoing_p, status_id) 
+        values (
+                v_revision_id, p_project_code, 
+                p_goal, p_planned_start_date, 
+                p_planned_end_date, p_actual_start_date, 
+                p_actual_end_date, p_ongoing_p, p_status_id);
 
-	PERFORM acs_permission__grant_permission(
-		v_revision_id,
-		p_creation_user,
-		''admin''
-	);
+        PERFORM acs_permission__grant_permission(
+                v_revision_id,
+                p_creation_user,
+                ''admin''
+        );
 
-	return v_revision_id;
+        return v_revision_id;
 end;' language 'plpgsql';
 
 
@@ -367,23 +371,23 @@
 create function pm_project__new_unique_name (integer)
 returns text as '
 declare
-	p_package_id		alias for $1;
+        p_package_id            alias for $1;
 
-	v_name			cr_items.name%TYPE;
-	v_package_key		apm_packages.package_key%TYPE;
-	v_id			integer;
+        v_name                  cr_items.name%TYPE;
+        v_package_key           apm_packages.package_key%TYPE;
+        v_id                    integer;
 begin
-	select package_key into v_package_key from apm_packages
-	    where package_id = p_package_id;
+        select package_key into v_package_key from apm_packages
+            where package_id = p_package_id;
 
-	select acs_object_id_seq.nextval into v_id from dual;
+        select acs_object_id_seq.nextval into v_id from dual;
 
-	-- Set the name
-	select v_package_key || ''_'' || 
-	    to_char(current_timestamp, ''YYYYMMDD'') || ''_'' ||
-	    v_id into v_name;
+        -- Set the name
+        select v_package_key || ''_'' || 
+            to_char(current_timestamp, ''YYYYMMDD'') || ''_'' ||
+            v_id into v_name;
 
-	return v_name;
+        return v_name;
 end;' language 'plpgsql';
 
 ----------------------------------
@@ -421,171 +425,171 @@
 select define_function_args('pm_task__new_task_item', 'task_id, project_id, title, description, end_date, percent_complete, estimated_hours_work, estimated_hours_work_min, estimated_hours_work_max, creation_date, creation_user, creation_ip, package_id');
 
 create function pm_task__new_task_item (
-	integer,        -- task_id
+        integer,        -- task_id
         integer,        -- project_id
         varchar,        -- title
-	varchar,        -- description
-	timestamptz,    -- end_date
+        varchar,        -- description
+        timestamptz,    -- end_date
         numeric,        -- percent_complete
         numeric,        -- estimated_hours_work
         numeric,        -- estimated_hours_work_min
         numeric,        -- estimated_hours_work_max,
-	timestamptz,    -- creation_date
-	integer,        -- creation_user
-	varchar,        -- creation_ip
-	integer         -- package_id
+        timestamptz,    -- creation_date
+        integer,        -- creation_user
+        varchar,        -- creation_ip
+        integer         -- package_id
 ) returns integer 
 as '
 declare
         p_task_id                               alias for $1;
-	p_project_id				alias for $2;
+        p_project_id                            alias for $2;
         p_title                                 alias for $3;
-	p_description				alias for $4;
-	p_end_date                              alias for $5;
+        p_description                           alias for $4;
+        p_end_date                              alias for $5;
         p_percent_complete                      alias for $6;
         p_estimated_hours_work                  alias for $7;
         p_estimated_hours_work_min              alias for $8;
         p_estimated_hours_work_max              alias for $9;
-	p_creation_date				alias for $10;
-	p_creation_user				alias for $11;
-	p_creation_ip				alias for $12;
-	p_package_id				alias for $13;
+        p_creation_date                         alias for $10;
+        p_creation_user                         alias for $11;
+        p_creation_ip                           alias for $12;
+        p_package_id                            alias for $13;
 
-	v_item_id		cr_items.item_id%TYPE;
-	v_revision_id		cr_revisions.revision_id%TYPE;
-	v_id			cr_items.item_id%TYPE;
+        v_item_id               cr_items.item_id%TYPE;
+        v_revision_id           cr_revisions.revision_id%TYPE;
+        v_id                    cr_items.item_id%TYPE;
         v_task_number           integer;
 begin
-	select acs_object_id_seq.nextval into v_id from dual;
+        select acs_object_id_seq.nextval into v_id from dual;
 
         -- We want to put the task under the project item
 
         -- create the task_number
         
-	v_item_id := content_item__new (
-		v_id::varchar,          -- name
-		p_project_id,		-- parent_id
-		v_id,			-- item_id
-		null,			-- locale
-		now(),			-- creation_date
-		p_creation_user,	-- creation_user
+        v_item_id := content_item__new (
+                v_id::varchar,          -- name
+                p_project_id,           -- parent_id
+                v_id,                   -- item_id
+                null,                   -- locale
+                now(),                  -- creation_date
+                p_creation_user,        -- creation_user
                 p_package_id,           -- context_id
-		p_creation_ip,		-- creation_ip
-		''content_item'',	-- item_subtype
-		''pm_task'',            -- content_type
-		p_title,                -- title
-		p_description,		-- description
-		''text/plain'',		-- mime_type
-		null,			-- nls_language
-		null			-- data
-	);
+                p_creation_ip,          -- creation_ip
+                ''content_item'',       -- item_subtype
+                ''pm_task'',            -- content_type
+                p_title,                -- title
+                p_description,          -- description
+                ''text/plain'',         -- mime_type
+                null,                   -- nls_language
+                null                    -- data
+        );
 
-	v_revision_id := content_revision__new (
-		p_title,                -- title
-		p_description,		-- description
-		now(),			-- publish_date
-		''text/plain'',		-- mime_type
-		NULL,			-- nls_language
-		NULL,			-- data
-		v_item_id,		-- item_id
-		NULL,			-- revision_id
-		now(),			-- creation_date
-		p_creation_user,	-- creation_user
-		p_creation_ip		-- creation_ip
-	);
+        v_revision_id := content_revision__new (
+                p_title,                -- title
+                p_description,          -- description
+                now(),                  -- publish_date
+                ''text/plain'',         -- mime_type
+                NULL,                   -- nls_language
+                NULL,                   -- data
+                v_item_id,              -- item_id
+                NULL,                   -- revision_id
+                now(),                  -- creation_date
+                p_creation_user,        -- creation_user
+                p_creation_ip           -- creation_ip
+        );
 
-	PERFORM content_item__set_live_revision (v_revision_id);
+        PERFORM content_item__set_live_revision (v_revision_id);
 
-	insert into pm_tasks (
+        insert into pm_tasks (
                 task_id, task_number)
-	values (
+        values (
                 v_item_id, v_task_number);
 
         insert into pm_tasks_revisions (
                 task_revision_id, end_date, percent_complete, estimated_hours_work, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked)
         values (
                 v_revision_id, p_end_date, p_percent_complete, p_estimated_hours_work, p_estimated_hours_work_min, p_estimated_hours_work_max, ''0'');
 
-	PERFORM acs_permission__grant_permission(
-		v_revision_id,
-		p_creation_user,
-		''admin''
-	);
+        PERFORM acs_permission__grant_permission(
+                v_revision_id,
+                p_creation_user,
+                ''admin''
+        );
 
-	return v_revision_id;
+        return v_revision_id;
 end;' language 'plpgsql';
 
 
 select define_function_args('pm_task__new_task_revision', 'task_id, project_id, title, description, end_date, percent_complete, estimated_hours_work, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked, creation_date, creation_user, creation_ip, package_id');
 
 create function pm_task__new_task_revision (
-	integer,        -- task_id (the item_id)
+        integer,        -- task_id (the item_id)
         integer,        -- project_id
         varchar,        -- title
-	varchar,        -- description
-	timestamptz,    -- end_date
+        varchar,        -- description
+        timestamptz,    -- end_date
         numeric,        -- percent_complete
         numeric,        -- estimated_hours_work
         numeric,        -- estimated_hours_work_min
         numeric,        -- estimated_hours_work_max
         numeric,        -- actual_hours_worked
-	timestamptz,    -- creation_date
-	integer,        -- creation_user
-	varchar,        -- creation_ip
-	integer         -- package_id
+        timestamptz,    -- creation_date
+        integer,        -- creation_user
+        varchar,        -- creation_ip
+        integer         -- package_id
 ) returns integer 
 as '
 declare
         p_task_id                               alias for $1;
-	p_project_id				alias for $2;
+        p_project_id                            alias for $2;
         p_title                                 alias for $3;
-	p_description				alias for $4;
-	p_end_date                              alias for $5;
+        p_description                           alias for $4;
+        p_end_date                              alias for $5;
         p_percent_complete                      alias for $6;
         p_estimated_hours_work                  alias for $7;
         p_estimated_hours_work_min              alias for $8;
         p_estimated_hours_work_max              alias for $9;
         p_actual_hours_worked                   alias for $10;
-	p_creation_date				alias for $11;
-	p_creation_user				alias for $12;
-	p_creation_ip				alias for $13;
-	p_package_id				alias for $14;
+        p_creation_date                         alias for $11;
+        p_creation_user                         alias for $12;
+        p_creation_ip                           alias for $13;
+        p_package_id                            alias for $14;
 
-	v_revision_id		cr_revisions.revision_id%TYPE;
-	v_id			cr_items.item_id%TYPE;
+        v_revision_id           cr_revisions.revision_id%TYPE;
+        v_id                    cr_items.item_id%TYPE;
 begin
-	select acs_object_id_seq.nextval into v_id from dual;
+        select acs_object_id_seq.nextval into v_id from dual;
 
         -- We want to put the task under the project item
 
-	v_revision_id := content_revision__new (
-		p_title,                -- title
-		p_description,		-- description
-		now(),			-- publish_date
-		''text/plain'',		-- mime_type
-		NULL,			-- nls_language
-		NULL,			-- data
-                p_task_id,		-- item_id
-		NULL,			-- revision_id
-		now(),			-- creation_date
-		p_creation_user,	-- creation_user
-		p_creation_ip		-- creation_ip
-	);
+        v_revision_id := content_revision__new (
+                p_title,                -- title
+                p_description,          -- description
+                now(),                  -- publish_date
+                ''text/plain'',         -- mime_type
+                NULL,                   -- nls_language
+                NULL,                   -- data
+                p_task_id,              -- item_id
+                NULL,                   -- revision_id
+                now(),                  -- creation_date
+                p_creation_user,        -- creation_user
+                p_creation_ip           -- creation_ip
+        );
 
-	PERFORM content_item__set_live_revision (v_revision_id);
+        PERFORM content_item__set_live_revision (v_revision_id);
 
         insert into pm_tasks_revisions (
                 task_revision_id, end_date, percent_complete, estimated_hours_work, estimated_hours_work_min, estimated_hours_work_max, actual_hours_worked)
         values (
                 v_revision_id, p_end_date, p_percent_complete, p_estimated_hours_work, p_estimated_hours_work_min, p_estimated_hours_work_max, p_actual_hours_worked);
 
-	PERFORM acs_permission__grant_permission(
-		v_revision_id,
-		p_creation_user,
-		''admin''
-	);
+        PERFORM acs_permission__grant_permission(
+                v_revision_id,
+                p_creation_user,
+                ''admin''
+        );
 
-	return v_revision_id;
+        return v_revision_id;
 end;' language 'plpgsql';
 
 
@@ -596,15 +600,15 @@
 create or replace function pm_task__delete_task_item (integer)
 returns integer as '
 declare
-	p_task_id				alias for $1;
+        p_task_id                               alias for $1;
 begin
         -- will not work because permissions are on revision_id not
         -- item_id
-	-- delete from acs_permissions
-	-- 	where object_id = p_task_id;
+        -- delete from acs_permissions
+        --      where object_id = p_task_id;
 
-	delete from pm_tasks_revisions
-		where task_revision_id in (select revision_id from pm_tasks_revisionsx where item_id = p_task_id);
+        delete from pm_tasks_revisions
+                where task_revision_id in (select revision_id from pm_tasks_revisionsx where item_id = p_task_id);
 
         delete from pm_tasks
                 where task_id = p_task_id;
Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-table-create.sql,v
diff -u -N -r1.15 -r1.16
--- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql	3 Oct 2003 22:21:45 -0000	1.15
+++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-table-create.sql	11 Dec 2003 21:39:44 -0000	1.16
@@ -14,6 +14,25 @@
 
 -- PROJECTS
 
+create sequence pm_project_status_seq start 3;
+
+create table pm_project_status (
+        status_id               integer
+                                constraint pm_project_status_pk
+                                primary key,
+        description             varchar(100),
+        -- closed or open
+        status_type             char(1) default 'c'
+				constraint pm_projects_status_type_ck
+				check (status_type in ('c','o'))
+);
+
+insert into pm_project_status (status_id, description, status_type) values
+(1, 'Open', 'o');
+insert into pm_project_status (status_id, description, status_type) values
+(2, 'Closed', 'c');
+
+
 create table pm_projects (
 	project_id		integer
 				constraint project_manager_id_fk
@@ -27,6 +46,11 @@
 	planned_end_date	timestamptz,
 	actual_start_date  	timestamptz,
 	actual_end_date		timestamptz,
+        status_id               integer
+                                constraint pm_projects_status_id_nn
+                                not null
+                                constraint pm_projects_status_id_fk
+                                references pm_project_status,
 	ongoing_p		char(1) default 'f' 
 				constraint pm_projects_ongoing_p_ck
 				check (ongoing_p in ('t','f')),
@@ -53,10 +77,9 @@
  );
 
 
-
 -- ROLES
 
-create sequence pm_role_seq start 3;
+create sequence pm_role_seq start 4;
 
 create table pm_roles (
         role_id                 integer
@@ -78,15 +101,15 @@
   or task. For example, they could be a manager, or client, or
   participant.. The sort order determines what order it is displayed
   in.  The is_observer_p specifies whether they are directly
-  responsible for the task. People not directly responsible will not
-  get email notifications reminding them that tasks are overdue, for
-  example.
+  responsible for the task, or are just observers on it. 
 ';
 
-insert into pm_roles (role_id, one_line, description, sort_order) values ('1','Participant','Team members who are responsible for the completion of the project','10');
-insert into pm_roles (role_id, one_line, description, sort_order) values ('2','Manager','Manages the team to complete the project or task on time and on budget.','20');
+insert into pm_roles (role_id, one_line, description, sort_order) values ('1','Lead','Team members who are responsible for the completion of the project','10');
+insert into pm_roles (role_id, one_line, description, sort_order) values ('2','Player','A person on the team responsible for completion of the project','20');
 
+insert into pm_roles (role_id, one_line, description, sort_order, is_observer_p) values ('3','Watcher','A person interested in developments, possibly helping out on it.','30','t');
 
+
 create table pm_default_roles (
         role_id                 integer
                                 constraint pm_default_role_fk
Index: openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-postgresql.xql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql	18 Sep 2003 23:33:54 -0000	1.9
+++ openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql	11 Dec 2003 21:39:44 -0000	1.10
@@ -1,5 +1,36 @@
 <?xml version="1.0"?>
 <queryset>
+  <fullquery name="project_query">
+    <querytext>
+        SELECT
+        p.item_id as project_item_id,
+        p.parent_id,
+	p.project_id,
+        p.title as project_name,
+        p.project_code,
+	p.goal,
+	p.description,
+        p.status_id,
+	to_char(p.planned_start_date,'YYYY MM DD') as planned_start_date,
+	to_char(p.planned_end_date,'YYYY MM DD') as planned_end_date,
+	p.ongoing_p
+        FROM
+	pm_projectsx p
+        WHERE 
+        p.item_id    = :project_item_id and
+        p.project_id = :project_id 
+    </querytext>
+  </fullquery>
+
+  <fullquery name="do_nothing">
+    <querytext>
+        SELECT
+        current_timestamp
+        FROM
+	pm_projects
+    </querytext>
+  </fullquery>
+
   <fullquery name="new_project_item">
     <querytext>
 	select pm_project__new_project_item (
@@ -14,6 +45,7 @@
 		null,
 		null,
 		:ongoing_p,
+                :status_id,
 		now(),
 		:user_id,
 		:peeraddr,
@@ -36,6 +68,7 @@
 		null,
 		null,
 		:ongoing_p,
+                :status_id,
 		now(),
 		:user_id,
 		:peeraddr,
@@ -44,27 +77,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="project_query">
-    <querytext>
-        SELECT
-        p.item_id as project_item_id,
-        p.parent_id,
-	p.project_id,
-        p.title as project_name,
-        p.project_code,
-	p.goal,
-	p.description,
-	to_char(p.planned_start_date,'YYYY MM DD') as planned_start_date,
-	to_char(p.planned_end_date,'YYYY MM DD') as planned_end_date,
-	p.ongoing_p
-        FROM
-	pm_projectsx p
-        WHERE 
-        p.item_id    = :project_item_id and
-        p.project_id = :project_id 
-    </querytext>
-  </fullquery>
-
   <fullquery name="get_item_id">
     <querytext>
 	SELECT
@@ -76,4 +88,15 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="get_status_codes">
+    <querytext>
+	SELECT
+        description, status_id
+	FROM
+	pm_project_status
+        ORDER BY
+        status_type desc, description asc
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/contrib/packages/project-manager/www/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/contrib/packages/project-manager/www/add-edit.tcl	18 Sep 2003 23:33:54 -0000	1.12
+++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl	11 Dec 2003 21:39:44 -0000	1.13
@@ -23,6 +23,7 @@
     {planned_end_date ""}
     {deadline_scheduling ""}
     {ongoing_p ""}
+    {status_id ""}
 
 } -properties {
 
@@ -58,87 +59,121 @@
 }
 
 
-ad_form -name add_edit -form {
-    project_id:key
+ad_form -name add_edit \
+    -form {
+        project_id:key
+        
+        {parent_id:text(hidden)
+            {value $parent_id}
+        }
+        
+        {project_item_id:text(hidden)
+            {value $project_item_id}
+        }
+        
+        {project_name:text
+            {label "[set project_term] name"}
+            {value $project_name}
+        }
+        
+        {description:text(textarea),optional
+            {label "Description"}
+            {value $description}
+            {html { rows 5 cols 40 wrap soft}}}
+        
+        {planned_start_date:date,to_sql(linear_date)
+            {label "Starts"}
+            {format "MONTH DD YYYY"}
+            {value {[util::date acquire clock [clock scan $planned_start_date]]}}
+            {today}
+            {help}
+        }
+        
+        {planned_end_date:date,to_sql(linear_date) 
+            {label "Deadline"}
+            {format "MONTH DD YYYY"}
+            {value {[util::date acquire clock [clock scan $planned_end_date]]}}
+            {today}
+            {help}
+        }
+        
+        {ongoing_p:text(select)
+            {label "Project is ongoing?"}
+            {options {{"No" "f"} {"Yes" "t"}} {value $ongoing_p}}
+            {help_text "If yes, then this project has no deadline"}
+        }
+        
+        {status_id:text(select)
+            {label "Status"}
+            {options {[db_list_of_lists get_status_codes { }]}}
+        }
 
-    {parent_id:text(hidden)
-        {value $parent_id}
     }
 
-    {project_item_id:text(hidden)
-        {value $project_item_id}
-    }
 
-    {project_name:text
-        {label "[set project_term] name"}
-	{value $project_name}
+if {[exists_and_not_null project_id]} {
+    if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
+        ad_form -extend -name add_edit -form {
+            {category_ids:integer(category),multiple,optional {label "Categories"}
+                {html {size 4}} {value {$project_item_id $package_id}}
+            }
+        }
     }
-
-    {description:text(textarea),optional
-	{label "Description"}
-	{value $description}
-	{html { rows 5 cols 40 wrap soft}}}
-
-    {planned_start_date:date,to_sql(linear_date)
-	{label "Starts"}
-	{format "MONTH DD YYYY"}
-        {value {[util::date acquire clock [clock scan $planned_start_date]]}}
-        {today}
-	{help}
+} else {
+    if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
+        ad_form -extend -name add_edit -form {
+            {category_ids:integer(category),multiple,optional {label "Categories"}
+                {html {size 4}} {value {$package_id $package_id}}
+            }
+        }
     }
-
-    {planned_end_date:date,to_sql(linear_date) 
-	{label "Deadline"}
-	{format "MONTH DD YYYY"}
-        {value {[util::date acquire clock [clock scan $planned_end_date]]}}
-        {today}
-	{help}
-    }
-
-    {ongoing_p:text(select)
-	{label "Project is ongoing?"}
-	{options {{"No" "f"} {"Yes" "t"}} {value $ongoing_p}}
-        {help_text "If yes, then this project has no deadline"}
-    }
-
-} -select_query_name project_query -on_submit {
-
-    set user_id [ad_conn user_id]
-    set peeraddr [ad_conn peeraddr]
-
-} -new_data {
-    set project_id [db_exec_plsql new_project_item { *SQL* }]
-    set project_item_id [db_string get_item_id { }]
-
-    ad_returnredirect "one?[export_url_vars project_item_id project_id]"
-    ad_script_abort
-
-} -edit_data {
-
-    set project_id [db_exec_plsql new_project_revision { *SQL* }]
-    project_manager::project::compute_parent_status $project_item_id
-
-} -after_submit {
-
-    ad_returnredirect "one?[export_url_vars project_id]"
-    ad_script_abort
 }
 
 if {$use_goal_p} {
-    ad_form -extend -name add_edit -form {
-        {goal:text(textarea),optional
-            {label "[set project_term] goal"}
-            {value $goal}
-            {html { rows 5 cols 40 wrap soft}}}
-    }
+    ad_form -extend -name add_edit \
+        -form {
+            {goal:text(textarea),optional
+                {label "[set project_term] goal"}
+                {value $goal}
+                {html { rows 5 cols 40 wrap soft}}}
+        } 
 }
 
 
 if {$use_project_code_p} {
-    ad_form -extend -name add_edit -form {
-        {project_code:text,optional
-            {label "[set project_term] code"}
-            {value $project_code}
-        }
-    }
+    ad_form -extend -name add_edit \
+        -form {
+            {project_code:text,optional
+                {label "[set project_term] code"}
+                {value $project_code}
+            }
+        } 
 }
+
+
+ad_form -extend -name add_edit \
+    -select_query_name project_query \
+    -on_submit {
+        
+        set user_id [ad_conn user_id]
+        set peeraddr [ad_conn peeraddr]
+        
+    } -new_data {
+        set project_id [db_exec_plsql new_project_item { *SQL* }]
+        set project_item_id [db_string get_item_id { }]
+        
+        ad_returnredirect "one?[export_url_vars project_item_id project_id]"
+        ad_script_abort
+        
+    } -edit_data {
+        
+        set project_id [db_exec_plsql new_project_revision { *SQL* }]
+        project_manager::project::compute_parent_status $project_item_id
+ 
+        category::map_object -remove_old -object_id $project_item_id $category_ids
+       
+    } -after_submit {
+        
+        ad_returnredirect "one?[export_url_vars project_id]"
+        ad_script_abort
+    }
Index: openacs-4/contrib/packages/project-manager/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index-postgresql.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/contrib/packages/project-manager/www/index-postgresql.xql	18 Sep 2003 01:09:14 -0000	1.8
+++ openacs-4/contrib/packages/project-manager/www/index-postgresql.xql	11 Dec 2003 21:39:44 -0000	1.9
@@ -14,15 +14,19 @@
         to_char(p.planned_start_date, 'MM/DD/YY') as planned_start_date,
         to_char(p.planned_end_date, 'MM/DD/YY') as planned_end_date,
         p.ongoing_p,
+        c.category_id,
+        c.category_name,
         p.actual_hours_completed,
         p.estimated_hours_total,
         to_char(p.estimated_finish_date, 'MM/DD/YY') as estimated_finish_date,
         to_char(p.earliest_finish_date, 'MM/DD/YY') as earliest_finish_date,
         to_char(p.latest_finish_date, 'MM/DD/YY') as latest_finish_date
-        FROM pm_projectsx p, cr_items i
+        FROM pm_projectsx p LEFT JOIN (select om.category_id, om.object_id, t.name as category_name from category_object_map om, category_translations t where om.category_id = t.category_id) c ON p.item_id = c.object_id, cr_items i, pm_project_status s
         WHERE p.project_id = i.live_revision and
-        p.parent_id = :root_folder
-        ORDER BY p.title
+        p.parent_id = :root_folder and
+        s.status_id = p.status_id
+        [template::list::filter_where_clauses -and -name projects]
+        [template::list::orderby_clause -orderby -name projects]
     </querytext>
 </fullquery>
 
Index: openacs-4/contrib/packages/project-manager/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.adp,v
diff -u -N -r1.17 -r1.18
--- openacs-4/contrib/packages/project-manager/www/index.adp	8 Oct 2003 23:29:16 -0000	1.17
+++ openacs-4/contrib/packages/project-manager/www/index.adp	11 Dec 2003 21:39:44 -0000	1.18
@@ -3,33 +3,27 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 
 <property name="title">@project_term@s</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
-<table border="0" cellpadding="2">
+<table cellpadding="3" cellspacing="3">
+
   <tr>
 
-    <!--<td valign="top"><a href="" class="button">My @project_term_lower@s</a></td>
-    <td valign="top"><a href="" class="button">All @project_term_lower@s</a></td>
-    <td valign="top"><a href="" class="button">My @task_term_lower@s</a></td>
-    <td valign="top"><a href="" class="button">All @task_term_lower@s</a></td>-->
-    <td valign="top"><a href="processes" class="button">Processes</a></td>
+    <td class="list-filter-pane" valign="top" width="200">
 
-  <if @admin_p@>
-    <td>&nbsp;</td>
+        <listfilters name="projects"></listfilters>
 
-    <td><a href="admin/index" class="button">Admin pages</td>
-  </if>
+    </td>
 
-  </tr>
+    <td class="list-list-pane" valign="top">
 
-  <tr>
-    <td><a class="button" href="add-edit">Add Project</a>
-  </tr>
-</table>
+        <listtemplate name="projects"></listtemplate>
 
+    </td>
 
-<P>
+  </tr>
 
-<listtemplate name="projects"></listtemplate>
+</table>
 
 
+
Index: openacs-4/contrib/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/contrib/packages/project-manager/www/index.tcl	12 Sep 2003 21:36:32 -0000	1.9
+++ openacs-4/contrib/packages/project-manager/www/index.tcl	11 Dec 2003 21:39:44 -0000	1.10
@@ -14,6 +14,10 @@
     @return project_term Terminology for projects
     @return project_term_lower Terminology for projects (lower case)
 
+} {
+    orderby_project:optional
+    status_id:optional
+    category_id:optional
 } -properties {
 
     context:onevalue
@@ -54,13 +58,19 @@
 
 # Projects, using list-builder ---------------------------------
 
+
+
+set category_choices [db_list_of_lists gg "select t.name, t.category_id from category_tree_map tm, categories c, category_translations t where c.tree_id = tm.tree_id and c.category_id = t.category_id and tm.object_id = :package_id"]
+
+
+
 template::list::create \
     -name projects \
     -multirow projects \
     -key item_id \
     -elements {
         project_name {
-            label "Subject"
+            label "Project name"
             link_url_col item_url
             link_html { title "View this project version" }
         }
@@ -74,16 +84,50 @@
             label "Hours completed"
             display_template "@projects.actual_hours_completed@/@projects.estimated_hours_total@"
         }
+        category_id {
+            label "Categories"
+            display_template "<group column=\"item_id\"><li>@projects.category_name@</group>"
+        }
     } \
+    -actions {
+        "Tasks" "tasks" "View list of tasks"
+        "Processes" "processes" "View and use processes"
+        "Add project" "add-edit" "Add project"
+        "Admin" "admin/" "Administration pages"
+    } \
     -main_class {
         narrow
     } \
     -filters {
-        orderby_project {}
+        status_id {
+            label "Status"
+            values {[db_list_of_lists get_status "select description, status_id from pm_project_status order by status_type desc, description"]}
+            where_clause {
+                s.status_id = :status_id
+            }
+        }
+        category_id {
+            label "Category"
+            values {$category_choices}
+            where_clause {
+                om.category_id = :category_id
+            }
+        }
     } \
     -orderby {
-        project_name {orderby project_name}
-        default_value project_name,desc
+        default_value category_id,asc
+        project_name {
+            label "Project name"
+            orderby_desc "upper(p.title) desc"
+            orderby_asc "upper(p.title) asc"
+            default_direction asc
+        }
+        category_id {
+            label "Categories"
+            orderby_desc "c.category_name desc"
+            orderby_asc "c.category_name asc"
+            default_direction asc
+        }
     } \
     -orderby_name orderby_project \
     -html {
Index: openacs-4/contrib/packages/project-manager/www/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one-postgresql.xql,v
diff -u -N -r1.19 -r1.20
--- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	3 Oct 2003 23:52:17 -0000	1.19
+++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	11 Dec 2003 21:39:44 -0000	1.20
@@ -33,13 +33,13 @@
 	p.project_code,
 	p.goal,
 	p.description,
-	to_char(p.planned_start_date,'Mon DD') as planned_start_date,
-	to_char(p.planned_end_date,'Mon DD') as planned_end_date,
+	to_char(p.planned_start_date,'YYYY-MM-DD HH24:MI') as planned_start_date,
+	to_char(p.planned_end_date,'YYYY-MM-DD HH24:MI') as planned_end_date,
 	p.ongoing_p,
         i.live_revision,
-        to_char(p.estimated_finish_date,'Mon DD') as estimated_finish_date,
-        to_char(p.earliest_finish_date,'Mon DD') as earliest_finish_date,
-        to_char(p.latest_finish_date,'Mon DD') as latest_finish_date,
+        to_char(p.estimated_finish_date,'YYYY-MM-DD HH24:MI') as estimated_finish_date,
+        to_char(p.earliest_finish_date,'YYYY-MM-DD HH24:MI') as earliest_finish_date,
+        to_char(p.latest_finish_date,'YYYY-MM-DD HH24:MI') as latest_finish_date,
         p.actual_hours_completed,
         p.estimated_hours_total,
         p.parent_id
@@ -84,12 +84,12 @@
 	SELECT
         t.item_id as task_id,
         t.title,
-	to_char(t.end_date,'Mon DD') as end_date,
-	to_char(t.earliest_start,'Mon DD') as earliest_start,
-	to_char(t.earliest_finish,'Mon DD') as earliest_finish,
-	to_char(t.latest_start,'Mon DD') as latest_start,
-	to_char(t.latest_finish,'Mon DD') as latest_finish,
-        to_char(t.latest_start-t.earliest_start,'FMDD') || ' days' as slack_time,
+	to_char(t.end_date,'YYYY-MM-DD HH24:MI') as end_date,
+	to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start,
+	to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish,
+	to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start,
+	to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish,
+        to_char(t.latest_start-t.earliest_start,'DD') || ' days' as slack_time,
         u.first_names,
         u.last_name,
         t.percent_complete,
@@ -100,11 +100,11 @@
         t.estimated_hours_work_max,
         t.actual_hours_worked
 	FROM
-	pm_tasks_revisionsx t LEFT JOIN pm_task_assignment a ON t.item_id = a.task_id, cr_items i LEFT JOIN pm_task_dependency d ON i.item_id = d.task_id, cc_users u
+	(select * from pm_tasks_revisionsx LEFT JOIN pm_task_assignment ON item_id = task_id) t, cr_items i LEFT JOIN pm_task_dependency d ON i.item_id = d.task_id, all_users u
 	WHERE
         t.parent_id = :project_item_id and
         t.revision_id = i.live_revision and
-        a.party_id = u.party_id
+        t.party_id = u.party_id
         [template::list::orderby_clause -name tasks -orderby]
     </querytext>
   </fullquery>
Index: openacs-4/contrib/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v
diff -u -N -r1.27 -r1.28
--- openacs-4/contrib/packages/project-manager/www/one.adp	10 Nov 2003 19:34:54 -0000	1.27
+++ openacs-4/contrib/packages/project-manager/www/one.adp	11 Dec 2003 21:39:44 -0000	1.28
@@ -103,7 +103,33 @@
 
   </table>
   <p>
-  <a class="button" href="add-edit?parent_id=@project_item_id@">Breakdown</a>
+
+  <table border="1" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <th colspan="2">Categories</th>
+  </tr>
+
+  <tr>
+  <td>
+    <table border="0" cellpadding="1" cellspacing="1" width="100%">
+      <tr>
+        <td class="highlight">
+
+        <ul>
+        <list name="categories">
+        <if @categories:rowcount@ gt 0>
+        <li> @categories:item@
+        </if>
+        </list>
+        </ul>
+
+        </td>
+
+     </table>
+  </table>
+
+  <p />
+  <a class="button" href="add-edit?parent_id=@project_item_id@">Add subproject</a>
   </p>
 
   Subprojects:
@@ -154,5 +180,5 @@
 
   <listtemplate name="versions"></listtemplate>
 
-<!--left out because of display bug on Safari</div>-->
+</div>
 
Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -N -r1.26 -r1.27
--- openacs-4/contrib/packages/project-manager/www/one.tcl	10 Oct 2003 22:51:04 -0000	1.26
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	11 Dec 2003 21:39:44 -0000	1.27
@@ -29,6 +29,7 @@
     {orderby_versions ""}
 
 } -properties {
+    categories:onelist
     context_bar:onevalue
     project:multirow
     tasks:multirow
@@ -74,9 +75,24 @@
 set write_p  [permission::permission_p -object_id $package_id -privilege write] 
 set create_p [permission::permission_p -object_id $package_id -privilege create]
 
+# categories
+
+
+set categories [list]
+set cat_list [category::get_mapped_categories $project_item_id]
+foreach cat $cat_list {
+    lappend categories [category::get_name $cat]
+}
+
 db_1row project_query { } -column_array project
 set project_root [db_exec_plsql get_root_folder { }]
 
+set project(planned_start_date) [lc_time_fmt $project(planned_start_date) "%x"]
+set project(planned_end_date)   [lc_time_fmt $project(planned_end_date) "%x"]
+set project(estimated_finish_date) [lc_time_fmt $project(estimated_finish_date) "%x"]
+set project(earliest_finish_date) [lc_time_fmt $project(earliest_finish_date) "%x"]
+set project(latest_finish_date) [lc_time_fmt $project(latest_finish_date) "%x"]
+
 # set up context bar, needs parent_id
 
 if {[string equal $project(parent_id) $project_root]} {
@@ -127,20 +143,20 @@
         }
         earliest_start {
             label "Earliest Start"
-            display_template "@tasks.earliest_start@"
+            display_template "@tasks.earliest_start_pretty@"
         }
         earliest_finish {
             label "Earliest Finish"
-            display_template "@tasks.earliest_finish@"
+            display_template "@tasks.earliest_finish_pretty@"
         }
         latest_start {
             label "Latest Start"
-            display_template "@tasks.latest_start@"
+            display_template "@tasks.latest_start_pretty@"
         }
         latest_finish {
             label "Latest Finish"
             display_template {
-                @tasks.latest_finish@
+                @tasks.latest_finish_pretty@
             }
         }
         last_name {
@@ -176,16 +192,21 @@
         latest_start {orderby latest_start}
         slack_time {orderby slack_time}
         latest_finish {orderby latest_finish}
-        default_value slack_time,asc
+        default_value latest_start,asc
     } \
     -orderby_name orderby_tasks \
     -html {
     }
 
 
-db_multirow -extend { item_url } tasks project_tasks_query {
+db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty} tasks project_tasks_query {
 } {
     set item_url [export_vars -base "task-one" { revision_id task_id}]
+
+    set earliest_start_pretty [lc_time_fmt $earliest_start "%x"]
+    set earliest_finish_pretty [lc_time_fmt $earliest_finish "%x"]
+    set latest_start_pretty [lc_time_fmt $latest_start "%x"]
+    set latest_finish_pretty [lc_time_fmt $latest_finish "%x"]
 }
 
 
@@ -318,6 +339,8 @@
 db_multirow -extend { item_url } versions project_versions {
 } {
     set item_url [export_vars -base "one" -override {{project_item_id $item_id}} {project_item_id}]
+
+    
 }
 
 
Index: openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-dependency-add-edit.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl	10 Oct 2003 22:51:04 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl	11 Dec 2003 21:39:44 -0000	1.4
@@ -62,6 +62,7 @@
 if {![exists_and_not_null use_dependency]} {
     ns_log Notice "Redirecting"
     ad_returnredirect "process-one?[export_url_vars process_id]"
+    ad_script_abort
 }
 
 # terminology
Index: openacs-4/contrib/packages/project-manager/www/process-one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-one-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/process-one-postgresql.xql	10 Oct 2003 22:51:04 -0000	1.2
+++ openacs-4/contrib/packages/project-manager/www/process-one-postgresql.xql	11 Dec 2003 21:39:44 -0000	1.3
@@ -7,7 +7,6 @@
         t.process_task_id,
         t.one_line,
         t.description,
-        t.end_date,
         t.estimated_hours_work,
         t.estimated_hours_work_min,
         t.estimated_hours_work_max,
Index: openacs-4/contrib/packages/project-manager/www/process-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-one.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/process-one.adp	10 Nov 2003 19:34:54 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/process-one.adp	11 Dec 2003 21:39:44 -0000	1.4
@@ -8,7 +8,7 @@
 Process tasks:
 
 <ul>
-  <li> Use this process: @use_link@<p />
+  <li> Use this process: @use_link;noquote@<p />
   <li> 
     <form action="process-task-add-edit" method="post"> 
       Add 
Index: openacs-4/contrib/packages/project-manager/www/process-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-one.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/contrib/packages/project-manager/www/process-one.tcl	10 Oct 2003 22:51:04 -0000	1.6
+++ openacs-4/contrib/packages/project-manager/www/process-one.tcl	11 Dec 2003 21:39:44 -0000	1.7
@@ -75,7 +75,7 @@
         estimated_hours_work_min {
             label "Work estimate min"
         }
-        estimated_hours_work_min {
+        estimated_hours_work_max {
             label "Work estimate max"
         }
     } \
Index: openacs-4/contrib/packages/project-manager/www/processes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/processes.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/contrib/packages/project-manager/www/processes.adp	10 Nov 2003 19:34:54 -0000	1.4
+++ openacs-4/contrib/packages/project-manager/www/processes.adp	11 Dec 2003 21:39:44 -0000	1.5
@@ -5,22 +5,6 @@
 <property name="title">Processes</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<table border="0" cellpadding="2">
-  <tr>
-
-  <if @admin_p@>
-    <td>&nbsp;</td>
-
-    <td><a href="admin/index" class="button">Admin pages</td>
-  </if>
-
-  </tr>
-
-</table>
-
-
-<P>
-
 <listtemplate name="processes"></listtemplate>
 
 
Index: openacs-4/contrib/packages/project-manager/www/processes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/processes.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/contrib/packages/project-manager/www/processes.tcl	10 Oct 2003 22:51:04 -0000	1.4
+++ openacs-4/contrib/packages/project-manager/www/processes.tcl	11 Dec 2003 21:39:44 -0000	1.5
@@ -81,7 +81,9 @@
         narrow
     } \
     -actions {
+        "Projects" "index" "View projects"
         "Add process" "process-add-edit" "Add a process"
+        "Admin" "admin/" "Administration pages"
     } \
     -filters {
         orderby_process {}
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit-postgresql.xql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql	10 Oct 2003 22:51:04 -0000	1.11
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql	11 Dec 2003 21:39:44 -0000	1.12
@@ -2,48 +2,48 @@
 <queryset>
   <fullquery name="get_process_tasks">
     <querytext>
-	SELECT
+        SELECT
         t.process_task_id as process_tid,
         t.one_line,
         t.description,
         t.estimated_hours_work,
         t.estimated_hours_work_min,
         t.estimated_hours_work_max,
         d.dependency_id
-	FROM
+        FROM
         pm_process_task t LEFT JOIN pm_process_task_dependency d ON t.process_task_id = d.process_task_id
-	WHERE
-	t.process_id = :process_id
+        WHERE
+        t.process_id = :process_id
         ORDER BY
         t.process_task_id
     </querytext>
   </fullquery>
 
   <fullquery name="new_task_item">
     <querytext>
-	select pm_task__new_task_item (
+        select pm_task__new_task_item (
                 null,
-		:project_item_id,
+                :project_item_id,
                 :p_task_title,
                 :p_description,
                 [project_manager::project::util::datenvl -value [set end_date_$i] -value_if_null "null," -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS'),"]
                 '0',
                 :p_work,
                 :p_work_min,
                 :p_work_max,
-		current_timestamp,
-		:user_id,
-		:peeraddr,
-		:package_id
-	);
+                current_timestamp,
+                :user_id,
+                :peeraddr,
+                :package_id
+        );
     </querytext>
   </fullquery>
 
   <fullquery name="new_task_revision">
     <querytext>
-	select pm_task__new_task_revision (
+        select pm_task__new_task_revision (
                 :p_task_item_id,
-		:project_item_id,
+                :project_item_id,
                 :p_task_title,
                 :p_description,
                 [project_manager::project::util::datenvl -value [set end_date_$i] -value_if_null "null," -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS'),"]
@@ -52,20 +52,20 @@
                 :p_work_min,
                 :p_work_max,
                 :p_hours,
-		current_timestamp,
-		:user_id,
-		:peeraddr,
-		:package_id
-	);
+                current_timestamp,
+                :user_id,
+                :peeraddr,
+                :package_id
+        );
     </querytext>
   </fullquery>
 
   <fullquery name="task_query">
     <querytext>
       select
         current_timestamp
-	FROM
-	dual
+        FROM
+        dual
     </querytext>
   </fullquery>
 
@@ -77,15 +77,15 @@
         t.item_id,
         t.description,
         t.name,
-	to_char(t.end_date,'YYYY MM DD') as end_date,
+        to_char(t.end_date,'YYYY MM DD') as end_date,
         t.percent_complete,
         t.estimated_hours_work,
         t.estimated_hours_work_min,
         t.estimated_hours_work_max,
         d.parent_task_id,
         t.actual_hours_worked
-  	FROM
-	pm_tasks_revisionsx t, 
+        FROM
+        pm_tasks_revisionsx t, 
         cr_items i LEFT JOIN pm_task_dependency d ON i.item_id = d.task_id
         WHERE
         t.item_id in ([join $task_id ","]) and
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.tcl,v
diff -u -N -r1.23 -r1.24
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl	10 Nov 2003 19:34:54 -0000	1.23
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl	11 Dec 2003 21:39:44 -0000	1.24
@@ -1,4 +1,4 @@
-ns_log notice task assign add edit page
+ns_log notice task add edit page
 set mypage [ns_getform]
 if {[string equal "" $mypage]} {
     ns_log notice no form was submitted on my page
@@ -218,131 +218,9 @@
 	{value $number}
     }
 
-} -on_submit {
-
-    set user_id [ad_conn user_id]
-    set peeraddr [ad_conn peeraddr]
-
-} -new_data {
-
-    ns_log Notice "new data"
-
-    # --------------------------------------------------------------
-    # each task we add in returns a task_revision_id
-    # we set up two lists, one for tasks that will need dependencies
-    # another for tasks that don't
-    # --------------------------------------------------------------
-
-    set revision_has_dependencies [list]
-    set revision_no_dependencies  [list]
-
-    for {set i 1} {$i <= $number} {incr i} {
- 
-        if {![exists_and_not_null estimated_hours_work($i)]} {
-            set estimated_hours_work($i) [expr .5 * ($estimated_hours_work_max($i) - $estimated_hours_work_min($i)) + $estimated_hours_work_min($i)]
-        }
-
-        if {![exists_and_not_null estimated_hours_work_min($i)]} {
-            set estimated_hours_work_min($i) $estimated_hours_work($i)
-        }
-
-        if {![exists_and_not_null estimated_hours_work_max($i)]} {
-            set estimated_hours_work_max($i) $estimated_hours_work($i)
-        }
-
-
-        if {![exists_and_not_null end_date_$i]} {
-            set end_date_$i "{} {} {} {} {} {}"
-        }
-
-        # set up variables, pulling from arrays
-        set p_task_title  $task_title($i)
-        set p_description $description($i)
-        set p_work        $estimated_hours_work($i)
-        set p_work_min    $estimated_hours_work_min($i)
-        set p_work_max    $estimated_hours_work_max($i)
-
-        set this_revision_id [db_exec_plsql new_task_item { *SQL* }]
-
-        if {[info exists use_dependency_p($i)] && [string equal $use_dependency_p($i) "on"]} {
-            lappend revision_has_dependencies $this_revision_id
-        } else {
-            lappend revision_no_dependencies  $this_revision_id
-        }
-
-        lappend process_task_id $process_task_ids($i)
-    }
-
-} -edit_data {
-
-    ns_log Notice "edit_data"
-
-    # --------------------------------------------------------------
-    # each task we edit returns a task_revision_id
-    # we set up two lists, one for tasks that will need dependencies
-    # another for tasks that don't
-    # --------------------------------------------------------------
-
-    set revision_has_dependencies [list]
-    set revision_no_dependencies  [list]
-
-    for {set i 1} {$i <= $number} {incr i} {
- 
-        if {![exists_and_not_null estimated_hours_work($i)]} {
-            set estimated_hours_work($i) [expr .5 * ($estimated_hours_work_max($i) - $estimated_hours_work_min($i)) + $estimated_hours_work_min($i)]
-        }
-
-        if {![exists_and_not_null estimated_hours_work_min($i)]} {
-            set estimated_hours_work_min($i) $estimated_hours_work($i)
-        }
-
-        if {![exists_and_not_null estimated_hours_work_max($i)]} {
-            set estimated_hours_work_max($i) $estimated_hours_work($i)
-        }
-
-        if {![exists_and_not_null end_date_$i]} {
-            set end_date_$i "{} {} {} {} {} {}"
-        }
-
-        # set up variables, pulling from arrays
-        set p_task_item_id $task_item_id($i)
-        set p_task_title   $task_title($i)
-        set p_description  $description($i)
-        set p_percent      $percent_complete($i)
-        set p_work         $estimated_hours_work($i)
-        set p_work_min     $estimated_hours_work_min($i)
-        set p_work_max     $estimated_hours_work_max($i)
-        set p_hours        $actual_hours_worked($i)
-
-        # do the actual edit
-        set this_revision_id [db_exec_plsql new_task_revision { }]
-
-        ns_log Notice "Added in $this_revision_id"
-
-        # BUG: we need to make sure we take care of deleting dependencies
-        # if unchecked, adding dependencies, etc..
-
-        if {[info exists use_dependency_p($i)] && [string equal $use_dependency_p($i) "t"]} {
-            lappend revision_has_dependencies $this_revision_id
-        } else {
-            lappend revision_no_dependencies  $this_revision_id
-        }
-    }
-
-    project_manager::project::compute_parent_status $project_item_id
-
-} -select_query_name task_query -after_submit {
-
-    # now go through the use_dependency_p items. For each that is checked,
-    # we add that to a list of ids that we pass to the dependency-add-edit
-    # page.
-
-
-    ad_returnredirect "task-assign-add-edit?[export_vars -url {revision_has_dependencies:multiple revision_no_dependencies:multiple project_item_id process_task_id:multiple}]"
-    ad_script_abort
-
 }
 
+
 # ----------------------------------
 # we set the values for edited tasks
 # ----------------------------------
@@ -544,3 +422,134 @@
     }
 }
 
+
+
+ad_form -extend -name add_edit -select_query_name task_query -on_submit {
+    
+    set user_id [ad_conn user_id]
+    set peeraddr [ad_conn peeraddr]
+
+} -new_data {
+
+    ns_log Notice "new data"
+
+    # --------------------------------------------------------------
+    # each task we add in returns a task_revision_id
+    # we set up two lists, one for tasks that will need dependencies
+    # another for tasks that don't
+    # --------------------------------------------------------------
+
+    set revision_has_dependencies [list]
+    set revision_no_dependencies  [list]
+
+    for {set i 1} {$i <= $number} {incr i} {
+ 
+        if {![exists_and_not_null estimated_hours_work($i)]} {
+            set estimated_hours_work($i) [expr .5 * ($estimated_hours_work_max($i) - $estimated_hours_work_min($i)) + $estimated_hours_work_min($i)]
+        }
+
+        if {![exists_and_not_null estimated_hours_work_min($i)]} {
+            set estimated_hours_work_min($i) $estimated_hours_work($i)
+        }
+
+        if {![exists_and_not_null estimated_hours_work_max($i)]} {
+            set estimated_hours_work_max($i) $estimated_hours_work($i)
+        }
+
+
+        if {![exists_and_not_null end_date_$i]} {
+            set end_date_$i "{} {} {} {} {} {}"
+        }
+
+        # set up variables, pulling from arrays
+        set p_task_title  $task_title($i)
+        set p_description $description($i)
+        set p_work        $estimated_hours_work($i)
+        set p_work_min    $estimated_hours_work_min($i)
+        set p_work_max    $estimated_hours_work_max($i)
+
+        ns_log Notice "adding task: pii: $project_item_id tt:$p_task_title d:$p_description ed: end_date($i) w:$p_work m:$p_work_min mx:$p_work_max"
+
+        set this_revision_id [db_exec_plsql new_task_item { *SQL* }]
+
+        if {[info exists use_dependency_p($i)] && [string equal $use_dependency_p($i) "on"]} {
+            lappend revision_has_dependencies $this_revision_id
+        } else {
+            lappend revision_no_dependencies  $this_revision_id
+        }
+
+        lappend process_task_id $process_task_ids($i)
+    }
+
+} -edit_data {
+
+    ns_log Notice "edit_data"
+
+    # --------------------------------------------------------------
+    # each task we edit returns a task_revision_id
+    # we set up two lists, one for tasks that will need dependencies
+    # another for tasks that don't
+    # --------------------------------------------------------------
+
+    set revision_has_dependencies [list]
+    set revision_no_dependencies  [list]
+
+    for {set i 1} {$i <= $number} {incr i} {
+ 
+        if {![exists_and_not_null estimated_hours_work($i)]} {
+            set estimated_hours_work($i) [expr .5 * ($estimated_hours_work_max($i) - $estimated_hours_work_min($i)) + $estimated_hours_work_min($i)]
+        }
+
+        if {![exists_and_not_null estimated_hours_work_min($i)]} {
+            set estimated_hours_work_min($i) $estimated_hours_work($i)
+        }
+
+        if {![exists_and_not_null estimated_hours_work_max($i)]} {
+            set estimated_hours_work_max($i) $estimated_hours_work($i)
+        }
+
+        if {![exists_and_not_null end_date_$i]} {
+            set end_date_$i "{} {} {} {} {} {}"
+        }
+
+        # set up variables, pulling from arrays
+        set p_task_item_id $task_item_id($i)
+        set p_task_title   $task_title($i)
+        set p_description  $description($i)
+        set p_percent      $percent_complete($i)
+        set p_work         $estimated_hours_work($i)
+        set p_work_min     $estimated_hours_work_min($i)
+        set p_work_max     $estimated_hours_work_max($i)
+        set p_hours        $actual_hours_worked($i)
+
+        # do the actual edit
+        set this_revision_id [db_exec_plsql new_task_revision { }]
+
+        ns_log Notice "Added in $this_revision_id"
+
+        # BUG: we need to make sure we take care of deleting dependencies
+        # if unchecked, adding dependencies, etc..
+
+        if {[info exists use_dependency_p($i)] && [string equal $use_dependency_p($i) "t"]} {
+            lappend revision_has_dependencies $this_revision_id
+        } else {
+            lappend revision_no_dependencies  $this_revision_id
+        }
+    }
+
+    project_manager::project::compute_parent_status $project_item_id
+
+    ns_log Notice "computed parent pre redirect"
+
+} -after_submit {
+
+    # now go through the use_dependency_p items. For each that is checked,
+    # we add that to a list of ids that we pass to the dependency-add-edit
+    # page.
+
+
+    ad_returnredirect "task-assign-add-edit?[export_vars -url {revision_has_dependencies:multiple revision_no_dependencies:multiple project_item_id process_task_id:multiple}]"
+    ad_script_abort
+
+}
+
Index: openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-assign-add-edit.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl	10 Oct 2003 22:51:04 -0000	1.5
+++ openacs-4/contrib/packages/project-manager/www/task-assign-add-edit.tcl	11 Dec 2003 21:39:44 -0000	1.6
@@ -90,7 +90,7 @@
 
 # currently hardcoded the number of assignments
 
-for {set i 0} {$i <= 10} {incr i} {
+for {set i 0} {$i <= 5} {incr i} {
     template::multirow append num $i 
 }
 
Index: openacs-4/contrib/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v
diff -u -N -r1.19 -r1.20
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	10 Nov 2003 19:34:54 -0000	1.19
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	11 Dec 2003 21:39:44 -0000	1.20
@@ -25,7 +25,7 @@
 <tr>
 <th colspan="2">Description</th>
 <tr>
-<td colspan="2">@task_info.description@
+<td colspan="2">@task_info.description;noquote@
 </tr>
 
 <tr>
@@ -103,6 +103,8 @@
 
 <listtemplate name="revisions"></listtemplate>
 
-@comments@
+@comments;noquote@
 <P>
-@comments_link@
+@comments_link;noquote@
+
+</div>
Index: openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql	11 Dec 2003 21:39:44 -0000	1.2
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<queryset>
+<rdbms><type>postgresql</type><version>7.2</version></rdbms>
+
+<fullquery name="tasks">
+    <querytext>
+        SELECT
+        ts.task_id,
+        ts.task_number,
+        t.task_revision_id,
+        t.title,
+        t.description,
+        to_char(t.end_date,'YYYY-MM-DD HH24:MI') as end_date,
+        t.percent_complete,
+        t.estimated_hours_work,
+        t.estimated_hours_work_min,
+        t.estimated_hours_work_max,
+        t.actual_hours_worked,
+        to_char(t.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start,
+        to_char(t.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish,
+        to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start,
+        to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish,
+        p.first_names || ' ' || p.last_name as full_name,
+        r.one_line as role
+        FROM
+        pm_tasks ts, pm_tasks_revisionsx t LEFT JOIN pm_task_assignment ta on t.item_id = ta.task_id, persons p, pm_roles r
+        WHERE
+        ts.task_id  = t.item_id and
+        ta.party_id = p.person_id and
+        ta.role_id  = r.role_id
+        [template::list::filter_where_clauses -and -name tasks]
+        [template::list::orderby_clause -orderby -name tasks]
+    </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/contrib/packages/project-manager/www/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/tasks.adp	11 Dec 2003 21:39:44 -0000	1.2
@@ -0,0 +1,29 @@
+<master>
+
+<link rel="stylesheet" href="style.css" type="text/css">
+
+<property name="title">@task_term@s</property>
+<property name="context_bar">@context_bar;noquote@</property>
+
+<table cellpadding="3" cellspacing="3">
+
+  <tr>
+
+    <td class="list-filter-pane" valign="top" width="200">
+
+        <listfilters name="tasks"></listfilters>
+
+    </td>
+
+    <td class="list-list-pane" valign="top">
+
+        <listtemplate name="tasks"></listtemplate>
+
+    </td>
+
+  </tr>
+
+</table>
+
+
+
Index: openacs-4/contrib/packages/project-manager/www/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/project-manager/www/tasks.tcl	11 Dec 2003 21:39:44 -0000	1.2
@@ -0,0 +1,128 @@
+ad_page_contract {
+
+    Main view page for tasks.
+
+    @author jader@bread.com
+    @creation-date 2003-12-03
+    @cvs-id $Id: tasks.tcl,v 1.2 2003/12/11 21:39:44 jeffd Exp $
+
+    @return title Page title.
+    @return context Context bar.
+    @return tasks Multirow data set of tasks
+    @return task_term Terminology for tasks
+    @return task_term_lower Terminology for tasks (lower case)
+    @return project_term Terminology for projects
+    @return project_term_lower Terminology for projects (lower case)
+
+} {
+    orderby:optional
+    party_id:optional
+} -properties {
+    task_term:onevalue
+    context_bar:onevalue
+    tasks:multirow
+}
+
+# --------------------------------------------------------------- #
+
+# terminology
+set task_term       [parameter::get -parameter "TaskName" -default "Task"]
+set task_term_lower [parameter::get -parameter "taskname" -default "task"]
+set project_term    [parameter::get -parameter "ProjectName" -default "Project"]
+set project_term_lower [parameter::get -parameter "projectname" -default "project"]
+
+# set up context bar
+set context_bar [ad_context_bar "Tasks"]
+
+# the unique identifier for this package
+set package_id [ad_conn package_id]
+set user_id    [ad_maybe_redirect_for_registration]
+
+# by default, show this user's tasks
+if {![exists_and_not_null party_id]} {
+    set party_id $user_id
+}
+
+# permissions
+permission::require_permission -party_id $user_id -object_id $package_id -privilege read
+
+set write_p  [permission::permission_p -object_id $package_id -privilege write] 
+set create_p [permission::permission_p -object_id $package_id -privilege create]
+set admin_p [permission::permission_p -object_id $package_id -privilege admin]
+
+# Tasks, using list-builder ---------------------------------
+
+template::list::create \
+    -name tasks \
+    -multirow tasks \
+    -key item_id \
+    -elements {
+        task_number {
+            label "\#"
+            link_url_col item_url
+            link_html { title "View this project version" }
+        }
+        title {
+            label "Subject"
+        }
+        full_name {
+            label "Who"
+            display_template "@tasks.full_name@ (@tasks.role@)"
+        }
+        description {
+            label "Description"
+        }
+        end_date {
+            label "Deadline"
+        }
+        actual_hours_worked {
+            label "Hours completed"
+            display_template "@tasks.actual_hours_worked@/@tasks.estimated_hours_work@"
+        }
+    } \
+    -actions {
+        "Projects" "index" "View list of tasks"
+        "Processes" "processes" "View and use processes"
+        "Add task" "task-add-edit" "Add a task"
+        "Admin" "admin/" "Administration pages"
+    } \
+    -main_class {
+        narrow
+    } \
+    -filters {
+        party_id {
+            label "People"
+            values {[db_list_of_lists get_people "select first_names || ' ' || last_name, u.party_id from all_users u, pm_task_assignment a where u.party_id = a.party_id order by upper(first_names), upper(last_name)"]}
+            where_clause {
+                ta.party_id = :party_id
+            }
+        }
+    } \
+    -orderby {
+        default_value task_number,asc
+        task_number {
+            label "Task \#"
+            orderby_desc "ts.task_number desc"
+            orderby_asc "ts.task_number asc"
+            default_direction asc
+        }
+        title {
+            label "Subject"
+            orderby_desc "t.title desc"
+            orderby_asc "t.title asc"
+            default_direction asc
+        }
+    } \
+    -orderby_name orderby \
+    -html {
+        width 100%
+    }
+
+
+db_multirow -extend { item_url } tasks tasks {
+} {
+    set item_url [export_vars -base "task-one" {task_id}]
+}
+
+
+# ------------------------- END OF FILE ------------------------- #
Index: openacs-4/contrib/packages/project-manager/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/admin/Attic/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/admin/index.adp	10 Nov 2003 19:34:54 -0000	1.2
+++ openacs-4/contrib/packages/project-manager/www/admin/index.adp	11 Dec 2003 21:39:44 -0000	1.3
@@ -31,4 +31,14 @@
     <td>the description given to the user for task dependencies.</td>
   </tr>
 
+  <tr>
+    <th>Status types</th>
+    <td>type valid status codes, for example, 'Open' and 'Closed'</td>
+  </tr>
+
+  <tr>
+    <th><a href="@categories_link;noquote@">Project categories</a></th>
+    <td>the categories for projects.</td>
+  </tr>
+
 </table>
Index: openacs-4/contrib/packages/project-manager/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/admin/Attic/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/www/admin/index.tcl	12 Sep 2003 01:20:57 -0000	1.1
+++ openacs-4/contrib/packages/project-manager/www/admin/index.tcl	11 Dec 2003 21:39:44 -0000	1.2
@@ -16,6 +16,7 @@
 
 } -properties {
 
+    categories_link:onevalue
     context:onevalue
     projects:multirow
     write_p:onevalue
@@ -42,6 +43,10 @@
 set package_id [ad_conn package_id]
 set user_id    [ad_maybe_redirect_for_registration]
 
+# set up link to categories
+set categories_link "/categories/cadmin/one-object?object_id=$package_id"
+
+
 # permissions
 permission::require_permission -party_id $user_id -object_id $package_id -privilege read
 
Index: openacs-4/contrib/packages/survey/tcl/survey-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/tcl/Attic/survey-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/tcl/survey-procs.tcl	19 Sep 2003 16:48:03 -0000	1.1
+++ openacs-4/contrib/packages/survey/tcl/survey-procs.tcl	11 Dec 2003 21:39:44 -0000	1.2
@@ -576,7 +576,7 @@
 
         #dotlrn specific info
     set dotlrn_installed_p [apm_package_installed_p dotlrn]
-    if {$dotlrn_installed_p} {
+	if {$dotlrn_installed_p && ![empty_string_p [dotlrn_community::get_community_id]]} {
 	set package_id [ad_conn package_id]
 	set community_id [dotlrn_community::get_community_id]
 	set segment_id [dotlrn_community::get_rel_segment_id -community_id $community_id -rel_type "dotlrn_member_rel"]
Index: openacs-4/etc/backup.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/backup.sh,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/etc/backup.sh	11 Dec 2003 21:39:44 -0000	1.2
@@ -0,0 +1,162 @@
+#!/bin/bash
+#
+# $Id: backup.sh,v 1.2 2003/12/11 21:39:44 jeffd Exp $
+#
+# full and incremental backup script
+# created 07 February 2000
+# Based on a script by Daniel O'Callaghan <danny@freebsd.org>
+# and modified by Gerhard Mourani <gmourani@videotron.ca>
+# modified more by Joel Aufrecht in 2002
+# merged with Collaboraid database backups Dec 2003
+#
+# Change the variables below to fit your computer/backup
+#
+
+COMPUTER=yourserver.net              # name of this computer
+BACKUPUSER=backup                    # username to own the files
+BACKUPDIR=/backup/thisserver         # where to store the backups
+WEBDIR=/var/lib/aolserver            # path to OpenACS service root
+PG_BINDIR=/usr/local/pgsql/bin       # path to PostGreSQL binaries
+TIMEDIR=$BACKUPDIR/last-full         # where to store time of full backup
+TAR=/bin/tar                         # name and location of tar
+CHOWN=/bin/chown
+CHMOD=/bin/chmod
+SCP="/usr/bin/scp -oProtocol=2"
+OTHERHOST=otherserver.net            # another server, to receive backup
+                                     # files
+                                     # leave blank to skip scp exchange
+
+OTHERUSER=backup                     # the user on the recipient server
+                                     # must have silent authentication, ie,
+                                     # certificates
+
+                                     # script assumes an exact match between database
+                                     # name and filesystem
+POSTGRES_DBS="service0"              # space-separated list of postgres databases
+                                     # to be backed up to file system
+
+ORACLE8I_DBS="service0"              # space-separated list of Oracle8i databases
+                                     # to be backed up to file system
+
+                                     # space-separated list of directories to be backed up
+DIRECTORIES="/etc /home /root /cvsroot /var/qmail/alias /usr/local/aolserver $WEBDIR"
+
+#######################################################################
+#
+# Shouldn't need to change anything below this line 
+#
+#######################################################################
+
+DOW=`date +%a`              # Day of the week e.g. Mon
+DOM=`date +%d`              # Date of the Month e.g. 27
+DM=`date +%d%b`             # Date and Month e.g. 27Sep
+DATE=`date +"%Y-%m-%d"`     # Year, Month, Date, e.g. 20020401
+
+# A full backup is generated:
+#   the first time the script is run,
+#   On the 1st of the month
+#   Every Sunday
+# The rest of the time the backup includes only files that have changed
+# since the last full backup
+# Each backup has a date-specific filename
+#
+
+#---------------------------------------------------------------------
+# Parse command line 
+#---------------------------------------------------------------------
+
+case $1 in
+    --full)
+        TYPE="full"
+        NEWER=""
+        ;;
+    --help | -help | -h | --h)
+        echo "Usage: $0 --full to force full backup, or $0 to run automated.  All other variables are set in the script."
+        exit;;
+    *)
+esac
+
+if [ ! -s $TIMEDIR/$COMPUTER-full-date ];
+    then 
+    TYPE="full";
+fi
+
+if [[ $DOM = "01" || $DOW = "Sun" ]];
+    then
+    TYPE="full";
+fi
+
+if $TYPE == "full";
+    then
+    NEWER=""
+else
+    TYPE="incremental"
+    NEWER="--newer-mtime `cat $TIMEDIR/$COMPUTER-full-date`";
+fi
+
+mkdir -p $BACKUPDIR
+mkdir -p $TIMEDIR
+
+#---------------------------------------------------------------------
+# Dump databases
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# PostGreSQL
+echo -e "\nPostgres"
+
+for dbname in $POSTGRES_DBS
+do
+    dmp_file=$WEBDIR/$dbname/database-backup/$dbname-nightly-backup.dmp
+    echo -n "-> Dumping $dbname to $dmp_file ... "
+    time $PG_BINDIR/pg_dump -f $dmp_file -Fp $dbname
+    /bin/ls -lh $dmp_file | awk '{print $5}'
+    gzip -f $dmp_file
+done
+
+#---------------------------------------------------------------------
+# Oracle
+for dbname in $ORACLE8IDBS
+do
+    dmp_file=$WEBDIR/$dbname/database-backup/$dbname-nightly-backup.dmp
+    echo -n "-> Dumping $dbname to $dmp_file ... "
+    time /usr/sbin/export-oracle $dbname $dmp_file
+    /bin/ls -lh $dmp_file | awk '{print $5}'
+    gzip -f $dmp_file
+done
+
+#---------------------------------------------------------------------
+# Make backup files from file system and transfer to remote site
+# TODO: This could be parallelized
+#---------------------------------------------------------------------
+# we switched from bzip2 back to gzip because bzip2 takes 10 times longer
+# for a 10% size advantage
+
+for directory in $DIRECTORIES
+
+  do
+
+  # strip directory of slashes when using it in the backup file name
+  FULLNAME=$BACKUPDIR/$DATE-$COMPUTER-${directory//\//-}-backup-$TYPE.tar.gz
+  # to use bzip2 instead of gzip, change z to j in the tar flags
+  cd $NEWER
+  tar -zcpsh . --file $FULLNAME $directory
+  $CHOWN $BACKUPUSER $FULLNAME
+  $CHMOD 660 $FULLNAME
+  if [[ -n $OTHERHOST ]]
+      then $SCP -q $FULLNAME $OTHERUSER@$OTHERHOST:$BACKUPDIR
+  fi
+done
+
+# If full backup completed successfully, record the date so that
+# incremental backups are relative to the last successful full
+# backup
+
+if $TYPE == "full";
+    then
+    NEWER=""
+    NOW=`date +%Y-%m-%d`
+    echo $NOW> $TIMEDIR/$COMPUTER-full-date;
+fi
+
+echo "Done."
\ No newline at end of file
Index: openacs-4/etc/config.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/config.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/etc/config.tcl	11 Nov 2003 16:51:47 -0000	1.12
+++ openacs-4/etc/config.tcl	11 Dec 2003 21:39:44 -0000	1.13
@@ -53,7 +53,6 @@
 ns_param   nssha1             ${bindir}/nssha1.so 
 ns_param   nscache            ${bindir}/nscache.so 
 ns_param   nsrewrite          ${bindir}/nsrewrite.so 
-ns_param   libtdom            ${bindir}/libtdom.so
 
 #---------------------------------------------------------------------
 # nsopenssl will fail unless the cert files are present as specified
@@ -74,10 +73,14 @@
 #ns_param   nscgi              ${bindir}/nscgi.so 
 #ns_param   nsjava             ${bindir}/libnsjava.so
 
-# Required for AOLserver 4
-#ns_param   nsdb               ${bindir}/nsdb.so
+if { [ns_info version] >= 4 } {
+    # Required for AOLserver 4.x
+    ns_param   nsdb               ${bindir}/nsdb.so
+} else {
+    # Required for AOLserver 3.x
+    ns_param   libtdom            ${bindir}/libtdom.so
+}
 
-
 #---------------------------------------------------------------------
 #
 # Rollout email support
@@ -143,7 +146,8 @@
 
 ns_section ns/threads 
 ns_param   mutexmeter         true      ;# measure lock contention 
-ns_param   stacksize          500000
+# The per-thread stack size must be a multiple of 8k for AOLServer to run under MacOS X
+ns_param   stacksize          [expr 128 * 8192]
 
 # 
 # MIME types. 
Index: openacs-4/etc/install/build-release.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/build-release.sh,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/etc/install/build-release.sh	11 Dec 2003 21:39:45 -0000	1.2
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# if TAG=1 create the cvs tags otherwise assume they exist.
+TAG=1
+
+# What release version are we building; version format should be
+# dashes rather than dots eg. OACS_VERSION=5-0-0b4
+
+OACS_VERSION=5-0-0b4
+DOTLRN_VERSION=2-0-0b4
+
+OACS_BRANCH=oacs-5-0
+DOTLRN_BRANCH=dotlrn-2-0
+
+DOTLRN_CVSROOT=/dotlrn-cvsroot
+OACS_CVSROOT=/cvsroot
+
+#
+# Nothing below here should need to change...
+#
+BASE=/var/tmp/release-$OACS_VERSION
+mkdir $BASE
+if [ ! -d $BASE ]; then 
+    echo "Failed creating base dir $BASE"
+    exit 1
+fi
+
+cd $BASE 
+
+if [ $TAG -eq 1 ]; then 
+
+    # Checkout and tag the release 
+    cvs -d $OACS_CVSROOT checkout -r $OACS_BRANCH openacs-4
+    cd openacs-4 
+    cvs tag -F oacs-$OACS_VERSION 
+    cd ../
+
+
+    # Checkout and tag the dotlrn release
+    mkdir dotlrn-packages
+    cd dotlrn-packages
+    cvs -d $DOTLRN_CVSROOT checkout -r $DOTLRN_BRANCH dotlrn-all
+    for dir in *; do ( cd $dir && cvs tag -F dotlrn-$DOTLRN_VERSION ); done
+    cd ../
+
+    #
+    # Should check for .sql .xql .adp .tcl .html .xml executable files and squak if found.
+    #
+
+fi
+
+
+
+# Generate tarballs...
+#
+
+# openacs
+#
+mkdir tarball
+cd tarball
+cvs -d $OACS_CVSROOT export -r oacs-$OACS_VERSION acs-core
+mv opeancs-4 openacs-${OACS_VERSION//-/.}
+tar -czf ../openacs-${OACS_VERSION//-/.}.tar.gz openacs-${OACS_VERSION//-/.}
+cd ..
+
+# dotlrn
+#
+mkdir dotlrn-tarball
+cd dotlrn-tarball
+cvs -d $OACS_CVSROOT export -r oacs-$OACS_VERSION acs-core
+cd  openacs-4/packages
+cvs -d $OACS_CVSROOT export -r oacs-$OACS_VERSION dotlrn-prereq
+cvs -d $DOTLRN_CVSROOT export -r dotlrn-$DOTLRN_VERSION dotlrn-core
+cd ../..
+cp -f openacs-4/packages/dotlrn/install.xml openacs-4
+mv openacs-4 dotlrn-${DOTLRN_VERSION//-/.}
+tar -czf ../dotlrn-${DOTLRN_VERSION//-/.}.tar.gz dotlrn-${DOTLRN_VERSION//-/.}
+
+
+# Clean up after ourselves...
+cd $BASE && rm -rf dotlrn-tarball tarball openacs-4 dotlrn-packages
Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/acs-admin/acs-admin.info	10 Nov 2003 14:28:55 -0000	1.22
+++ openacs-4/packages/acs-admin/acs-admin.info	11 Dec 2003 21:39:45 -0000	1.23
@@ -7,15 +7,17 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://openacs.org/repository/download/apm/acs-admin-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-admin-5.0.0b4.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
-        <summary>Provides an interface for administering the OpenACS Community System Installation.</summary>
+        <summary>An interface for Site-wide administration of an OpenACS Installation.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
-        <description format="text/html">A UI for administering the OpenACS system.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Provides a UI for administering site-wide services
+          (including package installation, cache, authentication, and user accounts) for an OpenACS system.
+        </description>
 
-        <provides url="acs-admin" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-admin" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-admin/lib/service-parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/service-parameters.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/lib/service-parameters.tcl	17 Sep 2003 22:49:09 -0000	1.3
+++ openacs-4/packages/acs-admin/lib/service-parameters.tcl	11 Dec 2003 21:39:45 -0000	1.4
@@ -21,6 +21,7 @@
     if { $parameter_count > 0 } {
         set param_url [export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]
     }
+    set instance_name [lang::util::localize $instance_name]
 
     if { [empty_string_p $url] && [empty_string_p $admin_url] && [empty_string_p $param_url] } {
         continue
Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/Attic/apm-admin-procs-postgresql.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/tcl/apm-admin-procs-postgresql.xql	10 May 2001 13:50:10 -0000	1.3
+++ openacs-4/packages/acs-admin/tcl/apm-admin-procs-postgresql.xql	11 Dec 2003 21:39:45 -0000	1.4
@@ -3,13 +3,14 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
+<!-- Note that the IN here generates a better plan than = on 7.3 for some mysterious reason -->
 <fullquery name="apm_higher_version_installed_p.apm_higher_version_installed_p">      
       <querytext>
 
 		select apm_package_version__version_name_greater(:version_name, highest.version_name)
                 from (select version_name
 		      from apm_package_versions
-                      where version_id = apm_package__highest_version(:package_key)
+ 	              where version_id IN (select apm_package__highest_version(:package_key))
                      ) highest
     
       </querytext>
Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	4 Oct 2003 03:10:01 -0000	1.11
+++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	11 Dec 2003 21:39:45 -0000	1.12
@@ -51,7 +51,11 @@
     } else {
         set title [lindex $args end]
         set context [concat [list [list $apm_url $apm_title]] $args]
-        set context_bar [eval ad_context_bar $context]
+        set cmd [list ad_context_bar --]
+        foreach elem $context {
+            lappend cmd $elem
+        }
+        set context_bar [eval $cmd]
     }
     set header [ad_header $title ""]
     append body "$header\n"
Index: openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl	11 Dec 2003 21:39:45 -0000	1.2
@@ -21,7 +21,7 @@
     doc_body_append "</ul>"
 } on_error {
     if {![apm_version_installed_p $version_id] } {
-	ad_return_complaint "Database Error" "The database returned the following error
+	ad_return_complaint 1 "Database Error: The database returned the following error
 	message <pre><blockquote>[ad_quotehtml $errmsg]</blockquote></pre>"
     }
 }
Index: openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	17 May 2003 09:36:29 -0000	1.5
+++ openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	11 Dec 2003 21:39:45 -0000	1.6
@@ -23,47 +23,10 @@
 
 apm_version_info $version_id
 
-doc_body_append [apm_header [list "version-view?version_id=$version_id" "$pretty_name $version_name"] "Delete"]
+doc_body_append [apm_header "Delete"]
 
-# Unmount all instances of this package with the Tcl API that invokes before-unmount callbacks
-db_foreach all_package_instances {
-    select site_nodes.node_id
-    from apm_packages, site_nodes
-    where apm_packages.package_id = site_nodes.object_id
-    and   apm_packages.package_key = :package_key
-} {
-    set url [site_node::get_url -node_id $node_id]
-    doc_body_append "Unmounting package instance at url $url <br />"
-    site_node::unmount -node_id $node_id
-}
-
-# Delete the package instances with Tcl API that invokes before-uninstantiate callbacks
-db_foreach all_package_instances {
-    select package_id
-    from apm_packages
-    where package_key = :package_key
-} {
-    doc_body_append "Deleting package instance $package_id <br />"
-    apm_package_instance_delete $package_id
-}
-
-# Invoke the before-uninstall Tcl callback before the sql drop scripts
-apm_invoke_callback_proc -version_id $version_id -type before-uninstall
-
-if {![empty_string_p $sql_drop_scripts]} {
-    
-    doc_body_append "Now executing drop scripts.
-<ul>
-"
-    foreach path $sql_drop_scripts {
-	doc_body_append "<li><pre>"
-	db_source_sql_file -callback apm_doc_body_callback "[acs_package_root_dir $package_key]/$path"
-	doc_body_append "</pre>"
-    }
-}
-
 db_transaction {
-    apm_package_delete -remove_files=0 -callback apm_doc_body_callback $package_key
+    apm_package_delete -sql_drop_scripts $sql_drop_scripts -remove_files=0 -callback apm_doc_body_callback $package_key
 } on_error {
     if {[apm_package_registered_p $package_key] } {
 	doc_body_append "The database returned the following error
@@ -74,6 +37,6 @@
 doc_body_append "
 </ul>
 <p>
-Return to the <a href=\"index\">index</a>.
+<p>You should restart the server now to make sure the memory footprint and cache of the package is cleared out. <a href=\"../server-restart\">Click here</a> to restart the server now.</p>
 [ad_footer]
 "
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	17 May 2003 09:36:29 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	11 Dec 2003 21:39:45 -0000	1.5
@@ -22,7 +22,7 @@
 	}
 
 	default {
-	    ad_return complaint "Dependency Entry Error" "Depenendencies are either provided or required."
+	    ad_return_complaint 1 "Entry error: Depenendencies are either provided or required."
 	}
     }
     apm_package_install_spec $version_id
@@ -31,7 +31,7 @@
 	select count(*) from apm_package_dependencies
 	where dependency_id = :dependency_id
     } -default 0] } {
-	ad_return_complaint "Database Error" "The database returned the following error:
+	ad_return_complaint 1 "The database returned the following error:
 	<blockquote><pre>[ad_quotehtml $errmsg]</pre></blockquote>"
     }
 }
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	10 Sep 2002 22:21:59 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	11 Dec 2003 21:39:45 -0000	1.3
@@ -20,12 +20,12 @@
 	}
 
 	default {
-	    ad_return complaint "Dependency Entry Error" "Depenendencies are either interfaces or requirements."
+	    ad_return complaint 1 "Dependency Entry Error: Depenendencies are either interfaces or requirements."
 	}
     }
     apm_package_install_spec $version_id
 } on_error {
-    ad_return_complaint "Database Error" "The database returned the following error:
+    ad_return_complaint 1 "Database Error: The database returned the following error:
 	<blockquote><pre>[ad_quotehtml $errmsg]</pre></blockquote>"
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl	10 Mar 2003 19:59:31 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl	11 Dec 2003 21:39:45 -0000	1.4
@@ -11,7 +11,7 @@
 db_transaction {
     apm_generate_tarball $version_id
 } on_error {
-    ad_return_complaint "APM Generation Error" "The database returned the following error message:
+    ad_return_complaint 1 "APM Generation Error: The database returned the following error message:
 <pre>
 <blockquote>
 [ad_quotehtml $errmsg]
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp	3 Oct 2003 10:36:09 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp	11 Dec 2003 21:39:45 -0000	1.8
@@ -5,16 +5,14 @@
 <h3>Import/Export Messages</h3>
 
 <p>
-  <b>&raquo;</b> <a href="version-i18n-export?version_id=@version_id@"><b>Export</b>
-      messages from the database to catalog files</a> (NB! Overwrites
-      catalog files in the file system)
+  <b>&raquo;</b> <a href="@export_url@"><b>Export</b>
+      messages from the database to catalog files</a>
 </p>
 
 <p>
   <b>&raquo;</b> <a
-      href="version-i18n-import?version_id=@version_id@&format=xml"><b>Import</b>
-      messages from catalog files to the database</a> (NB! Overwrites
-      messages in the database)
+      href="@import_url@"><b>Import</b>
+      messages from catalog files to the database</a>
 </p>
 
 
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl	3 Oct 2003 08:56:40 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl	11 Dec 2003 21:39:45 -0000	1.5
@@ -26,3 +26,5 @@
 
 set localize_url [export_vars -base "[apm_package_url_from_key "acs-lang"]admin/message-list" { package_key {locale {[ad_conn locale]}}}]
 
+set import_url [export_vars -base "/acs-lang/admin/import-messages" { package_key {return_url {[ad_return_url]}} }]
+set export_url [export_vars -base "/acs-lang/admin/export-messages" { package_key {return_url {[ad_return_url]}} }]
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	13 Oct 2003 16:37:48 -0000	1.13
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	11 Dec 2003 21:39:45 -0000	1.14
@@ -55,7 +55,7 @@
 
 # We need either or both of the actions to be selected
 if { (! $replace_text_p) && (! $replace_tags_p) } {
-    ad_return_complaint "Invalid HTML Parameters" "You must choose an action to take on selected adp files, either replace_text or replace_tags or both."
+    ad_return_complaint 1 "Invalid HTML Parameters: you must choose an action to take on selected adp files, either replace_text or replace_tags or both."
     ad_script_abort
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-i18n.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n.adp,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-admin/www/apm/version-i18n.adp	16 Oct 2003 13:17:20 -0000	1.15
+++ openacs-4/packages/acs-admin/www/apm/version-i18n.adp	11 Dec 2003 21:39:45 -0000	1.16
@@ -12,323 +12,4 @@
 
 <formtemplate id="file_list_form"></formtemplate>
 
-<h2>Instructions</h2>
-
-<p>
-  Here's the process for internationalizing a package:
-</p>
-
-<ol>
-  <p>
-    <li>
-      <b>Replace text with tags in ADP files</b>: Run above process
-      for ADP files with only the first action checked.
-    </li>
-  </p>
-  <p>
-    <li>
-      <b>Manually check ADP files</b>: Go through the ADP files and
-      check that the &lt;\#...\#&gt;'s are where they should be.
-    </li>
-  </p>
-  <p>
-    <li>
-      <b>Manually check Tcl files</b>: Go through the Tcl files, and
-      replace any localizable text with the &lt;\#...\#&gt; notation.
-    </li>
-  </p>
-  <p>
-    <li>
-      <b>Replace tags with keys</b> and insert into catalog: Run this
-      action for both ADP files and Tcl files, one after another.
-    </li>
-  </p>
-</ol>
-
-<p>
-  An <b>important piece of advice</b> when doing message catalog conversion is to
-  replace phrases rather than words with message catalog lookups.
-  The reason for this is that different languages have very
-  different grammar. An example of this is that some languages don't have
-  prepositions.
-</p>
-
-<h3>Valid message lookups</h3>
-
-<p>
-  In adp files message lookups are always done with the syntax <code>\#package_key.message_key\#</code>. In Tcl
-  files all message lookups *must* be on either of the following formats:
-
-  <ul>
-    <li>Typical static lookup: <code>[_ package_key.message_key]</code> - The message key and package key used here must be string literals, they can't result from variable evaluation.
-  </li> 
-
-  <li>
-    Static lookup with non-default locale: <code>[lang::message::lookup $locale package_key.message_key]</code> - The message key and package key used here must be string literals, they can't result from variable evaluation.
-  </li> 
-  <li>
-    Dynamic lookup: <code>[lang::util::localize $var_with_embedded_message_keys]</code> - In this case the message keys in the variable <code>var_with_embedded_message_keys</code> must appear as string literals <code>\#package_key.message_key\#</code> somewhere in the code. Here is an example of a dynamic lookup:
-    
-    <pre>
-      set message_key_array {
-         dynamic_key_1  \#package_key.message_key1\#
-         dynamic_key_2  \#package_key.message_key2\#
-      }
-
-      set my_text [lang::util::localize $message_key_array([get_dynamic_key])]
-    </pre>
-
-  </li>
-  </ul>  
-</p>
-
-<h3>Actions to take on adp files</h3>
-
-<p>
-  The last two checkboxes in the form above let you choose which of
-  the two available scripts to run on the selected adp files.  You
-  have to choose at least one of these actions, by default both are
-  selected and for almost all cases this is the setting that we
-  recommend. When translating the dotlrn package we first ran through
-  all adp files with both actions. For each adp file, we looked at the
-  untouched texts on the result page and manually inserted <#key
-  text#> tags in the adp where appropriate. When we were done with
-  this run-through we then ran the action "Replace tags with keys and
-  insert into catalog" to remove the temporary tags from the adp:s.
-</p>
-
-<p>
-  To the best of our knowledge there is no harm in running those
-  actions multiple times on files. Before an adp file is modified it
-  will be backed up to a file with the name of the original file with
-  the ending .orig appended to it (i.e.  www/a-file.adp is backed up
-  to www/a-file.adp.orig). However if such an .orig file already
-  exists no backup is done.
-</p>
-
-<p>
-  If the adp status for a file shows 0 translatable texts, then the
-  "Replace texts with tags" action will do nothing. Likewise, if the
-  adp status shows 0 tags then "Replace tags with keys and insert into
-  catalog" action will have no effect.
-</p>
-
-<h4>Replacing text with tags</h4>
-
-<p>
-  If you select "Replace text with tags" then for each adp file a
-  script will attempt to replace translatable text with temporary
-  <#message_key text#> tags. You will have the opportunity to edit the
-  message keys to use. You will also be able to indicate when a piece
-  of text should be left untouched (since it should not be subject to
-  translation, for example Javascript code).
-</p>
-
-<p>
-  Any pieces of text that our script finds that it could not
-  automatically extract, for example pieces of text with embedded adp
-  variables (i.e. \@var_name\@), will be listed on the result
-  page. Make sure to take note of these texts and translate them
-  manually. Suppose for example that our script tells you that it left
-  the text "Manage forum \@forum_name\@" untouched. What you should do then
-  is to edit the corresponding adp file and manually replace that text
-  with something like "<#manage_forum Manage forum \@forum_name\@#>" (to save you
-  from too much typing you may use the shorthand <#_ Manage forum \@forum_name\@#>, an
-  underscore key will result in the script auto-generating a key for
-  you based on the text). After you have made all such manual edits
-  you can simply run the second action labeled "Replace tags with keys
-  and insert into catalog".
-</p>
-
-<p>
-  <b>Note:</b> running this action will not find translatable text
-  within HTML or adp tags on adp pages (i.e. text in alt tags of
-  images), nor will it find translatable text in tcl files. Such texts
-  will have to be found manually.  If those texts are in adp files
-  they are best replaced with the <#message_key text#> tags that can
-  be extracted by the action described below. Here are some commands
-  that we used on Linux to look for texts in adp pages not found by
-  the script:
-</p>
-
-<pre>
-# List image tags with alt attributes, look for alt attributes with literal text
-find -iname '*.adp'|xargs egrep -i '&lt;img.*alt='
-# List submit buttons, look for text in the value attribute 
-find -iname '*.adp'|xargs egrep -i '&lt;input[^&gt;]*type="?submit'
-</pre>
-
-<h4>Replace tags with keys and insert into catalog</h4>
-
-<p>
-  If selected, this action will be executed after the "Replace text
-  with tags" action. It will replace any occurence of the temporary
-  <#message_key text#> tags with \#message_key\# lookups in the adp
-  files and insert the corresponding keys and messages into the en_US
-  catalog file for the package.
-</p>
-
-<p>
-  Entries for the extracted messages will be added to the en_US
-  catalog file only if they do not already exist in that file.  If the
-  messages don't contain the package key prefix this prefix will be
-  added before insertion into the message catalog.
-</p>
-
-<p>
-  The message tags are processed from the adp:s in the order that they
-  appear. If the key of a message tag is already in the catalog file
-  then the message texts will be compared. If the message texts in the
-  tag and in the catalog file are identical then no insertion is done
-  to the catalog file. If they differ it is assumed that the new
-  message should be inserted into the catalog file but with a
-  different key. In this case a warning is issued in the log file and
-  an integer is appended to the message key to make it unique before
-  insertion into the catalog file is done.
-</p>
-
-<h3>Dealing with tcl files</h3>
-
-<p>
-  When internationalizing the tcl files in the dotlrn package we
-  noticed that translatable texts are often found in page titles,
-  context bars, and form labels and options. Many times the texts are
-  enclosed in double quotes. We used the following grep commands on
-  Linux to highlight translatable text in tcl files for us:
-</p>
-
-<pre>
-# Find text in double quotes
-find -iname '*.tcl'|xargs egrep -i '"[a-z]'
-# Find untranslated text in form labels, options and values
-find -iname '*.tcl'|xargs egrep -i '\-(options|label|value)'|egrep -v '<#'|egrep -v '\-(value|label|options)[[:space:]]+\$[a-zA-Z_]+[[:space:]]*\\?[[:space:]]*$'
-# Find text in page titles and context bars
-find -iname '*.tcl'|xargs egrep -i 'set (title|page_title|context_bar) '|egrep -v '<#'
-# Find text in error messages
-find -iname '*.tcl'|xargs egrep -i '(ad_complain|ad_return_error)'|egrep -v '<#'
-</pre>
-
-<p>
-  You may mark up translatable text in tcl library files and tcl pages
-  with temporary tags (on the <#key text#> syntax mentioned
-  previously). If you have a sentence or paragraph of text with
-  variables and or procedure calls in it you should in most cases 
-  try to turn the whole text into one
-  message in the catalog. In those cases, follow these steps:
-</p>
-
-<ul>
-  <li>For each message call in the text, decide on a variable name and replace
-      the procedure call with a variable lookup on the syntax %var_name%. Remember
-      to initialize a tcl variable with the same name on some line above the text.</li>
-  <li>If the text is in a tcl file you must replace variable lookups 
-      (occurences of $var_name or ${var_name}) with %var_name%</li>
-  <li>You are now ready to follow the normal procedure and mark up the text using a 
-      tempoarary message tag (<#_ text_with_percentage_vars#>) and run the action 
-      replace tags with keys in the APM.</li>
-</ul>
-
-<p>
-The variable values in the message are usually fetched with upvar, here is an example from dotlrn:
-</p>
-
-<pre>
-ad_return_complaint 1 "Error: A [parameter::get -parameter classes_pretty_name] 
-             must have <em>no</em>[parameter::get -parameter class_instances_pretty_plural] to be deleted"
-</pre>
-
-<p>
-  was replaced by:
-</p>
-
-<pre>
-set subject [parameter::get -localize -parameter classes_pretty_name] 
-set class_instances [parameter::get -localize -parameter class_instances_pretty_plural]
-
-ad_return_complaint 1 [_ dotlrn.class_may_not_be_deleted]
-</pre>
-
-<p>
-This kind of interpolation also works in adp files where adp variable values will be inserted into the message.
-</p>
-
-<p>
-Alternatively, you may pass in an array list of the variable values to be interpolated into the message so that
-our example becomes:
-</p>
-
-<pre>
-set msg_subst_list [list subject [parameter::get -localize -parameter classes_pretty_name] 
-                         class_instances [parameter::get -localize -parameter class_instances_pretty_plural]]
-
-ad_return_complaint 1 [_ dotlrn.class_may_not_be_deleted $msg_subst_list]
-</pre>
-
-
-<p>
-  When we were done going through the tcl files we ran the following
-  commands to check for mistakes:
-</p>
-
-<pre>
-# Message tags should usually not be in curly braces since then the message lookup may not be
-# executed then (you can usually replace curly braces with the list command). Find message tags 
-# in curly braces (should return nothing, or possibly a few lines for inspection)
-find -iname '*.tcl'|xargs egrep -i '\{.*<#'
-# Check if you've forgotten space between default key and text in message tags (should return nothing)
-find -iname '*.tcl'|xargs egrep -i '<#_[^ ]'
-# Review the list of tcl files with no message lookups
-for tcl_file in $(find -iname '*.tcl'); do egrep -L '(<#|\[_)' $tcl_file; done
-</pre>
-
-<p>
-  When you feel ready you may run the action "Replace tags with keys
-  and insert into catalog" on the tcl files that you've edited to
-  replace the temporary tags with calls to the message lookup
-  procedure.
-</p>
-
-<h3>Checking the Consistency of the Catalog File</h3>
-
-<p>
-  This section describes how we checked that the set of keys used in
-  message lookups in tcl, adp, and info files and the set of keys in
-  the catalog file are identical.  The scripts below assume that
-  message lookups in adp and info files are on the format
-  \#package_key.message_key\#, and that message lookups in tcl files
-  are always done with the underscore procedure. The script assumes
-  that you have perl installed and in your path.  Run the script like
-  this:
-</p>
-
-<pre>
-acs-lang/bin/check-catalog.sh package_key
-</pre>
-
-<p>
-  where package_key is the key of the package that you want to
-  test. If you don't provide the package_key argument then all
-  packages with catalog files will be checked. 
-  The script will run its checks on en_US xml catalog files.
-</p>
-
-<h2>Help</h2>
-
-<a name="file-status"><h3>The I18N status of adp files</h3></a>
-
-<p>
-  Clicking on the "Show I18N status of files" link above will display
-  three counts for each adp file - the number of potential
-  translatable text messages, the number of temporary tags (on the
-  syntax <#message_key text#>), and the number of message key lookups
-  in the file (i.e. occurencies of \#message_key\#).
-</p>
-
-<p>
-  A fully translated adp must have 0 tags, it typically has 0 or only
-  a few texts deemed translatable by our script and any number of
-  message key lookups (the last count). Our script sometimes considers
-  for example Javascript to be translatable, but don't worry - you
-  will have the opportunity to tell it to leave such texts untouched.
-</p>
-
+<a href="/doc/i18n.html">Developer's Guide to i18n</a>
\ No newline at end of file
Index: openacs-4/packages/acs-admin/www/apm/version-tag.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/version-tag.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-tag.tcl	10 Sep 2002 22:21:59 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-tag.tcl	11 Dec 2003 21:39:45 -0000	1.3
@@ -21,7 +21,7 @@
 
 set files [db_list apm_all_paths {
 	select path from apm_package_files where version_id = :version_id order by path
-}
+}]
 
 if { [llength $files] == 0 } {
     ad_return_complaint 1 "<li>No files in this packages"
Index: openacs-4/packages/acs-admin/www/auth/authority.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/acs-admin/www/auth/authority.tcl	7 Nov 2003 17:35:41 -0000	1.18
+++ openacs-4/packages/acs-admin/www/auth/authority.tcl	11 Dec 2003 21:39:45 -0000	1.19
@@ -274,16 +274,7 @@
         if { $run_time_seconds > 0 && $num_actions > 0 } {
             set actions_per_minute [expr round(60.0 * $num_actions / $run_time_seconds)]
         }
-        
-        set run_time {}
-        if { $run_time_seconds > 0 } {
-            set hrs [expr $run_time_seconds / (60*60)]
-            set mins [expr ($run_time_seconds / 60) % 60]
-            set secs [expr $run_time_seconds % 60]
-            if { $hrs > 0 } { append run_time "${hrs}h " }
-            if { $hrs > 0 || $mins > 0 } { append run_time "${mins}m " }
-            append run_time "${secs}s"
-        }
+        set run_time [util::interval_pretty -seconds $run_time_seconds]
     }
     if { [exists_and_not_null get_doc_impl_id] && [exists_and_not_null process_doc_impl_id] } {
         set batch_sync_run_url [export_vars -base batch-job-run { authority_id }]
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	18 Sep 2002 14:54:47 -0000	1.9
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	11 Dec 2003 21:39:45 -0000	1.10
@@ -29,7 +29,7 @@
     where user_id = :user_id
 }]} {
     # The user is not in there
-    ad_return_complaint "Invalid User" "The user is not in the system"
+    ad_return_complaint 1 "Invalid User: the user is not in the system"
     return
 }
 
@@ -70,7 +70,7 @@
 }
 
 if [empty_string_p $action] {
-    ad_return_complaint "Not valid action" "You have not changed the user in any way"
+    ad_return_complaint 1 "Not valid action: You have not changed the user in any way"
     return
 }
 
Index: openacs-4/packages/acs-admin/www/users/user-batch-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/user-batch-add.adp	22 May 2003 14:00:20 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/user-batch-add.adp	11 Dec 2003 21:39:45 -0000	1.4
@@ -10,16 +10,16 @@
 <p>Each user will get this email:
 <br />From: <input name="from" value="@admin_email@">
 <br />Subject: <input name=subject value="You have been added as a user to @system_name@ at @system_url@" size=50>
-<p>Message: (The four variables delimited by # marks will be automatically set for each user.)
+<p>Message: (The four variables delimited by {) marks will be automatically set for each user.)
 <br /><textarea name="message" rows=10 cols=70 wrap=hard>
-#first_names# #last_name#
+{first_names} {last_name}
 
 You have been added as a user to @system_name@
 at @system_url@
 
 Login information:
-Email: #email#
-Password: #password# 
+Email: {email}
+Password: {password} 
 (you may change your password after you log in)
 
 Thank you,
Index: openacs-4/packages/acs-api-browser/acs-api-browser.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/acs-api-browser.info,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-api-browser/acs-api-browser.info	10 Nov 2003 14:28:55 -0000	1.10
+++ openacs-4/packages/acs-api-browser/acs-api-browser.info	11 Dec 2003 21:39:45 -0000	1.11
@@ -1,20 +1,21 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-api-browser" url="http://www.openacs.org/acs-repository/apm/packages/acs-api-browser/" type="apm_service">
+<package key="acs-api-browser" url="http://openacs.org/repository/apm/packages/acs-api-browser/" type="apm_service">
     <package-name>API Browser</package-name>
     <pretty-plural>API Browsers</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/repository/download/apm/acs-api-browser-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-api-browser-5.0.0b4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <summary>A browser for Tcl and SQL APIs.</summary>
+        <summary>Interactive documentation for the Tcl and SQL APIs.</summary>
         <release-date>2003-11-07</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">On line interactive documentation for the locally installed Tcl and SQL APIs.  Links to the Tcl core and AOLServer online documentation as well.</description>
 
-        <provides url="acs-api-browser" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-api-browser" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-api-browser/lib/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/lib/search.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-api-browser/lib/search.adp	10 Sep 2003 12:11:54 -0000	1.1
+++ openacs-4/packages/acs-api-browser/lib/search.adp	11 Dec 2003 21:39:45 -0000	1.2
@@ -64,4 +64,25 @@
   </tr>
  </form>
 
+ <if @db_doc_search_url@ not nil>
+  <form action="@db_doc_search_url@" method="get">
+   @db_doc_search_export;noquote@
+ </if>
+   <tr bgcolor="#DDDDDD">
+    <td colspan="2">
+     <if @db_doc_search_url@ not nil>
+       <h4>@db_pretty@ Search</h4>
+       <input type="text" name="@db_doc_search_query_name@" />
+       <input type="submit" value="Go" /><br />
+     </if>
+     <else>
+       <h4>@db_pretty@ Documentation</h4>
+     </else>
+     <a href="@db_doc_url@">Browse the @db_pretty@ documentation</a>
+    </td>
+   </tr>
+ <if @db_doc_search_url@ not nil>
+  </form>
+ </if>
+
 </table>
Index: openacs-4/packages/acs-api-browser/lib/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/lib/search.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-api-browser/lib/search.tcl	10 Sep 2003 12:11:55 -0000	1.1
+++ openacs-4/packages/acs-api-browser/lib/search.tcl	11 Dec 2003 21:39:45 -0000	1.2
@@ -12,7 +12,7 @@
 
 set aolserver_tcl_api_root "http://www.aolserver.com/docs/devel/tcl/api/"
 
-set tcl_docs_root "http://dev.scriptics.com/man/tcl[info tclversion]/TclCmd/contents.htm"
+set tcl_docs_root "http://tcl.tk/man/tcl[info tclversion]/TclCmd/contents.htm"
 
 set package_url [apm_package_url_from_key "acs-api-browser"]
 
@@ -25,3 +25,29 @@
 set aolserver_search_url "${package_url}tcl-proc-view"
 
 set tcl_search_url "${package_url}tcl-doc-search"
+
+
+switch [db_type] {
+    postgresql {
+        set db_pretty "PostgreSQL [db_version]"
+        set db_doc_url "http://www.postgresql.org/docs/[db_version]/interactive/index.html"
+        set db_doc_search_url "http://www.postgresql.org/search.cgi"
+        set db_doc_search_export [export_vars -form { { ul "http://www.postgresql.org/docs/[db_version]/static/" } }]
+        set db_doc_search_query_name "q"
+    }
+    oracle {
+        set db_pretty "Oracle [db_version]"
+        # Oracle docs require login, can't offer direct search link
+        switch [db_version] {
+            8.1.7 {
+                set db_doc_url "http://otn.oracle.com/documentation/oracle8i.html"
+            }
+            8.1.6 {
+                set db_doc_url "http://otn.oracle.com/documentation/oracle8i_arch_816.html"
+            }
+            9* {
+                set db_doc_url "http://otn.oracle.com/documentation/oracle9i.html"
+            }
+        }
+    }
+}
Index: openacs-4/packages/acs-authentication/acs-authentication.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/acs-authentication.info,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-authentication/acs-authentication.info	11 Nov 2003 10:34:47 -0000	1.10
+++ openacs-4/packages/acs-authentication/acs-authentication.info	11 Dec 2003 21:39:46 -0000	1.11
@@ -7,13 +7,13 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0a3" url="http://openacs.org/repository/download/apm/acs-authentication-5.0a3.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-authentication-5.0.0b4.apm">
         <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
-        <summary>Authentication and related functionality.</summary>
+        <summary>Authentication, account management, and related functionality.</summary>
         <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
-        <description format="text/html">Implements authentication-related security functions for OpenACS, including authentication, password maangement, account management, session management, etc.</description>
+        <description format="text/html">Implements authentication-related security functions for OpenACS, including password, account and session management, bulk account creation etc.  Provides a contract based interface for different authentication methods such as PAM or LDAP based authentication.</description>
 
-        <provides url="acs-authentication" version="5.0a3"/>
+        <provides url="acs-authentication" version="5.0.0b4"/>
         <requires url="acs-kernel" version="5.0d10"/>
         <requires url="acs-service-contract" version="4.7d2"/>
 
@@ -23,14 +23,14 @@
             <callback type="before-uninstall"  proc="auth::package_uninstall"/>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AcknowledgementFileName"  default="{acs_root_dir}/batch-sync-ack-{authority}-{ansi_date}.xml" description="Full file path to where we should drop the acknowledgement file for batch syncs. You can use these special values: {acs_root_dir} will get replaced with the root directory for this OpenACS installation, e.g. '/var/lib/aolserver/service0' (no trailing slash). {ansi_date} will get replaced with today's date in ANSI format, e.g. '2003-10-29'. {authority} will get replaced with the short_name of the authority, e.g. 'rz_pam'." section_name="Batch Syncrhonization"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="KeepBatchLogDays"  default="0" description="The number of days to keep the log for a batch user synchronization job around. Say 0 if you want to keep the log forever." section_name="Batch Syncrhonization"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AcknowledgementFileName"  default="{acs_root_dir}/batch-sync-ack-{authority}-{ansi_date}.xml" description="Full file path to where we should drop the acknowledgement file for batch syncs. You can use these special values: {acs_root_dir} will get replaced with the root directory for this OpenACS installation, e.g. '/var/lib/aolserver/service0' (no trailing slash). {ansi_date} will get replaced with today's date in ANSI format, e.g. '2003-10-29'. {authority} will get replaced with the short_name of the authority, e.g. 'rz_pam'." section_name="Batch Synchronization"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="KeepBatchLogDays"  default="0" description="The number of days to keep the log for a batch user synchronization job around. Say 0 if you want to keep the log forever." section_name="Batch Synchronization"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegisterAuthority"  default="local" description="The short name of the authority in which users are registered. Is best set in the Authentication admin UI."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncAddUsersToDotLrnP"  default="0" description="Should we add users to .LRN? This requires .LRN to be installed, and has serious performance implications." section_name="Batch Syncrhonization"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncDotLrnAccessLevel"  default="1" description=".LRN access level (if .LRN is installed). 1 = Full access user, 0 = Limited access user" section_name="Batch Syncrhonization"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncDotLrnReadPrivateDataP"  default="1" description=".LRN user is guest (if .LRN is installed). 1 = Not a guest , 0 = Guest" section_name="Batch Syncrhonization"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SyncDotLrnUserType"  default="student" description=".LRN user type for new user (if .LRN is installed)" section_name="Batch Syncrhonization"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncEmailConfirmationP"  default="0" description="Send out email confirmation when batch sync is complete. 1 = Yes, 0 = No." section_name="Batch Syncrhonization"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncAddUsersToDotLrnP"  default="0" description="Should we add users to .LRN? This requires .LRN to be installed, and has serious performance implications." section_name="Batch Synchronization"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncDotLrnAccessLevel"  default="1" description=".LRN access level (if .LRN is installed). 1 = Full access user, 0 = Limited access user" section_name="Batch Synchronization"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncDotLrnReadPrivateDataP"  default="1" description=".LRN user is guest (if .LRN is installed). 1 = Not a guest , 0 = Guest" section_name="Batch Synchronization"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SyncDotLrnUserType"  default="student" description=".LRN user type for new user (if .LRN is installed)" section_name="Batch Synchronization"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncEmailConfirmationP"  default="0" description="Send out email confirmation when batch sync is complete. 1 = Yes, 0 = No." section_name="Batch Synchronization"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -N -r1.58 -r1.59
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	6 Nov 2003 09:44:13 -0000	1.58
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	11 Dec 2003 21:39:46 -0000	1.59
@@ -413,6 +413,9 @@
         }
     }
 
+    set email [string trim $email]
+    set username [string trim $username]
+
     foreach elm [get_all_registration_elements] {
         if { [info exists $elm] } {
             set user_info($elm) [set $elm]
@@ -1359,6 +1362,13 @@
         }
     }
 
+    if { [info exists user(email)] } {
+        set user(email) [string trim $user(email)]
+    }
+    if { [info exists user(username)] } {
+        set user(username) [string trim $user(username)]
+    }
+
     if { $update_p } {
         set user(user_id) [acs_user::get_by_username \
                                -authority_id $authority_id \
Index: openacs-4/packages/acs-authentication/tcl/local-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/local-procs.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/acs-authentication/tcl/local-procs.tcl	10 Nov 2003 16:16:13 -0000	1.25
+++ openacs-4/packages/acs-authentication/tcl/local-procs.tcl	11 Dec 2003 21:39:46 -0000	1.26
@@ -457,15 +457,23 @@
     # Notify admin on new registration
     if { [parameter::get -parameter  NotifyAdminOfNewRegistrationsP -default 0] } {
 	with_catch errmsg {
+	    set admin_email [parameter::get \
+				 -parameter NewRegistrationEmailAddress \
+				 -package_id [ad_conn subsite_id] \
+				 -default [ad_system_owner]]
+
+	    set admin_locale [lang::user::locale -user_id [party::get_by_email -email $admin_email]]
+	    set system_url [ad_url]
+
             ns_sendmail \
-                [parameter::get -parameter NewRegistrationEmailAddress -package_id [ad_conn subsite_id] -default [ad_system_owner]] \
+		$admin_email \
                 $email \
-                [_ acs-subsite.lt_New_registration_at_s] \
-                [_ acs-subsite.lt_first_names_last_name]
+		[lang::message::lookup $admin_locale acs-subsite.lt_New_registration_at_s] \
+		[lang::message::lookup $admin_locale acs-subsite.lt_first_names_last_name]
 	} {
             # We don't fail hard here, just log an error
             global errorInfo
-	    ns_log Error "Error sending admin notification to $notification_address.\n$errorInfo"
+	    ns_log Error "Error sending admin notification to $admin_email.\n$errorInfo"
 	}
     }
 
Index: openacs-4/packages/acs-automated-testing/acs-automated-testing.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/acs-automated-testing.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-automated-testing/acs-automated-testing.info	10 Nov 2003 14:28:55 -0000	1.5
+++ openacs-4/packages/acs-automated-testing/acs-automated-testing.info	11 Dec 2003 21:39:46 -0000	1.6
@@ -7,14 +7,14 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.0.0a5" url="http://openacs.org/repository/download/apm/acs-automated-testing-5.0.0a5.apm">
-        <owner url="http://www.openacs.org">OpenACS</owner>
-        <summary>Provides an interface for administering automated tests within the OpenACS.</summary>
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-automated-testing-5.0.0b4.apm">
+        <owner url="http://openacs.org">OpenACS</owner>
+        <summary>The interface to the automated testing facilities within OpenACS.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org">OpenACS</vendor>
-        <description format="text/html">A UI for viewing and running automated tests within the OpenACS system.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Provides a UI for viewing and running automated tests provided by each package within the OpenACS system.</description>
 
-        <provides url="acs-automated-testing" version="5.0.0a5"/>
+        <provides url="acs-automated-testing" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	8 Dec 2003 06:57:14 -0000	1.22
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	11 Dec 2003 21:39:46 -0000	1.23
@@ -787,11 +787,13 @@
   teardown_code will be executed even if error is thrown. Will catch
   errors in teardown_code as well and provide stack traces for both code blocks.
 
-  @param test_code Tcl code that sets up the test case and executes tests
+  @param test_code     Tcl code that sets up the test case and executes tests
+
   @param teardown_code Tcl code that tears down database data etc. that needs to execute
-  after testing even if error is thrown.
-  @param rollback If specified, any db transactions in test_code will be rolled back.
+                       after testing even if error is thrown.
 
+  @param rollback      If specified, any db transactions in test_code will be rolled back.
+
   @author Peter Marklund
 } {
   if { $rollback_p } {
Index: openacs-4/packages/acs-automated-testing/www/doc/index.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/doc/index.html,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-automated-testing/www/doc/index.html	11 Dec 2003 21:39:46 -0000	1.2
@@ -0,0 +1,10 @@
+<html>
+<head>
+<title>ACS Automated Testing</title>
+</head>
+<body bgcolor="#FFFFFF">
+
+See <a href="/doc/tutorial-debug.html">/doc/tutorial-debug.html</a>.
+
+</body>
+</html>
Index: openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info	11 Dec 2003 18:02:26 -0000	1.13
+++ openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info	11 Dec 2003 21:39:46 -0000	1.14
@@ -1,22 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-bootstrap-installer" url="http://www.openacs.org/acs-repository/apm/packages/acs-bootstrap-installer" type="apm_service">
+<package key="acs-bootstrap-installer" url="http://openacs.org/repository/apm/packages/acs-bootstrap-installer" type="apm_service">
     <package-name>Bootstrap Installer</package-name>
     <pretty-plural>Bootstrap Installers</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/repository/download/apm/acs-bootstrap-installer-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-bootstrap-installer-5.0.0b4.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>Bootstraps an OpenACS installation.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">This package bootstraps OpenACS. If the core packages have not yet been installed, it calls the installer which leads the user through the steps necessary to do so.  It also checks that the installation meets the requirements for a successful install of OpenACS.</description>
 
-        <provides url="acs-bootstrap-installer" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
 
+        <provides url="acs-bootstrap-installer" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
+
         <callbacks>
         </callbacks>
         <parameters>
Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	15 Oct 2003 09:47:44 -0000	1.12
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	11 Dec 2003 21:39:46 -0000	1.13
@@ -12,6 +12,142 @@
 # Return a header for an installation page, suitable for ns_writing.
 # This procedure engages the installer mutex, as every installer page is a critical section.
 
+ad_proc -private install_input_widget { 
+    {-type ""}
+    {-size 40}
+    {-extra_attributes ""}
+    param_name 
+} {
+    Return an HTML input widget for a parameter with an
+    indication of whether the param is mandatory.
+} {
+    set type_attribute [ad_decode $type "" "" "type=\"$type\""]
+
+    set input_widget "<input name=\"$param_name\" size=\"$size\" $type_attribute $extra_attributes>"
+
+    if { [install_param_mandatory_p $param_name] } {
+        append input_widget " <span style=\"color: red;\">\[*\]</span>"
+    }
+
+    return $input_widget
+} 
+
+ad_proc -private install_param_mandatory_p { param_name } {
+    Return 1 if the given parameter with given name is
+    mandatory for OpenACS install and 0 otherwise.
+
+    @author Peter Marklund
+} {
+    array set mandatory_params_array [install_mandatory_params]
+    set mandatory_names [array names mandatory_params_array]
+    return [expr [lsearch -exact $mandatory_names $param_name] != -1]
+}
+
+ad_proc -private install_mandatory_params {} {
+    Return information about parameters that are mandatory
+    for OpenACS installation.
+
+    @return An array list with variable names as values
+            and pretty names as keys.
+} {
+    return {
+        email "Email"
+        first_names "First names"
+        last_name "Last name"
+        password "Password"
+        password_confirmation "Password confirmation"
+        system_url "System URL"
+        system_name "System name"
+        publisher_name "Publisher name"
+    }
+}
+
+ad_proc -private install_optional_params {} {
+    Return information about parameters that are optional
+    for OpenACS installation.
+
+    @return An array list with variable names as values
+            and default values as keys.
+} {
+    return  {
+        username ""
+        system_owner ""
+        admin_owner ""
+        host_administrator ""
+        outgoing_sender ""
+        new_registrations ""
+    }
+}
+
+ad_proc -private install_page_contract { mandatory_params optional_params } {
+    Instead of using ad_page_contract that relies on certain acs-subsite libraries
+    that may not be available at all times during installation we use this
+    more primitive proc instead.
+
+    @param mandatory_params An array list where keys are param names and values
+                            are pretty names.
+    @param optional_params An array list with param names as keys and default
+                           values as keys.
+
+    @author Peter Marklund
+} {
+    array set mandatory_params_array $mandatory_params
+    array set optional_params_array $optional_params
+
+    set form [ns_getform]
+    set missing_params [list]
+
+    if { [empty_string_p $form] } {
+        # Form is empty - all mandatory params are missing
+        foreach param_name [array names mandatory_params_array] {
+            lappend missing_params $mandatory_params_array($param_name)
+        }
+    } else {
+        # Form is non-empty
+
+        # Loop over all params
+        set all_param_names [concat [array names mandatory_params_array] \
+                                 [array names optional_params_array]]
+        foreach param_name $all_param_names {
+            set param_value [ns_set iget $form $param_name]
+            set mandatory_p [expr [lsearch -exact $mandatory_params $param_name] != -1]
+
+            if { ![empty_string_p $param_value] } {
+                # Param in form - set value in callers scope
+                uplevel [list set $param_name $param_value]
+            } else {
+                # Param not in form
+                if { $mandatory_p } {
+                    # Mandatory param - complain
+                    lappend missing_params $mandatory_params_array($param_name)
+                } else {
+                    # Optional param - set default
+                    uplevel [list set $param_name $optional_params_array($param_name)]
+                }
+            }
+        }
+    }
+
+    # If there are missing mandatory params - return a complaint
+    # page and exit
+    if { [llength $missing_params] > 0 } {
+        ns_write "[install_header 200 "Missing parameters"]
+
+The following mandatory parameters are missing:
+<ul>
+<li>[join $missing_params "</li>\n<li>"]</li>
+</ul>
+
+<p>
+Please back up your browser and provide those parameters. Thank you.
+</p>
+
+[install_footer]
+"
+        return -code return
+    }
+}
+
 proc install_header { status title } {
 
     # Prefix the page title
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 -N -r1.27 -r1.28
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	10 Nov 2003 14:28:55 -0000	1.27
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	11 Dec 2003 21:39:46 -0000	1.28
@@ -7,16 +7,20 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://openacs.org/repository/download/apm/acs-content-repository-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-content-repository-5.0.0b4.apm">
         <owner url="mailto:dcwickstrom@earthlink.net">Dan Wickstrom</owner>
-        <summary>A canonical repository for all OpenACS content.</summary>
+        <summary>The canonical repository for OpenACS content.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://openacs.org/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Provides the API for creating and managing user generated content including 
+         full support for versioning, rendering content to the filesystem, folders and composite content items, and
+         other CMS backing functionality.  Utilized by Bug Tracker, File Storage, and other packages.
+        </description>
 
-        <provides url="acs-content-repository" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
-        <requires url="acs-service-contract" version="5.0.0a5"/>
-        <requires url="search" version="5.0.0a5"/>
+        <provides url="acs-content-repository" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
+        <requires url="acs-service-contract" version="5.0.0b4"/>
+        <requires url="search" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
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 -N -r1.13 -r1.14
--- openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	7 Nov 2003 19:51:43 -0000	1.13
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql	11 Dec 2003 21:39:46 -0000	1.14
@@ -1674,24 +1674,22 @@
   v_parent_folder_p   char(1);
 begin
   v_parent_folder_p := 'f';
+  v_folder_id := get_parent_folder.item_id;
 
-  while v_parent_folder_p = 'f' loop
-
+  while v_parent_folder_p = 'f' and v_folder_id is not null loop
     select
       parent_id, content_folder.is_folder( parent_id ) 
     into 
       v_folder_id, v_parent_folder_p
     from
       cr_items
     where
-      item_id = get_parent_folder.item_id;
+      item_id = v_folder_id;
 
   end loop; 
 
   return v_folder_id;
-  exception
-    when NO_DATA_FOUND then
-      return null;
+
 end get_parent_folder;
 
 end content_item;
Index: openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql	30 Sep 2003 12:10:01 -0000	1.7
+++ openacs-4/packages/acs-content-repository/sql/oracle/content-revision.sql	11 Dec 2003 21:39:46 -0000	1.8
@@ -195,7 +195,7 @@
     creation_user, creation_date, creation_ip,
     last_modified, modifying_user, modifying_ip
   ) ( select 
-    v_copy_id, object_type, context_id, security_inherit_p, 
+    v_copy_id, object_type, v_target_item_id, security_inherit_p, 
     copy.creation_user, sysdate, copy.creation_ip,
     sysdate, copy.creation_user, copy.creation_ip from
     acs_objects where object_id = copy.revision_id
Index: openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.0.0b3-5.0.0b4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.0.0b3-5.0.0b4.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.0.0b3-5.0.0b4.sql	11 Dec 2003 21:39:46 -0000	1.2
@@ -0,0 +1,8 @@
+-- there was an infinite loop in content_item.get_parent_folder if called with 
+-- a child content_item rather than a content item which was directly below a 
+-- folder.
+
+@@ ../content-item.sql
+
+-- fix error in setting context_id in content_revision__copy
+@@ ../content-revision.sql
\ No newline at end of file
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql,v
diff -u -N -r1.40 -r1.41
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql	17 May 2003 09:43:09 -0000	1.40
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-create.sql	11 Dec 2003 21:39:46 -0000	1.41
@@ -267,7 +267,7 @@
   p_item_id    alias for $1;
 begin
   return tree_sortkey from cr_items where item_id = p_item_id;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 create function cr_items_tree_insert_tr () returns opaque as '
 declare
@@ -1004,7 +1004,7 @@
   p_keyword_id    alias for $1;
 begin
   return tree_sortkey from cr_keywords where keyword_id = p_keyword_id;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 create function cr_keywords_tree_insert_tr () returns opaque as '
 declare
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql	17 May 2003 09:43:09 -0000	1.9
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql	11 Dec 2003 21:39:46 -0000	1.10
@@ -10,7 +10,7 @@
 -- License.  Full text of the license is available from the GNU Project:
 -- http://www.fsf.org/copyleft/gpl.html
 
-create function content_extlink__new (varchar,varchar,varchar,varchar,integer,integer,timestamptz,integer,varchar)
+create or replace function content_extlink__new (varchar,varchar,varchar,varchar,integer,integer,timestamptz,integer,varchar)
 returns integer as '
 declare
   new__name                   alias for $1;  -- default null  
@@ -68,7 +68,7 @@
 
 end;' language 'plpgsql';
 
-create function content_extlink__delete (integer)
+create or replace function content_extlink__delete (integer)
 returns integer as '
 declare
   delete__extlink_id             alias for $1;  
@@ -83,7 +83,7 @@
 end;' language 'plpgsql';
 
 
-create function content_extlink__is_extlink (integer)
+create or replace function content_extlink__is_extlink (integer)
 returns boolean as '
 declare
   is_extlink__item_id                alias for $1;  
@@ -99,9 +99,9 @@
   
   return v_extlink_p;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
-create function content_extlink__copy (integer,integer,integer,varchar)
+create or replace function content_extlink__copy (integer,integer,integer,varchar)
 returns integer as '
 declare
   copy__extlink_id             alias for $1;  
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 -N -r1.23 -r1.24
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	14 Oct 2003 07:30:42 -0000	1.23
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql	11 Dec 2003 21:39:47 -0000	1.24
@@ -12,7 +12,7 @@
 
 -- create or replace package body content_folder
 
-create function content_folder__new(varchar,varchar,varchar,integer) 
+create or replace function content_folder__new(varchar,varchar,varchar,integer) 
 returns integer as '
 declare
   new__name                   alias for $1;  
@@ -35,7 +35,7 @@
 -- function new
 select define_function_args('content_folder__new','name,label,description,parent_id,context_id,folder_id,creation_date,creation_user,creation_ip');
 
-create function content_folder__new (varchar,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar)
+create or replace function content_folder__new (varchar,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar)
 returns integer as '
 declare
   new__name                   alias for $1;  
@@ -117,7 +117,7 @@
 
 -- function new -- accepts security_inherit_p DaveB
 
-create function content_folder__new (varchar,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar, boolean)
+create or replace function content_folder__new (varchar,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar, boolean)
 returns integer as '
 declare
   new__name                   alias for $1;  
@@ -199,7 +199,7 @@
 end;' language 'plpgsql';
 
 -- procedure delete
-create function content_folder__delete (integer)
+create or replace function content_folder__delete (integer)
 returns integer as '
 declare
   delete__folder_id              alias for $1;  
@@ -243,7 +243,7 @@
 
 
 -- procedure rename
-create function content_folder__rename (integer,varchar,varchar,varchar)
+create or replace function content_folder__rename (integer,varchar,varchar,varchar)
 returns integer as '
 declare
   rename__folder_id              alias for $1;  
@@ -285,7 +285,7 @@
 -- 3) update the parent_id for the folder
 
 -- procedure move
-create function content_folder__move (integer,integer)
+create or replace function content_folder__move (integer,integer)
 returns integer as '
 declare
   move__folder_id              alias for $1;  
@@ -352,7 +352,7 @@
 
 
 -- procedure copy
-create function content_folder__copy (integer,integer,integer,varchar)
+create or replace function content_folder__copy (integer,integer,integer,varchar)
 returns integer as '
 declare
   copy__folder_id              alias for $1;  
@@ -463,7 +463,7 @@
 
 
 -- function is_folder
-create function content_folder__is_folder (integer)
+create or replace function content_folder__is_folder (integer)
 returns boolean as '
 declare
   item_id                alias for $1;  
@@ -472,11 +472,11 @@
   return count(*) > 0 from cr_folders
     where folder_id = item_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- function is_sub_folder
-create function content_folder__is_sub_folder (integer,integer)
+create or replace function content_folder__is_sub_folder (integer,integer)
 returns boolean as '
 declare
   is_sub_folder__folder_id              alias for $1;  
@@ -521,7 +521,7 @@
 
 
 -- function is_empty
-create function content_folder__is_empty (integer)
+create or replace function content_folder__is_empty (integer)
 returns boolean as '
 declare
   is_empty__folder_id              alias for $1;  
@@ -537,11 +537,11 @@
 
   return v_return;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- procedure register_content_type
-create function content_folder__register_content_type (integer,varchar,boolean)
+create or replace function content_folder__register_content_type (integer,varchar,boolean)
 returns integer as '
 declare
   register_content_type__folder_id              alias for $1;  
@@ -606,7 +606,7 @@
 
 
 -- procedure unregister_content_type
-create function content_folder__unregister_content_type (integer,varchar,boolean)
+create or replace function content_folder__unregister_content_type (integer,varchar,boolean)
 returns integer as '
 declare
   unregister_content_type__folder_id              alias for $1;  
@@ -644,7 +644,7 @@
 
 
 -- function is_registered
-create function content_folder__is_registered (integer,varchar,boolean)
+create or replace function content_folder__is_registered (integer,varchar,boolean)
 returns boolean as '
 declare
   is_registered__folder_id              alias for $1;  
@@ -654,7 +654,7 @@
   v_subtype_val                         record;
 begin
 
-  if is_registered__include_subtypes = ''f'' then
+  if is_registered__include_subtypes = ''f'' or  is_registered__include_subtypes is null then
     select 
       count(1)
     into 
@@ -699,11 +699,11 @@
     return ''t'';
   end if;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- function get_label
-create function content_folder__get_label (integer)
+create or replace function content_folder__get_label (integer)
 returns varchar as '
 declare
   get_label__folder_id              alias for $1;  
@@ -719,11 +719,11 @@
 
   return v_label;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function get_index_page
-create function content_folder__get_index_page (integer)
+create or replace function content_folder__get_index_page (integer)
 returns integer as '
 declare
   get_index_page__folder_id              alias for $1;  
@@ -761,11 +761,11 @@
 
   return v_index_page_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function is_root
-create function content_folder__is_root (integer)
+create or replace function content_folder__is_root (integer)
 returns boolean as '
 declare
   is_root__folder_id              alias for $1;  
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 -N -r1.42 -r1.43
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	17 Nov 2003 18:52:02 -0000	1.42
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql	11 Dec 2003 21:39:47 -0000	1.43
@@ -13,7 +13,7 @@
 create view content_item_globals as 
 select -100 as c_root_folder_id;
 
-create function content_item__get_root_folder (integer)
+create or replace function content_item__get_root_folder (integer)
 returns integer as '
 declare
   get_root_folder__item_id                alias for $1;  -- default null 
@@ -39,7 +39,7 @@
 
   return v_folder_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 -- new 19 param version of content_item__new
 create or replace function content_item__new (
@@ -236,7 +236,7 @@
 end;' language 'plpgsql';
 
 --
-create function content_item__new (varchar,integer,integer,varchar,timestamptz,integer,integer,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar)
+create or replace function content_item__new (varchar,integer,integer,varchar,timestamptz,integer,integer,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar)
 returns integer as '
 declare
   new__name                   alias for $1;  
@@ -392,7 +392,7 @@
  
 end;' language 'plpgsql';
 
-create function content_item__new (varchar,integer,integer,varchar,timestamptz,integer,integer,varchar,varchar,varchar,varchar,varchar,varchar,varchar,integer)
+create or replace function content_item__new (varchar,integer,integer,varchar,timestamptz,integer,integer,varchar,varchar,varchar,varchar,varchar,varchar,varchar,integer)
 returns integer as '
 declare
   new__name                   alias for $1;  
@@ -551,7 +551,7 @@
  
 end;' language 'plpgsql';
 
-create function content_item__new(varchar,integer,varchar,text,text) 
+create or replace function content_item__new(varchar,integer,varchar,text,text) 
 returns integer as '
 declare
         new__name               alias for $1;
@@ -580,7 +580,7 @@
                                  
 end;' language 'plpgsql';
 
-create function content_item__new(varchar,integer) returns integer as '
+create or replace function content_item__new(varchar,integer) returns integer as '
 declare
         new__name       alias for $1;
         new__parent_id  alias for $2;
@@ -594,7 +594,7 @@
 
 -- function new -- sets security_inherit_p to FALSE -DaveB
 
-create function content_item__new ( integer, varchar, integer, varchar, timestamptz, integer, integer, varchar, boolean, varchar, text, varchar, boolean, varchar,varchar,varchar)
+create or replace function content_item__new ( integer, varchar, integer, varchar, timestamptz, integer, integer, varchar, boolean, varchar, text, varchar, boolean, varchar,varchar,varchar)
 
 returns integer as '
 declare
@@ -755,7 +755,7 @@
 
 end;' language 'plpgsql';
 
-create function content_item__is_published (integer)
+create or replace function content_item__is_published (integer)
 returns boolean as '
 declare
   is_published__item_id                alias for $1;  
@@ -772,29 +772,37 @@
   and
     item_id = is_published__item_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
-create function content_item__is_publishable (integer)
+create or replace function content_item__is_publishable (integer)
 returns boolean as '
 declare
   is_publishable__item_id                alias for $1;  
   v_child_count                          integer;       
   v_rel_count                            integer;       
+  v_content_type			 varchar;
   v_template_id                          cr_templates.template_id%TYPE;
   v_child_type                           record;
   v_rel_type                             record;
   -- v_pub_wf                               record;
 begin
+  -- check valid item_id
+  select content_item__get_content_type(is_publishable__item_id) into v_content_type;
 
+  if v_content_type is null then 
+	raise exception ''content_item__is_publishable item_id % invalid'',is_publishable__item_id;
+  end if;
+
   -- validate children
   -- make sure the # of children of each type fall between min_n and max_n
   for v_child_type in select
                         child_type, min_n, max_n
                       from
                         cr_type_children
                       where
-                        parent_type = content_item__get_content_type(is_publishable__item_id) 
+                        parent_type = v_content_type 
+	                and (min_n is not null or max_n is not null)
   LOOP
     select
       count(rel_id) into v_child_count
@@ -819,13 +827,14 @@
 
   -- validate relations
   -- make sure the # of ext links of each type fall between min_n and max_n
+  -- only check if one of min_n max_n not null
   for v_rel_type in select
                       target_type, min_n, max_n
                     from
                       cr_type_relations
                     where
-                      content_type = content_item__get_content_type(is_publishable__item_id)
-
+                      content_type = v_content_type
+		      and (max_n is not null or min_n is not null)
   LOOP
     select
       count(rel_id) into v_rel_count
@@ -879,9 +888,9 @@
 
   return ''t'';
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
--- new verson of is_valid_child that checks relation_tag
+-- new verson of is_valid_child that checks relation_tag 
 
 create or replace function content_item__is_valid_child (integer,varchar,varchar)
 returns boolean as '
@@ -942,9 +951,9 @@
 
   return v_is_valid_child;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 --
-create function content_item__is_valid_child (integer,varchar)
+create or replace function content_item__is_valid_child (integer,varchar)
 returns boolean as '
 declare
   is_valid_child__item_id                alias for $1;  
@@ -995,7 +1004,7 @@
 
   return v_is_valid_child;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 /* delete a content item
@@ -1007,7 +1016,7 @@
  6) delete keyword associations
  7) delete all associated comments */
 
-create function content_item__delete (integer)
+create or replace function content_item__delete (integer)
 returns integer as '
 declare
   delete__item_id                alias for $1;  
@@ -1132,7 +1141,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__rename (integer,varchar)
+create or replace function content_item__rename (integer,varchar)
 returns integer as '
 declare
   rename__item_id                alias for $1;  
@@ -1167,7 +1176,7 @@
   return 0; 
 end;' language 'plpgsql';
 
-create function content_item__get_id (varchar,integer,boolean)
+create or replace function content_item__get_id (varchar,integer,boolean)
 returns integer as '
 declare
   get_id__item_path              alias for $1;  
@@ -1248,143 +1257,282 @@
 
   return child_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
-create sequence content_item_gp_session_id;
+-- create sequence content_item_gp_session_id;
 
-create table get_path_cursors (
-       rel_cursor_pos         integer,
-       abs_cursor_pos         integer
-);
+-- create table get_path_cursors (
+--        rel_cursor_pos         integer,
+--        abs_cursor_pos         integer
+-- );
 
-insert into get_path_cursors values (0,0);
+-- insert into get_path_cursors values (0,0);
 
-create table get_path_abs_cursor (
-       sid              integer,
-       pos              integer,
-       name             text,
-       parent_id        integer,
-       tree_level       integer,
-       primary key (sid,pos)
-);
+-- create table get_path_abs_cursor (
+--        sid              integer,
+--        pos              integer,
+--        name             text,
+--        parent_id        integer,
+--        tree_level       integer,
+--        primary key (sid,pos)
+-- );
 
-create table get_path_rel_cursor (
-       sid              integer,
-       pos              integer,
-       parent_id        integer,
-       tree_level       integer,
-       primary key (sid,pos)
-);
+-- create table get_path_rel_cursor (
+--        sid              integer,
+--        pos              integer,
+--        parent_id        integer,
+--        tree_level       integer,
+--        primary key (sid,pos)
+-- );
 
-create function content_item__create_rel_cursor(integer,integer) 
-returns integer as '
-declare
-        v_item_id       alias for $1;
-        v_sid           alias for $2;
-        v_rec           record;
-        v_cur_pos       integer default 0;
-begin
-        update get_path_cursors set rel_cursor_pos = 0;
-        for v_rec in select i2.name, 
-                            i2.parent_id, 
-                            tree_level(i2.tree_sortkey) as tree_level
-                     from (select * from cr_items where item_id = v_item_id) i1,
-                          cr_items i2
-                     where i2.parent_id <> 0
-                       and i1.tree_sortkey between i2.tree_sortkey and tree_right(i2.tree_sortkey)
-                  order by i2.tree_sortkey
+-- create or replace function content_item__create_rel_cursor(integer,integer) 
+-- returns integer as '
+-- declare
+--         v_item_id       alias for $1;
+--         v_sid           alias for $2;
+--         v_rec           record;
+--         v_cur_pos       integer default 0;
+-- begin
+--         update get_path_cursors set rel_cursor_pos = 0;
+--         for v_rec in select i2.name, 
+--                             i2.parent_id, 
+--                             tree_level(i2.tree_sortkey) as tree_level
+--                      from (select * from cr_items where item_id = v_item_id) i1,
+--                           cr_items i2
+--                      where i2.parent_id <> 0
+--                        and i1.tree_sortkey between i2.tree_sortkey and tree_right(i2.tree_sortkey)
+--                   order by i2.tree_sortkey
                      
-        LOOP
-                insert into get_path_rel_cursor 
-                (sid,pos,parent_id,tree_level)
-                values
-                (v_sid,v_cur_pos,v_rec.parent_id,v_rec.tree_level);
-                v_cur_pos := v_cur_pos + 1;
-        end LOOP;
+--         LOOP
+--                 insert into get_path_rel_cursor 
+--                 (sid,pos,parent_id,tree_level)
+--                 values
+--                 (v_sid,v_cur_pos,v_rec.parent_id,v_rec.tree_level);
+--                 v_cur_pos := v_cur_pos + 1;
+--         end LOOP;
 
-        return null;
-end;' language 'plpgsql';
+--         return null;
+-- end;' language 'plpgsql';
 
-create function content_item__create_abs_cursor(integer,integer) 
-returns integer as '
-declare
-        v_item_id       alias for $1;
-        v_sid           alias for $2;
-        v_rec           record;
-        v_cur_pos       integer default 0;
-begin
-        update get_path_cursors set abs_cursor_pos = 0;
-        for v_rec in select i2.name, 
-                            i2.parent_id, 
-                            tree_level(i2.tree_sortkey) as tree_level
-                     from (select * from cr_items where item_id = v_item_id) i1,
-                          cr_items i2
-                     where i2.parent_id <> 0
-                       and i1.tree_sortkey between i2.tree_sortkey and tree_right(i2.tree_sortkey)
-                  order by i2.tree_sortkey
+-- create or replace function content_item__create_abs_cursor(integer,integer) 
+-- returns integer as '
+-- declare
+--         v_item_id       alias for $1;
+--         v_sid           alias for $2;
+--         v_rec           record;
+--         v_cur_pos       integer default 0;
+-- begin
+--         update get_path_cursors set abs_cursor_pos = 0;
+--         for v_rec in select i2.name, 
+--                             i2.parent_id, 
+--                             tree_level(i2.tree_sortkey) as tree_level
+--                      from (select * from cr_items where item_id = v_item_id) i1,
+--                           cr_items i2
+--                      where i2.parent_id <> 0
+--                        and i1.tree_sortkey between i2.tree_sortkey and tree_right(i2.tree_sortkey)
+--                   order by i2.tree_sortkey
                      
-        LOOP
-                insert into get_path_abs_cursor 
-                (sid,pos,name,parent_id,tree_level)
-                values
-                (v_sid,v_cur_pos,v_rec.name,v_rec.parent_id,v_rec.tree_level);
-                v_cur_pos := v_cur_pos + 1;
-        end LOOP;
+--         LOOP
+--                 insert into get_path_abs_cursor 
+--                 (sid,pos,name,parent_id,tree_level)
+--                 values
+--                 (v_sid,v_cur_pos,v_rec.name,v_rec.parent_id,v_rec.tree_level);
+--                 v_cur_pos := v_cur_pos + 1;
+--         end LOOP;
 
-        return null;
-end;' language 'plpgsql';
+--         return null;
+-- end;' language 'plpgsql';
 
-create function content_item__abs_cursor_next_pos() returns integer as '
-declare 
-        v_pos   integer;
-begin
-        select abs_cursor_pos into v_pos from get_path_cursors;
-        update get_path_cursors set abs_cursor_pos = abs_cursor_pos + 1;
+-- create or replace function content_item__abs_cursor_next_pos() returns integer as '
+-- declare 
+--         v_pos   integer;
+-- begin
+--         select abs_cursor_pos into v_pos from get_path_cursors;
+--         update get_path_cursors set abs_cursor_pos = abs_cursor_pos + 1;
 
-        return v_pos;        
-end;' language 'plpgsql';
+--         return v_pos;        
+-- end;' language 'plpgsql';
 
-create function content_item__rel_cursor_next_pos() returns integer as '
-declare 
-        v_pos   integer;
-begin
-        select rel_cursor_pos into v_pos from get_path_cursors;
-        update get_path_cursors set rel_cursor_pos = rel_cursor_pos + 1;
+-- create or replace function content_item__rel_cursor_next_pos() returns integer as '
+-- declare 
+--         v_pos   integer;
+-- begin
+--         select rel_cursor_pos into v_pos from get_path_cursors;
+--         update get_path_cursors set rel_cursor_pos = rel_cursor_pos + 1;
 
-        return v_pos;        
-end;' language 'plpgsql';
+--         return v_pos;        
+-- end;' language 'plpgsql';
 
-create function content_item__cleanup_cursors(integer) returns integer as '
-declare
-        v_sid   alias for $1;
-begin
-        delete from get_path_abs_cursor where sid = v_sid;
-        delete from get_path_rel_cursor where sid = v_sid;
+-- -- if called with null its a noop and returns null so strict.
+-- create or replace function content_item__cleanup_cursors(integer) returns integer as '
+-- declare
+--         v_sid   alias for $1;
+-- begin
+--         delete from get_path_abs_cursor where sid = v_sid;
+--         delete from get_path_rel_cursor where sid = v_sid;
         
-        return null;
-end;' language 'plpgsql';
+--         return null;
+-- end;' language 'plpgsql' strict;
 
-create function content_item__get_path (integer,integer)
+-- old slow version
+-- create or replace function content_item__get_path (integer,integer)
+-- returns varchar as '
+-- declare
+--   get_path__item_id                alias for $1;  
+--   get_path__root_folder_id         alias for $2;  -- default null  
+--   v_count                          integer;       
+--   v_name                           varchar;  
+--   v_saved_name                     varchar;  
+--   v_parent_id                      integer default 0;        
+--   v_tree_level                     integer;       
+--   v_resolved_root_id               integer;       
+--   v_rel_parent_id                  integer default 0;        
+--   v_rel_tree_level                 integer default 0;        
+--   v_path                           text    default '''';  
+--   v_rec                            record;
+--   v_item_id                        integer;
+--   v_rel_item_id                    integer;
+--   v_session_id                     integer;
+--   v_rel_found_p                    boolean;
+--   v_abs_found_p                    boolean;
+--   v_tmp                            integer;
+-- begin
+
+--   -- check that the item exists
+--   select count(*) into v_count from cr_items where item_id = get_path__item_id;
+
+--   if v_count = 0 then
+--     raise EXCEPTION ''-20000: Invalid item ID: %'', get_path__item_id;
+--   end if;
+
+--   -- begin walking down the path to the item (from the repository root)
+ 
+--   -- if the root folder is not null then prepare for a relative path
+
+--   if get_path__root_folder_id is not null then
+
+--     -- if root_folder_id is a symlink, resolve it (child items will point
+--     -- to the actual folder, not the symlink)
+
+--     v_resolved_root_id := content_symlink__resolve(get_path__root_folder_id);
+
+--     v_session_id := nextval(''content_item_gp_session_id'');
+--     PERFORM content_item__create_abs_cursor(get_path__item_id, v_session_id);
+--     PERFORM content_item__create_rel_cursor(v_resolved_root_id, v_session_id);
+
+--     -- begin walking down the path to the root folder.  Discard
+--     -- elements of the item path as long as they are the same as the root
+--     -- folder
+
+--     while v_parent_id = v_rel_parent_id loop
+--         v_tmp := content_item__abs_cursor_next_pos();
+--         select name, parent_id, tree_level 
+--         into v_name, v_parent_id, v_tree_level
+--         from get_path_abs_cursor
+--         where sid = v_session_id
+--         and pos = v_tmp;
+
+--         if NOT FOUND then 
+--            v_name := v_saved_name;
+--            v_abs_found_p := ''f'';
+--         else 
+--            v_saved_name := v_name;
+--            v_abs_found_p := ''t'';
+--         end if;
+
+--         v_tmp := content_item__rel_cursor_next_pos();
+--         select parent_id, tree_level 
+--         into v_rel_parent_id, v_rel_tree_level
+--         from get_path_rel_cursor
+--         where sid = v_session_id
+--         and pos = v_tmp;
+
+--         if NOT FOUND then 
+--            v_rel_found_p := ''f'';
+--         else 
+--            v_rel_found_p := ''t'';
+--         end if;
+
+--         exit when NOT v_rel_found_p or NOT v_abs_found_p;         
+--     end loop;
+
+
+--     -- walk the remainder of the relative path, add a ''..'' for each 
+--     -- additional step
+
+--     LOOP
+--       exit when NOT v_rel_found_p;
+--       v_path := v_path || ''../'';
+
+--       v_tmp := content_item__rel_cursor_next_pos();
+--       select parent_id, tree_level 
+--       into v_rel_parent_id, v_rel_tree_level
+--       from get_path_rel_cursor
+--       where sid = v_session_id
+--       and pos = v_tmp;
+      
+--       if NOT FOUND then 
+--          v_rel_found_p := ''f'';
+--       else 
+--          v_rel_found_p := ''t'';
+--       end if;
+--     end loop;
+--     -- an item relative to itself is ''../item''
+--     if v_resolved_root_id = get_path__item_id then
+-- 	v_path := ''../'';
+--     end if;
+
+--     -- loop over the remainder of the absolute path
+--     LOOP
+
+--       v_path := v_path || v_name;
+--       v_tmp := content_item__abs_cursor_next_pos();
+--       select name, parent_id, tree_level 
+--       into v_name, v_parent_id, v_tree_level
+--       from get_path_abs_cursor
+--       where sid = v_session_id
+--       and pos = v_tmp;
+
+--       if NOT FOUND then 
+--          v_abs_found_p := ''f'';
+--       else 
+--          v_abs_found_p := ''t'';
+--       end if;
+
+--       exit when NOT v_abs_found_p;
+--       v_path := v_path || ''/'';
+
+--     end LOOP;
+--     PERFORM content_item__cleanup_cursors(v_session_id);
+--   else
+
+--     -- this is an absolute path so prepend a ''/''
+--     -- loop over the absolute path
+
+--     for v_rec in select i2.name, tree_level(i2.tree_sortkey) as tree_level
+--                  from cr_items i1, cr_items i2
+--                  where i2.parent_id <> 0
+--                  and i1.item_id = get_path__item_id
+--                  and i1.tree_sortkey between i2.tree_sortkey and tree_right(i2.tree_sortkey)
+--                  order by tree_level
+--     LOOP
+--       v_path := v_path || ''/'' || v_rec.name;
+--     end loop;
+
+--   end if;
+
+--   return v_path;
+ 
+-- end;' language 'plpgsql';
+create or replace function content_item__get_path (integer,integer)
 returns varchar as '
 declare
   get_path__item_id                alias for $1;  
   get_path__root_folder_id         alias for $2;  -- default null  
   v_count                          integer;       
-  v_name                           varchar;  
-  v_saved_name                     varchar;  
-  v_parent_id                      integer default 0;        
-  v_tree_level                     integer;       
   v_resolved_root_id               integer;       
-  v_rel_parent_id                  integer default 0;        
-  v_rel_tree_level                 integer default 0;        
   v_path                           text    default '''';  
   v_rec                            record;
-  v_item_id                        integer;
-  v_rel_item_id                    integer;
-  v_session_id                     integer;
-  v_rel_found_p                    boolean;
-  v_abs_found_p                    boolean;
-  v_tmp                            integer;
 begin
 
   -- check that the item exists
@@ -1405,94 +1553,46 @@
 
     v_resolved_root_id := content_symlink__resolve(get_path__root_folder_id);
 
-    v_session_id := nextval(''content_item_gp_session_id'');
-    PERFORM content_item__create_abs_cursor(get_path__item_id, v_session_id);
-    PERFORM content_item__create_rel_cursor(v_resolved_root_id, v_session_id);
+    -- check to see if the item is under or out side the root_id
+    PERFORM 1 from cr_items i, 
+        (select tree_sortkey from cr_items where item_id = v_resolved_root_id) a
+    where tree_ancestor_p(a.tree_sortkey, i.tree_sortkey) and i.item_id = get_path__item_id;
 
-    -- begin walking down the path to the root folder.  Discard
-    -- elements of the item path as long as they are the same as the root
-    -- folder
+    if NOT FOUND then
+        -- if not found then we need to go up the folder and append ../ until we have common ancestor
 
-    while v_parent_id = v_rel_parent_id loop
-        v_tmp := content_item__abs_cursor_next_pos();
-        select name, parent_id, tree_level 
-        into v_name, v_parent_id, v_tree_level
-        from get_path_abs_cursor
-        where sid = v_session_id
-        and pos = v_tmp;
+        for v_rec in select i1.name, i1.parent_id, tree_level(i1.tree_sortkey) as tree_level
+                 from cr_items i1, (select tree_ancestor_keys(tree_sortkey) as tree_sortkey from cr_items where item_id = v_resolved_root_id) i2,
+                 (select tree_sortkey from cr_items where item_id = get_path__item_id) i3
+                 where 
+                 i1.parent_id <> 0
+                 and i2.tree_sortkey = i1.tree_sortkey
+                 and not tree_ancestor_p(i2.tree_sortkey, i3.tree_sortkey)
+                 order by tree_level desc
+        LOOP
+            v_path := v_path || ''../'';
+        end loop;
+        -- lets now assign the new root_id to be the last parent_id on the loop
+        v_resolved_root_id := v_rec.parent_id;
 
-        if NOT FOUND then 
-           v_name := v_saved_name;
-           v_abs_found_p := ''f'';
-        else 
-           v_saved_name := v_name;
-           v_abs_found_p := ''t'';
-        end if;
+    end if;
 
-        v_tmp := content_item__rel_cursor_next_pos();
-        select parent_id, tree_level 
-        into v_rel_parent_id, v_rel_tree_level
-        from get_path_rel_cursor
-        where sid = v_session_id
-        and pos = v_tmp;
-
-        if NOT FOUND then 
-           v_rel_found_p := ''f'';
-        else 
-           v_rel_found_p := ''t'';
+    -- go downwards the tree and append the name and /
+    for v_rec in select i1.name, i1.item_id, tree_level(i1.tree_sortkey) as tree_level
+             from cr_items i1, (select tree_sortkey from cr_items where item_id = v_resolved_root_id) i2,
+            (select tree_ancestor_keys(tree_sortkey) as tree_sortkey from cr_items where item_id = get_path__item_id) i3
+             where 
+             i1.tree_sortkey = i3.tree_sortkey
+             and i1.tree_sortkey > i2.tree_sortkey
+             order by tree_level
+    LOOP
+        v_path := v_path || v_rec.name;
+        if v_rec.item_id <> get_path__item_id then 
+            -- put a / if we are still going down
+            v_path := v_path || ''/'';
         end if;
-
-        exit when NOT v_rel_found_p or NOT v_abs_found_p;         
     end loop;
 
-
-    -- walk the remainder of the relative path, add a ''..'' for each 
-    -- additional step
-
-    LOOP
-      exit when NOT v_rel_found_p;
-      v_path := v_path || ''../'';
-
-      v_tmp := content_item__rel_cursor_next_pos();
-      select parent_id, tree_level 
-      into v_rel_parent_id, v_rel_tree_level
-      from get_path_rel_cursor
-      where sid = v_session_id
-      and pos = v_tmp;
-      
-      if NOT FOUND then 
-         v_rel_found_p := ''f'';
-      else 
-         v_rel_found_p := ''t'';
-      end if;
-    end loop;
-    -- an item relative to itself is ''../item''
-    if v_resolved_root_id = get_path__item_id then
-	v_path := ''../'';
-    end if;
-
-    -- loop over the remainder of the absolute path
-    LOOP
-
-      v_path := v_path || v_name;
-      v_tmp := content_item__abs_cursor_next_pos();
-      select name, parent_id, tree_level 
-      into v_name, v_parent_id, v_tree_level
-      from get_path_abs_cursor
-      where sid = v_session_id
-      and pos = v_tmp;
-
-      if NOT FOUND then 
-         v_abs_found_p := ''f'';
-      else 
-         v_abs_found_p := ''t'';
-      end if;
-
-      exit when NOT v_abs_found_p;
-      v_path := v_path || ''/'';
-
-    end LOOP;
-    PERFORM content_item__cleanup_cursors(v_session_id);
   else
 
     -- this is an absolute path so prepend a ''/''
@@ -1515,7 +1615,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__get_virtual_path (integer,integer)
+create or replace function content_item__get_virtual_path (integer,integer)
 returns varchar as '
 declare
   get_virtual_path__item_id               alias for $1;  
@@ -1525,6 +1625,7 @@
   v_is_folder                             boolean;       
   v_index                                 cr_items.item_id%TYPE;
 begin
+  -- XXX possible bug: root_folder_id arg is ignored.
 
   -- first resolve the item
   v_item_id := content_symlink__resolve(get_virtual_path__item_id);
@@ -1544,7 +1645,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__write_to_file (integer,varchar)
+create or replace function content_item__write_to_file (integer,varchar)
 returns integer as '
 declare
   item_id                alias for $1;  
@@ -1571,7 +1672,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__register_template (integer,integer,varchar)
+create or replace function content_item__register_template (integer,integer,varchar)
 returns integer as '
 declare
   register_template__item_id                alias for $1;  
@@ -1603,7 +1704,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__unregister_template (integer,integer,varchar)
+create or replace function content_item__unregister_template (integer,integer,varchar)
 returns integer as '
 declare
   unregister_template__item_id                alias for $1;  
@@ -1643,7 +1744,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__get_template (integer,varchar)
+create or replace function content_item__get_template (integer,varchar)
 returns integer as '
 declare
   get_template__item_id                alias for $1;  
@@ -1687,10 +1788,10 @@
 
   return v_template_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
-create function content_item__get_content_type (integer)
+create or replace function content_item__get_content_type (integer)
 returns varchar as '
 declare
   get_content_type__item_id                alias for $1;  
@@ -1704,16 +1805,12 @@
   where 
     item_id = get_content_type__item_id;  
 
-  if NOT FOUND then 
-     return null;
-  end if;
-
   return v_content_type;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
-create function content_item__get_live_revision (integer)
+create or replace function content_item__get_live_revision (integer)
 returns integer as '
 declare
   get_live_revision__item_id                alias for $1;  
@@ -1727,16 +1824,12 @@
   where
     item_id = get_live_revision__item_id;
 
-  if NOT FOUND then 
-     return null;
-  else 
-     return v_revision_id;
-  end if;
+  return v_revision_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
-create function content_item__set_live_revision (integer) returns integer as '
+create or replace function content_item__set_live_revision (integer) returns integer as '
 declare
   set_live_revision__revision_id    alias for $1;  
   set_live_revision__publish_status cr_items.publish_status%TYPE default ''ready'';
@@ -1765,7 +1858,7 @@
   return 0; 
 end;' language 'plpgsql';
 
-create function content_item__set_live_revision (integer,varchar)
+create or replace function content_item__set_live_revision (integer,varchar)
 returns integer as '
 declare
   set_live_revision__revision_id    alias for $1;  
@@ -1796,7 +1889,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__unset_live_revision (integer)
+create or replace function content_item__unset_live_revision (integer)
 returns integer as '
 declare
   unset_live_revision__item_id                alias for $1;  
@@ -1822,7 +1915,7 @@
   return 0; 
 end;' language 'plpgsql';
 
-create function content_item__set_release_period (integer, timestamptz, timestamptz)
+create or replace function content_item__set_release_period (integer, timestamptz, timestamptz)
 returns integer as '
 declare
   set_release_period__item_id                alias for $1;  
@@ -1854,7 +1947,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__get_revision_count (integer)
+create or replace function content_item__get_revision_count (integer)
 returns integer as '
 declare
   get_revision_count__item_id   alias for $1;  
@@ -1870,10 +1963,10 @@
 
   return v_count;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
-create function content_item__get_context (integer)
+create or replace function content_item__get_context (integer)
 returns integer as '
 declare
   get_context__item_id                alias for $1;  
@@ -1890,12 +1983,12 @@
     object_id = get_context__item_id;
 
   if NOT FOUND then 
-     raise EXCEPTION ''-20000: Content item % does not exist in content_item.get_context'', item_id;
+     raise EXCEPTION ''-20000: Content item % does not exist in content_item.get_context'', get_context__item_id;
   end if;
 
   return v_context_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- 1) make sure we are not moving the item to an invalid location:
@@ -1904,13 +1997,17 @@
 --   to the target folder
 -- 3) update the parent_id for the item
 
-create function content_item__move (integer,integer)
+create or replace function content_item__move (integer,integer)
 returns integer as '
 declare
   move__item_id                alias for $1;  
   move__target_folder_id       alias for $2;  
 begin
 
+  if move__target_folder_id is null then 
+	raise exception ''attempt to move item_id % to null folder_id'', move__item_id;
+  end if;
+
   if content_folder__is_folder(move__item_id) = ''t'' then
 
     PERFORM content_folder__move(move__item_id, move__target_folder_id);
@@ -1936,7 +2033,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__copy (integer,integer,integer,varchar)
+create or replace function content_item__copy (integer,integer,integer,varchar)
 returns integer as '
 declare
   item_id                alias for $1;  
@@ -1960,7 +2057,7 @@
 -- 3) create a new item with no revisions in the target folder
 -- 4) copy the latest revision from the original item to the new item (if any)
 
-create function content_item__copy2 (integer,integer,integer,varchar)
+create or replace function content_item__copy2 (integer,integer,integer,varchar)
 returns integer as '
 declare
   copy2__item_id                alias for $1;  
@@ -2086,11 +2183,11 @@
 end;' language 'plpgsql';
 
 
-create function content_item__get_latest_revision (integer)
+create or replace function content_item__get_latest_revision (integer)
 returns integer as '
 declare
-  get_latest_revision__item_id                alias for $1;  
-  v_revision_id                               integer;       
+  get_latest_revision__item_id                alias for $1;
+  v_revision_id                               integer;
   v_rec                                       record;
 begin
   for v_rec in 
@@ -2105,20 +2202,16 @@
   order by 
     o.creation_date desc
   LOOP
-        v_revision_id := v_rec.revision_id;
-        exit;
+      v_revision_id := v_rec.revision_id;
+      exit;
   end LOOP;
 
-  if NOT FOUND then
-     return null;
-  end if;
-
   return v_revision_id;
  
-end;' language 'plpgsql' with (isstrict);
+end;' language 'plpgsql' strict stable;
 
 
-create function content_item__get_best_revision (integer)
+create or replace function content_item__get_best_revision (integer)
 returns integer as '
 declare
   get_best_revision__item_id                alias for $1;  
@@ -2134,16 +2227,12 @@
   where
     item_id = get_best_revision__item_id;
 
-  if NOT FOUND then 
-     return null;
-  end if;
-
   return v_revision_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
-create function content_item__get_title (integer,boolean)
+create or replace function content_item__get_title (integer,boolean)
 returns varchar as '
 declare
   get_title__item_id                alias for $1;  
@@ -2185,21 +2274,21 @@
 
   return v_title;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
-create function content_item__get_title (integer)
+create or replace function content_item__get_title (integer)
 returns varchar as '
 declare
   get_title__item_id                alias for $1;  
 begin
   
   return content_item__get_title(get_title__item_id, ''f'');
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
-create function content_item__get_publish_date (integer,boolean)
+create or replace function content_item__get_publish_date (integer,boolean)
 returns timestamptz as '
 declare
   get_publish_date__item_id                alias for $1;  
@@ -2228,43 +2317,32 @@
       r.revision_id = i.latest_revision;
   end if;
 
-  if NOT FOUND then 
-     return null;
-  end if;
-
   return v_publish_date;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
-create function content_item__is_subclass (varchar,varchar)
+create or replace function content_item__is_subclass (varchar,varchar)
 returns boolean as '
 declare
   is_subclass__object_type            alias for $1;  
   is_subclass__supertype              alias for $2;  
   v_subclass_p                        boolean;      
   v_inherit_val                       record;
 begin
+  select count(*) > 0 into v_subclass_p where exists (
+	select 1
+          from acs_object_types o, acs_object_types o2
+         where o2.object_type = is_subclass__supertype
+           and o.object_type = is_subclass__object_type
+           and o.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey));
 
-  v_subclass_p := ''f'';
-
-  for v_inherit_val in select o.object_type
-                       from acs_object_types o, acs_object_types o2
-                       where o2.object_type = is_subclass__supertype
-                         and o.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey)
-                       order by o.tree_sortkey
-  LOOP
-    if v_inherit_val.object_type = is_subclass__object_type then
-         v_subclass_p := ''t'';
-    end if;
-  end loop;
-
   return v_subclass_p;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
-create function content_item__relate (integer,integer,varchar,integer,varchar)
+create or replace function content_item__relate (integer,integer,varchar,integer,varchar)
 returns integer as '
 declare
   relate__item_id                alias for $1;  
@@ -2359,7 +2437,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__unrelate (integer)
+create or replace function content_item__unrelate (integer)
 returns integer as '
 declare
   unrelate__rel_id      alias for $1;  
@@ -2375,7 +2453,7 @@
 end;' language 'plpgsql';
 
 
-create function content_item__is_index_page (integer,integer)
+create or replace function content_item__is_index_page (integer,integer)
 returns boolean as '
 declare
   is_index_page__item_id                alias for $1;  
@@ -2387,18 +2465,18 @@
     return ''f'';
   end if;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
-
-create function content_item__get_parent_folder (integer)
+create or replace function content_item__get_parent_folder (integer)
 returns integer as '
 declare
   get_parent_folder__item_id               alias for $1;  
   v_folder_id                              cr_folders.folder_id%TYPE;
   v_parent_folder_p                        boolean default ''f'';       
 begin
+  v_folder_id := get_parent_folder__item_id;
 
-  while NOT v_parent_folder_p LOOP
+  while NOT v_parent_folder_p and v_folder_id is not null LOOP
 
     select
       parent_id, content_folder__is_folder(parent_id) 
@@ -2407,17 +2485,13 @@
     from
       cr_items
     where
-      item_id = get_parent_folder__item_id;
+      item_id = v_folder_id;
 
-    if NOT FOUND then
-       return null;
-    end if;
-
   end loop; 
 
   return v_folder_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql	17 May 2003 09:43:09 -0000	1.14
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql	11 Dec 2003 21:39:47 -0000	1.15
@@ -8,7 +8,7 @@
 -- License.  Full text of the license is available from the GNU Project:
 -- http://www.fsf.org/copyleft/gpl.html
 
-create function content_keyword__get_heading (integer)
+create or replace function content_keyword__get_heading (integer)
 returns text as '
 declare
   get_heading__keyword_id             alias for $1;  
@@ -20,11 +20,11 @@
 
   return v_heading;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function get_description
-create function content_keyword__get_description (integer)
+create or replace function content_keyword__get_description (integer)
 returns text as '
 declare
   get_description__keyword_id             alias for $1;  
@@ -36,11 +36,11 @@
 
   return v_description;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- procedure set_heading
-create function content_keyword__set_heading (integer,varchar)
+create or replace function content_keyword__set_heading (integer,varchar)
 returns integer as '
 declare
   set_heading__keyword_id             alias for $1;  
@@ -57,7 +57,7 @@
 
 
 -- procedure set_description
-create function content_keyword__set_description (integer,varchar)
+create or replace function content_keyword__set_description (integer,varchar)
 returns integer as '
 declare
   set_description__keyword_id             alias for $1;  
@@ -74,7 +74,7 @@
 
 
 -- function is_leaf
-create function content_keyword__is_leaf (integer)
+create or replace function content_keyword__is_leaf (integer)
 returns boolean as '
 declare
   is_leaf__keyword_id             alias for $1;  
@@ -87,11 +87,11 @@
   where
     k.parent_id = is_leaf__keyword_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- function new
-create function content_keyword__new (varchar,varchar,integer,integer,timestamptz,integer,varchar,varchar)
+create or replace function content_keyword__new (varchar,varchar,integer,integer,timestamptz,integer,varchar,varchar)
 returns integer as '
 declare
   new__heading                alias for $1;  
@@ -124,7 +124,7 @@
 
 
 -- procedure delete
-create function content_keyword__delete (integer)
+create or replace function content_keyword__delete (integer)
 returns integer as '
 declare
   delete__keyword_id             alias for $1;  
@@ -143,7 +143,7 @@
 
 
 -- procedure item_assign
-create function content_keyword__item_assign (integer,integer,integer,integer,varchar)
+create or replace function content_keyword__item_assign (integer,integer,integer,integer,varchar)
 returns integer as '
 declare
   item_assign__item_id                alias for $1;  
@@ -174,7 +174,7 @@
 
 
 -- procedure item_unassign
-create function content_keyword__item_unassign (integer,integer)
+create or replace function content_keyword__item_unassign (integer,integer)
 returns integer as '
 declare
   item_unassign__item_id                alias for $1;  
@@ -198,6 +198,9 @@
   is_assigned__recurse                alias for $3;  -- default ''none''  
   v_ret                               boolean;    
 begin
+  if is_assigned__recurse is null then 
+	is_assigned__recurse := ''none'';
+  end if;
 
   -- Look for an exact match
   if is_assigned__recurse = ''none'' then
@@ -235,11 +238,11 @@
   raise EXCEPTION ''-20000: The recurse parameter to content_keyword.is_assigned should be \\\'none\\\', \\\'up\\\' or \\\'down\\\''';
   
   return null;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- function get_path
-create function content_keyword__get_path (integer)
+create or replace function content_keyword__get_path (integer)
 returns text as '
 declare
   get_path__keyword_id             alias for $1;  
@@ -280,10 +283,47 @@
 end;' language 'plpgsql';
 
 
+create or replace function content_keyword__get_path (integer)
+returns text as '
+declare
+  get_path__keyword_id             alias for $1;  
+  v_path                          text default '''';
+  v_is_found                      boolean default ''f'';   
+  v_heading                       cr_keywords.heading%TYPE;
+  v_rec                           record;
+begin
+--               select
+--                 heading 
+--               from (
+--                  select 
+--                    heading, level as tree_level
+--                  from cr_keywords
+--                    connect by prior parent_id = keyword_id
+--                    start with keyword_id = get_path.keyword_id) k 
+--                order by 
+--                  tree_level desc 
 
--- show errors
+  for v_rec in select heading 
+               from (select k2.heading, tree_level(k2.tree_sortkey) as tree_level
+                     from cr_keywords k1, cr_keywords k2
+                     where k1.keyword_id = get_path__keyword_id
+                       and k1.tree_sortkey between k2.tree_sortkey and tree_right(k2.tree_sortkey)) k
+                order by tree_level desc 
+  LOOP
+      v_heading := v_rec.heading;
+      v_is_found := ''t'';
+      v_path := v_path || ''/'' || v_heading;
+  end LOOP;
 
+  if v_is_found = ''f'' then
+    return null;
+  else
+    return v_path;
+  end if;
+ 
+end;' language 'plpgsql' stable strict;
 
+
 -- Ensure that the context_id in acs_objects is always set to the
 -- parent_id in cr_keywords
 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql,v
diff -u -N -r1.31 -r1.32
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql	17 May 2003 09:43:09 -0000	1.31
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql	11 Dec 2003 21:39:47 -0000	1.32
@@ -13,7 +13,7 @@
 -- create or replace package body content_revision
 
 -- function new
-create function content_revision__new (varchar,varchar,timestamptz,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar)
+create or replace function content_revision__new (varchar,varchar,timestamptz,varchar,varchar,integer,integer,integer,timestamptz,integer,varchar)
 returns integer as '
 declare
   new__title                  alias for $1;  
@@ -65,7 +65,7 @@
 
 end;' language 'plpgsql';
 
-create function content_revision__new(varchar,varchar,timestamptz,varchar,text,integer) returns integer as '
+create or replace function content_revision__new(varchar,varchar,timestamptz,varchar,text,integer) returns integer as '
 declare
         new__title              alias for $1;
         new__description        alias for $2;  -- default null
@@ -89,7 +89,7 @@
 
 end;' language 'plpgsql';
 
-create function content_revision__new (varchar,varchar,timestamptz,varchar,varchar,text,integer,integer,timestamptz,integer,varchar)
+create or replace function content_revision__new (varchar,varchar,timestamptz,varchar,varchar,text,integer,integer,timestamptz,integer,varchar)
 returns integer as '
 declare
   new__title                  alias for $1;  
@@ -120,7 +120,7 @@
 end;' language 'plpgsql';
 
 -- function new
-create function content_revision__new (varchar,varchar,timestamptz,varchar,varchar,text,integer,integer,timestamptz,integer,varchar,integer)
+create or replace function content_revision__new (varchar,varchar,timestamptz,varchar,varchar,text,integer,integer,timestamptz,integer,varchar,integer)
 returns integer as '
 declare
   new__title                  alias for $1;  
@@ -180,7 +180,7 @@
 
 
 -- procedure copy_attributes
-create function content_revision__copy_attributes (varchar,integer,integer)
+create or replace function content_revision__copy_attributes (varchar,integer,integer)
 returns integer as '
 declare
   copy_attributes__content_type           alias for $1;  
@@ -192,6 +192,10 @@
   attr_rec                                record;
 begin
 
+  if copy_attributes__content_type is null or copy_attributes__revision_id is null or copy_attributes__copy_id is null then 
+     raise exception ''content_revision__copy_attributes called with null % % %'',copy_attributes__content_type,copy_attributes__revision_id, copy_attributes__copy_id;
+  end if;
+
   select table_name, id_column into v_table_name, v_id_column
   from acs_object_types where object_type = copy_attributes__content_type;
 
@@ -215,7 +219,7 @@
 
 
 -- function copy
-create function content_revision__copy (integer,integer,integer,integer,varchar)
+create or replace function content_revision__copy (integer,integer,integer,integer,varchar)
 returns integer as '
 declare
   copy__revision_id            alias for $1;  
@@ -249,7 +253,7 @@
        select 
          v_copy_id as object_id, 
          object_type, 
-         context_id, 
+         v_target_item_id, 
          security_inherit_p, 
          copy__creation_user as creation_user, 
          now() as creation_date, 
@@ -317,7 +321,7 @@
 
 
 -- procedure delete
-create function content_revision__delete (integer)
+create or replace function content_revision__delete (integer)
 returns integer as '
 declare
   delete__revision_id    alias for $1;  
@@ -381,7 +385,7 @@
 
 
 -- function get_number
-create function content_revision__get_number (integer)
+create or replace function content_revision__get_number (integer)
 returns integer as '
 declare
   get_number__revision_id            alias for $1;  
@@ -410,9 +414,9 @@
 
   return null;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
-create function content_revision__revision_name(integer)
+create or replace function content_revision__revision_name(integer)
 returns text as '
 declare
         p_revision_id   alias for $1;
@@ -421,30 +425,24 @@
                '' of '' || (select count(*) from cr_revisions where item_id = r.item_id) || '' for item: '' 
                || content_item__get_title(item_id)
                from cr_revisions r where r.revision_id = p_revision_id;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 -- procedure index_attributes
-create function content_revision__index_attributes (integer)
+create or replace function content_revision__index_attributes (integer)
 returns integer as '
 declare
   index_attributes__revision_id            alias for $1;  
   clob_loc                                 text;          
   v_revision_id                            cr_revisions.revision_id%TYPE;
 begin
 
-  insert into cr_revision_attributes 
-    select index_attributes__revision_id as revision_id, 
-           clob_loc as attributes 
+	raise exception ''content_revision__index_attributes not implemented on postgres'';
 
-  -- FIXME: need to find a way to deal with these xml calls
-  v_revision_id := write_xml(revision_id, clob_loc);  
-
-  return 0; 
 end;' language 'plpgsql';
 
 
 -- function import_xml
-create function content_revision__import_xml (integer,integer,numeric)
+create or replace function content_revision__import_xml (integer,integer,numeric)
 returns integer as '
 declare
   import_xml__item_id                alias for $1;  
@@ -454,18 +452,13 @@
   v_revision_id                      cr_revisions.revision_id%TYPE;
 begin
 
-  -- FIXME: need a way to deal with this xml call.
-  select doc into clob_loc from cr_xml_docs where doc_id = import_xml__doc_id;
-  v_revision_id := read_xml(import_xml__item_id, import_xml__revision_id, 
-                            clob_loc);  
+	raise exception ''content_revision__import_xml not implemented on postgres'';
 
-  return v_revision_id;
- 
 end;' language 'plpgsql';
 
 
 -- function export_xml
-create function content_revision__export_xml (integer)
+create or replace function content_revision__export_xml (integer)
 returns integer as '
 declare
   revision_id            alias for $1;  
@@ -474,21 +467,13 @@
   v_revision_id          cr_revisions.revision_id%TYPE;
 begin
 
-  v_doc_id := cr_xml_doc_seq.nextval;
-
-  insert into cr_xml_docs (doc_id, doc) 
-    values (v_doc_id, '''');
-
-  -- FIXME: need a way to deal with this xml call.
-  v_revision_id := write_xml(revision_id, clob_loc);  
-
-  return v_doc_id;
+  raise exception ''content_revision__export_xml Not currently implemented on postgresql'';
  
 end;' language 'plpgsql';
 
 
 -- procedure to_html
-create function content_revision__to_html (integer)
+create or replace function content_revision__to_html (integer)
 returns integer as '
 declare
   to_html__revision_id            alias for $1;  
@@ -516,7 +501,7 @@
 
 
 -- function is_live
-create function content_revision__is_live (integer)
+create or replace function content_revision__is_live (integer)
 returns boolean as '
 declare
   is_live__revision_id            alias for $1;  
@@ -525,11 +510,11 @@
   return count(*) > 0 from cr_items
    where live_revision = is_live__revision_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' strict;
 
 
 -- function is_latest
-create function content_revision__is_latest (integer)
+create or replace function content_revision__is_latest (integer)
 returns boolean as '
 declare
   is_latest__revision_id            alias for $1;  
@@ -538,11 +523,11 @@
   return count(*) > 0 from cr_items
     where latest_revision = is_latest__revision_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- procedure to_temporary_clob
-create function content_revision__to_temporary_clob (integer)
+create or replace function content_revision__to_temporary_clob (integer)
 returns integer as '
 declare
   to_temporary_clob__revision_id            alias for $1;  
@@ -571,7 +556,7 @@
 
 
 -- procedure content_copy
-create function content_revision__content_copy (integer,integer)
+create or replace function content_revision__content_copy (integer,integer)
 returns integer as '
 declare
   content_copy__revision_id            alias for $1;  
@@ -584,6 +569,9 @@
   v_new_lob                            cr_revisions.lob%TYPE;
   v_storage_type                       varchar;
 begin
+  if content_copy__revision_id is null then 
+	raise exception ''content_revision__content_copy attempt to copy a null revision_id'';
+  end if;
 
   select
     content_length, item_id
@@ -659,7 +647,7 @@
 
 
 -- procedure content__get_content
-create function content_revision__get_content (integer)
+create or replace function content_revision__get_content (integer)
 returns text as '
 declare
   get_content__revision_id            alias for $1;  
@@ -681,7 +669,7 @@
             where revision_id = get_content__revision_id;
         end if;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 -- show errors
 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql	17 May 2003 09:43:09 -0000	1.11
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql	11 Dec 2003 21:39:47 -0000	1.12
@@ -12,7 +12,7 @@
 
 -- create or replace package body content_symlink
 -- function new
-create function content_symlink__new (varchar,varchar,integer,integer,integer,timestamptz,integer,varchar)
+create or replace function content_symlink__new (varchar,varchar,integer,integer,integer,timestamptz,integer,varchar)
 returns integer as '
 declare
   new__name                   alias for $1;  -- default null  
@@ -108,7 +108,7 @@
 
 
 -- procedure delete
-create function content_symlink__delete (integer)
+create or replace function content_symlink__delete (integer)
 returns integer as '
 declare
   delete__symlink_id             alias for $1;  
@@ -124,7 +124,7 @@
 
 
 -- function is_symlink
-create function content_symlink__is_symlink (integer)
+create or replace function content_symlink__is_symlink (integer)
 returns boolean as '
 declare
   is_symlink__item_id                alias for $1;  
@@ -140,11 +140,11 @@
 
   return v_symlink_p;  
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- procedure copy
-create function content_symlink__copy (integer,integer,integer,varchar)
+create or replace function content_symlink__copy (integer,integer,integer,varchar)
 returns integer as '
 declare
   copy__symlink_id             alias for $1;  
@@ -157,6 +157,7 @@
   v_label                      cr_symlinks.label%TYPE;
   v_symlink_id                 cr_symlinks.symlink_id%TYPE;
 begin
+  -- XXX: bug if target is not a folder this will silently fail.
 
   if content_folder__is_folder(copy__target_folder_id) = ''t'' then
     select
@@ -210,7 +211,7 @@
 
 
 -- function resolve
-create function content_symlink__resolve (integer)
+create or replace function content_symlink__resolve (integer)
 returns integer as '
 declare
   resolve__item_id                alias for $1;  
@@ -230,11 +231,11 @@
      return v_target_id;
   end if;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function resolve_content_type
-create function content_symlink__resolve_content_type (integer)
+create or replace function content_symlink__resolve_content_type (integer)
 returns varchar as '
 declare
   resolve_content_type__item_id                alias for $1;  
@@ -248,13 +249,9 @@
   where
     symlink_id = resolve_content_type__item_id;
 
-  if NOT FOUND then 
-     return null;
-  end if;
-
   return v_content_type;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql	7 Jul 2003 12:25:53 -0000	1.9
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql	11 Dec 2003 21:39:47 -0000	1.10
@@ -13,14 +13,14 @@
 create view content_template_globals as 
 select -200 as c_root_folder_id;
 
-create function content_template__get_root_folder() returns integer as '
+create or replace function content_template__get_root_folder() returns integer as '
 begin
   return content_template_globals.c_root_folder_id;
-end;' language 'plpgsql';
+end;' language 'plpgsql' immutable;
 
 -- create or replace package body content_template
 
-create function content_template__new(varchar) returns integer as '
+create or replace function content_template__new(varchar) returns integer as '
 declare
         new__name       alias for $1;
 begin
@@ -36,7 +36,7 @@
 
 -- function new
 
-create function content_template__new (varchar,integer,integer,timestamptz,integer,varchar)
+create or replace function content_template__new (varchar,integer,integer,timestamptz,integer,varchar)
 returns integer as '
 declare
   new__name                   alias for $1;  
@@ -174,7 +174,7 @@
 
 
 -- procedure delete
-create function content_template__delete (integer)
+create or replace function content_template__delete (integer)
 returns integer as '
 declare
   delete__template_id            alias for $1;  
@@ -196,7 +196,7 @@
 
 
 -- function is_template
-create function content_template__is_template (integer)
+create or replace function content_template__is_template (integer)
 returns boolean as '
 declare
   is_template__template_id            alias for $1;  
@@ -205,11 +205,11 @@
   return count(*) > 0 from cr_templates
     where template_id = is_template__template_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- function get_path
-create function content_template__get_path (integer,integer)
+create or replace function content_template__get_path (integer,integer)
 returns varchar as '
 declare
   template_id            alias for $1;  
@@ -219,7 +219,7 @@
 
   return content_item__get_path(template_id, root_folder_id);
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 
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 -N -r1.28 -r1.29
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql	17 May 2003 09:43:09 -0000	1.28
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql	11 Dec 2003 21:39:47 -0000	1.29
@@ -45,7 +45,7 @@
 
 -- create or replace package body content_type is
 -- procedure create_type
-create function content_type__create_type (varchar,varchar,varchar,varchar,varchar,varchar,varchar)
+create or replace function content_type__create_type (varchar,varchar,varchar,varchar,varchar,varchar,varchar)
 returns integer as '
 declare
   create_type__content_type           alias for $1;  
@@ -94,7 +94,7 @@
 end;' language 'plpgsql';
 
 
-create function content_type__drop_type (varchar,boolean,boolean)
+create or replace function content_type__drop_type (varchar,boolean,boolean)
 returns integer as '
 declare
   drop_type__content_type           alias for $1;  
@@ -197,7 +197,7 @@
 
 
 -- function create_attribute
-create function content_type__create_attribute (varchar,varchar,varchar,varchar,varchar,integer,varchar,varchar)
+create or replace function content_type__create_attribute (varchar,varchar,varchar,varchar,varchar,integer,varchar,varchar)
 returns integer as '
 declare
   create_attribute__content_type           alias for $1;  
@@ -258,7 +258,7 @@
 
 
 -- procedure drop_attribute
-create function content_type__drop_attribute (varchar,varchar,boolean)
+create or replace function content_type__drop_attribute (varchar,varchar,boolean)
 returns integer as '
 declare
   drop_attribute__content_type           alias for $1;  
@@ -308,7 +308,7 @@
 
 
 -- procedure register_template
-create function content_type__register_template (varchar,integer,varchar,boolean)
+create or replace function content_type__register_template (varchar,integer,varchar,boolean)
 returns integer as '
 declare
   register_template__content_type           alias for $1;  
@@ -360,7 +360,7 @@
 
 
 -- procedure set_default_template
-create function content_type__set_default_template (varchar,integer,varchar)
+create or replace function content_type__set_default_template (varchar,integer,varchar)
 returns integer as '
 declare
   set_default_template__content_type           alias for $1;  
@@ -389,7 +389,7 @@
 
 
 -- function get_template
-create function content_type__get_template (varchar,varchar)
+create or replace function content_type__get_template (varchar,varchar)
 returns integer as '
 declare
   get_template__content_type           alias for $1;  
@@ -409,17 +409,13 @@
   and
     is_default = ''t'';
 
-  if NOT FOUND then 
-     return null;
-  else
-     return v_template_id;
-  end if;
+  return v_template_id;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- procedure unregister_template
-create function content_type__unregister_template (varchar,integer,varchar)
+create or replace function content_type__unregister_template (varchar,integer,varchar)
 returns integer as '
 declare
   unregister_template__content_type           alias for $1;  -- default null  
@@ -459,7 +455,7 @@
 
 
 -- function trigger_insert_statement
-create function content_type__trigger_insert_statement (varchar)
+create or replace function content_type__trigger_insert_statement (varchar)
 returns varchar as '
 declare
   trigger_insert_statement__content_type   alias for $1;  
@@ -469,6 +465,9 @@
   vals                                     varchar default '''';
   attr_rec                                 record;
 begin
+  if trigger_insert_statement__content_type is null then 
+	return exception ''content_type__trigger_insert_statement called with null content_type'';
+  end if;
 
   select 
     table_name, id_column into v_table_name, v_id_column
@@ -492,7 +491,7 @@
     '' ( '' || v_id_column || cols || '' ) values (cr_dummy.val'' ||
     vals || '')'';
   
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 -- dummy table provides a target for updates in dynamically generated trigger
 -- statements.  If type is cr_revisions then rule would end up having only a 
@@ -538,7 +537,7 @@
 -- revisions for any content type
 
 -- procedure refresh_trigger
-create function content_type__refresh_trigger (varchar)
+create or replace function content_type__refresh_trigger (varchar)
 returns integer as '
 declare
   refresh_trigger__content_type           alias for $1;  
@@ -709,7 +708,7 @@
 
 
 -- procedure register_child_type
-create function content_type__register_child_type (varchar,varchar,varchar,integer,integer)
+create or replace function content_type__register_child_type (varchar,varchar,varchar,integer,integer)
 returns integer as '
 declare
   register_child_type__parent_type   alias for $1;  
@@ -756,12 +755,12 @@
 
 
 -- procedure unregister_child_type
-create function content_type__unregister_child_type (varchar,varchar,varchar)
+create or replace function content_type__unregister_child_type (varchar,varchar,varchar)
 returns integer as '
 declare
   unregister_child_type__parent_type            alias for $1;  
   unregister_child_type__child_type             alias for $2;  
-  unregister_child_type__relation_tag           alias for $3;  -- default null
+  unregister_child_type__relation_tag           alias for $3;
 begin
 
   delete from 
@@ -778,7 +777,7 @@
 
 
 -- procedure register_relation_type
-create function content_type__register_relation_type (varchar,varchar,varchar,integer,integer)
+create or replace function content_type__register_relation_type (varchar,varchar,varchar,integer,integer)
 returns integer as '
 declare
   register_relation_type__content_type  alias for $1;  
@@ -830,7 +829,7 @@
 
 
 -- procedure unregister_relation_type
-create function content_type__unregister_relation_type (varchar,varchar,varchar)
+create or replace function content_type__unregister_relation_type (varchar,varchar,varchar)
 returns integer as '
 declare
   unregister_relation_type__content_type  alias for $1;  
@@ -853,7 +852,7 @@
 
 
 -- procedure register_mime_type
-create function content_type__register_mime_type (varchar,varchar)
+create or replace function content_type__register_mime_type (varchar,varchar)
 returns integer as '
 declare
   register_mime_type__content_type           alias for $1;  
@@ -890,7 +889,7 @@
 
 
 -- procedure unregister_mime_type
-create function content_type__unregister_mime_type (varchar,varchar)
+create or replace function content_type__unregister_mime_type (varchar,varchar)
 returns integer as '
 declare
   unregister_mime_type__content_type           alias for $1;  
@@ -906,7 +905,7 @@
 
 
 -- function is_content_type
-create function content_type__is_content_type (varchar)
+create or replace function content_type__is_content_type (varchar)
 returns boolean as '
 declare
   is_content_type__object_type            alias for $1;  
@@ -926,11 +925,11 @@
   
   return v_is_content_type;
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- procedure rotate_template
-create function content_type__rotate_template (integer,varchar,varchar)
+create or replace function content_type__rotate_template (integer,varchar,varchar)
 returns integer as '
 declare
   rotate_template__template_id            alias for $1;  
@@ -1003,7 +1002,7 @@
 
 -- prompt *** Refreshing content type attribute views...
 
-create function inline_0 ()
+create or replace function inline_0 ()
 returns integer as '
 declare 
         type_rec        record;
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-util.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-util.sql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-util.sql	22 May 2001 22:46:13 -0000	1.6
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-util.sql	11 Dec 2003 21:39:47 -0000	1.7
@@ -20,9 +20,9 @@
           from pg_class 
          where relname = lower(table_exists__table_name);
  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
-create function column_exists (varchar,varchar)
+create or replace function column_exists (varchar,varchar)
 returns boolean as '
 declare
         column_exists__table_name             alias for $1;  
@@ -35,9 +35,9 @@
            and c.oid = a.attrelid
            and a.attname = lower(column_exists__column_name);
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
-create function trigger_exists (varchar,varchar) returns boolean as '
+create or replace function trigger_exists (varchar,varchar) returns boolean as '
 declare 
         trigger_name    alias for $1;
         on_table        alias for $2;
@@ -48,9 +48,9 @@
            and c.oid = t.tgrelid
            and t.tgname = lower(trigger_name);
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
-create function trigger_func_exists (varchar) returns boolean as '
+create or replace function trigger_func_exists (varchar) returns boolean as '
 declare 
         trigger_name    alias for $1;
 begin
@@ -59,19 +59,19 @@
          where proname = lower(trigger_name)
            and pronargs = 0;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
-create function rule_exists (varchar,varchar) returns boolean as '
+create or replace function rule_exists (varchar,varchar) returns boolean as '
 declare
         rule_name       alias for $1;
         table_name      alias for $2;
 begin
         return count(*) = 1
           from pg_rules
-         where tablename::varchar = table_name
-           and rulename::varchar = rule_name;
+         where tablename::varchar = lower(table_name)
+           and rulename::varchar = lower(rule_name);
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 -- java stuff, deal with this later.
 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/doc-package.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/doc-package.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-content-repository/sql/postgresql/doc-package.sql	13 May 2001 18:17:01 -0000	1.4
+++ openacs-4/packages/acs-content-repository/sql/postgresql/doc-package.sql	11 Dec 2003 21:39:47 -0000	1.5
@@ -2,25 +2,9 @@
 -- Return function headers for packages
 ---------------------------------------
 
--- create or replace package doc
--- is
--- 
---   function get_proc_header (
---     proc_name    in varchar2,
---     package_name in varchar2
---   ) return varchar2;
--- 
---   function get_package_header (
---     package_name in varchar2
---   ) return varchar2;
--- 
--- end doc;
-
 -- show errors
 
--- create or replace package body doc
--- function get_proc_header
-create function doc__get_proc_header (varchar,varchar)
+create or replace function doc__get_proc_header (varchar,varchar)
 returns varchar as '
 declare
   proc_name              alias for $1;  
@@ -31,24 +15,17 @@
          where fname = (package_name || ''__'' || proc_name)::name 
          limit 1;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
--- function get_package_header
-create function doc__get_package_header (varchar)
+create or replace function doc__get_package_header (varchar)
 returns varchar as '
 declare
   package_name           alias for $1;  
 begin
 
         return '''';
-   
-end;' language 'plpgsql';
 
+end;' language 'plpgsql' immutable strict;
 
-
 -- show errors
-         
-      
-
-        
Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1,746 @@
+create or replace function content_item__get_content_type (integer)
+returns varchar as '
+declare
+  get_content_type__item_id                alias for $1;  
+  v_content_type                           cr_items.content_type%TYPE;
+begin
+
+  select
+    content_type into v_content_type
+  from 
+    cr_items
+  where 
+    item_id = get_content_type__item_id;  
+
+  return v_content_type;
+ 
+end;' language 'plpgsql' stable strict;
+
+
+
+create or replace function content_item__get_best_revision (integer)
+returns integer as '
+declare
+  get_best_revision__item_id                alias for $1;  
+  v_revision_id                             cr_revisions.revision_id%TYPE;
+begin
+    
+  select
+    coalesce(live_revision, latest_revision )
+  into
+    v_revision_id
+  from
+    cr_items
+  where
+    item_id = get_best_revision__item_id;
+
+  return v_revision_id;
+ 
+end;' language 'plpgsql' stable strict;
+
+
+create or replace function content_item__get_context (integer)
+returns integer as '
+declare
+  get_context__item_id                alias for $1;  
+  v_context_id                        acs_objects.context_id%TYPE;
+begin
+
+  select
+    context_id
+  into
+    v_context_id
+  from
+    acs_objects
+  where
+    object_id = get_context__item_id;
+
+  if NOT FOUND then 
+     raise EXCEPTION ''-20000: Content item % does not exist in content_item.get_context'', get_context__item_id;
+  end if;
+
+  return v_context_id;
+ 
+end;' language 'plpgsql' stable;
+
+
+
+create or replace function content_item__get_latest_revision (integer)
+returns integer as '
+declare
+  get_latest_revision__item_id                alias for $1;
+  v_revision_id                               integer;
+  v_rec                                       record;
+begin
+  for v_rec in 
+  select 
+    r.revision_id 
+  from 
+    cr_revisions r, acs_objects o
+  where 
+    r.revision_id = o.object_id
+  and 
+    r.item_id = get_latest_revision__item_id
+  order by 
+    o.creation_date desc
+  LOOP
+      v_revision_id := v_rec.revision_id;
+      exit;
+  end LOOP;
+
+  return v_revision_id;
+ 
+end;' language 'plpgsql' strict stable;
+
+
+create or replace function content_item__get_live_revision (integer)
+returns integer as '
+declare
+  get_live_revision__item_id                alias for $1;  
+  v_revision_id                             acs_objects.object_id%TYPE;
+begin
+
+  select
+    live_revision into v_revision_id
+  from
+    cr_items
+  where
+    item_id = get_live_revision__item_id;
+
+  return v_revision_id;
+ 
+end;' language 'plpgsql' stable strict;
+
+
+-- there was an infinite loop in content_item.get_parent_folder if called with 
+-- a child content_item rather than a content item which was directly below a 
+-- folder.
+
+create or replace function content_item__get_parent_folder (integer)
+returns integer as '
+declare
+  get_parent_folder__item_id               alias for $1;  
+  v_folder_id                              cr_folders.folder_id%TYPE;
+  v_parent_folder_p                        boolean default ''f'';       
+begin
+  v_folder_id := get_parent_folder__item_id;
+
+  while NOT v_parent_folder_p and v_folder_id is not null LOOP
+
+    select
+      parent_id, content_folder__is_folder(parent_id) 
+    into 
+      v_folder_id, v_parent_folder_p
+    from
+      cr_items
+    where
+      item_id = v_folder_id;
+
+  end loop; 
+
+  return v_folder_id;
+ 
+end;' language 'plpgsql' stable strict;
+
+
+create or replace function content_item__get_publish_date (integer,boolean)
+returns timestamptz as '
+declare
+  get_publish_date__item_id                alias for $1;  
+  get_publish_date__is_live                alias for $2;  -- default ''f''  
+  v_revision_id                            cr_revisions.revision_id%TYPE;
+  v_publish_date                           cr_revisions.publish_date%TYPE;
+begin
+
+  if get_publish_date__is_live then
+    select
+	publish_date into v_publish_date
+    from
+	cr_revisions r, cr_items i
+    where
+      i.item_id = get_publish_date__item_id
+    and
+      r.revision_id = i.live_revision;
+  else
+    select
+	publish_date into v_publish_date
+    from
+	cr_revisions r, cr_items i
+    where
+      i.item_id = get_publish_date__item_id
+    and
+      r.revision_id = i.latest_revision;
+  end if;
+
+  return v_publish_date;
+ 
+end;' language 'plpgsql' stable;
+
+create or replace function content_item__get_publish_date (integer,boolean)
+returns timestamptz as '
+declare
+  get_publish_date__item_id                alias for $1;  
+  get_publish_date__is_live                alias for $2;  -- default ''f''  
+  v_revision_id                            cr_revisions.revision_id%TYPE;
+  v_publish_date                           cr_revisions.publish_date%TYPE;
+begin
+
+  if get_publish_date__is_live then
+    select
+	publish_date into v_publish_date
+    from
+	cr_revisions r, cr_items i
+    where
+      i.item_id = get_publish_date__item_id
+    and
+      r.revision_id = i.live_revision;
+  else
+    select
+	publish_date into v_publish_date
+    from
+	cr_revisions r, cr_items i
+    where
+      i.item_id = get_publish_date__item_id
+    and
+      r.revision_id = i.latest_revision;
+  end if;
+
+  return v_publish_date;
+ 
+end;' language 'plpgsql' stable;
+
+
+-- This used to have a pretty gross loop and sort.
+--
+create or replace function content_item__is_subclass (varchar,varchar)
+returns boolean as '
+declare
+  is_subclass__object_type            alias for $1;  
+  is_subclass__supertype              alias for $2;  
+  v_subclass_p                        boolean;      
+  v_inherit_val                       record;
+begin
+  select count(*) > 0 into v_subclass_p where exists (
+	select 1
+          from acs_object_types o, acs_object_types o2
+         where o2.object_type = is_subclass__supertype
+           and o.object_type = is_subclass__object_type
+           and o.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey));
+
+  return v_subclass_p;
+
+end;' language 'plpgsql' stable;
+
+
+
+create or replace function content_item__is_publishable (integer)
+returns boolean as '
+declare
+  is_publishable__item_id                alias for $1;  
+  v_child_count                          integer;       
+  v_rel_count                            integer;       
+  v_template_id                          cr_templates.template_id%TYPE;
+  v_child_type                           record;
+  v_rel_type                             record;
+  v_content_type			 varchar;
+  -- v_pub_wf                               record;
+begin
+  -- check valid item_id
+  select content_item__get_content_type(is_publishable__item_id) into v_content_type;
+
+  if v_content_type is null then 
+	raise exception ''content_item__is_publishable item_id % invalid'',is_publishable__item_id;
+  end if;
+
+  -- validate children
+  -- make sure the # of children of each type fall between min_n and max_n
+  for v_child_type in select
+                        child_type, min_n, max_n
+                      from
+                        cr_type_children
+                      where
+                        parent_type = v_content_type 
+	                and (min_n is not null or max_n is not null)
+  LOOP
+    select
+      count(rel_id) into v_child_count
+    from
+      cr_child_rels
+    where
+      parent_id = is_publishable__item_id
+    and
+      content_item__get_content_type(child_id) = v_child_type.child_type;
+
+    -- make sure # of children is in range
+    if v_child_type.min_n is not null 
+      and v_child_count < v_child_type.min_n then
+      return ''f'';
+    end if;
+    if v_child_type.max_n is not null
+      and v_child_count > v_child_type.max_n then
+      return ''f'';
+    end if;
+
+  end LOOP;
+
+  -- validate relations
+  -- make sure the # of ext links of each type fall between min_n and max_n
+  -- only check if one of min_n max_n not null
+  for v_rel_type in select
+                      target_type, min_n, max_n
+                    from
+                      cr_type_relations
+                    where
+                      content_type = v_content_type
+		      and (max_n is not null or min_n is not null)
+  LOOP
+    select
+      count(rel_id) into v_rel_count
+    from
+      cr_item_rels i, acs_objects o
+    where
+      i.related_object_id = o.object_id
+    and
+      i.item_id = is_publishable__item_id
+    and
+      coalesce(content_item__get_content_type(o.object_id),o.object_type) = v_rel_type.target_type;
+      
+    -- make sure # of object relations is in range
+    if v_rel_type.min_n is not null 
+      and v_rel_count < v_rel_type.min_n then
+      return ''f'';
+    end if;
+    if v_rel_type.max_n is not null 
+      and v_rel_count > v_rel_type.max_n then
+      return ''f'';
+    end if;
+  end loop;
+
+  -- validate publishing workflows
+  -- make sure any ''publishing_wf'' associated with this item are finished
+  -- KG: logic is wrong here.  Only the latest workflow matters, and even
+  -- that is a little problematic because more than one workflow may be
+  -- open on an item.  In addition, this should be moved to CMS.
+  
+  -- Removed this as having workflow stuff in the CR is just plain wrong.
+  -- DanW, Aug 25th, 2001.
+
+  --   for v_pub_wf in  select
+  --                      case_id, state
+  --                    from
+  --                      wf_cases
+  --                    where
+  --                      workflow_key = ''publishing_wf''
+  --                    and
+  --                      object_id = is_publishable__item_id
+  -- 
+  --   LOOP
+  --     if v_pub_wf.state != ''finished'' then
+  --        return ''f'';
+  --     end if;
+  --   end loop;
+
+  -- if NOT FOUND then 
+  --   return ''f'';
+  -- end if;
+
+  return ''t'';
+ 
+end;' language 'plpgsql' stable;
+
+
+
+create or replace function content_item__move (integer,integer)
+returns integer as '
+declare
+  move__item_id                alias for $1;  
+  move__target_folder_id       alias for $2;  
+begin
+
+  if move__target_folder_id is null then 
+	raise exception ''attempt to move item_id % to null folder_id'', move__item_id;
+  end if;
+
+  if content_folder__is_folder(move__item_id) = ''t'' then
+
+    PERFORM content_folder__move(move__item_id, move__target_folder_id);
+
+  else if content_folder__is_folder(move__target_folder_id) = ''t'' then
+   
+
+    if content_folder__is_registered(move__target_folder_id,
+          content_item__get_content_type(move__item_id),''f'') = ''t'' and
+       content_folder__is_registered(move__target_folder_id,
+          content_item__get_content_type(content_symlink__resolve(move__item_id)),''f'') = ''t''
+      then
+
+    -- update the parent_id for the item
+    update cr_items 
+      set parent_id = move__target_folder_id
+      where item_id = move__item_id;
+    end if;
+
+  end if; end if;
+
+  return 0; 
+end;' language 'plpgsql';
+
+
+
+create or replace function content_revision__copy_attributes (varchar,integer,integer)
+returns integer as '
+declare
+  copy_attributes__content_type           alias for $1;  
+  copy_attributes__revision_id            alias for $2;  
+  copy_attributes__copy_id                alias for $3;  
+  v_table_name                            acs_object_types.table_name%TYPE;
+  v_id_column                             acs_object_types.id_column%TYPE;
+  cols                                    varchar default ''''; 
+  attr_rec                                record;
+begin
+
+  if copy_attributes__content_type is null or copy_attributes__revision_id is null or copy_attributes__copy_id is null then 
+     raise exception ''content_revision__copy_attributes called with null % % %'',copy_attributes__content_type,copy_attributes__revision_id, copy_attributes__copy_id;
+  end if;
+
+  select table_name, id_column into v_table_name, v_id_column
+  from acs_object_types where object_type = copy_attributes__content_type;
+
+  for attr_rec in select
+                    attribute_name
+                  from
+                    acs_attributes
+                  where
+                    object_type = copy_attributes__content_type 
+  LOOP
+    cols := cols || '', '' || attr_rec.attribute_name;
+  end loop;
+
+  execute ''insert into '' || v_table_name || '' select '' || copy_attributes__copy_id || 
+          '' as '' || v_id_column || cols || '' from '' || 
+          v_table_name || '' where '' || v_id_column || '' = '' || 
+          copy_attributes__revision_id;
+  
+  return 0; 
+end;' language 'plpgsql';
+
+
+
+create or replace function content_revision__export_xml (integer)
+returns integer as '
+declare
+  revision_id            alias for $1;  
+  clob_loc               text;          
+  v_doc_id               cr_xml_docs.doc_id%TYPE;
+  v_revision_id          cr_revisions.revision_id%TYPE;
+begin
+
+  raise exception '' content_revision__export_xml Not currently implemented on postgresql'';
+ 
+end;' language 'plpgsql';
+
+
+
+create or replace function content_keyword__is_assigned (integer,integer,varchar)
+returns boolean as '
+declare
+  is_assigned__item_id                alias for $1;  
+  is_assigned__keyword_id             alias for $2;  
+  is_assigned__recurse                alias for $3;  -- default ''none''  
+  v_ret                               boolean;    
+begin
+  if is_assigned__recurse is null then 
+	is_assigned__recurse := ''none'';
+  end if;
+
+  -- Look for an exact match
+  if is_assigned__recurse = ''none'' then
+      return count(*) > 0 from cr_item_keyword_map
+       where item_id = is_assigned__item_id
+         and keyword_id = is_assigned__keyword_id;
+  end if;
+
+  -- Look from specific to general
+  if is_assigned__recurse = ''up'' then
+      return count(*) > 0
+      where exists (select 1
+                    from (select keyword_id from cr_keywords c, cr_keywords c2
+	                  where c2.keyword_id = is_assigned__keyword_id
+                            and c.tree_sortkey between c2.tree_sortkey and tree_right(c2.tree_sortkey)) t,
+                      cr_item_keyword_map m
+                    where t.keyword_id = m.keyword_id
+                      and m.item_id = is_assigned__item_id);
+  end if;
+
+  if is_assigned__recurse = ''down'' then
+      return count(*) > 0
+      where exists (select 1
+                    from (select k2.keyword_id
+                          from cr_keywords k1, cr_keywords k2
+                          where k1.keyword_id = is_assigned__keyword_id
+                            and k1.tree_sortkey between k2.tree_sortkey and tree_right(k2.tree_sortkey)) t, 
+                      cr_item_keyword_map m
+                    where t.keyword_id = m.keyword_id
+                      and m.item_id = is_assigned__item_id);
+
+  end if;  
+
+  -- Tried none, up and down - must be an invalid parameter
+  raise EXCEPTION ''-20000: The recurse parameter to content_keyword.is_assigned should be \\\'none\\\', \\\'up\\\' or \\\'down\\\''';
+  
+  return null;
+end;' language 'plpgsql' stable;
+
+
+create or replace function content_folder__is_registered (integer,varchar,boolean)
+returns boolean as '
+declare
+  is_registered__folder_id              alias for $1;  
+  is_registered__content_type           alias for $2;  
+  is_registered__include_subtypes       alias for $3;  -- default ''f''  
+  v_is_registered                       integer;
+  v_subtype_val                         record;
+begin
+
+  if is_registered__include_subtypes = ''f'' or  is_registered__include_subtypes is null then
+    select 
+      count(1)
+    into 
+      v_is_registered
+    from
+      cr_folder_type_map
+    where
+      folder_id = is_registered__folder_id
+    and
+      content_type = is_registered__content_type;
+
+  else
+--                         select
+--                            object_type
+--                          from 
+--                            acs_object_types
+--                          where 
+--                            object_type <> ''acs_object''
+--                          connect by 
+--                            prior object_type = supertype
+--                          start with 
+--                            object_type = is_registered.content_type 
+
+    v_is_registered := 1;
+    for v_subtype_val in select o.object_type
+                         from acs_object_types o, acs_object_types o2
+                         where o.object_type <> ''acs_object''
+                           and o2.object_type = is_registered__content_type
+                           and o.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey)
+                         order by o.tree_sortkey
+    LOOP
+      if content_folder__is_registered(is_registered__folder_id,
+                       v_subtype_val.object_type, ''f'') = ''f'' then
+        v_is_registered := 0;
+      end if;
+    end loop;
+  end if;
+
+  if v_is_registered = 0 then
+    return ''f'';
+  else
+    return ''t'';
+  end if;
+ 
+end;' language 'plpgsql' stable;
+
+
+create or replace function content_revision__content_copy (integer,integer)
+returns integer as '
+declare
+  content_copy__revision_id            alias for $1;  
+  content_copy__revision_id_dest       alias for $2;  -- default null  
+  v_item_id                            cr_items.item_id%TYPE;
+  v_content_length                     cr_revisions.content_length%TYPE;
+  v_revision_id_dest                   cr_revisions.revision_id%TYPE;
+  v_content                            cr_revisions.content%TYPE;
+  v_lob                                cr_revisions.lob%TYPE;
+  v_new_lob                            cr_revisions.lob%TYPE;
+  v_storage_type                       varchar;
+begin
+  if content_copy__revision_id is null then 
+	raise exception ''content_revision__content_copy attempt to copy a null revision_id'';
+  end if;
+
+  select
+    content_length, item_id
+  into
+    v_content_length, v_item_id
+  from
+    cr_revisions
+  where
+    revision_id = content_copy__revision_id;
+
+  -- get the destination revision
+  if content_copy__revision_id_dest is null then
+    select
+      latest_revision into v_revision_id_dest
+    from
+      cr_items
+    where
+      item_id = v_item_id;
+  else
+    v_revision_id_dest := content_copy__revision_id_dest;
+  end if;
+
+
+  -- only copy the content if the source content is not null
+  if v_content_length is not null and v_content_length > 0 then
+
+    /* The internal LOB types - BLOB, CLOB, and NCLOB - use copy semantics, as 
+       opposed to the reference semantics which apply to BFILEs.
+       When a BLOB, CLOB, or NCLOB is copied from one row to another row in 
+       the same table or in a different table, the actual LOB value is
+       copied, not just the LOB locator. */
+
+    select r.content, r.content_length, r.lob, i.storage_type 
+      into v_content, v_content_length, v_lob, v_storage_type
+      from cr_revisions r, cr_items i 
+     where r.item_id = i.item_id 
+       and r.revision_id = content_copy__revision_id;
+
+    if v_storage_type = ''lob'' then
+        v_new_lob := empty_lob();
+
+        update cr_revisions
+           set content = null,
+               content_length = v_content_length,
+               lob = v_new_lob
+         where revision_id = v_revision_id_dest;
+        PERFORM lob_copy(v_lob, v_new_lob);
+    else 
+        -- this will work for both file and text types... well sort of.
+        -- this really just creates a reference to the first file which is
+        -- wrong since, the item_id, revision_id uniquely describes the 
+        -- location of the file in the content repository file system.  
+        -- after copy is called, the content attribute needs to be updated 
+        -- with the new relative file path:
+
+        -- update cr_revisions
+        -- set content = ''[cr_create_content_file $item_id $revision_id [cr_fs_path]$old_rel_path]''
+        -- where revision_id = :revision_id
+        
+        -- old_rel_path is the content attribute value of the content revision
+        -- that is being copied.
+        update cr_revisions
+           set content = v_content,
+               content_length = v_content_length,
+               lob = null
+         where revision_id = v_revision_id_dest;
+    end if;
+
+  end if;
+
+  return 0; 
+end;' language 'plpgsql';
+
+
+create or replace function content_revision__import_xml (integer,integer,numeric)
+returns integer as '
+declare
+  import_xml__item_id                alias for $1;  
+  import_xml__revision_id            alias for $2;  
+  import_xml__doc_id                 alias for $3;  
+  clob_loc                           text;          
+  v_revision_id                      cr_revisions.revision_id%TYPE;
+begin
+
+	raise exception '' content_revision__import_xml not implemented on postgres'';
+
+end;' language 'plpgsql';
+
+
+create or replace function content_revision__index_attributes (integer)
+returns integer as '
+declare
+  index_attributes__revision_id            alias for $1;  
+  clob_loc                                 text;          
+  v_revision_id                            cr_revisions.revision_id%TYPE;
+begin
+
+	raise exception ''content_revision__index_attributes not implemented on postgres'';
+
+end;' language 'plpgsql';
+
+
+create or replace function content_type__get_template (varchar,varchar)
+returns integer as '
+declare
+  get_template__content_type           alias for $1;  
+  get_template__use_context            alias for $2;  
+  v_template_id                        cr_templates.template_id%TYPE;
+begin
+  select
+    template_id
+  into
+    v_template_id
+  from
+    cr_type_template_map
+  where
+    content_type = get_template__content_type
+  and
+    use_context = get_template__use_context
+  and
+    is_default = ''t'';
+
+  return v_template_id;
+ 
+end;' language 'plpgsql' stable strict;
+
+
+create or replace function content_type__trigger_insert_statement (varchar)
+returns varchar as '
+declare
+  trigger_insert_statement__content_type   alias for $1;  
+  v_table_name                             acs_object_types.table_name%TYPE;
+  v_id_column                              acs_object_types.id_column%TYPE;
+  cols                                     varchar default '''';
+  vals                                     varchar default '''';
+  attr_rec                                 record;
+begin
+  if trigger_insert_statement__content_type is null then 
+	return exception ''content_type__trigger_insert_statement called with null content_type'';
+  end if;
+
+  select 
+    table_name, id_column into v_table_name, v_id_column
+  from 
+    acs_object_types 
+  where 
+    object_type = trigger_insert_statement__content_type;
+
+  for attr_rec in select
+                    attribute_name
+                  from
+                    acs_attributes
+                  where
+                    object_type = trigger_insert_statement__content_type 
+  LOOP
+    cols := cols || '', '' || attr_rec.attribute_name;
+    vals := vals || '', new.'' || attr_rec.attribute_name;
+  end LOOP;
+
+  return ''insert into '' || v_table_name || 
+    '' ( '' || v_id_column || cols || '' ) values (cr_dummy.val'' ||
+    vals || '')'';
+  
+end;' language 'plpgsql' stable;
+
+
+create or replace function rule_exists (varchar,varchar) returns boolean as '
+declare
+        rule_name       alias for $1;
+        table_name      alias for $2;
+begin
+        return count(*) = 1
+          from pg_rules
+         where tablename::varchar = lower(table_name)
+           and rulename::varchar = lower(rule_name);
+
+end;' language 'plpgsql' stable;
+
Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0d2-5.0d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0d2-5.0d3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.0d2-5.0d3.sql	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1,196 @@
+-- @author Dave Bauer (dave@thedesignexperience.org)
+-- @creation-date 2003-12-03
+-- @cvs-id $Id: 
+
+create or replace function content_item__get_path (integer,integer)
+returns varchar as '
+declare
+  get_path__item_id                alias for $1;  
+  get_path__root_folder_id         alias for $2;  -- default null  
+  v_count                          integer;       
+  v_resolved_root_id               integer;       
+  v_path                           text    default '''';  
+  v_rec                            record;
+begin
+
+  -- check that the item exists
+  select count(*) into v_count from cr_items where item_id = get_path__item_id;
+
+  if v_count = 0 then
+    raise EXCEPTION ''-20000: Invalid item ID: %'', get_path__item_id;
+  end if;
+
+  -- begin walking down the path to the item (from the repository root)
+ 
+  -- if the root folder is not null then prepare for a relative path
+
+  if get_path__root_folder_id is not null then
+
+    -- if root_folder_id is a symlink, resolve it (child items will point
+    -- to the actual folder, not the symlink)
+
+    v_resolved_root_id := content_symlink__resolve(get_path__root_folder_id);
+
+    -- check to see if the item is under or out side the root_id
+    PERFORM 1 from cr_items i, 
+        (select tree_sortkey from cr_items where item_id = v_resolved_root_id) a
+    where tree_ancestor_p(a.tree_sortkey, i.tree_sortkey) and i.item_id = get_path__item_id;
+
+    if NOT FOUND then
+        -- if not found then we need to go up the folder and append ../ until we have common ancestor
+
+        for v_rec in select i1.name, i1.parent_id, tree_level(i1.tree_sortkey) as tree_level
+                 from cr_items i1, (select tree_ancestor_keys(tree_sortkey) as tree_sortkey from cr_items where item_id = v_resolved_root_id) i2,
+                 (select tree_sortkey from cr_items where item_id = get_path__item_id) i3
+                 where 
+                 i1.parent_id <> 0
+                 and i2.tree_sortkey = i1.tree_sortkey
+                 and not tree_ancestor_p(i2.tree_sortkey, i3.tree_sortkey)
+                 order by tree_level desc
+        LOOP
+            v_path := v_path || ''../'';
+        end loop;
+        -- lets now assign the new root_id to be the last parent_id on the loop
+        v_resolved_root_id := v_rec.parent_id;
+
+    end if;
+
+    -- go downwards the tree and append the name and /
+    for v_rec in select i1.name, i1.item_id, tree_level(i1.tree_sortkey) as tree_level
+             from cr_items i1, (select tree_sortkey from cr_items where item_id = v_resolved_root_id) i2,
+            (select tree_ancestor_keys(tree_sortkey) as tree_sortkey from cr_items where item_id = get_path__item_id) i3
+             where 
+             i1.tree_sortkey = i3.tree_sortkey
+             and i1.tree_sortkey > i2.tree_sortkey
+             order by tree_level
+    LOOP
+        v_path := v_path || v_rec.name;
+        if v_rec.item_id <> get_path__item_id then 
+            -- put a / if we are still going down
+            v_path := v_path || ''/'';
+        end if;
+    end loop;
+
+  else
+
+    -- this is an absolute path so prepend a ''/''
+    -- loop over the absolute path
+
+    for v_rec in select i2.name, tree_level(i2.tree_sortkey) as tree_level
+                 from cr_items i1, cr_items i2
+                 where i2.parent_id <> 0
+                 and i1.item_id = get_path__item_id
+                 and i1.tree_sortkey between i2.tree_sortkey and tree_right(i2.tree_sortkey)
+                 order by tree_level
+    LOOP
+      v_path := v_path || ''/'' || v_rec.name;
+    end loop;
+
+  end if;
+
+  return v_path;
+ 
+end;' language 'plpgsql';
+
+--
+-- fix setting of context_id to new item id
+
+create or replace function content_revision__copy (integer,integer,integer,integer,varchar)
+returns integer as '
+declare
+  copy__revision_id            alias for $1;  
+  copy__copy_id                alias for $2;  -- default null  
+  copy__target_item_id         alias for $3;  -- default null
+  copy__creation_user          alias for $4;  -- default null
+  copy__creation_ip            alias for $5;  -- default null
+  v_copy_id                    cr_revisions.revision_id%TYPE;
+  v_target_item_id             cr_items.item_id%TYPE;
+  type_rec                     record;
+begin
+  -- use the specified item_id or the item_id of the original revision 
+  --   if none is specified
+  if copy__target_item_id is null then
+    select item_id into v_target_item_id from cr_revisions 
+      where revision_id = copy__revision_id;
+  else
+    v_target_item_id := copy__target_item_id;
+  end if;
+
+  -- use the copy_id or generate a new copy_id if none is specified
+  --   the copy_id is a revision_id
+  if copy__copy_id is null then
+    select acs_object_id_seq.nextval into v_copy_id from dual;
+  else
+    v_copy_id := copy__copy_id;
+  end if;
+
+  -- create the basic object
+  insert into acs_objects 
+       select 
+         v_copy_id as object_id, 
+         object_type, 
+         v_target_item_id, 
+         security_inherit_p, 
+         copy__creation_user as creation_user, 
+         now() as creation_date, 
+         copy__creation_ip as creation_ip,
+         now() as last_modified, 
+         copy__creation_user as modifying_user, 
+         copy__creation_ip as modifying_ip 
+       from
+         acs_objects 
+       where 
+         object_id = copy__revision_id;
+  
+  -- create the basic revision (using v_target_item_id)
+  insert into cr_revisions 
+      select 
+        v_copy_id as revision_id, 
+        v_target_item_id as item_id, 
+        title, 
+        description, 
+        publish_date, 
+        mime_type, 
+        nls_language, 
+        lob,
+	content,
+        content_length
+      from 
+        cr_revisions 
+      where
+        revision_id = copy__revision_id;
+
+--                  select 
+--                    object_type
+--                  from                                                
+--                    acs_object_types                                  
+--                  where                                               
+--                    object_type <> ''acs_object''                       
+--                  and                                                 
+--                    object_type <> ''content_revision''                 
+--                  connect by                                          
+--                    prior supertype = object_type                     
+--                  start with                                          
+----                    object_type = (select object_type 
+--                                     from acs_objects 
+--                                    where object_id = copy__revision_id)
+--                  order by
+--                    level desc 
+
+  -- iterate over the ancestor types and copy attributes
+  for type_rec in select ot2.object_type, tree_level(ot2.tree_sortkey) as level
+                  from acs_object_types ot1, acs_object_types ot2, acs_objects o
+                  where ot2.object_type <> ''acs_object''                       
+                    and ot2.object_type <> ''content_revision''
+                    and o.object_id = copy__revision_id 
+                    and ot1.object_type = o.object_type 
+                    and ot1.tree_sortkey between ot2.tree_sortkey and tree_right(ot2.tree_sortkey)
+                  order by level desc
+  LOOP
+    PERFORM content_revision__copy_attributes(type_rec.object_type, 
+                                              copy__revision_id, v_copy_id);
+  end loop;
+
+  return v_copy_id;
+ 
+end;' language 'plpgsql';
Index: openacs-4/packages/acs-content-repository/www/doc/requirements.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/requirements.html,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/www/doc/requirements.html	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-content-repository/www/doc/requirements.html	11 Dec 2003 21:39:47 -0000	1.2
@@ -258,7 +258,7 @@
 range of allowed parameters for the general MIME types such as
 <tt>text/plain</tt>.</p>
 
-<p><b>100.20 Locales</b></p>
+<p id="100-20"><b>100.20 Locales</b></p>
 
 <P>The repository must have access to a list of recognized locales for
 the purpose of publishing content items in multiple languages and
Index: openacs-4/packages/acs-core-docs/acs-core-docs.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/acs-core-docs.info,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-core-docs/acs-core-docs.info	10 Nov 2003 14:28:55 -0000	1.10
+++ openacs-4/packages/acs-core-docs/acs-core-docs.info	11 Dec 2003 21:39:47 -0000	1.11
@@ -1,21 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-core-docs" url="http://www.openacs.org/acs-repository/apm/packages/acs-core-docs/" type="apm_service">
+<package key="acs-core-docs" url="http://openacs.org/repository/apm/packages/acs-core-docs/" type="apm_service">
     <package-name>Documentation</package-name>
     <pretty-plural>Documentation</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/repository/download/apm/acs-core-docs-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-core-docs-5.0.0b4.apm">
         <owner url="mailto:docs@openacs.org">OpenACS Documentation Team</owner>
-        <summary>Documentation for the ACS Core.</summary>
+        <summary>Documentation for the OpenACS Core.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Static HTML documentation for the OpenACS core (includes the DocBook sources).
+        </description>
 
-        <provides url="acs-core-docs" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
-        <requires url="acs-tcl" version="5.0.0a5"/>
+        <provides url="acs-core-docs" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
+        <requires url="acs-tcl" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-core-docs/www/automated-testing-best-practices.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/automated-testing-best-practices.html,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/automated-testing-best-practices.html	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1,27 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Automated Testing</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.0"><link rel="home" href="index.html" title="OpenACS Core Documentation"><link rel="up" href="eng-standards.html" title="Chapter�9.�Engineering Standards"><link rel="previous" href="variables.html" title="Variables"><link rel="next" href="doc-standards.html" title="Chapter�10.�Documentation Standards"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0" alt="Alex logo"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="variables.html">Prev</a> </td><th width="60%" align="center">Chapter�9.�Engineering Standards</th><td width="20%" align="right"> <a accesskey="n" href="doc-standards.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="automated-testing-best-practices"></a>Automated Testing</h2></div></div><div></div></div><div class="authorblurb"><p>By <a href="mailto:davis@xarg.net" target="_top">Jeff Davis</a></p>
+          OpenACS docs are written by the named authors, and may be edited
+          by OpenACS documentation staff.
+        </div><p>Best practices in writing OpenACS automated tests</p><div class="itemizedlist"><ul type="disc"><li><p><b>Special characters in Tcl.�</b>
+Try strings starting with a <tt class="computeroutput">-Bad</tt> and strings containing <tt class="computeroutput">[BAD]</tt>, <tt class="computeroutput">{</tt>, <tt class="computeroutput">\077</tt>, and <tt class="computeroutput">$Bad</tt>.  For user input, <tt class="computeroutput">[BAD]</tt> should never be evaluated, <tt class="computeroutput">\077</tt> should not be turned into a <tt class="computeroutput">?</tt> and <tt class="computeroutput">$Bad</tt> should not be interpolated.  The string <tt class="computeroutput">-Bad [BAD] \077 { $Bad</tt> should be valid user input, should pass through the system unaltered, and if it isn't that's a bug.
+</p></li><li><p><b>Quoting issues.�</b>Put some html in plain text fields and make sure the result is
+properly quoted anywhere it shows up (I use "&lt;b&gt;bold&lt;/b&gt;"
+usually).  Look out especially for quoting errors in the context bar
+and in round trips via an edit form. For fields that disallow html
+tags you can use <tt class="computeroutput">&amp;amp;</tt> to check that the field is quoted
+properly.  If it is not displayed as <tt class="computeroutput">&amp;amp;</tt> then the quoting for the field is incorrect. (It's not clear whether this
+should be considered an error but given that data for text fields can
+come from various sources if it's text it should be properly quoted
+and we should not rely on input validation to prevent XSS security
+holes.)</p></li><li><p><b>Whitespace input.�</b>Check that whitespace is not considered valid input for a field
+if it does not make sense.  For example, the subject of a forum post is
+used to construct a link and if it is " " it will have a link of
+<tt class="computeroutput">&lt;a href="..."&gt; &lt;/a&gt;</tt> which would not be clickable if whitespace was allowed as a valid input.
+</p></li><li><p><b>Doubleclick.�</b>
+Make sure that if you submit a form, use the back button, and submit
+again that the behavior is reasonable (correct behavior depends on
+what the form is for, but a server error is not reasonable).
+</p></li><li><p><b>Duplicate names.�</b>
+Make sure that if a duplicate name is entered that there is a
+reasonable error rather than a server error.  Check for
+insert, move, copy, and rename.
+</p></li></ul></div><div class="cvstag">($Id: automated-testing-best-practices.html,v 1.2 2003/12/11 21:39:47 jeffd Exp $)</div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="variables.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="doc-standards.html">Next</a></td></tr><tr><td width="40%" align="left">Variables </td><td width="20%" align="center"><a accesskey="u" href="eng-standards.html">Up</a></td><td width="40%" align="right"> Chapter�10.�Documentation Standards</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/automated-testing-best-practices.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/packages/acs-core-docs/www/doc-standards.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/doc-standards.html,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/doc-standards.html	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter�10.�Documentation Standards</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.0"><link rel="home" href="index.html" title="OpenACS Core Documentation"><link rel="up" href="acs-package-dev.html" title="Part�III.�For OpenACS Package Developers"><link rel="previous" href="automated-testing-best-practices.html" title="Automated Testing"><link rel="next" href="docbook-primer.html" title="OpenACS Documentation Guide"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0" alt="Alex logo"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="automated-testing-best-practices.html">Prev</a> </td><th width="60%" align="center">Part�III.�For OpenACS Package Developers</th><td width="20%" align="right"> <a accesskey="n" href="docbook-primer.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="doc-standards"></a>Chapter�10.�Documentation Standards</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="docbook-primer.html">OpenACS Documentation Guide</a></span></dt><dt><span class="sect1"><a href="psgml-mode.html">Using PSGML mode in Emacs</a></span></dt><dt><span class="sect1"><a href="nxml-mode.html">Using nXML mode in Emacs</a></span></dt><dt><span class="sect1"><a href="filename.html">Detailed Design Documentation Template</a></span></dt><dt><span class="sect1"><a href="requirements-template.html">System/Application Requirements Template</a></span></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="automated-testing-best-practices.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="docbook-primer.html">Next</a></td></tr><tr><td width="40%" align="left">Automated Testing </td><td width="20%" align="center"><a accesskey="u" href="acs-package-dev.html">Up</a></td><td width="40%" align="right"> OpenACS Documentation Guide</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/doc-standards.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/packages/acs-core-docs/www/form-builder.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/form-builder.html,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/form-builder.html	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1,12 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Using HTML Forms</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.0"><link rel="home" href="index.html" title="OpenACS Core Documentation"><link rel="up" href="dev-guide.html" title="Chapter�8.�Development Reference"><link rel="previous" href="programming-with-aolserver.html" title="Programming with AOLserver"><link rel="next" href="eng-standards.html" title="Chapter�9.�Engineering Standards"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0" alt="Alex logo"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="programming-with-aolserver.html">Prev</a> </td><th width="60%" align="center">Chapter�8.�Development Reference</th><td width="20%" align="right"> <a accesskey="n" href="eng-standards.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="form-builder"></a>Using HTML Forms</h2></div></div><div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="ad-form-overview"></a>Overview</h3></div></div><div></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="multi-part-elements"></a>Multi-part Elements</h3></div></div><div></div></div><p>Some elements have more than one choice, or can submit more than one value.</p><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2904088"></a>SELECT elements</h4></div></div><div></div></div><div class="orderedlist"><ol type="1"><li><p><b>Creating the form element.�</b>Populate a list of lists with values for the option list.</p><pre class="programlisting">set foo_options [db_list_of_lists foo_option_list "
+    select foo,
+           foo_id
+      from foos
+"]
+</pre><p>The variable <tt class="computeroutput">foo_options</tt> should resemble <tt class="computeroutput">{{first foo} 1234} {{second foo} 1235}
+</tt></p><p>Within ad_form, set up the element to use this list:</p><pre class="programlisting">{foo:text(select)
+        {label "Which Foo"}
+        {options $foo_options}
+    }</pre><p>This will result in a single name/value pair coming back in the submitted form.  Handle this within the same ad_form structure, in the <tt class="computeroutput">-new_data</tt> and <tt class="computeroutput">-edit_data</tt>.  In the example, it is available as <tt class="computeroutput">$foo</tt></p></li></ol></div><p>See also the 
+        <a href="http://www.w3.org/TR/html401/interact/forms.html#h-17.6" target="_top">W3C spec for "The SELECT, OPTGROUP, and OPTION elements"</a>.
+        </p></div></div><div class="cvstag">($Id: form-builder.html,v 1.2 2003/12/11 21:39:47 jeffd Exp $)</div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="programming-with-aolserver.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="eng-standards.html">Next</a></td></tr><tr><td width="40%" align="left">Programming with AOLserver </td><td width="20%" align="center"><a accesskey="u" href="dev-guide.html">Up</a></td><td width="40%" align="right"> Chapter�9.�Engineering Standards</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/form-builder.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/packages/acs-core-docs/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/index.adp,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-core-docs/www/index.adp	28 Oct 2003 22:20:03 -0000	1.16
+++ openacs-4/packages/acs-core-docs/www/index.adp	11 Dec 2003 21:39:47 -0000	1.17
@@ -3,8 +3,10 @@
 <table border="0" cellpadding="8" cellspacing="0" width="80%">
 
 <tr><td valign="top">
-<a href="http://openacs.org/projects/openacs/doc-project">Errata and
-Corrections</a>
+<a href="index.html">Full index</a>
+
+<br>
+<a href="http://openacs.org/projects/openacs/doc-project">Errata and Corrections</a>
 <p><strong>Getting Started</strong>
 <ul>
 <li><a href="release-notes.html">Release Notes</a>
@@ -32,7 +34,9 @@
 
 <strong>Archive</strong>
 <ul>
-<li><a href="http://openacs.org/projects/openacs/doc-project/olddocs">Documentation for Earlier Versions of OpenACS</a>
+<li><a
+href="http://openacs.org/projects/openacs/doc-project/olddocs">Documentation
+for Past and Future Versions of OpenACS</a>
 </ul>
 </td>
 
Index: openacs-4/packages/acs-core-docs/www/individual-programs.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/individual-programs.html,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/acs-core-docs/www/individual-programs.html	19 Nov 2003 15:44:50 -0000	1.14
+++ openacs-4/packages/acs-core-docs/www/individual-programs.html	11 Dec 2003 21:39:47 -0000	1.15
@@ -6,9 +6,9 @@
 	and webserver.  Many additional programs, such as a Mail
 	Transport Agent and source control system, are also needed for
 	a fully effective instance.
-  </p><div class="itemizedlist"><ul type="disc"><li><a name="openacs-download"></a><p><b><a href="http://openacs.org/projects/openacs/download/" target="_top">OpenACS 5.0.0b1</a>.�</b>The OpenACS tarball comprises the core packages and
+  </p><div class="itemizedlist"><ul type="disc"><li><a name="openacs-download"></a><p><b><a href="http://openacs.org/projects/openacs/download/" target="_top">OpenACS 5.0.0b4</a>.�</b>The OpenACS tarball comprises the core packages and
             many useful additional packages.  This includes a full set
-            of documentation.  The tarball works with both PostGreSQL
+            of documentation.  The tarball works with both PostgreSQL
             and Oracle.</p></li><li><p><b>Operating System.�</b>OpenACS is designed for a Unix-like system.  It is
           developed primarily in Linux.  It can be run on Mac OS X,
           and in Windows within VMWare.</p><div class="itemizedlist"><ul type="circle"><li><p><b>Linux.�</b>The installation assumes a linux kernel of 2.2.22 or newer, or 2.4.14 or newer.</p></li><li><p><b>FreeBSD.�</b><a href="http://www.orchardlabs.com/freebsd/" target="_top">FreeBSD
@@ -38,7 +38,7 @@
               distributions. </p></li><li><p><b>TCL 8.3 development headers and libraries, OPTIONAL.�</b>  The site-wide-search service, OpenFTS, requires these to
 			  compile. (Debian users: <tt class="computeroutput">apt-get install
 			  tcl8.3-dev</tt>).  You need this
-              to install OpenFTS.</p></li></ul></div></li><li><a name="source-tdom"></a><p><b>tDOM, REQUIRED.�</b>OpenACS 5.0.0b1 stores
+              to install OpenFTS.</p></li></ul></div></li><li><a name="source-tdom"></a><p><b>tDOM, REQUIRED.�</b>OpenACS 5.0.0b4 stores
           queries in XML files, so we use an AOLserver module called
           tDOM to parse these files.  (This replaces libxml2, which
           was used prior to 4.6.4.)  tDOM is available from <a href="http://www.tdom.org" target="_top">http://www.tdom.org</a>).</p></li><li><a name="source-tclwebtest"></a><p><b>tclwebtest, OPTIONAL.�</b>tclwebtest 0.3 is a tool for testing web interfaces
@@ -49,7 +49,7 @@
         running Apache with mod_nsd - see <a href="http://openacs.org/forums/message-view?message_id=21461" target="_top">this
         post.</a></p><div class="itemizedlist"><ul type="circle"><li><a name="source-aolserver"></a><p><b><a href="http://uptime.openacs.org/aolserver-openacs/aolserver3.3oacs1.tar.gz" target="_top">AOLserver 3.3oacs1</a>, REQUIRED.�</b>Mat Kovach's source distribution of AOLserver, including all of the patches listed below.</p><p>
       Mat Kovach is graciously maintaining an AOLserver distribution that
-      includes all the patches and modules needed to run OpenACS 5.0.0b1. These
+      includes all the patches and modules needed to run OpenACS 5.0.0b4. These
       instructions will describe how to install using his source
       distribution. He also has binaries for SuSE 7.3 and OpenBSD 2.8 (and
       perhaps more to come), currently located at <a href="http://uptime.openacs.org/aolserver-openacs/" target="_top">uptime.openacs.org</a>.
@@ -85,20 +85,20 @@
               page</a>)</p></li><li><a name="pam-radius-download"></a><p><b><a href="ftp://ftp.freeradius.org/pub/radius/pam_radius-1.3.16.tar" target="_top">pam_radius 1.3.16</a>, OPTIONAL.�</b>Provides RADIUS capabilities for PAM.  You need
               this if you want to use RADIUS authentication via PAM in OpenACS.</p></li><li><a name="nsldap-download"></a><p><b><a href="http://sourceforge.net/project/showfiles.php?group_id=3152" target="_top">ns_ldap 0.r8
               </a>, OPTIONAL.�</b>Provides LDAP capabilities for AOLserver.  You need
-              this if you want to use LDAP authentication in OpenACS.</p></li><li><a name="openfts-download"></a><p><b><a href="http://unc.dl.sourceforge.net/sourceforge/openfts/Search-OpenFTS-tcl-0.3.2.tar.gz" target="_top">OpenFTS TCL 0.3.2</a>, OPTIONAL.�</b>Adds full-text-search to PostGreSQL and includes a
+              this if you want to use LDAP authentication in OpenACS.</p></li><li><a name="openfts-download"></a><p><b><a href="http://unc.dl.sourceforge.net/sourceforge/openfts/Search-OpenFTS-tcl-0.3.2.tar.gz" target="_top">OpenFTS TCL 0.3.2</a>, OPTIONAL.�</b>Adds full-text-search to PostgreSQL and includes a
                driver for AOLserver.  You need this if you want users
                to be able to search for any text on your site.</p></li><li><p><a name="analog-download"></a><b><a href="http://www.analog.cx/analog-5.32.tar.gz" target="_top">Analog 5.32</a>, OPTIONAL.�</b>This program examines web server request logs, looks up
 	    DNS values, and produces a report.  You need this if you
 	    want to see how much traffic your site is getting.</p></li></ul></div></li><li><p><b>Database.�</b>The data on your site (for example, user names and passwords,
         calender entries, and notes) is stored in the database.
         OpenACS seperates the database with an abstraction layer,
         which means that several different databases all function
-        identically.  Currently OpenACS supports PostGreSQL 7.2 and
+        identically.  Currently OpenACS supports PostgreSQL 7.2 and
         Oracle 8.1.7.  While you can run the core OpenACS on any
         supported database, not all contributed packages support all
-        databases.</p><div class="itemizedlist"><ul type="circle"><li><p><b>Oracle 8.1.7 (Either this or PostGreSQL is REQUIRED).�</b>You can register and download Oracle from <a href="http://otn.oracle.com/software/content.html" target="_top">Oracle
+        databases.</p><div class="itemizedlist"><ul type="circle"><li><p><b>Oracle 8.1.7 (Either this or PostgreSQL is REQUIRED).�</b>You can register and download Oracle from <a href="http://otn.oracle.com/software/content.html" target="_top">Oracle
               TechNet</a>.  You need this if you want to use an
-              Oracle database.</p></li><li><p><a name="source-postgresql"></a><b><a href="http://sourceforge.net/projects/pgsql/" target="_top">PostGreSQL 7.3.4</a> (Either this or Oracle is REQUIRED).�</b>You need this if you want to use a PostGreSQL database.</p></li></ul></div></li><li><p><b>Process Controller.�</b>This is software that initiates other software, and
+              Oracle database.</p></li><li><p><a name="source-postgresql"></a><b><a href="http://sourceforge.net/projects/pgsql/" target="_top">PostgreSQL 7.3.4</a> (Either this or Oracle is REQUIRED).�</b>You need this if you want to use a PostgreSQL database.</p></li></ul></div></li><li><p><b>Process Controller.�</b>This is software that initiates other software, and
           restarts that software if it fails.  On Linux, we recommend
           using Daemontools to control AOLserver and qmail.</p><div class="itemizedlist"><ul type="circle"><li><a name="daemontools-download"></a><p><b><a href="http://cr.yp.to/daemontools/daemontools-0.76.tar.gz" target="_top">Daemontools 0.76</a>, OPTIONAL.�</b>You need this if you want AOLserver and qmail to run
               "supervised," meaning that they are monitored and
Index: openacs-4/packages/acs-core-docs/www/ld-id2890769.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/Attic/ld-id2890769.html,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/ld-id2890769.html	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Long Description</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.0"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><p><span class="strong">OpenACS without APM vs. with APM</span></p></body></html>
Index: openacs-4/packages/acs-core-docs/www/ld-id2913366.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/Attic/ld-id2913366.html,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/ld-id2913366.html	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Long Description</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.0"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><p>This is an image of the flow in the Request Processor</p></body></html>
Index: openacs-4/packages/acs-core-docs/www/nxml-mode.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/nxml-mode.html,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/nxml-mode.html	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1,10 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Using nXML mode in Emacs</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.0"><link rel="home" href="index.html" title="OpenACS Core Documentation"><link rel="up" href="doc-standards.html" title="Chapter�10.�Documentation Standards"><link rel="previous" href="psgml-mode.html" title="Using PSGML mode in Emacs"><link rel="next" href="filename.html" title="Detailed Design Documentation Template"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0" alt="Alex logo"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="psgml-mode.html">Prev</a> </td><th width="60%" align="center">Chapter�10.�Documentation Standards</th><td width="20%" align="right"> <a accesskey="n" href="filename.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="nxml-mode"></a>Using nXML mode in Emacs</h2></div></div><div></div></div><div class="authorblurb"><p>By Jeff Davis</p>
+          OpenACS docs are written by the named authors, and may be edited
+          by OpenACS documentation staff.
+        </div><p>
+    An alternative to psgml mode is nXML by James Clark, a new major mode for GNU Emacs
+    for editing XML, and which features highlighting, indentation, and on the fly validation versus a RelaxNG Schema.
+  </p><div class="itemizedlist"><ul type="disc"><li><p>An
+        <a href="http://www.xmlhack.com/read.php?item=2061" target="_top">introduction to nXML mode</a> at xmlhack.com.
+      </p></li><li><p>The <a href="http://groups.yahoo.com/group/emacs-nxml-mode/" target="_top">nXML mode mail list</a> at groups.yahoo.com.
+      </p></li><li><p>The <a href="http://www.thaiopensource.com/download/" target="_top">nXML download page</a> at <a href="http://www.thaiopensource.com/" target="_top">thaiopensource.com</a>.</p></li></ul></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="psgml-mode.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="filename.html">Next</a></td></tr><tr><td width="40%" align="left">Using PSGML mode in Emacs </td><td width="20%" align="center"><a accesskey="u" href="doc-standards.html">Up</a></td><td width="40%" align="right"> Detailed Design Documentation Template</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/nxml-mode.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/packages/acs-core-docs/www/openacs-unpack.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/openacs-unpack.html,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-core-docs/www/openacs-unpack.html	19 Nov 2003 15:44:50 -0000	1.9
+++ openacs-4/packages/acs-core-docs/www/openacs-unpack.html	11 Dec 2003 21:39:47 -0000	1.10
@@ -1,17 +1,17 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Unpack the OpenACS tarball</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.0"><link rel="home" href="index.html" title="OpenACS Core Documentation"><link rel="up" href="install-more-software.html" title="Appendix�B.�Install additional supporting software"><link rel="previous" href="install-more-software.html" title="Appendix�B.�Install additional supporting software"><link rel="next" href="install-cvs.html" title="Initialize CVS (OPTIONAL)"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0" alt="Alex logo"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="install-more-software.html">Prev</a> </td><th width="60%" align="center">Appendix�B.�Install additional supporting software</th><td width="20%" align="right"> <a accesskey="n" href="install-cvs.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="openacs-unpack"></a>Unpack the OpenACS tarball</h2></div></div><div></div></div><p>The OpenACS tarball contains sample configuration files
       for some of the packages listed below.  In order to access those
       files, unpack the tarball now.</p><pre class="screen">[root@yourserver root]# <b class="userinput"><tt>cd /tmp</tt></b>
-[root@yourserver tmp]# <b class="userinput"><tt>tar xzf openacs-5.0.0b1.tgz</tt></b>
+[root@yourserver tmp]# <b class="userinput"><tt>tar xzf openacs-5.0.0b4.tgz</tt></b>
 <pre class="action"><span class="action">cd /tmp
-tar xzf openacs-5.0.0b1.tgz</span></pre></pre><p>If you are installing from a different method and just need the configuration files, you can instead get them from CVS:</p><pre class="screen">[root@yourserver root]# <b class="userinput"><tt>cd /tmp</tt></b>
+tar xzf openacs-5.0.0b4.tgz</span></pre></pre><p>If you are installing from a different method and just need the configuration files, you can instead get them from CVS:</p><pre class="screen">[root@yourserver root]# <b class="userinput"><tt>cd /tmp</tt></b>
 [root@yourserver tmp]# <b class="userinput"><tt>cvs -d :pserver:anonymous@openacs.org:/cvsroot co openacs-4/packages/acs-core-docs/www/files/</tt></b>
 cvs checkout: warning: failed to open /root/.cvspass for reading: No such file or directory
 cvs server: Updating openacs-4/packages/acs-core-docs/www/files
 U openacs-4/packages/acs-core-docs/www/files/README.TXT
 <span class="emphasis"><em>(many lines omitted)</em></span>
 U openacs-4/packages/acs-core-docs/www/files/template-ini.ini
 U openacs-4/packages/acs-core-docs/www/files/winnsd.txt
-[root@yourserver tmp]# <b class="userinput"><tt>mv openacs-4 openacs-5.0.0b1</tt></b>
+[root@yourserver tmp]# <b class="userinput"><tt>mv openacs-4 openacs-5.0.0b4</tt></b>
 <pre class="action"><span class="action">cd /tmp
 cvs -d :pserver:anonymous@openacs.org:/cvsroot co openacs-4/packages/acs-core-docs/www/files/
 mv openacs-4 openacs-5.0.0a4</span></pre></pre></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="install-more-software.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="install-cvs.html">Next</a></td></tr><tr><td width="40%" align="left">Appendix�B.�Install additional supporting software </td><td width="20%" align="center"><a accesskey="u" href="install-more-software.html">Up</a></td><td width="40%" align="right"> Initialize CVS (OPTIONAL)</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/openacs-unpack.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/packages/acs-core-docs/www/style-guide.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/style-guide.html,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/style-guide.html	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1,90 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>OpenACS Style Guide</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.0"><link rel="home" href="index.html" title="OpenACS Core Documentation"><link rel="up" href="eng-standards.html" title="Chapter�9.�Engineering Standards"><link rel="previous" href="eng-standards.html" title="Chapter�9.�Engineering Standards"><link rel="next" href="eng-standards-versioning.html" title="Release Version Numbering"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0" alt="Alex logo"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="eng-standards.html">Prev</a> </td><th width="60%" align="center">Chapter�9.�Engineering Standards</th><td width="20%" align="right"> <a accesskey="n" href="eng-standards-versioning.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="style-guide"></a>OpenACS Style Guide</h2></div></div><div></div></div><p>
+    By Jeff Davis
+  </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="style-guide-motivation"></a>Motivation</h3></div></div><div></div></div><p>
+      Why have coding standards for OpenACS?  And if the code works why change it to
+      adhere to some arbitrary rules?
+    </p><p>
+      Well, first lets consider the OpenACS code base (all this as of
+      December 2003 and including dotLRN).  There are about 390,000
+      lines of tcl code, about 460,000 lines of sql (in datamodel
+      scripts and .xql files), about 80,000 lines of markup in .adp
+      files, and about 100,000 lines of documentation.  All told, just
+      about a million lines of "stuff".  In terms of logical units
+      there are about 160 packages, 800 tables, 2,000 stored
+      procedures, about 2,000 functional pages, and about 3,200 tcl
+      procedures.
+    </p><p>
+      When confronted by this much complexity it's important to be
+      able to make sense of it without having to wade through it all.
+      Things should be coherent, things should be named predictably
+      and behave like you would expect, and your guess about what
+      something is called or where it is should be right more often
+      than not because the code follows the rules.
+    </p><p>
+      Unfortunately, like any large software project written 
+      over a long period by a lot of different people, OpenACS 
+      sometimes lacks this basic guessability and in the interest 
+      of bringing it into line we have advanced these guidelines.
+    </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="style-commandments"></a>Commandments</h3></div></div><div></div></div><p>
+      Here is a short list of the basic rules code contributed to 
+      OpenACS should follow...
+    </p><div class="orderedlist"><ol type="1"><li><p><b>Follow the file naming and the package structure rules.�</b>
+            Some of the file naming rules are requirements for things
+            to function correctly (for example data model creation
+            scripts and tcl library files must be named properly to be
+            used), while some are suggestions (the
+            <span class="emphasis"><em>object-verb</em></span> naming convention) which
+            if ignored won't break anything, but if you follow the
+            rules people will be able to understand your package much
+            more easily.
+          </p></li><li><p><b>Be literate in your programming.�</b>
+            Use ad_proc, ad_library, and ad_page_contract to provide
+            documentation for your code, use comments on your
+            datamodel, explain what things mean and how they should
+            work.
+          </p></li><li><p><b>Test.�</b>
+            Write test cases for your API and data model; test
+            negative cases as well as positive; document your tests.
+            Provide tests for bugs which are not yet fixed. Test,
+            Test, Test.
+          </p></li><li><p><b>Use namespaces.�</b>
+            For new packages choose a namespace and place all procedures in it
+            and in oracle create packages.
+          </p></li><li><p><b>Follow the constraint naming and the PL/SQL and PL/pgSQL rules.�</b>
+            Naming constraints is important for upgradability and for consistency.  Also, 
+            named constraints can be immensely helpful in developing good error handling.
+            Following the PL/SQL and PL/pgSQL rules ensure that the procedures created 
+            can be handled similarly across both Oracle and PostgreSQL databases.
+          </p></li><li><p><b>Follow the code formatting guidelines.�</b>
+            The code base is very large and if things are formatted
+            consistently it is easier to read.  Also, if it conforms
+            to the standard it won't be reformatted (which can mask
+            the change history and making tracking down bugs much
+            harder).  Using spaces rather than tabs makes patches
+            easier to read and manage and does not force other
+            programmers to decipher what tab settings you had in place
+            in your editor.
+          </p></li><li><p><b>Use the standard APIs.�</b>
+            Don't reinvent the wheel.  Prefer extending an existing
+            core API to creating your own.  If something in the core
+            does not meet your particular needs it probably won't meet
+            others as well and fleshing out the core API's makes the
+            toolkit more useful for everyone and more easily extended.
+          </p></li><li><p><b>Make sure your datamodel create/drop scripts work.�</b>
+            Break the table creation out from the package/stored
+            procedure creation and use <tt class="computeroutput">create or
+            replace</tt> where possible so that scripts
+            can be sourced more than once.  Make sure your drop script
+            works if data has been inserted (and permissioned and
+            notifications have been attached etc).
+          </p></li><li><p><b>Practice CVS/Bug Tracker Hygiene.�</b>
+            Commit your work. commit with sensible messages and include
+            patch and bug numbers in your commit messages.
+          </p><p>
+          Create bug tracker tickets for things you are going to work
+          on yourself (just in case you don't get to it and to act as
+          a pointer for others who might encounter the same problem).
+        </p></li><li><p><b>Solicit code reviews.�</b>
+            Ask others to look over your code and provide feedback and do 
+            the same for others.  
+          </p></li></ol></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="style-guide-rev-history"></a>Revision History</h3></div></div><div></div></div><div class="informaltable"><table cellspacing="0" border="1"><colgroup><col><col><col><col></colgroup><thead><tr><th>Document Revision #</th><th>Action Taken, Notes</th><th>When?</th><th>By Whom?</th></tr></thead><tbody><tr><td>0.1</td><td>Creation</td><td>12/2003</td><td>Jeff Davis</td></tr></tbody></table></div><div class="cvstag">($Id: style-guide.html,v 1.2 2003/12/11 21:39:47 jeffd Exp $)</div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="eng-standards.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="eng-standards-versioning.html">Next</a></td></tr><tr><td width="40%" align="left">Chapter�9.�Engineering Standards </td><td width="20%" align="center"><a accesskey="u" href="eng-standards.html">Up</a></td><td width="40%" align="right"> Release Version Numbering</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/style-guide.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/packages/acs-core-docs/www/variables.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/variables.html,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/variables.html	11 Dec 2003 21:39:47 -0000	1.2
@@ -0,0 +1,14 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Variables</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.0"><link rel="home" href="index.html" title="OpenACS Core Documentation"><link rel="up" href="eng-standards.html" title="Chapter�9.�Engineering Standards"><link rel="previous" href="eng-standards-plsql.html" title="PL/SQL Standards"><link rel="next" href="automated-testing-best-practices.html" title="Automated Testing"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0" alt="Alex logo"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="eng-standards-plsql.html">Prev</a> </td><th width="60%" align="center">Chapter�9.�Engineering Standards</th><td width="20%" align="right"> <a accesskey="n" href="automated-testing-best-practices.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="variables"></a>Variables</h2></div></div><div></div></div><div class="authorblurb"><p>By <a href="mailto:joel@aufrecht.org" target="_top">joel@aufrecht.org</a></p>
+          OpenACS docs are written by the named authors, and may be edited
+          by OpenACS documentation staff.
+        </div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="variables-datetime"></a>Date and Time Variables</h3></div></div><div></div></div><p>Starting with OpenACS 5.0 and the introduction of acs-lang,
+    we recommend retrieving date/time information from the database in
+    ANSI format and then using <a href="/api-doc/proc-view?proc=lc%5ftime%5ffmt" target="_top">lc_time_fmt</a> to format it for display.</p><div class="example"><a name="id2847931"></a><p class="title"><b>Example�9.1.�Getting datetime from the database ANSI-style</b></p><pre class="programlisting">db_multirow -extend { mydate_pretty } {
+    select to_char(mydate, 'YYYY-MM-DD HH24:MI:SS') as mydate_ansi,
+          ...
+    ...
+} {
+    set mydate_ansi [lc_time_system_to_conn $mydate_ansi]
+    set mydate_pretty [lc_time_fmt $mydate_ansi "%x %X"]
+}
+</pre></div></div><div class="cvstag">($Id: variables.html,v 1.2 2003/12/11 21:39:47 jeffd Exp $)</div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="eng-standards-plsql.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="automated-testing-best-practices.html">Next</a></td></tr><tr><td width="40%" align="left">PL/SQL Standards </td><td width="20%" align="center"><a accesskey="u" href="eng-standards.html">Up</a></td><td width="40%" align="right"> Automated Testing</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/variables.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/packages/acs-core-docs/www/sql/display-sql.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/sql/display-sql.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-core-docs/www/sql/display-sql.adp	22 May 2003 14:03:54 -0000	1.2
+++ openacs-4/packages/acs-core-docs/www/sql/display-sql.adp	11 Dec 2003 21:39:48 -0000	1.3
@@ -2,4 +2,4 @@
 <property name="title">SQL Display</property>
 <property name="context">@context;noquote@</property>
 
-@text@
+@text;noquote@
Index: openacs-4/packages/acs-core-docs/www/sql/display-sql.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/sql/display-sql.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-core-docs/www/sql/display-sql.tcl	18 Sep 2002 14:54:48 -0000	1.3
+++ openacs-4/packages/acs-core-docs/www/sql/display-sql.tcl	11 Dec 2003 21:39:48 -0000	1.4
@@ -44,16 +44,18 @@
 
     # if we were not passed a DB string get a list of matching files.
 
-    set text {}
+    set text {<ul>}
     set files [glob -nocomplain "[acs_package_root_dir $package_key]/sql/*/$url" "[acs_package_root_dir $package_key]/sql/$url"]
     foreach f $files { 
         regexp {([^/]*)/([^/]*)$} $f match db url
         append text "<li> <a href=\"display-sql?[export_url_vars db url package_key]\">$db</a></li>"
     }
-    if {[empty_string_p $text]} { 
-        set text "<li> No sql file found."
+    if {[empty_string_p $files]} { 
+        append text "<li> No sql file found."
     }
+    append text {</ul>}
     set context [list [list ../$package_key $package_key] "SQL Display"]
+
 } else { 
 
     # we have a db.  
Index: openacs-4/packages/acs-core-docs/www/xml/Makefile
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/Makefile,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-core-docs/www/xml/Makefile	31 Oct 2003 10:54:07 -0000	1.8
+++ openacs-4/packages/acs-core-docs/www/xml/Makefile	11 Dec 2003 21:39:48 -0000	1.9
@@ -18,8 +18,35 @@
 XSLTPROC=/usr/bin/xsltproc
 HTMLDOC=/usr/bin/htmldoc
 
-all: html pdf
+all: html 
 
+XSL:
+	if [ ! -d XSL -a ! -L XSL ]; then \
+		echo -e "\n\nNo XSL directory here.  I am looking for one...\n"; \
+		for d in \
+			/usr/share/sgml/docbook/xsl-stylesheets-* \
+			/usr/share/sgml/docbook/xsl-stylesheets \
+			/usr/share/sgml/docbook/stylesheet/xsl/nwalsh; \
+		do \
+			if [ -d $$d ]; then \
+				echo "Found $$d"; \
+				EXISTS=$$d; \
+			fi; \
+		done; \
+		if [ "$$EXISTS" = "" ]; then \
+			echo -e "\
+\nNo xsl stylesheets found in /usr/share/sgml/docbook/\n\
+You need to install them on your system or if they exist already,\n\
+symlink them here so that XSL/html/chunk.xsl exists\n\
+see http://sourceforge.net/projects/docbook/ for the docbook-xsl stylesheets\n"; \
+			exit 1; \
+		else \
+			echo "I think $$EXISTS is the best one\n\n"; \
+			ln -s $$EXISTS XSL; \
+		fi; \
+	fi;
+
+
 prelim:
 	cp -u images/*.{pdf,png,gif,jpg} ../images/
 
@@ -29,9 +56,18 @@
 
 	cp -u openacs.css ..
 
-html: prelim
+html: prelim XSL
 # adding --nonet --novalid is much faster but generates a bunch of bogus error messages
-	cd .. ; $(XSLTPROC) --novalid --nonet --xinclude xml/openacs.xsl xml/index.xml
+	cd .. ; $(XSLTPROC) --nonet --novalid --xinclude xml/openacs.xsl xml/index.xml
 
-pdf: html
-#	$(HTMLDOC) --batch ../for-everyone.book ../for-admins.book ../for-developers.book
+# I got this to work with FOP 0.20.5 and docbook-xsl 1.62, and Jimi 1.0
+# see README.fop for some notes.
+pdf: XSL
+	cd ..; $(XSLTPROC) --xinclude --output fop.fo xml/fo.xsl xml/index.xml
+	cd ..; fop -fo fop.fo -pdf full.pdf
+
+# Validate with xmllint. --postvalid is needed so validation takes place after xincludes.
+# In emacs do M-x compile then make lint; then C-x ` to walk through the resulting errors.
+#
+lint: XSL
+	xmllint --xinclude --noout -postvalid index.xml 2>&1 | grep -v 'No declaration for attribute base of element'
Index: openacs-4/packages/acs-core-docs/www/xml/README.fo
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/README.fo,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/xml/README.fo	11 Dec 2003 21:39:48 -0000	1.2
@@ -0,0 +1,46 @@
+I was able to generate PDFs using: 
+
+* xsltproc --version
+    Using libxml 20511, libxslt 10033 and libexslt 722
+    xsltproc was compiled against libxml 20511, libxslt 10033 and libexslt 722
+    libxslt 10033 was compiled against libxml 20511
+    libexslt 722 was compiled against libxml 20511
+* FOP version 0.20.5
+* Jimi 1.0 from Sun
+* docbook/xsl-stylesheets-1.62.0/
+
+(all this except Jimi was installed unchanged via emerge on gentoo)
+
+I did have to change the fop executable script to increase the JVM
+memory.  On the last line of /usr/bin/fop (or whereever yours ends
+up) add -Xms64m -Xmx256m; smaller might work too...
+
+104c104
+< $JAVACMD -classpath "$LOCALCLASSPATH" $FOP_OPTS org.apache.fop.apps.Fop "$@"
+---
+> $JAVACMD -Xms64m -Xmx256m -classpath "$LOCALCLASSPATH" $FOP_OPTS org.apache.fop.apps.Fop "$@"
+
+
+
+FOP generates a number of non-intuitive errors for docbook problems...
+
+* If you <blockquote><table>...</table></blockquote> it can end up in an
+  infinite loop trying to place the table.
+
+* If you have a listitem w/o a <para> (or some other block level
+  element) it will have a null pointer exception.
+
+* If you try to generate a list-of-tables or figures it barfs.  (see
+  <xsl:param name="generate.toc"> in fo.xsl for how to turn this off).
+
+All in all it's pretty unforgiving of validation errors and it's output
+is not great (and it's table handling is iffy).
+
+It does make a pdf with a TOC and page numbers though.
+
+
+I would be interested in seeing the output produced by PassiveTeX and
+XEP.
+
+
+Jeff Davis davis@xarg.ne
Index: openacs-4/packages/acs-core-docs/www/xml/fo.xsl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/fo.xsl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/xml/fo.xsl	11 Dec 2003 21:39:48 -0000	1.2
@@ -0,0 +1,59 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+	        xmlns:fo="http://www.w3.org/1999/XSL/Format"
+        version="1.1"
+                exclude-result-prefixes="doc">
+
+<!-- Import chunk.xsl, assumes XSL is a symlink to the docbook xsl-stylesheets 
+     see http://sourceforge.net/projects/docbook/ 
+     the makefile will try to create the link but may not find it.
+-->
+  <xsl:import href="XSL/fo/docbook.xsl"/>
+
+  <xsl:variable name="fop.extensions">1</xsl:variable>
+
+  <!-- FOP patheticness prevents figure and table toc entries from working right
+	that or maybe its docbook xsl scripts.  anyway, if you add book toc,figure,table,title 
+	it all goes pear shaped. -->
+  <xsl:param name="generate.toc">
+  book      toc,title,index
+  /sect1    toc
+  </xsl:param>
+
+  <!-- USletter or A4 mostly -->
+  <xsl:param name="paper.type" select="'A4'"></xsl:param>
+
+  <xsl:param name="generate.index" select="1"></xsl:param>
+
+  <!-- Number the chapters and sections -->
+  <xsl:variable name="section.autolabel">1</xsl:variable>
+  <xsl:variable name="section.label.includes.component.label">1</xsl:variable>
+
+
+  <xsl:template match="authorblurb">
+     <fo:block><xsl:call-template name="inline.charseq"/></fo:block>
+  </xsl:template>
+
+<!-- custom stuff to add better css hooks -->
+<xsl:template match="guibutton">
+    <fo:inline font-weight="bold" xsl:use-attribute-sets="monospace.properties"><xsl:call-template name="inline.charseq"/></fo:inline>
+</xsl:template>
+
+<xsl:template match="guilabel">
+    <fo:inline font-weight="bold" color="rgb(255,0,0)" xsl:use-attribute-sets="monospace.properties"><xsl:call-template name="inline.charseq"/></fo:inline>
+</xsl:template>
+
+<xsl:template match="action">
+    <fo:inline font-weight="bold" color="rgb(255,0,0)" xsl:use-attribute-sets="monospace.properties"><xsl:call-template name="inline.charseq"/></fo:inline>
+</xsl:template>
+
+<xsl:template match="replaceable">
+    <fo:inline font-weight="bold" color="rgb(255,0,0)" xsl:use-attribute-sets="monospace.properties"><xsl:call-template name="inline.charseq"/></fo:inline>
+</xsl:template>
+
+<xsl:template match="accel">
+    <fo:inline text-decoration="underline" font-weight="bold" xsl:use-attribute-sets="monospace.properties"><xsl:call-template name="inline.charseq"/></fo:inline>
+</xsl:template>
+
+</xsl:stylesheet>
+
Index: openacs-4/packages/acs-core-docs/www/xml/index.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/index.xml,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/acs-core-docs/www/xml/index.xml	31 Oct 2003 10:36:43 -0000	1.19
+++ openacs-4/packages/acs-core-docs/www/xml/index.xml	11 Dec 2003 21:39:48 -0000	1.20
@@ -1,185 +1,184 @@
-<?xml version='1.0' ?>
+<?xml version='1.0'?>
+
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 <!-- Global variables are defined in variables.ent -->
-<!ENTITY % myvars SYSTEM "variables.ent" >
+<!ENTITY % myvars SYSTEM "variables.ent">
 %myvars;
 
 ]>
 
 <book>
   <title>OpenACS Core Documentation</title>
-    
+
   <part id="for-everyone">
     <title>OpenACS For Everyone</title>
 
     <chapter id="general-documents">
       <title>High level information: What is OpenACS?</title>
+
       <sect1 id="openacs-overview" xreflabel="OpenACS Overview">
         <title>Overview</title>
-	  <para>
-	    OpenACS (Open Architecture Community System) is an
-	    advanced toolkit for building scalable, community-oriented
-	    web applications.  If you're thinking of building an
-	    enterprise-level web application, OpenACS is a solid,
-	    proven foundation that will give you a 3-6 month
-	    headstart.
-	  </para>
+        <para>
+          OpenACS (Open Architecture Community System) is an
+          advanced toolkit for building scalable, community-oriented
+          web applications.  If you're thinking of building an
+          enterprise-level web application, OpenACS is a solid,
+          scalable framework for building dynamic content driven
+          sites.
+        </para>
 
-	  <para>
-	    OpenACS is also a collection of pre-built applications and
-	    services that you can use to build your web
-	    site/application. Through a modular architecture, OpenACS
-	    has packages for user/groups management, content
-	    management, e-commerce, news, FAQ, calendar, forums, bug
-	    tracking, full-text searching, and <ulink
-	    url="http://dev.openacs.org/packages/package-list">much
+        <para>
+          OpenACS is a collection of pre-built applications and
+          services that you can use to build your web
+          site/application. Through a modular architecture, OpenACS
+          has packages for user/groups management, content
+          management, e-commerce, news, FAQs, calendar, forums, bug
+          tracking, full-text searching, and <ulink
+	    url="http://openacs.org/packages/">much
 	    more</ulink>.
-	  </para>
+        </para>
 
 
-	  <para>
-	    OpenACS relies on <ulink
+        <para>
+          OpenACS relies on <ulink
 	    url="http://www.aolserver.com/">AOLserver</ulink>, the
-	    free, multithreaded, scalable, Tcl-enabled,
-	    web/application server used by America On-Line for most of
-	    its web sites, and a true acid-compliant Relational
-	    Database Management System (RDBMS). Currently OpenACS
-	    supports PostgreSQL, an open source RDBMS, and
-	    Oracle. (<ulink
-	    url="http://openacs.org/about/what-is-openacs">read
-	    more</ulink>)
-	  </para>
+          free, multithreaded, scalable, Tcl-enabled,
+          web/application server used by America Online for most of
+          its web sites, and a true ACID-compliant Relational
+          Database Management System (RDBMS). Currently OpenACS
+          supports PostgreSQL, an open source RDBMS, and Oracle and
+          is easily extensible to other databases which support a
+          comparable feature set.
+        </para>
 
-          <para>
-	    The OpenACS toolkit is based on the ArsDigita Community
-	    System. ArsDigita (now part of Red Hat, Inc.) kindly made
-	    their work available under the <ulink
-	    url="http://dev.openacs.org/about/licensing/">GPL</ulink>,
-	    making all of this possible. 
-	  </para>
+        <para>
+          The OpenACS toolkit is derived from the ArsDigita
+          Community System (ACS). ArsDigita (now part of Red Hat,
+          Inc.) kindly made their work available under the <ulink
+	    url="http://www.gnu.org/licenses/gpl.txt">GPL</ulink>,
+          making all of this possible.
+        </para>
 
 	<para>
-	  <quote>The ArsDigita Community System (ACS) is a toolkit of software
-	  that will help you build Web services with a collaborative dimension,
-	  ranging from knowledge management within companies to B2C ecommerce
-	  to product support and community among the customers. The software is
-	  free and open-source and has been tested in heavy use since
-	  1995.</quote> - Philip Greenspun
-	</para>
+	  The OpenACS project was born when Don Baccus, Ben Adida, and
+          others decided to port ACS from Oracle to PostgreSQL, thus
+          making it a fully open-source solution.  With OpenACS 4,
+          Oracle and PostgreSQL support were combined in one code base
+          and with OpenACS 5, support for internationalization and
+          localization has been added.
+        </para>
 
-	<para>
-	  OpenACS was born when Don Baccus, Ben Adida, et al decided
-	  to port ACS from Oracle to PostgreSQL, thus making it a
-	  fully open-source solution.
+        <para>
+          A vibrant and productive community has sprung up around the
+          OpenACS software and there are many volunteer contributors
+          as well as a commercial companies able to provide support,
+          hosting, and custom development.  Many of the production
+          users are actively funding and contributing work back to the
+          project.  Formal, consensus driven governance has been
+          established (with semi-annual elections) which ensures the
+          project serves the needs of it's constituents.
 	</para>
 
-	<para>
-	  OpenACS &version; is the next generation of the web toolkit. It's based on
-	  ACS 4, but no longer follows ArsDigita development. Unlike ACS
-	  (which required Oracle) and OpenACS 3.x (which required PostgreSQL),
-	  OpenACS &version; allows you to use either database. It's also built in such
-	  a way to allow enterprising hackers (in the good sense of
-	  the word) to extend it to other databases. Don Baccus leads
-	  the development and numerous developers and non-developers
-	  contribute from around the world.
-	</para>
-        
         <para>
-	    The OpenACS community would like to hear your comments and
-	    help you in your endeavors with the system. Stop by our
-	    <ulink url="http://openacs.org">web site</ulink> and feel
-	    free to ask a question, post ideas or whatever.
-	  </para>
+          The OpenACS community would like to hear your comments and
+          can help you in your endeavors with the system. Visit our
+          <ulink url="http://openacs.org/">web site</ulink> and feel
+          free to <ulink url="http://openacs.org/forums/">ask questions or provide feedback</ulink>.
+        </para>
       </sect1>
       <xi:include href="for-everyone/release-notes.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Release Notes Section Missing</xi:fallback>
       </xi:include>
     </chapter>
   </part>
-  
+
   <part id="acs-admin">
     <title>Administrator's Guide</title>
 
   <chapter id="install-overview">
     <title>Installation Overview</title>
-    
+
     <authorblurb>
-      by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink>
+      <para>by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink></para>
     </authorblurb>
 
-    <xi:include href="install-guide/overview.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:include href="install-guide/overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>Overview Section Missing</xi:fallback>
     </xi:include>
 
-<!--    <xi:include href="install-guide/quick.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+<!--    <xi:include href="install-guide/quick.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback><para>Quick Guide Missing</para></xi:fallback>
     </xi:include>
 -->
-    <xi:include href="install-guide/software.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:include href="install-guide/software.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>Section Missing</xi:fallback>
     </xi:include>
     </chapter>
- 
+
     <chapter id="complete-install">
       <title>Complete Installation</title>
       <xi:include href="install-guide/os.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback>Section Missing</xi:fallback>
-    </xi:include>
- 
-      <xi:include href="install-guide/oracle.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback><para>Section Missing</para></xi:fallback>
-    </xi:include>
- 
-      <xi:include  href="install-guide/postgres.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback>Section Missing</xi:fallback>
-    </xi:include>
- 
-      <xi:include href="install-guide/aolserver.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback>Section Missing</xi:fallback>
-    </xi:include>
- 
-      <xi:include href="install-guide/openacs.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback>Section Missing</xi:fallback>
-    </xi:include>
- 
-      <xi:include href="install-guide/win2kinstall.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section Missing</xi:fallback>
+      </xi:include>
+
+      <xi:include href="install-guide/oracle.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback><para>Section Missing</para></xi:fallback>
+      </xi:include>
+      <xi:include  href="install-guide/postgres.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section Missing</xi:fallback>
+      </xi:include>
+
+      <xi:include href="install-guide/aolserver.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section Missing</xi:fallback>
+      </xi:include>
+
+      <xi:include href="install-guide/openacs.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section Missing</xi:fallback>
+      </xi:include>
+
+      <xi:include href="install-guide/win2kinstall.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="install-guide/macinstall.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-    </chapter>    
+      </xi:include>
+
+      <xi:include href="install-guide/macinstall.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+    </chapter>
+
     <chapter id="configure">
       <title>Configuring a New Service</title>
       <para>Placeholder</para> 
     </chapter>
 
     <chapter id="upgrade">
-          <title>Upgrading</title>
-          <xi:include href="install-guide/upgrade.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-        </chapter>
+      <title>Upgrading</title>
+      <xi:include href="install-guide/upgrade.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+    </chapter>
     <chapter id="maintenance">
-          <title>Maintenance</title>
-          <xi:include href="install-guide/maintenance.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="install-guide/database-maintenance.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="install-guide/recovery.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
+       <title>Maintenance</title>
+       <xi:include href="install-guide/maintenance.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+         <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="install-guide/database-maintenance.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="install-guide/recovery.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
     </chapter>
-    <xi:include href="install-guide/red-hat.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-    <xi:include href="install-guide/other-software.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-    <xi:include href="install-guide/credits.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+    <xi:include href="install-guide/red-hat.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <xi:fallback>Section missing</xi:fallback>
+    </xi:include>
+
+    <xi:include href="install-guide/other-software.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <xi:fallback>Section missing</xi:fallback>
+    </xi:include>
+
+    <xi:include href="install-guide/credits.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>Section Missing</xi:fallback>
     </xi:include>
   </part>
@@ -191,113 +190,129 @@
       </para>
     </partintro>
 
-    <chapter id="tutorial">
+    <chapter id="tutorial"> 
       <title>Development Tutorial</title>
-      <xi:include href="developers-guide/tutorial.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/tutorial-db.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/tutorial-pages.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/tutorial-debug.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/tutorial-advanced.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
+      <xi:include href="developers-guide/tutorial.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/tutorial-db.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/tutorial-pages.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/tutorial-debug.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/tutorial-advanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
     </chapter>
 
     <chapter id="dev-guide">
       <title>Development Reference</title>
-      <xi:include href="developers-guide/packages.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/objects.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/rp.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/db-api.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/templates.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/permissions.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/subsites.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/parties.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/permissions-tediously-explained.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+      <xi:include href="developers-guide/packages.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
       </xi:include>
-      <xi:include href="developers-guide/object-identity.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/programming-with-aolserver.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
+      <xi:include href="developers-guide/objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/rp.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/db-api.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/permissions.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/subsites.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/parties.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/permissions-tediously-explained.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/object-identity.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/programming-with-aolserver.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="developers-guide/form-builder.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
     </chapter>
 
     <chapter id="eng-standards">
       <title>Engineering Standards</title>
 
-      <xi:include href="engineering-standards/docbook-primer.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="engineering-standards/psgml-mode.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="engineering-standards/design-template.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="engineering-standards/requirements-template.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="engineering-standards/eng-standards-versioning.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="engineering-standards/constraint-naming.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="engineering-standards/filenaming.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="engineering-standards/plsql.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
+      <xi:include href="engineering-standards/style-guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
 
+      <xi:include href="engineering-standards/eng-standards-versioning.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="engineering-standards/constraint-naming.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="engineering-standards/filenaming.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="engineering-standards/plsql.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="engineering-standards/variables.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="engineering-standards/auto-testing.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
     </chapter>
-    <xi:include href="developers-guide/cvs.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>CVS Section missing</xi:fallback>
-      </xi:include> 
-    <xi:include href="releasing-openacs.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:fallback>'Releasing OpenACS' missing</xi:fallback>
-      </xi:include> 
+
+    <chapter id="doc-standards">
+      <title>Documentation Standards</title>
+      <xi:include href="engineering-standards/docbook-primer.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="engineering-standards/psgml-mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="engineering-standards/nxml-mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="engineering-standards/design-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+      <xi:include href="engineering-standards/requirements-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xi:fallback>Section missing</xi:fallback>
+      </xi:include>
+    </chapter>
+
+    <xi:include href="developers-guide/cvs.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <xi:fallback>CVS Section missing</xi:fallback>
+    </xi:include>
+    <xi:include href="releasing-openacs.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <xi:fallback>'Releasing OpenACS' missing</xi:fallback>
+    </xi:include>
+
   </part>
-  
+
   <part id="acs-plat-dev">
     <title>For OpenACS Platform Developers</title>
-    <preface id="platform-dev">
-      <title>Platform Development</title>
-      <para>Information about the internal workings of OpenACS, useful
-      both for modifying the core functionality and for developing new
-      packages.</para>
-    </preface>
     <chapter id="kernel-doc">
       <title>Kernel Documentation</title>
 
       <sect1 id="kernel-overview">
         <title>Overview</title>
-        
+
 	<itemizedlist>
 	  <listitem>
             <para>
@@ -312,19 +327,21 @@
               The <emphasis>OpenACS Core</emphasis>, which
 	      comprises all the other packages that ship with the
 	      kernel and are most frequently needed by users, such as
-	      templating, bboard, and user
+	      templating, forums, and user
 	      registration/management. The packages tend to be
 	      developed and distributed with the kernel.
 	    </para>
           </listitem>
 	  <listitem>
             <para>
-              <emphasis>OpenACS Application packages</emphasis>, which typically provide user-level
-	      web services built on top of the Kernel and Core.  Such
-	      packages include those built by ArsDigita as well as
-	      external contributors.  Application packages are
+
+              <emphasis>OpenACS Application packages</emphasis>,
+              which typically provide user-level
+	      web services built on top of the Kernel and Core.
+	      Application packages are
 	      developed separately from the Kernel, and are typically
 	      released independently of it.
+
 	    </para>
           </listitem>
 	</itemizedlist>
@@ -334,72 +351,71 @@
 	</para>
       </sect1>
 
-      <xi:include href="kernel/object-system-req.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      <xi:include href="kernel/object-system-req.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/object-system-design.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/object-system-design.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/permissions-requirements.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/permissions-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/permissions-design.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/permissions-design.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/groups-requirements.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/groups-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/groups-design.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/groups-design.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/subsites-requirements.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/subsites-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/subsites-design.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/subsites-design.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/apm-requirements.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/apm-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/apm-design.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/apm-design.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/db-api.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/db-api.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/i18n-requirements.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/i18n-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="developers-guide/i18n.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="developers-guide/i18n.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/security-requirements.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/security-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/security-design.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/security-design.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/security-notes.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/security-notes.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/rp-requirements.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/rp-requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/rp-design.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/rp-design.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/tcl-doc.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/tcl-doc.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/bootstrap-acs.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/bootstrap-acs.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-      <xi:include href="kernel/ext-auth.xml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+      </xi:include>
+      <xi:include href="kernel/ext-auth.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
         <xi:fallback>Section missing</xi:fallback>
-      </xi:include> 
-
+      </xi:include>
     </chapter>
 
   </part>
-
+<index/>
 </book>
Index: openacs-4/packages/acs-core-docs/www/xml/openacs.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/openacs.css,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-core-docs/www/xml/openacs.css	28 Feb 2003 05:25:49 -0000	1.2
+++ openacs-4/packages/acs-core-docs/www/xml/openacs.css	11 Dec 2003 21:39:48 -0000	1.3
@@ -1,28 +1,64 @@
 /* These are aimed at DocBook output, specifically from the chunk.xsl style and derivatives /*
 
-body, ol, td, th, hr, h1, h2, h3, strong, dl, a, blockquote, em, .force, dt, dd, ul, li, p{font-family:verdana,helvetica,arial,sans-serif}
-a:link{color:0000ff}
-a:visited{color:000099}
-a.topnav{font-size:1.2em}
-a.bottomnav{font-size:1.2em}
+body,ol,td,th,hr,h1,h2,h3,strong,dl,a,blockquote,em,.force,dt,dd,ul,li,p { 
+	font-family: verdana,helvetica,arial,sans-serif;
+}
 
-code{font-family:mono-space}
-.CVS, .cvstag{font-family:mono-space; font-size:small; color:#999999; text-align:right}
+a:link {color: #f00;}
+a:visited {color: #000099;}
 
-.codeblock{background-color:#ffffff;font-family:monospace}
-.strong{font-weight:bold}
-.authorblurb{font-size:small}
+a.topnav {font-size: 1.2em;}
+a.bottomnav {font-size: 1.2em;}
 
+code {
+	font-family: courier,monospace;
+}
+
+.codeblock {
+	background-color: #fff;
+	font-family: monospace;
+}
+.strong {font-weight: bold;}
+.authorblurb {font-size: small;}
+
 /* this is intended to catch docbook Screen stuff */
-pre {background-color:#eeeeee;}
+pre  {background-color: #eee;}
 
 /* DocBook stuff */
-.guibutton{background-color:white;border: solid#eeeeee; padding:1px;}
-.replaceable{color:red; font-style:italic;}
-.guilabel{background-color:silver; padding:2px;}
-.programlisting{background-color:#eeeeee}
-.strong{font-weight:bold}
-.authorblurb{font-size:small}
-.screen{padding:3px;}
-.action{padding:0.5em; margin:0.5em;font-weight:bold;}
+.guibutton {
+	background-color: #fff;
+	border: solid #eee 3px;
+	margin: 2px;
+}
+.replaceable {
+	color: red;
+	font-style: italic;
+}
+.guilabel {
+	background-color: #ccc;
+	margin: 2px;
+}
+.programlisting {
+	background-color: #eee;
+	margin-left: 1em;
+	padding-left: .5em;
+}
+.strong {font-weight:bold;}
+.authorblurb {font-size:small;}
+.screen {
+	padding:4px; 
+	margin-left: 1em;
+}
+.action {font-weight:bold;}
 
+.table,.informaltable,.informalfigure,.figure { margin-left: 1em; }
+
+body { margin: 1em 0 0 1em; max-width: 75em; }
+
+div.cvstag {
+	font-family: courier,monospace;
+	color: #999;
+	font-size: small;
+	text-align: right;
+}
+
Index: openacs-4/packages/acs-core-docs/www/xml/openacs.xsl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/openacs.xsl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-core-docs/www/xml/openacs.xsl	11 Nov 2003 10:28:28 -0000	1.12
+++ openacs-4/packages/acs-core-docs/www/xml/openacs.xsl	11 Dec 2003 21:39:48 -0000	1.13
@@ -3,12 +3,11 @@
         version="1.1"
                 exclude-result-prefixes="doc">
 
-<!-- Import chunk.xsl  
-
-  <xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
+<!-- Import chunk.xsl, assumes XSL is a symlink to the docbook xsl-stylesheets 
+     see http://sourceforge.net/projects/docbook/ 
+     the makefile will try to create the link but may not find it.
 -->
-<!-- Debian 3.0 use this path for chunk.xsl instead: -->
-  <xsl:import href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl"/>
+  <xsl:import href="XSL/html/chunk.xsl"/>
 
 <!-- override default cellspacing value -->
 
@@ -17,14 +16,16 @@
 <!-- vinodk: Not sure if this is needed                   -->
   <xsl:output media-type="text/html" encoding="utf-8"/>
 
+  <xsl:variable name="generate.index">1</xsl:variable>
 
 <!-- vinodk: narrower TOC's, use chunker (?), pretty file names      -->
   <xsl:variable name="toc.section.depth">1</xsl:variable>
   <xsl:variable name="using.chunker">1</xsl:variable>
   <xsl:variable name="use.id.as.filename">1</xsl:variable>
 
   <xsl:variable name="chunk.first.sections">1</xsl:variable>
-  
+
+
 <!-- vinodk: Add our logo to header                   -->
   <xsl:template name="header.navigation">
     <xsl:param name="prev" select="/foo"/>
@@ -34,7 +35,7 @@
 
     <xsl:if test="$suppress.navigation = '0'">
       <div class="navheader">
-        <a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0" /></a>
+        <a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0" alt="Alex logo" /></a>
         <table width="100%" summary="Navigation header" border="0">
           <tr>
             <td width="20%" align="left">
@@ -199,14 +200,11 @@
                   for authorblurb. Also add doc disclaimer.   -->
   <xsl:template match="authorblurb">
     <div class="{name(.)}">
-      <p>
       <xsl:apply-templates/>
-        <br />
         <xsl:text>
           OpenACS docs are written by the named authors, and may be edited
           by OpenACS documentation staff.
         </xsl:text>
-      </p>
     </div>
   </xsl:template>
   
@@ -307,9 +305,7 @@
 </xsl:template>
 
 <xsl:template match="action">
-  <pre class="action">
-    <xsl:call-template name="inline.charseq"/>
-  </pre>	
+    <span class="action"><xsl:call-template name="inline.charseq"/></span>
 </xsl:template>
 
 <xsl:template match="replaceable">
Index: openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml	11 Nov 2003 12:55:01 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml	11 Dec 2003 21:39:48 -0000	1.6
@@ -5,37 +5,45 @@
 <!ENTITY % myvars SYSTEM "variables.ent">
 %myvars;
 ]>
+
 <appendix id="releasing-openacs">
   <title>How to package and release OpenACS</title>
     <orderedlist>
       <listitem>
-        <para>Check out the cvs tree.  The files must be checked out
-        through a cvs account with write access.  In this example, the
-        cvs user on openacs.org is implied from the ssh login information
-        previously set up.  It could be overridden via <computeroutput>foobar@openacs.org</computeroutput>. </para>
-        <screen>
-<action>cd /tmp
-cvs -d :pserver:anonymous@openacs.org:/cvsroot checkout openacs-4
-</action>
+        <para>update the version number in
+          packages/acs-core-docs/www/xml/variables.ent, readme.txt,
+          and all core .info files.  Regenerate the html documentation
+          and commit all the changes.  Update the information in the
+          packages/acs-core-docs/www/xml/for-everyone/release-notes.xml
+          file.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>Check out the whole cvs tree.  The files must be checked
+        out through a cvs account with write access and should be a
+        checkout from the release branch.  In this example, the cvs
+        user on openacs.org is implied from the ssh login information
+        previously set up.  It could be overridden via
+        <computeroutput>foobar@openacs.org</computeroutput>. </para>
+        <screen><action>cd /var/tmp
+cvs -d /cvsroot checkout -r <replaceable>oacs-5-0</replaceable> openacs-4</action>
 </screen>
         <para>Repeat with the dotlrn cvs tree.</para>
-        <screen>
-<action>cd /tmp
+        <screen><action>cd /var/tmp
 mkdir dotlrn-packages
 cd dotlrn-packages
-cvs -d :pserver:anonymous@dotlrn@openacs.org:/dotlrn-cvsroot checkout dotlrn-all
+cvs -d /dotlrn-cvsroot checkout -r <replaceable>dotlrn-2-0</replaceable> dotlrn-all
 </action></screen>
       </listitem>
       <listitem>
         <para>Tag the tree.</para>
-        <screen><action>
-cd /tmp/openacs-4
-cvs tag <replaceable>openacs-5-0-0a1</replaceable>
+        <screen><action>cd /var/tmp/openacs-4
+cvs tag -F <replaceable>openacs-5-0-0a1</replaceable>
 </action></screen>
         <para>Tag dotLRN.  Since the dotLRN packages aren't all in one module, we iterate through all of the modules.  Log in first (cvs login) so that you don't have to log in for each module.</para>
-        <screen><action>
-cd /tmp/dotlrn-packages
-for dir in $(ls); do cd $dir; cvs tag <replaceable>dotlrn-2-0-0a3</replaceable>; cd ..; done
+        <screen><action>cd /var/tmp/dotlrn-packages
+for dir in *; do ( cd $dir &amp;&amp; cvs tag -F <replaceable>dotlrn-2-0-0a1</replaceable> ); done
 </action></screen>
       </listitem>
       <listitem>
@@ -49,18 +57,17 @@
             <orderedlist>
               <listitem>
                 <para>Go to a new working space and export the tagged files.</para>
-            <screen>
-<action>mkdir /tmp/tarball
-cd /tmp/tarball
-cvs -d :pserver:anonymous@openacs.org:/cvsroot export -r <replaceable>openacs-5-0-0a1</replaceable> -d openacs acs-core
+            <screen><action>mkdir /var/tmp/tarball
+cd /var/tmp/tarball
+cvs -d :pserver:anonymous@openacs.org:/cvsroot export -r <replaceable>openacs-5-0-0a1</replaceable> acs-core
+mv openacs-4 openacs
 </action></screen>
               </listitem>
               <listitem>
                 <para>Generate the tarball</para>
-            <screen><action>
-cd /tmp/tarball
-rm -rf /tmp/tarball/openacs/CVS
-tar cz -f <replaceable>openacs-5.0.0a1.tar.gz</replaceable> openacs
+            <screen><action>cd /var/tmp/tarball
+mv openacs openacs-<replaceable>5.0.0a1</replaceable>
+tar cz -f <replaceable>openacs-5.0.0a1.tar.gz</replaceable> openacs-<replaceable>5.0.0a1</replaceable>
 </action></screen>
               </listitem>
             </orderedlist>
@@ -76,36 +83,33 @@
                 files. (was getting errors here trying to use -d, so
                 gave up and just moved things from openacs-4 to
                 openacs at the end)</para>
-            <screen>
-<action>mkdir /tmp/dotlrn-tarball
-cd /tmp/dotlrn-tarball
+            <screen><action>mkdir /var/tmp/dotlrn-tarball
+cd /var/tmp/dotlrn-tarball
 cvs -d :pserver:anonymous@openacs.org:/cvsroot export \
   -r <replaceable>openacs-5-0-0a1</replaceable> acs-core
-cd /tmp/dotlrn-tarball/openacs-4/packages
+cd /var/tmp/dotlrn-tarball/openacs-4/packages
 cvs -d :pserver:anonymous@openacs.org:/cvsroot export \
   -r <replaceable>openacs-5-0-0a1</replaceable> dotlrn-prereq
 cvs -d :pserver:anonymous@dotlrn.openacs.org:/dotlrn-cvsroot export \
   -r <replaceable>dotlrn-2-0-0a1</replaceable> dotlrn-core
-cd /tmp/dotlrn-tarball
+cd /var/tmp/dotlrn-tarball
 mv openacs-4 openacs
 </action></screen>
               </listitem>
               <listitem>
                 <para>Copy the dotlrn install.xml file, which controls
                 which packages are installed on setup, to the root
                 location:</para>
-                <screen><action>
-cp /tmp/dotlrn-tarball/openacs-4/packages/dotlrn/install.xml /tmp/dotlrn-tarball/openacs
+                <screen><action>cp /var/tmp/dotlrn-tarball/openacs/packages/dotlrn/install.xml /var/tmp/dotlrn-tarball/openacs
 </action></screen>
               </listitem>
 
 
               <listitem>
                 <para>Generate the tarball</para>
-            <screen><action>
-cd /tmp/tarball
-rm -rf /tmp/tarball/openacs-4/CVS
-tar cz -f <replaceable>dotlrn-2.0.0a1.tar.gz</replaceable> openacs
+            <screen><action>cd /var/tmp/tarball
+mv openacs dotlrn-<replaceable>2.0.0a1</replaceable>
+tar cz -f <replaceable>dotlrn-2.0.0a1.tar.gz</replaceable> dotlrn-<replaceable>2.0.0a1</replaceable>
 </action></screen>
               </listitem>
             </orderedlist>
Index: openacs-4/packages/acs-core-docs/www/xml/variables.ent
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/variables.ent,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/variables.ent	11 Nov 2003 12:55:01 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/variables.ent	11 Dec 2003 21:39:48 -0000	1.5
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
-<!ENTITY version "5.0.0b1">
-<!ENTITY tarballpath "openacs-5.0.0b1">
-<!ENTITY cvsversiontag "openacs-5-0-0b1">
+<!ENTITY version "5.0.0b4">
+<!ENTITY tarballpath "openacs-5.0.0b4">
+<!ENTITY cvsversiontag "openacs-5-0-0b4">
 <!ENTITY majorversion "5">
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/cvs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/cvs.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/cvs.xml	31 Oct 2003 10:36:43 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/cvs.xml	11 Dec 2003 21:39:48 -0000	1.5
@@ -8,17 +8,18 @@
     <title>Using CVS with an OpenACS Site</title>
     
     <authorblurb>
-      by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+<para>      By <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
     </authorblurb>
-    <sect1 id="cvs-service-import">
+    <formalpara id="cvs-service-import">
       <title>Add the Service to CVS - OPTIONAL</title>
       <indexterm>
         <primary>cvs</primary>
         <secondary>setup</secondary>
       </indexterm>
-      <para>These steps take an existing OpenACS directory and add
+      These steps take an existing OpenACS directory and add
           it to a <link linkend="install-cvs">CVS
-          repository.</link>.</para>
+          repository</link>.
+     </formalpara>
       <orderedlist>
         <listitem>
           <para>Create and set permissions on a subdirectory in the local cvs repository.</para>
@@ -86,7 +87,6 @@
           
         </listitem>
       </orderedlist>
-    </sect1>
 
   </appendix>
   
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml	20 Aug 2003 16:20:18 -0000	1.8
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/db-api.xml	11 Dec 2003 21:39:48 -0000	1.9
@@ -8,9 +8,7 @@
   <title>The OpenACS Database Access API</title>
 
   <para>
-    By <ulink url="mailto:psu@arsdigita.com">Pete Su</ulink> and
-    <ulink url="mailto:jsalz@mit.edu">Jon Salz</ulink>. Modified
-    by Roberto Mello.
+    By Pete Su and Jon Salz. Modified by Roberto Mello.
   </para>
   
   <sect2 id="db-api-overview">
@@ -135,14 +133,18 @@
     </para>
     <orderedlist>
       <listitem>
+	<para>
 	If the literal value is a
 	huge string, then we waste a lot of time in the database server doing
 	useless parsing.
+	</para>
       </listitem>
       <listitem>
+	<para>
 	Second, if the literal value contains characters like
 	single quotes, we have to be careful to double-quote them, because not
 	quoting them will lead to surprising errors.
+	</para>
       </listitem>
       <listitem>
 	<para>
@@ -542,9 +544,9 @@
     <para>
 	Performs the SQL query <computeroutput>sql</computeroutput>, saving results in variables
     of the form
-    <computeroutput><emphasis>var_name</emphasis>:1</computeroutput>, <computeroutput><emphasis>var_name</emphasis>:2</computeroutput>, etc,
-    setting <computeroutput><emphasis>var_name</emphasis>:rowcount</computeroutput> to the total number
-    of rows, and setting <computeroutput><emphasis>var_name</emphasis>:columns</computeroutput> to a
+    <computeroutput><replaceable>var_name</replaceable>:1</computeroutput>, <computeroutput><replaceable>var_name</replaceable>:2</computeroutput>, etc,
+    setting <computeroutput><replaceable>var_name</replaceable>:rowcount</computeroutput> to the total number
+    of rows, and setting <computeroutput><replaceable>var_name</replaceable>:columns</computeroutput> to a
     list of column names. 
     </para>
 
@@ -573,7 +575,7 @@
 
     <para>
     You may also add additional, computed columns to the multirow, using the
-    <computeroutput>-extend { <emphasis>col_1</emphasis> <emphasis>col_2</emphasis> ... }</computeroutput> switch. This is
+    <computeroutput>-extend { <replaceable>col_1</replaceable> <replaceable>col_2</replaceable> ... }</computeroutput> switch. This is
     useful for things like constructing a URL for the object retrieved by
     the query.
     </para>                                                                                                                                           
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/form-builder.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/form-builder.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/form-builder.xml	11 Dec 2003 21:39:48 -0000	1.2
@@ -0,0 +1,48 @@
+<?xml version='1.0' ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY % myvars SYSTEM "../variables.ent">
+%myvars;
+]>
+<sect1 id="form-builder">
+<title>Using HTML Forms</title>
+
+<sect2 id="ad-form-overview">
+<title>Overview</title>
+
+</sect2>
+
+  <sect2 id="multi-part-elements">
+    <title>Multi-part Elements</title>
+    <para>Some elements have more than one choice, or can submit more than one value.</para>
+    <sect3>
+      <title>SELECT elements</title>
+      <orderedlist>
+        <listitem>
+          <formalpara>
+            <title>Creating the form element</title>
+            <para>Populate a list of lists with values for the option list.</para>
+          </formalpara>
+          <programlisting>set foo_options [db_list_of_lists foo_option_list "
+    select foo,
+           foo_id
+      from foos
+"]
+</programlisting>
+          <para>The variable <computeroutput>foo_options</computeroutput> should resemble <computeroutput>{{first foo} 1234} {{second foo} 1235}
+</computeroutput></para>
+          <para>Within ad_form, set up the element to use this list:</para>
+          <programlisting>{foo:text(select)
+        {label "Which Foo"}
+        {options $foo_options}
+    }</programlisting>
+          <para>This will result in a single name/value pair coming back in the submitted form.  Handle this within the same ad_form structure, in the <computeroutput>-new_data</computeroutput> and <computeroutput>-edit_data</computeroutput>.  In the example, it is available as <computeroutput>$foo</computeroutput></para>
+        </listitem>
+      </orderedlist>
+        <para>See also the 
+        <ulink url="http://www.w3.org/TR/html401/interact/forms.html#h-17.6">W3C spec for "The SELECT, OPTGROUP, and OPTION elements"</ulink>.
+        </para>
+    </sect3>
+  </sect2>
+<para><phrase role="cvstag">($Id: form-builder.xml,v 1.2 2003/12/11 21:39:48 jeffd Exp $)</phrase></para>
+</sect1>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/i18n.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/i18n.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/i18n.xml	14 Oct 2003 10:10:06 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/i18n.xml	11 Dec 2003 21:39:48 -0000	1.7
@@ -100,21 +100,21 @@
         <listitem>
           <para>
             The <emphasis role="strong">short</emphasis>:
-            <computeroutput>#<emphasis>package_key.message_key</emphasis>#</computeroutput>
+            <computeroutput>#<replaceable>package_key.message_key</replaceable>#</computeroutput>
           </para>
           <para>
             The advantage of the short syntax is that it's short. It's
             as simple as inserting the value of a variable.  Example:
-            <emphasis>#forum.title#</emphasis>
+            <replaceable>#forum.title#</replaceable>
           </para>
         </listitem>
 
         <listitem>
           <para>
             The <emphasis role="strong">verbose</emphasis>: <computeroutput>&lt;trn
-            key="<emphasis>package_key.message_key</emphasis>"
-            locale="<emphasis>locale</emphasis>"&gt;<emphasis>default
-            text</emphasis>&lt;/trn&gt;</computeroutput>
+            key="<replaceable>package_key.message_key</replaceable>"
+            locale="<replaceable>locale</replaceable>"&gt;<replaceable>default
+            text</replaceable>&lt;/trn&gt;</computeroutput>
           </para>
           <para>
             The verbose syntax allows you to specify a default text in
@@ -131,8 +131,8 @@
         <listitem>
           <para>
             The <emphasis role="strong">temporary</emphasis>:
-           <computeroutput> &lt;#<emphasis>message_key</emphasis>
-           <emphasis>original text</emphasis>#&gt;</computeroutput>
+           <computeroutput> &lt;#<replaceable>message_key</replaceable>
+           <replaceable>original text</replaceable>#&gt;</computeroutput>
           </para>
           <para>
             This syntax has been designed to make it easy to
@@ -177,7 +177,7 @@
         parameters, taken directly from the dotlrn package.
       </para>
 
-      <table frame="all">
+      <informaltable frame="all">
         <tgroup cols="2" colsep="1" rowsep="1">
           <colspec colname="c1"/>
           <colspec colname="c2"/>
@@ -198,13 +198,13 @@
             </row>
           </tbody>
         </tgroup>
-      </table>
+      </informaltable>
 
       <para>
         Then, depending on how we retrieve the value, here's what we get:
       </para>
   
-      <table frame="all">
+      <informaltable frame="all">
         <tgroup cols="2" colsep="1" rowsep="1">
           <colspec colname="c1"/>
           <colspec colname="c2"/>
@@ -229,7 +229,7 @@
             </row>
           </tbody>
         </tgroup>
-      </table>
+      </informaltable>
   
       <para>
         The value in the rightmost column in the table above is the
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/object-identity.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/object-identity.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/object-identity.xml	20 Aug 2003 16:20:18 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/object-identity.xml	11 Dec 2003 21:39:48 -0000	1.6
@@ -9,7 +9,7 @@
 
 
 <authorblurb>
-by <ulink url="http://planitia.org">Rafael H. Schloming</ulink> 
+<para>By <ulink url="http://planitia.org">Rafael H. Schloming</ulink></para>
 </authorblurb>
 
 
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/objects.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/objects.xml,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/objects.xml	30 Sep 2003 12:10:01 -0000	1.7
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/objects.xml	11 Dec 2003 21:39:48 -0000	1.8
@@ -8,7 +8,7 @@
 <title>OpenACS Data Models and the Object System</title>
 
 <authorblurb>
-By Pete Su
+<para>By Pete Su</para>
 </authorblurb>
 
 <sect2 id="objects-overview"><title>Overview</title>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/packages.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/packages.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/packages.xml	20 Aug 2003 16:20:18 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/packages.xml	11 Dec 2003 21:39:48 -0000	1.7
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="packages" xreflabel="Packages">
-  <title>OpenACS &version; Packages</title>
+  <title>OpenACS Packages</title>
 
   <authorblurb>
-    By Pete Su and Bryan Quinn
+    <para>By Pete Su and Bryan Quinn</para>
   </authorblurb>
   
   <sect2 id="packages-overview">
@@ -37,7 +37,6 @@
     
 
     <programlisting>
-
 ROOT/
    bin/
    parameters/
@@ -46,19 +45,19 @@
         core tcl libraries here
      www/
          admin/
-             bboard/
-                 site wide admin for bboard
+             forums/
+                 site wide admin for forums
              intranet/
                  site wide admin for intranet
 
              ... and so on for all modules ...
 
-         bboard/
-             pages for bboard
+         forums/
+             pages for forums
              admin/
-                 other admin pages for bboard
+                 other admin pages for forums
          intranet/
-             pages for bboard
+             pages for intranet
              admin/
                  other admin pages for intranet
          doc/
@@ -67,9 +66,8 @@
                 core and application data models here
 
          ... and so on for all modules ... 
+</programlisting>
 
-    </programlisting>
-
     <para>
       In previous versions of OpenACS, you wrote a new application like this:
     </para>
@@ -98,7 +96,6 @@
     
 
     <programlisting>
-
 ROOT/
     bin/
     packages/
@@ -115,8 +112,12 @@
         acs-test-harness/
         acs-util/
         acs-workflow/
-        bboard/
-               bboard.info
+        forums/
+               forums.info
+               catalog/
+                    i18n message catalogs
+               lib/
+		    includable page fragments (.tcl/.adp pairs)
                sql/
                     oracle/
                          oracle data model
@@ -125,11 +126,11 @@
                tcl/
                     tcl library code
                www/
+                    user visible pages
                     admin/
-                           administration pages
-                    other pages
+                         administration pages
                     doc/
-                          documentation
+                         documentation
         message-catalog/
         news/
         notification/
@@ -138,12 +139,12 @@
             bootstrap code
     www/
             misc pages
-    </programlisting>
+</programlisting>
 
 
     <para>
       Note that a major reorganization has happened here. The diagram only
-      expands the structure of the <computeroutput>bboard/</computeroutput> package directory,
+      expands the structure of the <computeroutput>forums/</computeroutput> package directory,
       but all the others are basically the same. Each package encapsulates
       all of its data model, library code, logic, adminstration pages and
       user pages in a single part of the file tree. This organization has
@@ -347,9 +348,9 @@
           files. In Oracle this can be done by including 
           <emphasis>@@ filename</emphasis> in the creation or drop
           scripts. See the <ulink
-        url="http://oradoc.photo.net/ora816/sqlplus.816/a75664/ch83.htm#1011677">
-        Oracle SQL*Plus documentation</ulink> for examples. In
-          PostgreSQL the same is acomplished by including <emphasis>\i</emphasis>.
+        url="http://www.orafaq.com/faqplus.htm#AT">
+        Oracle FAQ</ulink> for examples. In
+          PostgreSQL the same is acomplished by including <emphasis>\i filename</emphasis>.
         </entry>
         <entry>
           <computeroutput>sql/&lt;database&gt;/*.sql</computeroutput>
@@ -436,9 +437,9 @@
       <row>
         <entry>Administration UI</entry>
         <entry>The administration UI is used to administer the instances of
-          the package.  For example, the bboard administration UI is
+          the package.  For example, the forums administration UI is
           used to create new forums, moderate postings, and create new
-          categories for bboard postings.</entry>
+          categories for forums postings.</entry>
         <entry><computeroutput>www/admin/*</computeroutput></entry> 
       </row>
       <row>
@@ -552,7 +553,7 @@
           distinguish it from all the others. It is used as a database key to
           keep track of the package and as the name of the directory in the file
           system where all the files related to your package will live. Example
-          package keys in the current system include: <computeroutput>bboard</computeroutput>,
+          package keys in the current system include: <computeroutput>forums</computeroutput>,
           <computeroutput>acs-kernel</computeroutput> and so on. For the example application, we
           will use the package key <computeroutput>notes</computeroutput>.
         </para></listitem>
@@ -586,7 +587,7 @@
           Generally we think of packages as either being <emphasis>applications</emphasis>,
           meaning that the package is meant primarily for use by end-users, or
           <emphasis>services</emphasis> meaning that the package is meant to be a reusable
-          library of code, to be used by other packages. <computeroutput>bboard</computeroutput> is
+          library of code, to be used by other packages. <computeroutput>forums</computeroutput> is
           a good example of an application, while <computeroutput>acs-templating</computeroutput> is
           a good example of a service. Our example is an application, so pick
           that.
@@ -687,7 +688,7 @@
       this point, you should add your package files to your CVS repository.
       I'll assume that you have set up your development repository according
       to the standards described in 
-      <ulink url="http://acs40.arsdigita.com/acs40-project-central/client-build.html">these instructions</ulink>. If so, then you just do this:
+      <link linkend="cvs-service-import">this appendix</link>. If so, then you just do this:
     </para>
     
 
@@ -710,7 +711,7 @@
 
       <listitem><para>
       Now you can start developing the package. In addition to writing code,
-      you should also consider the tasks outlined in the <ulink url="http://acs40.arsdigita.com/acs40-project-central/package-submission.html">package submission guidelines</ulink>.
+      you should also consider the tasks outlined in the <link linkend="tutorial-newpackage">package development tutorial</link>.
     </para></listitem>
 
     </orderedlist>
@@ -840,7 +841,7 @@
     <itemizedlist>
       <listitem><para><xref linkend="apm-design"/></para></listitem>
       <listitem><para><xref linkend="apm-requirements"/></para></listitem>
-      <listitem><para><ulink url="http://acs40.arsdigita.com/acs40-project-central/package-submission.html">Package submission guidelines</ulink></para></listitem>
+      <listitem><para><link linkend="tutorial-newpackage">package development tutorial</link></para></listitem>
     </itemizedlist>
 
     <para><phrase role="cvstag">($Id$)</phrase></para>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/parties.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/parties.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/parties.xml	20 Aug 2003 16:20:18 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/parties.xml	11 Dec 2003 21:39:48 -0000	1.6
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="parties" xreflabel="Parties in OpenACS 4">
-<title>Parties in OpenACS &version;</title>
+<title>Parties in OpenACS</title>
 
 <authorblurb>
-by <ulink url="http://planitia.org">Rafael H. Schloming</ulink> 
+<para>By <ulink url="http://planitia.org">Rafael H. Schloming</ulink></para>
 </authorblurb>
 
 <sect2 id="parties-intro">
@@ -118,7 +118,7 @@
 users) is that it is now possible to &quot;nuke&quot; a user from a live
 system by removing his entry from the users table, but leaving the rest of
 his information present (i.e. turning him from a user into a person). This is
-because wherever possible the OpenACS &version; data model references the persons or
+because wherever possible the OpenACS data model references the persons or
 parties table, <emphasis role="strong">not</emphasis> the users table. If this feature is
 desired when extending the system, then the developers should be careful to
 only references the users table in situations where it is clear that the
@@ -456,7 +456,7 @@
 
 <para><emphasis role="strong">Specializing Groups</emphasis></para>
 
-<para>If one were to build an intranet application on top of the &version; party
+<para>If one were to build an intranet application on top of the party
 system, it is likely that one would want to take advantage of the systems
 efficient representation of sophisticated organizational structures, but
 there would be much more specialized information associated with each group.
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 -N -r1.3 -r1.4
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml	20 Aug 2003 16:20:18 -0000	1.3
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions-tediously-explained.xml	11 Dec 2003 21:39:48 -0000	1.4
@@ -5,24 +5,26 @@
 %myvars;
 ]>
 <sect1 id="permissions-tediously-explained" xreflabel="OpenACS Permissions Tediously Explained"> 
-  <title>OpenACS 4.x Permissions Tediously Explained</title>
+  <title>OpenACS Permissions Tediously Explained</title>
   <para>
     by Vadim Nasardinov. Modified and converted to Docbook XML by Roberto Mello
   </para>
   
+  <para>The code has been modified since this document was written so it is now out of date.  See <ulink url="http://openacs.org/forums/message-view?message_id=121807">this forum thread</ulink>.</para>
+
   <sect2 id="permissions-tedious-overview">
 
     <title>Overview</title>
     <para>
-      The general permissions system has a relatively complex data model in OpenACS 4.x.
+      The general permissions system has a relatively complex data model in OpenACS.
       Developers who haven't had the time to learn the internals of the data model
       may end up writing seemingly correct code that crashes their system in
       weird ways. This writeup is the result of my running into such a piece
       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 
-      <ulink url="http://openacs.org/doc/openacs-4/permissions.html">
-      OpenACS 4.x Permissions documentation</ulink>,
+      <ulink url="permissions.html">
+      OpenACS Permissions documentation</ulink>,
       but who haven't had the opportunity to take a long, careful look at the
       system internals.
     </para>
@@ -87,13 +89,13 @@
   create table <emphasis role="bold">acs_permissions</emphasis> (
       object_id
           not null
-          constraint acs_permissions_on_what_id_fk references <xref linkend="acs_objects">acs_objects</xref> (object_id),
+          constraint acs_permissions_on_what_id_fk references <xref linkend="acs_objects"/> (object_id),
       grantee_id
           not null
-          constraint acs_permissions_grantee_id_fk references <xref linkend="tedious-parties">parties</xref> (party_id),
+          constraint acs_permissions_grantee_id_fk references <xref linkend="tedious-parties"/> (party_id),
       privilege
           not null
-          constraint acs_permissions_priv_fk references <xref linkend="acs_privileges">acs_privileges</xref> (privilege),
+          constraint acs_permissions_priv_fk references <xref linkend="acs_privileges"/> (privilege),
       constraint acs_permissions_pk
           primary key (object_id, grantee_id, privilege)
   );
@@ -119,7 +121,7 @@
       entries of the form: 
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="3" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -194,7 +196,7 @@
           </row>
         </tbody>
       </tgroup>
-    </table>
+    </informaltable>
 
     <para>
       Although quite feasible, this approach fails to take advantage of the fact
@@ -221,6 +223,7 @@
     </para>
 
     <table frame="all">
+      <title>Context Hierarchy Example</title>
       <tgroup cols="3" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -273,12 +276,13 @@
     </table>
     
     <para>
-      This can be represented in the <computeroutput>
-      <xref linkend="acs_objects">acs_objects</xref></computeroutput> table
+      This can be represented in the 
+      <xref linkend="acs_objects"/> table
       by the following entries: 
     </para>
 
     <table frame="all">
+      <title>acs_objects example data</title>
       <tgroup cols="2" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -320,10 +324,10 @@
       we can compute that object 40 is the second-generation descendant of object 10.
       With this in mind, if we want to record the fact that user Joe has the <emphasis>read</emphasis> privilege on objects
       <emphasis>A</emphasis>, ..., <emphasis>F</emphasis>, we only need to record one entry in the
-      <computeroutput><xref linkend="acs_permissions">acs_permissions</xref></computeroutput> table. 
+      <xref linkend="acs_permissions"/> table. 
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="3" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -343,7 +347,7 @@
           </row>
         </tbody>
       </tgroup>
-    </table>
+    </informaltable>
 
     <para>
       The fact that Joe can also read <emphasis>B</emphasis>, <emphasis>C</emphasis>, 
@@ -357,7 +361,7 @@
       One way to solve this problem is to cache a flattened view of the context tree like so: 
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="3" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -442,7 +446,7 @@
           </row>
         </tbody>
       </tgroup>
-    </table>
+    </informaltable>
 
     <para>
       Note that the number of entries in the flattened view grows exponentially with
@@ -451,7 +455,7 @@
       in its flattened view is
     </para>
     
-    <para align="center">
+    <para>
       1 + 2*2 + 3*4 + 4*8 + 5*16 + ... + (n+1)*2<superscript>n</superscript> = n*2<superscript>n+1</superscript> + 1</para>
 
     <para>
@@ -465,10 +469,10 @@
   create table <emphasis role="bold">acs_object_context_index</emphasis> (
       object_id
           not null
-          constraint acs_obj_context_idx_obj_id_fk references <xref linkend="acs_objects">acs_objects</xref>(object_id),
+          constraint acs_obj_context_idx_obj_id_fk references <xref linkend="acs_objects"/> (object_id),
       ancestor_id
           not null
-          constraint acs_obj_context_idx_anc_id_fk references <xref linkend="acs_objects">acs_objects</xref>(object_id),
+          constraint acs_obj_context_idx_anc_id_fk references <xref linkend="acs_objects"/> (object_id),
       n_generations	    integer
           not null
           constraint acs_obj_context_idx_n_gen_ck check (n_generations <markup>></markup>= 0),
@@ -490,32 +494,32 @@
 
     <para>
       The <computeroutput>acs_object_context_index</computeroutput> is kept in sync with the
-      <computeroutput><xref linkend="acs_objects">acs_objects</xref></computeroutput> 
+      <xref linkend="acs_objects"/>
       table by triggers like this: 
     </para>
 
     <programlisting>
 create or replace trigger acs_objects_context_id_in_tr
-after insert on <xref linkend="acs_objects">acs_objects</xref>
+after insert on <xref linkend="acs_objects"/>
 for each row
 begin
-    insert into <xref linkend="acs_object_context_index">acs_object_context_index</xref>
+    insert into <xref linkend="acs_object_context_index"/>
      (object_id, ancestor_id, n_generations)
     values
      (:new.object_id, :new.object_id, 0);
 
     if :new.context_id is not null and :new.security_inherit_p = 't' then
-      insert into <xref linkend="acs_object_context_index">acs_object_context_index</xref>
+      insert into <xref linkend="acs_object_context_index"/>
        (object_id, ancestor_id,
         n_generations)
       select
        :new.object_id as object_id, ancestor_id,
        n_generations + 1 as n_generations
-      from <xref linkend="acs_object_context_index">acs_object_context_index</xref>
+      from <xref linkend="acs_object_context_index"/>
       where object_id = :new.context_id;
     elsif :new.object_id != 0 then
       -- 0 is the id of the security context root object
-      insert into <xref linkend="acs_object_context_index">acs_object_context_index</xref>
+      insert into <xref linkend="acs_object_context_index"/>
        (object_id, ancestor_id, n_generations)
       values
        (:new.object_id, 0, 1);
@@ -524,14 +528,14 @@
 </programlisting>
 
     <para>
-      One final note about <computeroutput>
-      <xref linkend="acs_objects">acs_objects</xref></computeroutput>. By setting
+      One final note about 
+      <xref linkend="acs_objects"/>. By setting
       an object's <computeroutput>security_inherit_p</computeroutput> column to 'f', you can stop permissions
       from cascading down the context tree. In the following example, Joe does not have
       the read permissions on <emphasis>C</emphasis> and <emphasis>F</emphasis>. 
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="3" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -587,7 +591,7 @@
           </row>
         </tbody>
       </tgroup>
-    </table>
+    </informaltable>
     
   </sect2>
 
@@ -600,7 +604,7 @@
       the Bboard package defines the following privileges: 
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="1" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
 	<thead>
@@ -650,7 +654,7 @@
 	  </row>
         </tbody>
       </tgroup>
-    </table>
+    </informaltable>
 
     <para>
       By defining parent-child relationship between privileges, the OpenACS data model
@@ -663,7 +667,7 @@
       as follows.
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="13" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -705,7 +709,7 @@
 	  </row>
 	</tbody>
        </tgroup>
-     </table>
+     </informaltable>
 
     <para>
       The parent-child relationship between privileges is represented in
@@ -717,10 +721,10 @@
   create table <emphasis role="bold">acs_privilege_hierarchy</emphasis> (
       privilege
           not null
-          constraint acs_priv_hier_priv_fk references <xref linkend="acs_privileges">acs_privileges</xref> (privilege),
+          constraint acs_priv_hier_priv_fk references <xref linkend="acs_privileges"/> (privilege),
       child_privilege
           not null
-          constraint acs_priv_hier_child_priv_fk references <xref linkend="acs_privileges">acs_privileges</xref> (privilege),
+          constraint acs_priv_hier_child_priv_fk references <xref linkend="acs_privileges"/> (privilege),
       constraint acs_privilege_hierarchy_pk
           primary key (privilege, child_privilege)
   );
@@ -738,14 +742,14 @@
     p1.privilege,
     p2.privilege as descendant
   from
-    <xref linkend="acs_privileges">acs_privileges</xref> p1,
-    <xref linkend="acs_privileges">acs_privileges</xref> p2
+    <xref linkend="acs_privileges"/> p1,
+    <xref linkend="acs_privileges"/> p2
   where
     p2.privilege in 
       (select
          child_privilege
        from
-         <xref linkend="acs_privilege_hierarchy">acs_privilege_hierarchy</xref>
+         <xref linkend="acs_privilege_hierarchy"/>
        start with
          privilege = p1.privilege
        connect by
@@ -771,46 +775,38 @@
       data model is set up as follows. 
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="2" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
         <tbody>
 	  <row>
 	    <entry namest="c1" nameend="c2">
-	      <xref linkend="tedious-parties">
-	        <computeroutput>parties</computeroutput>
-              </xref> 
+	      <xref linkend="tedious-parties"/>
 	    </entry>
 	  </row>
 	  <row>
             <entry>
-	      <xref linkend="persons">
-	        <computeroutput>persons</computeroutput>
-              </xref>
+	      <xref linkend="persons"/>
 	    </entry>
 	    <entry morerows="1" valign="top">
-	      <xref linkend="groups">
-	        <computeroutput>groups</computeroutput>
-	      </xref>
+	      <xref linkend="groups"/>
 	    </entry>
 	  </row>
 	  <row>
 	    <entry>
-              <xref linkend="users">
-	        <computeroutput>users</computeroutput>
-              </xref>
+              <xref linkend="users"/>
 	    </entry>
 	  </row>
 	</tbody>
       </tgroup>
-    </table>
+    </informaltable>
 
     <programlisting id="tedious-parties" xreflabel="parties">
   create table <emphasis role="bold">parties</emphasis> (
       party_id
           not null
-          constraint parties_party_id_fk references <xref linkend="acs_objects">acs_objects</xref> (object_id)
+          constraint parties_party_id_fk references <xref linkend="acs_objects"/> (object_id)
           constraint parties_pk primary key,
       email               varchar2(100)
           constraint parties_email_un unique,
@@ -822,7 +818,7 @@
   create table <emphasis role="bold">persons</emphasis> (
       person_id
           not null
-          constraint persons_person_id_fk references <xref linkend="tedious-parties">parties</xref> (party_id)
+          constraint persons_person_id_fk references <xref linkend="tedious-parties"/> (party_id)
           constraint persons_pk primary key,
       first_names          varchar2(100)
           not null,
@@ -835,7 +831,7 @@
   create table <emphasis role="bold">users</emphasis> (
       user_id
           not null
-          constraint users_user_id_fk references <xref linkend="persons">persons</xref> (person_id)
+          constraint users_user_id_fk references <xref linkend="persons"/> (person_id)
           constraint users_pk primary key,
       password        char(40),
       -- other attributes
@@ -846,15 +842,15 @@
   create table <emphasis role="bold">groups</emphasis> (
       group_id
           not null
-          constraint groups_group_id_fk references <xref linkend="tedious-parties">parties</xref> (party_id)
+          constraint groups_group_id_fk references <xref linkend="tedious-parties"/> (party_id)
           constraint groups_pk primary key,
       group_name           varchar2(100) not null
   );
     </programlisting>
 
     <para>
       Recall that the <computeroutput>grantee_id</computeroutput> column of the
-      <xref linkend="acs_permissions">acs_permissions</xref> table references 
+      <xref linkend="acs_permissions"/> table references 
       <computeroutput>parties.party_id</computeroutput>.
       This means that you can grant a privilege on an object to a party, person, user, or group.
       Groups represent aggregations of parties. The most common scenario that you are likely
@@ -875,17 +871,17 @@
   create table <emphasis role="bold">acs_rels</emphasis> (
       rel_id
           not null
-          constraint acs_rels_rel_id_fk references <xref linkend="acs_objects">acs_objects</xref> (object_id)
+          constraint acs_rels_rel_id_fk references <xref linkend="acs_objects"/> (object_id)
           constraint acs_rels_pk primary key,
       rel_type
           not null
           constraint acs_rels_rel_type_fk references acs_rel_types (rel_type),
       object_id_one
           not null
-          constraint acs_object_rels_one_fk references <xref linkend="acs_objects">acs_objects</xref> (object_id),
+          constraint acs_object_rels_one_fk references <xref linkend="acs_objects"/> (object_id),
       object_id_two
           not null
-          constraint acs_object_rels_two_fk references <xref linkend="acs_objects">acs_objects</xref> (object_id),
+          constraint acs_object_rels_two_fk references <xref linkend="acs_objects"/> (object_id),
       constraint acs_object_rels_un
           unique (rel_type, object_id_one, object_id_two)
   );
@@ -894,7 +890,7 @@
     <programlisting id="membership_rels" xreflabel="membership_rels">
   create table <emphasis role="bold">membership_rels</emphasis> (
       rel_id
-          constraint membership_rel_rel_id_fk references <xref linkend="acs_rels">acs_rels</xref> (rel_id)
+          constraint membership_rel_rel_id_fk references <xref linkend="acs_rels"/> (rel_id)
           constraint membership_rel_rel_id_pk primary key,
       -- null means waiting for admin approval
       member_state         varchar2(20)
@@ -904,11 +900,11 @@
     </programlisting>
 
     <para>
-      The <computeroutput><xref linkend="acs_rels">acs_rels</xref></computeroutput> 
+      The <xref linkend="acs_rels"/>
       table entries would look like so: 
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="3" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -962,32 +958,32 @@
 	  </row>
 	</tbody>
       </tgroup>
-    </table>
+    </informaltable>
 
     <para>
       Another way of building up groups is by adding subgroups.  Suppose
       we define <emphasis>Merry Pranksters</emphasis> and <emphasis>Sad Pranksters</emphasis> as subgroups
       of <emphasis>Pranksters</emphasis>.  We say that the <emphasis>Pranksters</emphasis> group
       is <emphasis role="strong">composed</emphasis> of 
       groups <emphasis>Merry Pranksters</emphasis> and <emphasis>Sad Pranksters</emphasis>.  This
-      information is stored in the <computeroutput><xref linkend="acs_rels">acs_rels</xref></computeroutput>
+      information is stored in the <xref linkend="acs_rels"/>
       and <computeroutput>composition_rels</computeroutput> tables. 
     </para>
       
     <programlisting id="composition_rels" xreflabel="composition_rels">
 create table <emphasis role="bold">composition_rels</emphasis> (
     rel_id
-        constraint composition_rel_rel_id_fk references <xref linkend="acs_rels">acs_rels</xref> (rel_id)
+        constraint composition_rel_rel_id_fk references <xref linkend="acs_rels"/> (rel_id)
         constraint composition_rel_rel_id_pk primary key
 );
     </programlisting>
 
     <para>
       The relevant entries in the 
-      <computeroutput><xref linkend="acs_rels">acs_rels</xref></computeroutput> look like so. 
+      <xref linkend="acs_rels"/> look like so. 
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="3" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -1030,7 +1026,7 @@
 	  </row>
 	</tbody>
       </tgroup>
-    </table>
+    </informaltable>
 
     <para>
       The composition relationship means that if I add Matt, Mel, and Mary to the 
@@ -1057,16 +1053,16 @@
  create table <emphasis role="bold">group_component_index</emphasis> (
           group_id        not null
                           constraint group_comp_index_group_id_fk
-                          references <xref linkend="groups">groups</xref> (group_id),
+                          references <xref linkend="groups"/> (group_id),
           component_id    not null
                           constraint group_comp_index_comp_id_fk
-                          references <xref linkend="groups">groups</xref> (group_id),
+                          references <xref linkend="groups"/> (group_id),
           rel_id          not null
                           constraint group_comp_index_rel_id_fk
                           references composition_rels (rel_id),
           container_id    not null
                           constraint group_comp_index_cont_id_ck
-                          references <xref linkend="groups">groups</xref> (group_id),
+                          references <xref linkend="groups"/> (group_id),
           constraint group_component_index_ck
           check (group_id != component_id),
           constraint group_component_index_pk
@@ -1078,35 +1074,35 @@
   create table <emphasis role="bold">group_member_index</emphasis> (
       group_id
           not null
-          constraint group_member_index_grp_id_fk references <xref linkend="groups">groups</xref> (group_id),
+          constraint group_member_index_grp_id_fk references <xref linkend="groups"/> (group_id),
       member_id
           not null
-          constraint group_member_index_mem_id_fk references <xref linkend="tedious-parties">parties</xref> (party_id),
+          constraint group_member_index_mem_id_fk references <xref linkend="tedious-parties"/> (party_id),
       rel_id
           not null
-          constraint group_member_index_rel_id_fk references <xref linkend="membership_rels">membership_rels</xref> (rel_id),
+          constraint group_member_index_rel_id_fk references <xref linkend="membership_rels"/> (rel_id),
       container_id
           not null
-          constraint group_member_index_cont_id_fk references <xref linkend="groups">groups</xref> (group_id),
+          constraint group_member_index_cont_id_fk references <xref linkend="groups"/> (group_id),
       constraint group_member_index_pk
           primary key (member_id, group_id, rel_id)
   ) organization index;
     </programlisting>
 
     <para>
       The <computeroutput>group_component_index</computeroutput> table stores a flattened representation of the
-      group composition hierarchy that is maintained in sync with the <computeroutput><xref linkend="acs_rels">acs_rels</xref></computeroutput>
+      group composition hierarchy that is maintained in sync with the <xref linkend="acs_rels"/>
       and <computeroutput>composition_rels</computeroutput> tables through triggers. 
     </para>
       
     <para>
       As far as the <computeroutput>group_member_index</computeroutput> table goes, I am not sure I understand its
       purpose.  It maintains group-member relationships that are resolved with respect
       to group composition.  Note that information stored in
-      <computeroutput><xref linkend="group_member_index">group_member_index</xref></computeroutput> can be trivially derived by joining
-      <computeroutput><xref linkend="membership_rels">membership_rels</xref></computeroutput>,
-      <computeroutput><xref linkend="acs_rels">acs_rels</xref></computeroutput>,
-      and <computeroutput><xref linkend="group_component_index">group_component_index</xref></computeroutput>. Here
+      <xref linkend="group_member_index"/> can be trivially derived by joining
+      <xref linkend="membership_rels"/>,
+      <xref linkend="acs_rels"/>,
+      and <xref linkend="group_component_index"/>. Here
       is a view that does it. (This view is <emphasis>not</emphasis> part of the OpenACS Kernel data model.)
     </para>
       
@@ -1120,23 +1116,23 @@
    select
      group_id, group_id as component_id
    from
-     <xref linkend="groups">groups</xref>
+     <xref linkend="groups"/>
    union
    select
      group_id, component_id
    from
      group_component_index
   ) gci,
-  <xref linkend="membership_rels">membership_rels</xref> mr,
-  <xref linkend="acs_rels">acs_rels</xref> r
+  <xref linkend="membership_rels"/> mr,
+  <xref linkend="acs_rels"/> r
 where
   mr.rel_id = r.rel_id
   and r.object_id_one = gci.component_id;
     </programlisting>
 
     <para>
       A heuristic way to verify that <computeroutput>group_member_view</computeroutput> is essentially identical
-      to <computeroutput><xref linkend="group_member_index">group_member_index</xref></computeroutput> is to compute the
+      to <xref linkend="group_member_index"/> is to compute the
       symmetric difference between the two: 
     </para>
 
@@ -1147,14 +1143,14 @@
   (
    select group_id, member_id from group_member_view
    minus
-   select group_id, member_id from <xref linkend="group_member_index">group_member_index</xref>
+   select group_id, member_id from <xref linkend="group_member_index"/>
   )
 union
 select
   group_id, member_id
 from
   (
-   select group_id, member_id from <xref linkend="group_member_index">group_member_index</xref>
+   select group_id, member_id from <xref linkend="group_member_index"/>
    minus
    select group_id, member_id from group_member_view
   )
@@ -1163,7 +1159,7 @@
     <para>
       The query returns no rows.  The important point is, if we
       have a flattened view of the composition hierarchy -- like one provided
-      by the <computeroutput><xref linkend="group_component_index">group_component_index</xref></computeroutput> table --
+      by the <xref linkend="group_component_index"/> table --
       membership relationship resolution can be computed trivially with no hierarchical
       queries involved. There is no need to keep the view in a denormalized
       table, unless doing so results in substantial performance gains.
@@ -1194,7 +1190,7 @@
     begin
       -- XXX This must be fixed: -1 shouldn't be hardcoded (it is the public)
       select decode(count(*),0,'f','t') into exists_p
-        from <xref linkend="acs_object_party_privilege_map">acs_object_party_privilege_map</xref>
+        from <xref linkend="acs_object_party_privilege_map"/>
        where object_id = permission_p.object_id
          and party_id in (permission_p.party_id, -1)
          and privilege = permission_p.privilege;
@@ -1206,7 +1202,7 @@
 
     <para>
       The function simply queries 
-      <computeroutput><xref linkend="acs_object_party_privilege_map">acs_object_party_privilege_map</xref></computeroutput>,
+      <xref linkend="acs_object_party_privilege_map"/>,
       which is a humongous view that joins three flattened hierarchies:
       the context tree, the privilege hierarchy,
       the party composition (and membership) hierarchy. As such,
@@ -1223,7 +1219,7 @@
     
     <programlisting>
 select count(*)
-  from <xref linkend="acs_object_party_privilege_map">acs_object_party_privilege_map</xref>;
+  from <xref linkend="acs_object_party_privilege_map"/>;
     </programlisting>
 
     <para>
@@ -1236,7 +1232,7 @@
         select
            object_id, party_id
         from
-           <xref linkend="acs_object_party_privilege_map">acs_object_party_privilege_map</xref>
+           <xref linkend="acs_object_party_privilege_map"/>
         where
            privilege = 'foo_create';
   begin
@@ -1276,7 +1272,7 @@
       one entry that needed to be deleted: 
     </para>
 
-    <table frame="all">
+    <informaltable frame="all">
       <tgroup cols="3" align="center" colsep="1" rowsep="1">
         <colspec colname="c1"/>
         <colspec colname="c2"/>
@@ -1308,7 +1304,7 @@
 	  </row>
 	</tbody>
       </tgroup>
-    </table>
+    </informaltable>
 
     <para>
       The above script would never get around to deleting this entry because it had
@@ -1329,8 +1325,8 @@
   gmm.member_id as party_id,
   ogpm.privilege
 from
-  <xref linkend="acs_object_grantee_priv_map">acs_object_grantee_priv_map</xref> ogpm,
-  <xref linkend="group_member_map">group_member_map</xref> gmm
+  <xref linkend="acs_object_grantee_priv_map"/> ogpm,
+  <xref linkend="group_member_map"/> gmm
 where
   ogpm.grantee_id = gmm.group_id
 union
@@ -1339,7 +1335,7 @@
   grantee_id as party_id,
   privilege
 from
-  <xref linkend="acs_object_grantee_priv_map">acs_object_grantee_priv_map</xref>;
+  <xref linkend="acs_object_grantee_priv_map"/>;
     </programlisting>
 
     <programlisting id="acs_object_grantee_priv_map" xreflabel="acs_object_grantee_priv_map">
@@ -1350,8 +1346,8 @@
   a.grantee_id,
   m.descendant as privilege
 from
-  <xref linkend="acs_permissions_all">acs_permissions_all</xref> a,
-  <xref linkend="acs_privilege_descendant_map">acs_privilege_descendant_map</xref> m
+  <xref linkend="acs_permissions_all"/> a,
+  <xref linkend="acs_privilege_descendant_map"/> m
 where
   a.privilege = m.privilege;
     </programlisting>
@@ -1365,8 +1361,8 @@
   p.grantee_id,
   p.privilege
 from
-  <xref linkend="acs_object_paths">acs_object_paths</xref> op,
-  <xref linkend="acs_permissions">acs_permissions</xref> p
+  <xref linkend="acs_object_paths"/> op,
+  <xref linkend="acs_permissions"/> p
 where
   op.ancestor_id = p.object_id;
     </programlisting>
@@ -1379,7 +1375,7 @@
   ancestor_id,
   n_generations
 from
-  <xref linkend="acs_object_context_index">acs_object_context_index</xref>;
+  <xref linkend="acs_object_context_index"/>;
     </programlisting>
 
     <programlisting id="group_member_map" xreflabel="group_member_map"> 
@@ -1392,7 +1388,7 @@
   rel_id,
   container_id
 from
-  <xref linkend="group_member_index">group_member_index</xref>;
+  <xref linkend="group_member_index"/>;
     </programlisting>
 
   </sect2>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml	20 Aug 2003 16:20:18 -0000	1.7
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml	11 Dec 2003 21:39:48 -0000	1.8
@@ -9,7 +9,7 @@
 
  
 <authorblurb>
-<para>By <ulink url="mailto:psu@arsdigita.com">Pete Su</ulink></para>
+<para>By Pete Su</para>
 </authorblurb>
 
 
@@ -256,7 +256,7 @@
 <computeroutput>address_book</computeroutput> table:
 </para>
 
-<blockquote>
+
 <informaltable frame="all">
 <tgroup cols="5">
 <thead>
@@ -294,7 +294,6 @@
 </tbody>
 </tgroup>
 </informaltable>
-</blockquote>
 
 <para>
 The first row represents an entry in User 123's personal address book,
@@ -326,7 +325,7 @@
 permissions in a subtree of some context.
 </para>
 
-<para> A good example of how to use this hierarchy is in the bboard
+<para> A good example of how to use this hierarchy is in the forums
 application. With only row-level permissions it is not obvious how to
 reasonably initialize the access control list when creating a
 message. At best, we have to explicitly grant various read and write
@@ -376,28 +375,26 @@
 <para>
 
 At this point, you should either go and download the Notes example
-code from the package repository, or check it out of the ArsDigita CVS
+code from the package repository, or check it out of the OpenACS CVS
 repository and add it to your server. The package is called
-"notes". To check it out from CVS, read the <ulink url="http://acs40.arsdigita.com/acs40-project-central/client-build.html">these instructions</ulink> on how to use anonymous checkouts and then
-checkout the module <computeroutput>acs-packages/notes</computeroutput>:
+"notes". To check it out from CVS, read the <ulink url="http://openacs.org/4/checkout">these instructions</ulink>
+on how to use anonymous checkouts and then
+checkout the module <computeroutput>notes</computeroutput>:
 
 </para>
 
  
 
-<programlisting>
-
-% export CVSROOT=:pserver:anonymous@cvs.arsdigita.com:/usr/local/cvsroot
-% cvs login # the password is acsrules
-% cvs checkout acs-packages/notes
-
+<programlisting>% export CVSROOT=:pserver:anonymous@openacs.org:/cvsroot
+% cvs login # just hit enter when prompted for a password
+% cvs co notes
 </programlisting>
 
 
 <para>
 After you have downloaded the package, look at the
 <computeroutput>index.tcl</computeroutput> page in the <computeroutput>www</computeroutput> directory. You can also
-look at the code <ulink url="http://cvs.arsdigita.com/cgi-bin/cvsweb.pl/acs-packages/notes/www/index.tcl?rev=1.3&amp;content-type=text/x-cvsweb-markup">in your browser</ulink>. The code should look something like this:
+look at the code <ulink url="http://cvs.openacs.org/cvs/openacs-4/packages/notes/www/index.tcl?view=markup">in your browser</ulink>. The code should look something like this:
 </para>
 
  
@@ -473,7 +470,7 @@
 </para>
 
 <para>
-Next, look at the <ulink url="http://cvs.arsdigita.com/cgi-bin/cvsweb.pl/acs-packages/notes/www/index.adp?rev=1.1&amp;content-type=text/x-cvsweb-markup">index.adp</ulink>. It is pretty complicated.
+Next, look at the <ulink url="http://cvs.openacs.org/cvs/openacs-4/packages/notes/www/index.adp?view=markup">index.adp</ulink>. It is pretty complicated.
 The main part of this page uses a <computeroutput>multiple</computeroutput> template
 tag. If you want to experiment, you can replace the main body of the
 <computeroutput>multiple</computeroutput> tag with this:
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/programming-with-aolserver.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/programming-with-aolserver.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/programming-with-aolserver.xml	20 Aug 2003 16:20:18 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/programming-with-aolserver.xml	11 Dec 2003 21:39:48 -0000	1.5
@@ -9,7 +9,7 @@
 
 
 <authorblurb>
-by <ulink url="mailto:michael@arsdigita.com">Michael Yoon</ulink>, <ulink url="mailto:jsalz@mit.edu">Jon Salz</ulink> and <ulink url="http://www.pinds.com/lars">Lars Pind</ulink>. 
+<para>By Michael Yoon, Jon Salz and <ulink url="http://www.pinds.com/lars">Lars Pind</ulink>.</para>
 </authorblurb>
 
 <sect2 id="programming-aolserver-global">
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/rp.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/rp.xml,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/rp.xml	20 Aug 2003 16:20:18 -0000	1.7
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/rp.xml	11 Dec 2003 21:39:48 -0000	1.8
@@ -9,7 +9,7 @@
 <title>The Request Processor</title>
 
 <authorblurb>
-By Pete Su
+<para>By Pete Su</para>
 </authorblurb>
 
 <sect2 id="rp-overview"><title>Overview</title>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/subsites.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/subsites.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/subsites.xml	20 Aug 2003 16:20:18 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/subsites.xml	11 Dec 2003 21:39:48 -0000	1.6
@@ -4,15 +4,12 @@
 <!ENTITY % myvars SYSTEM "../variables.ent">
 %myvars;
 ]>
- <sect1 id="subsites" xreflabbel="Writing OpenACS Application Pages">
-<title>Writing OpenACS &version; Application Pages</title>
+ <sect1 id="subsites" xreflabel="Writing OpenACS Application Pages">
+<title>Writing OpenACS Application Pages</title>
 
  
 <authorblurb>
-<para>
-By <ulink url="http://planitia.org/">Rafael H. Schloming</ulink> 
-and <ulink url="mailto:psu@arsdigita.com">Pete Su</ulink>
-</para>
+<para>By Rafael H. Schloming and Pete Su</para>
 </authorblurb>
 
 
@@ -24,10 +21,10 @@
 <para>
 In this document, we'll examine the user interface pages of the Notes
 application in more detail, covering two separate aspects of page
-development in OpenACS &version;. First, we'll talk about the code needed to make
+development in OpenACS. First, we'll talk about the code needed to make
 your pages aware of which application instance they are running
 in. Second, we'll talk about using the form builder to develop
-form-based user interfaces in OpenACS &version;. While these seem like unrelated
+form-based user interfaces in OpenACS. While these seem like unrelated
 topics, they both come up in the example page that we are going to
 look at, so it makes sense to address them at the same time.
 </para>
@@ -40,7 +37,7 @@
 
 <para>
 As you will recall from the <link linkend="packages">packages</link> tutorial, the Request
-Processor (RP) and Package Manager (APM) in OpenACS &version; allow site
+Processor (RP) and Package Manager (APM) allow site
 administrators to define an arbitrary mapping from URLs in the site to
 objects representing content. These objects may represent single
 files, or entire applications. The APM uses the site map to map
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml	20 Aug 2003 16:20:18 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml	11 Dec 2003 21:39:48 -0000	1.7
@@ -5,19 +5,19 @@
 %myvars;
 ]>
 <sect1 id="templates" xreflabel="Using Templates in OpenACS">
-<title>Using Templates in OpenACS &version;</title>
+<title>Using Templates in OpenACS</title>
 
  
 <authorblurb>
-<para>By <ulink url="mailto:psu@arsdigita.com">Pete Su</ulink></para>
+<para>By Pete Su</para>
 </authorblurb>
 
 <sect2 id="templates-overview">
 <title>Overview</title>
 
 
 <para>
-The OpenACS &version; Template System (ATS) is designed to allow developers to
+The OpenACS Template System (ATS) is designed to allow developers to
 cleanly separate <emphasis>application logic</emphasis> from <emphasis>display
 logic</emphasis>. The intent is to have all of the logic related to
 manipulating the database and other application state data in one
@@ -229,7 +229,7 @@
 <para>
 Templates separate application logic from display logic by requiring
 the developer to write pages in two stages, one file for database
-queries and application logic, and another for display. In OpenACS &version;, the
+queries and application logic, and another for display. In OpenACS, the
 logic part of the page is just a <computeroutput>.tcl</computeroutput> that sets up
 <emphasis>data sources</emphasis> that are used by the display part of the page. The
 display part of the page is an <computeroutput>.adp</computeroutput> file with some
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	28 Oct 2003 22:07:40 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	11 Dec 2003 21:39:48 -0000	1.5
@@ -10,7 +10,7 @@
     <para>This section is a work in progress.</para>
   </important>
   <authorblurb>
-    by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+    <para>by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
   </authorblurb>
   
   <sect2>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-db.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-db.xml,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-db.xml	11 Nov 2003 10:28:28 -0000	1.7
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-db.xml	11 Dec 2003 21:39:48 -0000	1.8
@@ -8,7 +8,7 @@
     <title>Setting Up Database Objects</title>
     
     <authorblurb>
-      by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+      <para>by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
     </authorblurb>
     
     <sect2>
@@ -18,8 +18,8 @@
       database scripts are database-specific and are thus in either
       the <computeroutput>myfirstpackage/sql/oracle</computeroutput> or
       <computeroutput>myfirstpackage/sql/postgresql</computeroutput>.
-      Packages can support Oracle, PostGreSQL, or both.  In this
-      tutorial, we'll work only with PostGreSQL</para>
+      Packages can support Oracle, PostgreSQL, or both.  In this
+      tutorial, we'll work only with PostgreSQL</para>
       <para>The first file will be
       <computeroutput>myfirstpackage-create.sql</computeroutput>.  The
       package manager requires a file with the name
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-debug.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-debug.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-debug.xml	14 Oct 2003 10:03:22 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-debug.xml	11 Dec 2003 21:39:48 -0000	1.5
@@ -11,7 +11,7 @@
   </important>
 
   <authorblurb>
-    by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+    <para>by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
   </authorblurb>
   
   <sect2><title>Debugging</title>
@@ -42,7 +42,7 @@
       <para>NOTE: explain how to add tcl to directly write your own
       log output</para>
     </formalpara>
-    <para>To set up real-time monitoring of the Aolserver error
+    <para>To set up real-time monitoring of the AOLserver error
           log, <emphasis role="bold">type</emphasis> <screen>less /usr/local/aolserver/log/openacs-dev-error.log</screen>
           <literallayout>F to show new log entries in real time (like tail -f)
 C-c to stop and F to start it up again. 
@@ -81,13 +81,15 @@
   </sect2>
   
   <sect2>
+    <title>Write automated tests</title>
+
     <authorblurb>
-      by <ulink url="mailto:simon@collaboraid.net">Simon Carstensen</ulink>
+      <para>by <ulink url="mailto:simon@collaboraid.net">Simon Carstensen</ulink></para>
     </authorblurb>
-    <title>Write automated tests</title>
-    <para><indexterm>
-        <primary>Create the automated tests for the package.</primary>
-      </indexterm>It seems to me that a lot of
+
+    <para>
+      <indexterm><primary>Automated tests</primary></indexterm>
+It seems to me that a lot of
 people have been asking for some guidelines on how to write automated
 tests. I've done several tests by now and have found the process to be
 extremely easy and useful. It's a joy to work with automated testing
@@ -200,7 +202,7 @@
 </screen>
         <para>There a number of other useful procs and I will encourage you to
 look at the few packages for which tests have already been implemented.
-That is perhaps the best documentation we have so far.</para>
+That is perhaps the best documentation we have so far.  See also <xref linkend="automated-testing-best-practices"/>.</para>
       </listitem>
     </orderedlist>
     
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-pages.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-pages.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-pages.xml	11 Nov 2003 10:28:28 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-pages.xml	11 Dec 2003 21:39:48 -0000	1.6
@@ -8,15 +8,15 @@
   <title>Creating Web Pages</title>
   
   <authorblurb>
-    by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+    <para>by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
   </authorblurb>
   
   <sect2>
     <title>Install some API</title>
     <para>As a workaround for missing content-repository functionality, copy a provided file into the directory for tcl files:</para>
     <screen>
     <action>cp <replaceable>/var/lib/aolserver/service1</replaceable>/packages/acs-core-docs/www/files/note-procs.tcl <replaceable>/var/lib/aolserver/service1</replaceable>/packages/myfirstpackage/tcl/</action></screen>
-    <para>To make this file take effect, go to the <ulink href="/acs-admin/apm">APM</ulink> and choose "Reload all files" for "MyFirstPackage".</para>
+    <para>To make this file take effect, go to the <ulink url="/acs-admin/apm">APM</ulink> and choose "Reload all files" for "MyFirstPackage".</para>
   </sect2>
   <sect2>
     <title>Build the "Index" page</title>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial.xml,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial.xml	11 Nov 2003 10:28:28 -0000	1.9
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial.xml	11 Dec 2003 21:39:48 -0000	1.10
@@ -10,26 +10,28 @@
     <title>Creating a Package</title>
     
     <authorblurb>
-      by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+      <para>by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
     </authorblurb>
     
 <sect2 id="tutorial-picture">
   <title>The intended page map</title>
-<para>...</para>
-<imageobject>
-          <imagedata fileref="images/openacs best practice.png" format="png"/>
+  <mediaobject>
+  <imageobject>
+          <imagedata fileref="images/openacs best practice.png" format="PNG"/>
   </imageobject>
+  </mediaobject>
 </sect2>
 
+
     <sect2>
       <title>Overview</title>
       <para>To start developing new code in OpenACS, we build a new
     package.  A package is a a discrete collection of web
     pages, tcl code, and database tables and procedures.  A package
       with user interface is called an <emphasis
-      type="strong">application</emphasis>; a package which provides
+      role="strong">application</emphasis>; a package which provides
       functions to other packages and has no direct interface, a
-      <emphasis type="bold">service</emphasis>.  A package
+      <emphasis role="strong">service</emphasis>.  A package
     can be installed, upgraded, and removed.  It communicates with
     other packages through an API.  This chapter walks you through the
     minimum steps to create a useful package, including writing
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/auto-testing.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/auto-testing.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/auto-testing.xml	11 Dec 2003 21:39:49 -0000	1.2
@@ -0,0 +1,74 @@
+<?xml version='1.0' ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY % myvars SYSTEM "../variables.ent">
+%myvars;
+]>
+<sect1 id="automated-testing-best-practices">
+  <title>Automated Testing</title>
+
+<authorblurb>
+<para>By <ulink url="mailto:davis@xarg.net">Jeff Davis</ulink></para>
+</authorblurb>
+  
+  <para>Best practices in writing OpenACS automated tests</para>
+  <itemizedlist>
+    <listitem>
+      <formalpara>
+        <title>Special characters in Tcl</title>
+        <para>
+Try strings starting with a <computeroutput>-Bad</computeroutput> and strings containing <computeroutput>[BAD]</computeroutput>, <computeroutput>{</computeroutput>, <computeroutput>\077</computeroutput>, and <computeroutput>$Bad</computeroutput>.  For user input, <computeroutput>[BAD]</computeroutput> should never be evaluated, <computeroutput>\077</computeroutput> should not be turned into a <computeroutput>?</computeroutput> and <computeroutput>$Bad</computeroutput> should not be interpolated.  The string <computeroutput>-Bad [BAD] \077 { $Bad</computeroutput> should be valid user input, should pass through the system unaltered, and if it isn't that's a bug.
+</para>
+      </formalpara>
+    </listitem>
+    <listitem>
+      <formalpara>
+        <title>Quoting issues</title>
+        <para>Put some html in plain text fields and make sure the result is
+properly quoted anywhere it shows up (I use "&lt;b&gt;bold&lt;/b&gt;"
+usually).  Look out especially for quoting errors in the context bar
+and in round trips via an edit form. For fields that disallow html
+tags you can use <computeroutput>&amp;amp;</computeroutput> to check that the field is quoted
+properly.  If it is not displayed as <computeroutput>&amp;amp;</computeroutput> then the quoting for the field is incorrect. (It's not clear whether this
+should be considered an error but given that data for text fields can
+come from various sources if it's text it should be properly quoted
+and we should not rely on input validation to prevent XSS security
+holes.)</para>
+      </formalpara>
+    </listitem>
+    <listitem>
+      <formalpara>
+        <title>Whitespace input</title>
+        <para>Check that whitespace is not considered valid input for a field
+if it does not make sense.  For example, the subject of a forum post is
+used to construct a link and if it is " " it will have a link of
+<computeroutput>&lt;a href="..."&gt; &lt;/a&gt;</computeroutput> which would not be clickable if whitespace was allowed as a valid input.
+</para>
+      </formalpara>
+    </listitem>
+    <listitem>
+      <formalpara>
+        <title>Doubleclick</title>
+        <para>
+Make sure that if you submit a form, use the back button, and submit
+again that the behavior is reasonable (correct behavior depends on
+what the form is for, but a server error is not reasonable).
+</para>
+      </formalpara>
+    </listitem>
+    <listitem>
+      <formalpara>
+        <title>Duplicate names</title>
+        <para>
+Make sure that if a duplicate name is entered that there is a
+reasonable error rather than a server error.  Check for
+insert, move, copy, and rename.
+</para>
+      </formalpara>
+    </listitem>
+  </itemizedlist>
+
+
+<para><phrase role="cvstag">($Id: auto-testing.xml,v 1.2 2003/12/11 21:39:49 jeffd Exp $)</phrase></para>
+
+</sect1>
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/constraint-naming.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/constraint-naming.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/constraint-naming.xml	20 Aug 2003 16:20:18 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/constraint-naming.xml	11 Dec 2003 21:39:49 -0000	1.5
@@ -9,7 +9,7 @@
 
  
 <authorblurb>
-<para>By <ulink url="mailto:mbryzek@arsdigita.com">mbryzek@arsdigita.com</ulink></para>
+<para>By Michael Bryzek</para>
 </authorblurb>
 
 <sect2 id="eng-standards-constraint-naming-big-picture">
@@ -182,7 +182,10 @@
 <title>Naming not null constraints is optional...</title>
 
 <para>
-ArsDigita is split on whether or not we should be naming not null constraints... So, if you want to name them, please do so and follow the above naming standard. But, naming not null constraints is not a requirement at ArsDigita.
+People disagree on whether or not we should be naming not null
+constraints.  So, if you want to name them, please do so and follow
+the above naming standard. But, naming not null constraints is not a
+requirement.
 </para>
 
 <para>
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/design-template.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/design-template.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/design-template.xml	20 Aug 2003 16:20:18 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/design-template.xml	11 Dec 2003 21:39:49 -0000	1.7
@@ -7,7 +7,7 @@
 <sect1 id="filename" xreflabel="Name of Document">
   <title>Detailed Design Documentation Template</title>
 
-  <para>By <ulink url="mailto:youremail@arsdigita.com">You</ulink></para>
+  <para>By <ulink url="mailto:youremail@example.com">You</ulink></para>
   
   <sect2 id="yourpackage-design-start-note">
     <title>Start Note</title>
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/docbook-primer.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/docbook-primer.xml,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/docbook-primer.xml	20 Aug 2003 16:20:18 -0000	1.9
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/docbook-primer.xml	11 Dec 2003 21:39:49 -0000	1.10
@@ -8,14 +8,12 @@
   <title>OpenACS Documentation Guide</title>
 
   <para>
-    By <ulink
-    url="mailto:claus@arsdigita.com">claus@arsdigita.com</ulink>, with
-    additions by <ulink url="mailto:rmello@fslc.usu.edu">Roberto
+    By Claus Rasmussen, with additions by <ulink url="mailto:rmello@cc.usu.edu">Roberto
       Mello</ulink> and the OpenACS Community
   </para>
 
   <sect2 id="dbprimer-overview" xreflabel="OpenACS Documentation Overview">
-    <title>Overview of OpenACS &version; Documentation</title>
+    <title>Overview of OpenACS Documentation</title>
     <para>
       ArsDigita created a good documentation ground for us to build
       upon. Some sections of the documentation, however, lack details
@@ -33,23 +31,28 @@
       The documentation for <productname>OpenACS</productname> is
       written using DocBook XML. The reasons why we are using
       DocBook	are explained in more details in the
-      <xref linkend="dbprimer-why"/> section. I will add the reasons why
+      next section. A few more reasons why
       we are using Docbook XML instead of Docbook SGML:
     </para>
     <itemizedlist>
-      <listitem>
-	<emphasis>Consistency</emphasis>. We already have a bunch of
-	.xml files that ArsDigita wrote. Trying to re-write them to
+      <listitem><para>
+	<emphasis>Consistency</emphasis>. We started with a collection 
+	of DcoBook XML files that ArsDigita wrote. Trying to re-write them to
 	conform to the SGML DTD would be unnecessary work (I tried).
-      </listitem>
-      <listitem>
+	</para></listitem>
+      <listitem><para>
 	<emphasis>It does not require extra
 	  effort</emphasis>. Writing in XML is almost identical to
 	SGML, with a couple extra rules. More details in the
 	<ulink
                url="http://en.tldp.org/LDP/LDP-Author-Guide/docbookxml.html">LDP 
 	  Author Guide</ulink>.
-      </listitem>
+	</para></listitem>
+      <listitem><para>
+	<emphasis>The tool chain has matured</emphasis>. xsltproc and other XML 
+	based tools have improved to the point where they are about as good as 
+	the SGML tools and generation of both html and pdf output is straighforward.
+	</para></listitem>
     </itemizedlist>
   </sect2>
   
@@ -68,12 +71,12 @@
 
     <para>
       Theoretically any strict DTD would have been sufficient - we could even write our own. But DocBook has been around
-      for a while (since <ulink url="http://docbook.org/tdg/en/html/ch01.html#d0e2132">early 90's</ulink>), 
-      it's well-tested, it's complete, it's extremely well-suited for technical documents
+      for a while (since the <ulink url="http://docbook.org/tdg/en/html/ch01.html#d0e2132">early 90's</ulink>), 
+      it's well-tested, it's complete, it's designed for technical documentation
       and best of all, it's open-source. A growing community surrounds DocBook (has 
-      <ulink url="http://www.oasis-open.org/committees/docbook/mailinglist/index.html">mailing lists</ulink>) 
+      <ulink url="http://docbook.org/mailinglist/index.html">mailing lists</ulink>) 
       and a number of free and commercial
-      <ulink url="http://www.oasis-open.org/committees/docbook/tools/index.html">tools</ulink> are available
+      <ulink url="http://www.docbook.org/wiki/moin.cgi/DocBookTools">tools</ulink> are available
       for editing and publishing DocBook documents.
     </para>
 
@@ -120,33 +123,41 @@
 
     <itemizedlist>
       <listitem>
+	<para>
 	<ulink url="http://docbook.org/xml/index.html">Docbook XML
 	DTD</ulink> - The document type definition for XML. You can
 	find an RPM or DEB package or you can download a zip file from
 	the site linked from here.
+	</para>
       </listitem>
 
       <listitem>
+	<para>
 	<ulink url="http://sourceforge.net/projects/docbook/">XSL
 	Stylesheets</ulink> (docbook-xsl) - The stylesheets to convert
 	to HTML. We have been using a stylesheet based upon
 	NWalsh's chunk.xsl.
+	</para>
       </listitem>
       
       <listitem>
+	<para>
 	<computeroutput>xsltproc</computeroutput> - The processor that
 	will take an XML document and, given a xsl stylesheet, convert
 	it to HTML. It needs libxml2 and libxslt (available in RPM and
 	DEB formats or from <ulink
 	url="http://xmlsoft.org/">xmlsoft.org</ulink>.	
+	</para>
       </listitem>
 
       <listitem>
+	<para>
 	Some editing tool. A popular one is Emacs with the psgml
 	mode. We have a <link linkend="psgml-mode">intro to the PSGML
 	Mode in Emacs</link> as part of our documentation. You can
 	read about other editing tools in the <ulink
 	url="http://en.tldp.org/LDP/LDP-Author-Guide/">LDP Author Guide</ulink>.
+	</para>
       </listitem>
     </itemizedlist>
   </sect2>
@@ -171,7 +182,7 @@
       <emphasis>System/Application Requirements Template</emphasis>.
     </para>
   </sect2>
-	  
+
   <sect2 id="dbprimer-structure">
     <title>Document Structure</title>
 
@@ -217,7 +228,7 @@
     <para>
       <indexterm><primary>Sections</primary><secondary>Headlines</secondary></indexterm>
       Given that your job starts at the <computeroutput>sect1</computeroutput>-level, all your documents should open with a
-      <ulink url="http://docbook.org/tdg/html/sect1.html"><computeroutput>&lt;sect1&gt;</computeroutput></ulink>-tag and end 
+      <ulink url="http://docbook.org/tdg/en/html/sect1.html"><computeroutput>&lt;sect1&gt;</computeroutput></ulink>-tag and end 
       with the corresponding <computeroutput>&lt;/sect1&gt;</computeroutput>.
     </para>
 
@@ -244,18 +255,18 @@
     </para>
 
     <programlisting>
-      &lt;sect1 id="docbook-primer" xreflabel="aD DocBook Primer"&gt;
-      &lt;title&gt;aD DocBook Primer&lt;/title&gt;
+&lt;sect1 id="docbook-primer" xreflabel="aD DocBook Primer"&gt;
+  &lt;title&gt;aD DocBook Primer&lt;/title&gt;
 
-      ...
+...
 
-      &lt;/sect1&gt;
-    </programlisting>
+&lt;/sect1&gt;
+</programlisting>
 
     <para>
       <indexterm><primary>sect2</primary></indexterm>
       Inside this container your document will be split up into 
-      <ulink url="http://docbook.org/tdg/html/sect2.html"><computeroutput>&lt;sect2&gt;</computeroutput></ulink>'s,
+      <ulink url="http://docbook.org/tdg/en/html/sect2.html"><computeroutput>&lt;sect2&gt;</computeroutput></ulink>'s,
       each with the same requirements - <computeroutput>id</computeroutput> and <computeroutput>xreflabel</computeroutput>
       attributes, and a <computeroutput>&lt;title&gt;</computeroutput>-tag inside. Actually, the <computeroutput>xreflabel</computeroutput> is never required in sections, but it makes linking to that section a lot easier.
     </para>
@@ -276,13 +287,13 @@
       <indexterm><primary>computeroutput</primary><secondary>code</secondary></indexterm>
       For displaying a snippet of code, a filename or anything else you just want to appear as a part of
       a sentence, we will use the tag 
-      <ulink url="http://docbook.org/tdg/html/computeroutput.html"><computeroutput>&lt;computeroutput&gt;</computeroutput></ulink>.
+      <ulink url="http://docbook.org/tdg/en/html/computeroutput.html"><computeroutput>&lt;computeroutput&gt;</computeroutput></ulink>.
       This takes the place of the HTML-tag <computeroutput>&lt;code&gt;</computeroutput>
     </para>
 
     <para>
       For bigger chunks of code such as SQL-blocks, the tag 
-      <ulink url="http://docbook.org/tdg/html/programlisting.html"><computeroutput>&lt;programlisting&gt;</computeroutput></ulink> is used. Just wrap your code block in it; mono-spacing, indents and all that stuff is taken care of
+      <ulink url="http://docbook.org/tdg/en/html/programlisting.html"><computeroutput>&lt;programlisting&gt;</computeroutput></ulink> is used. Just wrap your code block in it; mono-spacing, indents and all that stuff is taken care of
       automatically. 
     </para>
 
@@ -309,21 +320,21 @@
 
 	  <para><indexterm><primary>xref</primary><secondary>linkend</secondary></indexterm>Check out how I link to a subsection of the Developer's Guide:</para>
 
-	  <programlisting>
 
-	    Put this in your XML:
+	  <para>Put this in your XML:</para>
 
-	    - Find information about creating a package in
-	    &lt;xref linkend="packages-making-a-package"&gt;&lt;/xref&gt;.
+<programlisting>
+- Find information about creating a package in
+&lt;xref linkend="packages-making-a-package"&gt;&lt;/xref&gt;.
+</programlisting>
 
+	  <para>And the output is:</para>
 
-	    And the output is:
+<programlisting>
+- Find information about creating a package in 
+<xref linkend="packages-making-a-package"></xref>.
+</programlisting>
 
-	    - Find information about creating a package in 
-	    <xref linkend="packages-making-a-package"></xref>
-
-	  </programlisting>
-
 	  <para>
 	    Note that even though this is an empty tag, you have to either:
 	  </para>
@@ -345,21 +356,21 @@
 	  <para>If the section you link to hasn't a specified <computeroutput>xreflabel</computeroutput>-attribute,
 	    the link is going to look like this:</para>
 
-	  <programlisting>
 
-	    Put this in your XML:
+	   <para>Put this in your XML:</para>
+<programlisting>
+-Find information about what a package looks like in 
+&lt;xref linkend="packages-looks"&gt;&lt;/xref&gt;.
+</programlisting>
 
-	    - Find information about what a package looks like in 
-	    &lt;xref linkend="packages-looks"&gt;&lt;/xref&gt;.
+	<para>And the output is:</para>
 
+<programlisting>
+- Find information about what a package looks like in 
+<xref linkend="packages-looks"></xref>.
+</programlisting>
 
-	    And the output is:
 
-	    - Find information about what a package looks like in 
-	    <xref linkend="packages-looks"></xref>
-
-	  </programlisting>
-
 	  <para>
 	    Note that since I haven't provided an <computeroutput>xreflabel</computeroutput> for the subsection, 
 	    <computeroutput>packages-looks</computeroutput>, the
@@ -377,7 +388,7 @@
 	    If you're hyper-linking out of the documentation, it works almost the same way as HTML - the tag is just
 	    a little different
 
-	    (<ulink url="http://docbook.org/tdg/html/ulink.html"><computeroutput>&lt;ulink&gt;</computeroutput></ulink>):
+	    (<ulink url="http://docbook.org/tdg/en/html/ulink.html"><computeroutput>&lt;ulink&gt;</computeroutput></ulink>):
 
 	  </para>
 
@@ -416,29 +427,29 @@
     <para>
       <indexterm><primary>Graphics</primary><secondary>Images</secondary></indexterm>
       To insert a graphic we use the elements 
-      <ulink url="http://docbook.org/tdg/html/mediaobject.html"><computeroutput>&lt;mediaobject&gt;</computeroutput></ulink>,
-      <ulink url="http://docbook.org/tdg/html/imageobject.html"><computeroutput>&lt;imageobject&gt;</computeroutput></ulink>,
+      <ulink url="http://docbook.org/tdg/en/html/mediaobject.html"><computeroutput>&lt;mediaobject&gt;</computeroutput></ulink>,
+      <ulink url="http://docbook.org/tdg/en/html/imageobject.html"><computeroutput>&lt;imageobject&gt;</computeroutput></ulink>,
       and
-      <ulink url="http://docbook.org/tdg/html/imagedata.html"><computeroutput>&lt;imagedata&gt;</computeroutput></ulink>. 
+      <ulink url="http://docbook.org/tdg/en/html/imagedata.html"><computeroutput>&lt;imagedata&gt;</computeroutput></ulink>. 
       The news is that you have to provide two versions of all your graphics - one for the Web (probably a GIF or a JPEG) 
       and one for print (EPS). Finally you should provide a brief description wrapped in
-      <ulink url="http://docbook.org/tdg/html/textobject.html"><computeroutput>&lt;textobject&gt;</computeroutput></ulink> - 
+      <ulink url="http://docbook.org/tdg/en/html/textobject.html"><computeroutput>&lt;textobject&gt;</computeroutput></ulink> - 
       in HTML this will be the ALT text.
     </para>
 
     <programlisting>
-      &lt;mediaobject&gt;
-      &lt;imageobject&gt;
-      &lt;imagedata fileref="../images/rp-flow.gif" format="GIF" align="center"/&gt;
-      &lt;/imageobject&gt;
-      &lt;imageobject&gt;
-      &lt;imagedata fileref="../images/rp-flow.eps" format="EPS" align="center"/&gt;
-      &lt;/imageobject&gt;
-      &lt;textobject&gt;
-      &lt;phrase&gt;This is an image of the flow in the Request Processor&lt;/phrase&gt;
-      &lt;/textobject&gt;
-      &lt;/mediaobject&gt;
-    </programlisting>
+&lt;mediaobject&gt;
+  &lt;imageobject&gt;
+    &lt;imagedata fileref="../images/rp-flow.gif" format="GIF" align="center"/&gt;
+  &lt;/imageobject&gt;
+  &lt;imageobject&gt;
+    &lt;imagedata fileref="../images/rp-flow.eps" format="EPS" align="center"/&gt;
+  &lt;/imageobject&gt;
+  &lt;textobject&gt;
+    &lt;phrase&gt;This is an image of the flow in the Request Processor&lt;/phrase&gt;
+  &lt;/textobject&gt;
+&lt;/mediaobject&gt;
+</programlisting>
 
     <para>
       Put your graphics in a separate directory ("images") and link to them 
@@ -462,20 +473,20 @@
 	<listitem><para>
 	    Making an unordered list is pretty much like doing the same thing in HTML - if you close your <computeroutput>&lt;li&gt;</computeroutput>, that is. The only differences are that each list item has to be wrapped in something more, such as
 	    <computeroutput>&lt;para&gt;</computeroutput>, and that the tags are called
-	    <ulink url="http://docbook.org/tdg/html/itemizedlist.html"><computeroutput>&lt;itemizedlist&gt;</computeroutput></ulink>
+	    <ulink url="http://docbook.org/tdg/en/html/itemizedlist.html"><computeroutput>&lt;itemizedlist&gt;</computeroutput></ulink>
 	    and
-	    <ulink url="http://docbook.org/tdg/html/listitem.html"><computeroutput>&lt;listitem&gt;</computeroutput></ulink>:
+	    <ulink url="http://docbook.org/tdg/en/html/listitem.html"><computeroutput>&lt;listitem&gt;</computeroutput></ulink>:
 	  </para>
 
-	  <programlisting>
-	    &lt;itemizedlist&gt;
-	    
-	    &lt;listitem&gt;&lt;para&gt;Stuff goes here&lt;/para&gt;&lt;/listitem&gt;
-	    &lt;listitem&gt;&lt;para&gt;More stuff goes here&lt;/para&gt;&lt;/listitem&gt;
+<programlisting>
+&lt;itemizedlist&gt;
 
-	    &lt;/itemizedlist&gt;
-	  </programlisting>
+  &lt;listitem&gt;&lt;para&gt;Stuff goes here&lt;/para&gt;&lt;/listitem&gt;
+  &lt;listitem&gt;&lt;para&gt;More stuff goes here&lt;/para&gt;&lt;/listitem&gt;
 
+&lt;/itemizedlist&gt;
+</programlisting>
+
 	</listitem>
       </varlistentry>
 
@@ -484,17 +495,17 @@
 	<term><emphasis role="strong">2. How to make an &lt;ol&gt;</emphasis></term>
 	<listitem><para>
 	    The ordered list is like the preceding, except that you use 
-	    <ulink url="http://docbook.org/tdg/html/orderedlist.html"><computeroutput>&lt;orderedlist&gt;</computeroutput></ulink> instead:</para>
+	    <ulink url="http://docbook.org/tdg/en/html/orderedlist.html"><computeroutput>&lt;orderedlist&gt;</computeroutput></ulink> instead:</para>
 
 	  <programlisting>
-	    &lt;orderedlist&gt;
-	    
-	    &lt;listitem&gt;&lt;para&gt;Stuff goes here&lt;/para&gt;&lt;/listitem&gt;
-	    &lt;listitem&gt;&lt;para&gt;More stuff goes here&lt;/para&gt;&lt;/listitem&gt;
+&lt;orderedlist&gt;
 
-	    &lt;/orderedlist&gt;
-	  </programlisting>
+  &lt;listitem&gt;&lt;para&gt;Stuff goes here&lt;/para&gt;&lt;/listitem&gt;
+  &lt;listitem&gt;&lt;para&gt;More stuff goes here&lt;/para&gt;&lt;/listitem&gt;
 
+&lt;/orderedlist&gt;
+</programlisting>
+
 	</listitem>
       </varlistentry>
 
@@ -504,27 +515,27 @@
 	<listitem><para>
 	    This kind of list is called a <computeroutput>variablelist</computeroutput> and these are the tags you'll need to 
 	    make it happen:
-	    <ulink url="http://docbook.org/tdg/html/variablelist.html"><computeroutput>&lt;variablelist&gt;</computeroutput></ulink>,
-	    <ulink url="http://docbook.org/tdg/html/varlistentry.html"><computeroutput>&lt;varlistentry&gt;</computeroutput></ulink>, 
-	    <ulink url="http://docbook.org/tdg/html/term.html"><computeroutput>&lt;term&gt;</computeroutput></ulink> and
-	    <ulink url="http://docbook.org/tdg/html/listitem.html"><computeroutput>&lt;listitem&gt;</computeroutput></ulink>:</para>
+	    <ulink url="http://docbook.org/tdg/en/html/variablelist.html"><computeroutput>&lt;variablelist&gt;</computeroutput></ulink>,
+	    <ulink url="http://docbook.org/tdg/en/html/varlistentry.html"><computeroutput>&lt;varlistentry&gt;</computeroutput></ulink>, 
+	    <ulink url="http://docbook.org/tdg/en/html/term.html"><computeroutput>&lt;term&gt;</computeroutput></ulink> and
+	    <ulink url="http://docbook.org/tdg/en/html/listitem.html"><computeroutput>&lt;listitem&gt;</computeroutput></ulink>:</para>
 
 	  <programlisting>
-	    &lt;variablelist&gt;
-	    
-	    &lt;varlistentry&gt;
-	    &lt;term&gt;Heading (&lt;dt&gt;) goes here&lt;/term&gt;
-	    &lt;listitem&gt;&lt;para&gt;And stuff (&lt;dd&gt;)goes here&lt;/para&gt;&lt;/listitem&gt;
-	    &lt;/varlistentry&gt;
+&lt;variablelist&gt;
 
-	    &lt;varlistentry&gt;
-	    &lt;term&gt;Another heading goes here&lt;/term&gt;
-	    &lt;listitem&gt;&lt;para&gt;And more stuff goes here&lt;/para&gt;&lt;/listitem&gt;
-	    &lt;/varlistentry&gt;
+  &lt;varlistentry&gt;
+    &lt;term&gt;Heading (&lt;dt&gt;) goes here&lt;/term&gt;
+    &lt;listitem&gt;&lt;para&gt;And stuff (&lt;dd&gt;)goes here&lt;/para&gt;&lt;/listitem&gt;
+  &lt;/varlistentry&gt;
 
-	    &lt;/variablelist&gt;
-	  </programlisting>
+  &lt;varlistentry&gt;
+    &lt;term&gt;Another heading goes here&lt;/term&gt;
+    &lt;listitem&gt;&lt;para&gt;And more stuff goes here&lt;/para&gt;&lt;/listitem&gt;
+  &lt;/varlistentry&gt;
 
+&lt;/variablelist&gt;
+</programlisting>
+
 	</listitem>
       </varlistentry>
 
@@ -539,43 +550,42 @@
     <para>
       <indexterm><primary>informaltable</primary><secondary>table</secondary></indexterm>
       DocBook supports several types of tables, but in most cases, the
-      <ulink url="http://docbook.org/tdg/html/informaltable.html"><computeroutput>&lt;informaltable&gt;</computeroutput></ulink>
+      <ulink url="http://docbook.org/tdg/en/html/informaltable.html"><computeroutput>&lt;informaltable&gt;</computeroutput></ulink>
       is enough:
     </para>
 
     <programlisting>
-      &lt;informaltable frame="all"&gt;
-      &lt;tgroup cols="3"&gt;
-      &lt;tbody&gt;
+&lt;informaltable frame="all"&gt;
+  &lt;tgroup cols="3"&gt;
+    &lt;tbody&gt;
 
       &lt;row&gt;
-      &lt;entry&gt;a1&lt;/entry&gt;
-      &lt;entry&gt;b1&lt;/entry&gt;
-      &lt;entry&gt;c1&lt;/entry&gt;
+        &lt;entry&gt;a1&lt;/entry&gt;
+        &lt;entry&gt;b1&lt;/entry&gt;
+        &lt;entry&gt;c1&lt;/entry&gt;
       &lt;/row&gt;
 
       &lt;row&gt;
-      &lt;entry&gt;a2&lt;/entry&gt;
-      &lt;entry&gt;b2&lt;/entry&gt;
-      &lt;entry&gt;c2&lt;/entry&gt;
+        &lt;entry&gt;a2&lt;/entry&gt;
+        &lt;entry&gt;b2&lt;/entry&gt;
+        &lt;entry&gt;c2&lt;/entry&gt;
       &lt;/row&gt;
 
       &lt;row&gt;
-      &lt;entry&gt;a3&lt;/entry&gt;
-      &lt;entry&gt;b3&lt;/entry&gt;
-      &lt;entry&gt;c3&lt;/entry&gt;
+        &lt;entry&gt;a3&lt;/entry&gt;
+        &lt;entry&gt;b3&lt;/entry&gt;
+        &lt;entry&gt;c3&lt;/entry&gt;
       &lt;/row&gt;
 
-      &lt;/tbody&gt;
-      &lt;/tgroup&gt;
-      &lt;/informaltable&gt;
-    </programlisting>
+    &lt;/tbody&gt;
+  &lt;/tgroup&gt;
+&lt;/informaltable&gt;
+</programlisting>
 
     <para>
       With our current XSL-style-sheet, the output of the markup above will be a simple HTML-table:
     </para>
 
-    <blockquote>
       <informaltable frame="all">
 	<tgroup cols="3">
 	  <tbody>
@@ -601,12 +611,11 @@
 	  </tbody>
 	</tgroup>
       </informaltable>
-    </blockquote>
 
 
     <para>
       If you want cells to span more than one row or column, it gets a bit more complicated - check out
-      <ulink url="http://docbook.org/tdg/html/table.html"><computeroutput>&lt;table&gt;</computeroutput></ulink>
+      <ulink url="http://docbook.org/tdg/en/html/table.html"><computeroutput>&lt;table&gt;</computeroutput></ulink>
       for an example.
     </para>
   </sect2>
@@ -619,7 +628,7 @@
     <para>
       <indexterm><primary>emphasis</primary><secondary>bold, italics</secondary></indexterm>
       Our documentation uses two flavors of emphasis - italics and bold type. DocBook uses one - 
-      <ulink url="http://docbook.org/tdg/html/emphasis.html"><computeroutput>&lt;emphasis&gt;</computeroutput></ulink>.
+      <ulink url="http://docbook.org/tdg/en/html/emphasis.html"><computeroutput>&lt;emphasis&gt;</computeroutput></ulink>.
     </para>
 
     <para>
@@ -641,9 +650,9 @@
 
     <para>
       Use
-      <ulink url="http://docbook.org/tdg/html/indexterm.html"><computeroutput>&lt;indexterm&gt;</computeroutput></ulink>,
-      <ulink url="http://docbook.org/tdg/html/primary.html"><computeroutput>&lt;primary&gt;</computeroutput></ulink> and
-      <ulink url="http://docbook.org/tdg/html/secondary.html"><computeroutput>&lt;secondary&gt;</computeroutput></ulink>
+      <ulink url="http://docbook.org/tdg/en/html/indexterm.html"><computeroutput>&lt;indexterm&gt;</computeroutput></ulink>,
+      <ulink url="http://docbook.org/tdg/en/html/primary.html"><computeroutput>&lt;primary&gt;</computeroutput></ulink> and
+      <ulink url="http://docbook.org/tdg/en/html/secondary.html"><computeroutput>&lt;secondary&gt;</computeroutput></ulink>
       for this. See these links for an explanation.
     </para>
   </sect2>
@@ -652,14 +661,13 @@
     <title>Converting to HTML</title>
 
     <note>
-      This section is quoted almost verbatim from the LDP Author Guide.      
+      <para>This section is quoted almost verbatim from the LDP Author Guide.</para>
     </note>
     
     <para>
       Once you have the <xref linkend="dbprimer-validation"></xref>
-      installed, you can convert your xml documents to HTML (or other
-      formats. Let me know if you are able to convert to other
-      formats).
+      installed, you can convert your xml documents to HTML or other
+      formats.
     </para>
     
     <para>
@@ -669,22 +677,27 @@
       multiple files, you call a different stylesheet. 
     </para>
     
+
+	
     <para>
       To generate a single HTML file from your DocBook XML file,
       use the command:
     </para>
     
     <programlisting>
 bash$  xsltproc -o outputfilename.xml /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/html.xsl filename.xml
-    </programlisting>
+</programlisting>
 
+    
     <note>
+      <para>
       This example uses Daniel Veillard's <emphasis
       role="strong">xsltproc</emphasis> command available
       as part of libxslt from <ulink
       url="http://www.xmlsoft.org/XSLT/">http://www.xmlsoft.org/XSLT/</ulink>.
       If you are using other XML processors such as Xalan or Saxon,
       you will need to change the command line appropriately.
+      </para>
     </note>
 
     <para>
@@ -695,25 +708,31 @@
 
     <programlisting>
 bash$  xsltproc /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl filename.xml
-    </programlisting>
+</programlisting>
 
+    <para> 
+	You could also look at the <ulink url="http://cvs.openacs.org/cvs/openacs-4/packages/acs-core-docs/www/xml/Makefile?view=markup">acs-core-docs Makefile</ulink> 
+	for examples of how these documents are generated.`
+    </para>
+
   </sect2>
   
   <sect2 id="db-primer-further-reading" xreflabel="Docbook Further Reading">
     <title>Further Reading</title>
     <itemizedlist>
 
       <listitem>
+	<para>
 	The <ulink
 	url="http://en.tldp.org/LDP/LDP-Author-Guide/">LDP Author
 	Guide</ulink> has a lot of good information, a table of
 	docbook elements and their "look" in HTML and lots of good links
 	for tools.
+	</para>
       </listitem>
       
       <listitem><para>
-	  <ulink url="mailto:lutter@arsdigita.com">David
-	  Lutterkort</ulink>
+	  David Lutterkort
 	  wrote an <link linkend="psgml-mode">intro to the PSGML Mode in Emacs</link>
 	</para></listitem>
 
@@ -743,7 +762,7 @@
 	  In the process of transforming your HTML into XML, 
 	  <ulink url="http://tidy.sourceforge.net/">HTML tidy</ulink>
 	  can be a a handy tool to make your HTML "regexp'able".
-	  <ulink url="mailto:bcalef@arsdigita.com">Brandoch Calef</ulink> has made a 
+	  Brandoch Calef has made a 
 	  <ulink url="http://developer.arsdigita.com/working-papers/bcalef/html-to-docbook.html#html2docbook">Perl script</ulink>
 	  that gets you most of the way.
 
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/eng-standards-versioning.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/eng-standards-versioning.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/eng-standards-versioning.xml	20 Aug 2003 16:20:18 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/eng-standards-versioning.xml	11 Dec 2003 21:39:49 -0000	1.5
@@ -8,7 +8,7 @@
 <title>Release Version Numbering</title>
  
 <authorblurb>
-<para>By <ulink url="mailto:ron@arsdigita.com">Ron Henderson</ulink></para>
+<para>By Ron Henderson</para>
 </authorblurb>
 
 <para> 
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/filenaming.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/filenaming.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/filenaming.xml	20 Aug 2003 16:20:18 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/filenaming.xml	11 Dec 2003 21:39:49 -0000	1.5
@@ -9,8 +9,7 @@
 
  
 <authorblurb>
-<para>By <ulink url="mailto:michael@arsdigita.com">michael@arsdigita.com</ulink> and 
-<ulink url="mailto:aure@arsdigita.com">aure@arsdigita.com</ulink></para>
+<para>By Michael Yoon and Aurelius Prochazka</para>
 </authorblurb>
 
 <para>
@@ -268,7 +267,7 @@
     @param password_from_from The password the user entered.
     @param return_url What url to return to after successful login.
     @param persistent_cookie_p Specifies whether a cookie should be set to keep the user logged in forever.
-    @author John Doe (jdoe@arsdigita.com)
+    @author John Doe (jdoe@example.com)
     @cvs-id file-standards.html,v 1.2 2000/09/19 07:22:45 ron Exp
 } {
     user_id:integer,notnull
@@ -335,7 +334,7 @@
 ad_library {
     Provides helper routines for the Wimpy Point module.
 
-    @author John Doe (jdoe@arsdigita.com)
+    @author John Doe (jdoe@example.com)
     @cvs-id file-standards.html,v 1.2 2000/09/19 07:22:45 ron Exp
 }
 </programlisting>
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/nxml-mode.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/nxml-mode.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/nxml-mode.xml	11 Dec 2003 21:39:49 -0000	1.2
@@ -0,0 +1,28 @@
+<?xml version='1.0' ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY % myvars SYSTEM "../variables.ent">
+%myvars;
+]>
+<sect1 id="nxml-mode" xreflabel="Using nXML mode in Emacs">
+  <title>Using nXML mode in Emacs</title>
+
+  <authorblurb>
+    <para>By Jeff Davis</para>
+  </authorblurb>
+
+  <para>
+    An alternative to psgml mode is nXML by James Clark, a new major mode for GNU Emacs
+    for editing XML, and which features highlighting, indentation, and on the fly validation versus a RelaxNG Schema.
+  </para>
+  <itemizedlist>
+    <listitem><para>An
+        <ulink url="http://www.xmlhack.com/read.php?item=2061">introduction to nXML mode</ulink> at xmlhack.com.
+      </para>
+    </listitem>
+    <listitem><para>The <ulink url="http://groups.yahoo.com/group/emacs-nxml-mode/">nXML mode mail list</ulink> at groups.yahoo.com.
+      </para></listitem>
+    <listitem><para>The <ulink url="http://www.thaiopensource.com/download/">nXML download page</ulink> at <ulink url="http://www.thaiopensource.com/">thaiopensource.com</ulink>.</para></listitem>
+  </itemizedlist>
+
+</sect1>
\ No newline at end of file
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/plsql.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/plsql.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/plsql.xml	20 Aug 2003 16:20:18 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/plsql.xml	11 Dec 2003 21:39:49 -0000	1.5
@@ -10,8 +10,7 @@
  
 <authorblurb>
 <para>
-By <ulink url="mailto:richardl@arsdigita.com">richardl@arsdigita.com</ulink>
-and <ulink url="mailto:yon@arsdigita.com">yon@arsdigita.com</ulink>
+By Richard Li and Yon Feldman
 </para>
 </authorblurb>
 
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/psgml-mode.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/psgml-mode.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/psgml-mode.xml	20 Aug 2003 16:20:18 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/psgml-mode.xml	11 Dec 2003 21:39:49 -0000	1.6
@@ -8,7 +8,7 @@
 <title>Using PSGML mode in Emacs</title>
 
 <authorblurb>
-By <ulink url="mailto:lutter@arsdigita.com">David Lutterkort</ulink>
+<para>By David Lutterkort</para>
 </authorblurb>
 
 <sect2 id="psgml-mode-whatisit">
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/requirements-template.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/requirements-template.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/requirements-template.xml	20 Aug 2003 16:20:18 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/requirements-template.xml	11 Dec 2003 21:39:49 -0000	1.5
@@ -9,7 +9,7 @@
 
   
   <authorblurb>
-    <para>By <ulink url="mailto:youremail@arsdigita.com">You</ulink></para>
+    <para>By <ulink url="mailto:youremail@example.com">You</ulink></para>
   </authorblurb>
 
 
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/style-guide.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/style-guide.xml,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/style-guide.xml	11 Dec 2003 21:39:49 -0000	1.2
@@ -0,0 +1,225 @@
+<?xml version='1.0' ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY % myvars SYSTEM "../variables.ent">
+%myvars;
+]>
+<sect1 id="style-guide" xreflabel="OpenACS Style Guide">
+  <title>OpenACS Style Guide</title>
+
+  <para>
+    By Jeff Davis
+  </para>
+
+  <sect2 id="style-guide-motivation" xreflabel="Style Guide Motivation">
+    <title>Motivation</title>
+    <para>
+      Why have coding standards for OpenACS?  And if the code works why change it to
+      adhere to some arbitrary rules?
+    </para>
+    <para>
+      Well, first lets consider the OpenACS code base (all this as of
+      December 2003 and including dotLRN).  There are about 390,000
+      lines of tcl code, about 460,000 lines of sql (in datamodel
+      scripts and .xql files), about 80,000 lines of markup in .adp
+      files, and about 100,000 lines of documentation.  All told, just
+      about a million lines of "stuff".  In terms of logical units
+      there are about 160 packages, 800 tables, 2,000 stored
+      procedures, about 2,000 functional pages, and about 3,200 tcl
+      procedures.
+    </para>
+    <para>
+      When confronted by this much complexity it's important to be
+      able to make sense of it without having to wade through it all.
+      Things should be coherent, things should be named predictably
+      and behave like you would expect, and your guess about what
+      something is called or where it is should be right more often
+      than not because the code follows the rules.
+    </para>
+    <para>
+      Unfortunately, like any large software project written 
+      over a long period by a lot of different people, OpenACS 
+      sometimes lacks this basic guessability and in the interest 
+      of bringing it into line we have advanced these guidelines.
+    </para>
+  </sect2>
+
+  <sect2 id="style-commandments" xreflabel="Style Commandments">
+    <title>Commandments</title>
+    
+    <para>
+      Here is a short list of the basic rules code contributed to 
+      OpenACS should follow...
+    </para>
+    <orderedlist>
+
+      <listitem>
+        <formalpara>
+          <title>Follow the file naming and the package structure rules</title>
+          <para>
+            Some of the file naming rules are requirements for things
+            to function correctly (for example data model creation
+            scripts and tcl library files must be named properly to be
+            used), while some are suggestions (the
+            <emphasis>object-verb</emphasis> naming convention) which
+            if ignored won't break anything, but if you follow the
+            rules people will be able to understand your package much
+            more easily.
+          </para>
+        </formalpara>
+      </listitem>
+
+      <listitem>
+        <formalpara>
+          <title>Be literate in your programming</title>
+          <para>
+            Use ad_proc, ad_library, and ad_page_contract to provide
+            documentation for your code, use comments on your
+            datamodel, explain what things mean and how they should
+            work.
+          </para>
+        </formalpara>
+      </listitem>
+
+
+      <listitem>
+        <formalpara>
+          <title>Test</title>
+          <para>
+            Write test cases for your API and data model; test
+            negative cases as well as positive; document your tests.
+            Provide tests for bugs which are not yet fixed. Test,
+            Test, Test.
+          </para>
+        </formalpara>
+      </listitem>
+
+
+      <listitem>
+        <formalpara>
+          <title>Use namespaces</title>
+          <para>
+            For new packages choose a namespace and place all procedures in it
+            and in oracle create packages.
+          </para>
+        </formalpara>
+      </listitem>
+
+      <listitem>
+        <formalpara>
+          <title>Follow the constraint naming and the PL/SQL and PL/pgSQL rules</title>
+          <para>
+            Naming constraints is important for upgradability and for consistency.  Also, 
+            named constraints can be immensely helpful in developing good error handling.
+            Following the PL/SQL and PL/pgSQL rules ensure that the procedures created 
+            can be handled similarly across both Oracle and PostgreSQL databases.
+          </para>
+        </formalpara>
+      </listitem>
+
+
+      <listitem>
+        <formalpara>
+          <title>Follow the code formatting guidelines</title>
+          <para>
+            The code base is very large and if things are formatted
+            consistently it is easier to read.  Also, if it conforms
+            to the standard it won't be reformatted (which can mask
+            the change history and making tracking down bugs much
+            harder).  Using spaces rather than tabs makes patches
+            easier to read and manage and does not force other
+            programmers to decipher what tab settings you had in place
+            in your editor.
+          </para>
+        </formalpara>
+      </listitem>
+
+
+      <listitem>
+        <formalpara>
+          <title>Use the standard APIs</title>
+          <para>
+            Don't reinvent the wheel.  Prefer extending an existing
+            core API to creating your own.  If something in the core
+            does not meet your particular needs it probably won't meet
+            others as well and fleshing out the core API's makes the
+            toolkit more useful for everyone and more easily extended.
+          </para>
+        </formalpara>
+      </listitem>
+
+      <listitem>
+        <formalpara>
+          <title>Make sure your datamodel create/drop scripts work</title>
+          <para>
+            Break the table creation out from the package/stored
+            procedure creation and use <computeroutput>create or
+            replace</computeroutput> where possible so that scripts
+            can be sourced more than once.  Make sure your drop script
+            works if data has been inserted (and permissioned and
+            notifications have been attached etc).
+          </para>
+        </formalpara>
+      </listitem>
+
+
+      <listitem>
+        <formalpara>
+          <title>Practice CVS/Bug Tracker Hygiene</title>
+          <para>
+            Commit your work. commit with sensible messages and include
+            patch and bug numbers in your commit messages.
+          </para>
+        </formalpara>
+        <para>
+          Create bug tracker tickets for things you are going to work
+          on yourself (just in case you don't get to it and to act as
+          a pointer for others who might encounter the same problem).
+        </para>
+      </listitem>
+
+
+
+      <listitem>
+        <formalpara>
+          <title>Solicit code reviews</title>
+          <para>
+            Ask others to look over your code and provide feedback and do 
+            the same for others.  
+          </para>
+        </formalpara>
+      </listitem>
+
+    </orderedlist>
+  </sect2>
+
+  
+  <sect2 id="style-guide-rev-history">
+    <title>Revision History</title>
+
+    <informaltable>
+      <tgroup cols="4">
+	<thead>
+	  <row>
+	    <entry>Document Revision #</entry>
+	    <entry>Action Taken, Notes</entry>
+	    <entry>When?</entry>
+	    <entry>By Whom?</entry>
+	  </row>
+	</thead>
+	<tbody>
+
+	  <row>
+	    <entry>0.1</entry>
+	    <entry>Creation</entry>
+	    <entry>12/2003</entry>
+	    <entry>Jeff Davis</entry>
+	  </row>
+
+	</tbody>
+      </tgroup>
+    </informaltable>
+    <para><phrase role="cvstag">($Id: style-guide.xml,v 1.2 2003/12/11 21:39:49 jeffd Exp $)</phrase></para>
+  </sect2>
+
+</sect1>
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/variables.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/variables.xml,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/variables.xml	11 Nov 2003 14:24:37 -0000	1.1
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/variables.xml	11 Dec 2003 21:39:49 -0000	1.2
@@ -19,8 +19,7 @@
     ANSI format and then using <ulink url="/api-doc/proc-view?proc=lc%5ftime%5ffmt">lc_time_fmt</ulink> to format it for display.</para>
     <example>
       <title>Getting datetime from the database ANSI-style</title>
-      <programlisting>
-    db_multirow -extend { mydate_pretty } {
+      <programlisting>db_multirow -extend { mydate_pretty } {
     select to_char(mydate, 'YYYY-MM-DD HH24:MI:SS') as mydate_ansi,
           ...
     ...
Index: openacs-4/packages/acs-core-docs/www/xml/files/acceptance-sql.txt
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/files/acceptance-sql.txt,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-core-docs/www/xml/files/acceptance-sql.txt	10 Aug 2002 21:38:38 -0000	1.1
+++ openacs-4/packages/acs-core-docs/www/xml/files/acceptance-sql.txt	11 Dec 2003 21:39:49 -0000	1.2
@@ -1,4 +1,4 @@
--- acceptance-sql.txt by philg@mit.edu and jsc@arsdigita.com
+-- acceptance-sql.txt by philg@mit.edu and Jin S Choi
 --                      (Philip Greenspun and Jin Choi)
 
 -- SQL commands to test an Oracle installation
Index: openacs-4/packages/acs-core-docs/www/xml/for-everyone/acs-faq.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/for-everyone/acs-faq.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/for-everyone/acs-faq.xml	20 Aug 2003 16:20:18 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/for-everyone/acs-faq.xml	11 Dec 2003 21:39:49 -0000	1.6
@@ -39,19 +39,15 @@
 
 </itemizedlist>
 
-<para>
-See also: <ulink url="http://www.arsdigita.com/asj/collaboration">Adding collaboration to a
-Web Site</ulink> without buying or maintaining an RDBMS and <ulink url="http://www.greenspun.com">Free Services For Web
-Publishers</ulink> </para>
 </sect2>
 
 <sect2 id="acs-faq-infrastructure">
 <title>I would like to use the Open Architecture Community System. How do I set up the
 basic infrastructure?</title>
 
 <para>To use the Open Architecture Community System, you need a computer with Unix or
-Linux, Oracle or PostgreSQL (currently), AOLServer and the Oracle or
-PostgreSQL driver for AOLServer installed. </para>
+Linux, Oracle or PostgreSQL (currently), AOLserver and the Oracle or
+PostgreSQL driver for AOLserver installed. </para>
 
 <para>We have written an <link linkend="unix-install">installation guide</link> to
 aid you in the process. It takes you through the detailed steps necessary to
@@ -66,40 +62,40 @@
 </sect2>
 
 <sect2 id="acs-faq-architecture-install">
-<title>I have a machine with Unix/Linux, Oracle or PostgreSQL and AOLServer installed. How do
-I install the Open Architecture Community System and the ArsDigita Server
-Architecture?</title>
+<title>I have a machine with Unix/Linux, Oracle or PostgreSQL and AOLserver installed. How do
+I install the Open Architecture Community System?</title>
 
 <para>We strongly recommend that you thoroughly examine the <link linkend="unix-install">step-by-step OpenACS
 installation</link> guide, even if you already have a working Unix and Oracle
 installtion.</para>
 
 <para>The guide contains up-to-date information on the default settings that
-ArsDigita uses to generate properly running sites. Deviations from these
+OpenACS developers use to generate properly running sites.  Deviations from these
 defaults are recommended only if you are an expert system administrator.</para>
 
 <para>Once you have a working OpenACS installation, there are several utilities
 written by ArsDigita and the OpenACS community that can be installed
 to ensure that the server keeps running reliably.</para>
 
-<para>The <ulink url="http://www.arsdigita.com/asj/arsdigita-server-architecture">overview of
+<para>The <ulink url="http://philip.greenspun.com/wtr/arsdigita-server-architecture.html">overview of
 the ArsDigita Server Architecture</ulink> is a good starting point for the
 development of a reliable service. The following documents will also help you
 keep your system running properly:</para>
 
 <itemizedlist>
-<listitem><para><ulink url="http://www.arsdigita.com/free-tools/keepalive.html">Keepalive
-Installation</ulink></para></listitem>
 
-<listitem><para><ulink url="http://www.arsdigita.com/free-tools/uptime">Uptime
+<listitem><para><ulink url="http://uptime.openacs.org/uptime/about.adp">Uptime
 Installation</ulink>
+</para></listitem>
  <!--
+<listitem><para><ulink url="http://www.arsdigita.com/free-tools/keepalive.html">Keepalive
+Installation</ulink></para></listitem>
+
   <li><a target=faq_example href=http://arsdigita.com/free-tools/watchdog>WatchDog 
     Installation</a> 
--->
-</para></listitem>
 
-<listitem><para><ulink url="http://arsdigita.com/free-tools/reporte">Reporte Installation</ulink> <!--
+<listitem><para><ulink url="http://arsdigita.com/free-tools/reporte">Reporte Installation</ulink>
+
   <li><ulink url="http://www.arsdigita.com/free-tools/cassandrix">Cassandrix</ulink> 
 -->
 </para></listitem>
@@ -170,18 +166,18 @@
 <listitem><para><ulink url="http://philip.greenspun.com/panda/">Philip and Alex&#39;s Guide to
 Web Publishing</ulink></para></listitem>
 
-<listitem><para><ulink url="http://philip.greenspun.com/books/sql/">SQL for Web Nerds</ulink>
+<listitem><para><ulink url="http://philip.greenspun.com/sql/">SQL for Web Nerds</ulink>
 (tutorial for the SQL language; links into online Oracle docs for
 completeness)</para></listitem>
 
-<listitem><para><ulink url="http://philip.greenspun.com/books/tcl/">Tcl
+<listitem><para><ulink url="http://philip.greenspun.com/tcl/">Tcl
 for Web Nerds</ulink> (tutorial for the Tcl language; in rough shape right now
 and you might consider using the Welch book (below))</para></listitem>
 
-<listitem><para><ulink url="http://www.arsdigita.com/doc/common-errors">Common errors</ulink> made by
+<listitem><para><ulink url="http://philip.greenspun.com/doc/common-errors">Common errors</ulink> made by
 database backed web developers</para></listitem>
 
-<listitem><para><ulink url="http://www.arsdigita.com/asj/oracle-tips">Tips for using Oracle</ulink> 
+<listitem><para><ulink url="http://eveander.com/arsdigita/asj/oracle-tips">Tips for using Oracle</ulink> 
 
 
 </para></listitem>
@@ -205,20 +201,16 @@
 
 <listitem><para><ulink url="http://philip.greenspun.com/teaching/psets/ps5/ps5">Problem Set
 5</ulink> (how to build collaborative authoring environment, Oracle full text
-indexing system) <ulink url="http://www.photo.net/bboard/q-and-a.tcl?topic_id=24&amp;topic=6916">Question
-and answer forum</ulink> 
+indexing system)
 
 
 </para></listitem>
 </itemizedlist>
 
 <itemizedlist>
-<listitem><para><ulink url="http://www.aolserver.com/">AOLServer
+<listitem><para><ulink url="http://www.aolserver.com/">AOLserver
 Documentation</ulink></para></listitem>
 
-<listitem><para><ulink url="http://hojohn.photo.net/ora8doc">Oracle
-Documentation</ulink></para></listitem>
-
 <listitem><para><ulink
 	    url="http://aolserver.com/docs/devel/tcl/">AOLserver Tcl
 	    Reference Manual</ulink></para></listitem>
@@ -234,12 +226,12 @@
 <listitem><para><ulink url="http://www.amazon.com/exec/obidos/ISBN=007882396X/">Oracle 8:
 The Complete Reference</ulink> (more concise than the online Oracle docs)</para></listitem>
 
-<listitem><para><ulink url="http://www.amazon.com/exec/obidos/ISBN=0136168302/">Practical
+<listitem><para><ulink url="hhttp://www.amazon.com/exec/obidos/ISBN=0130385603">Practical
 Programming in Tcl and Tk</ulink> (Brent Welch 1997; Prentice-Hall;)</para></listitem>
 
 <listitem><para><ulink url="http://www.amazon.com/exec/obidos/ISBN=0961392126/">Visual
-Explanations : Images and Quantities, Evidence and Narrative</ulink> (Edward
-Tufte 1997; Graphics Press; order directly by calling (800) 822-2454) -
+Explanations : Images and Quantities, Evidence and Narrative</ulink> (<ulink url="http://www.edwardtufte.com/tufte/">Edward
+Tufte</ulink> 1997; Graphics Press; order directly by calling (800) 822-2454) -
 general design principles</para></listitem>
 </itemizedlist>
 
@@ -251,17 +243,9 @@
 <title>I am stuck. Where can a ask a question?</title>
 
 <itemizedlist>
-<listitem><para><ulink url="http://photo.net/bboard/q-and-a?topic=Problem%20Set%201">Problem set 1
-questions</ulink></para></listitem>
+<listitem><para><ulink url="http://openacs.org/forums/">OpenACS Forums</ulink></para></listitem>
+<listitem><para><ulink url="http://openacs.org/irc/">#openacs IRC</ulink></para></listitem>
 
-<listitem><para><ulink url="http://photo.net/bboard/q-and-a?topic=Problem%20Set%202">Problem set 2
-questions</ulink></para></listitem>
-
-<listitem><para><ulink url="http://photo.net/bboard/q-and-a?topic=Problem%20Set%203">Problem set 3
-questions</ulink></para></listitem>
-
-<listitem><para><ulink url="http://photo.net/bboard/q-and-a?topic=web/db">Database backed web
-site</ulink> discussion forum</para></listitem>
 </itemizedlist>
 
 
@@ -305,37 +289,12 @@
 development to suggest extensions, test new releases, write documentation and
 answer questions.</para></listitem>
 
-<listitem><para>Module creators: <ulink url="http://www.alexium.com">individuals</ulink> and <ulink url="http://www.ybos.net">firms</ulink> have created and publicized new
-modules.</para></listitem>
-
 <listitem><para>Teachers: Use our <link linkend="acs-faq-teaching">teaching materials</link>
 to teach your company, friends, or at a University.</para></listitem>
 </itemizedlist>
 
 </sect2>
 
-<sect2 id="acs-faq-company">
-<title>Where can I learn about ArsDigita, the company?</title>
-
-<para>
-See <ulink url="http://www.arsdigita.com">arsdigita.com</ulink>
-</para>
-
-
-
-</sect2>
-
-<sect2 id="acs-faq-jobs">
-<title>How can I work at ArsDigita?</title>
-
-<para>See <ulink url="http://www.arsdigita.com/pages/jobs/">Job Openings</ulink>.</para>
-
-
-
 <para><phrase role="cvstag">($Id$)</phrase></para>
 
-</sect2>
-
-
-
 </sect1>
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 -N -r1.11 -r1.12
--- openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml	11 Nov 2003 13:09:13 -0000	1.11
+++ openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml	11 Dec 2003 21:39:49 -0000	1.12
@@ -49,11 +49,11 @@
 END OF TEMPLATE -->
 
   <sect2 id="release-notes-5-0-0b1">
-    <title>Version 5.0.0 beta1</title>
+    <title>Version 5.0.0 beta</title>
 
     <para>
-	This is the first beta release of OpenACS 5.0.0.  This
-	release has a number of serious bugs, and is not suitable for
+	This is the second beta release of OpenACS 5.0.0 (tagged as oacs-5-0-0b4).  This
+	release may still have a number of serious bugs, and is not suitable for
 	production systems.  It has passed several release criteria,
 	including that it installs successfully, that all automated
 	tests succeed, and that there are no known severity 1
@@ -184,9 +184,35 @@
 
   </itemizedlist>
 
-      </sect2>
+
+  <para>
+        Potential incompatibilities:
+  </para>
+
+  <itemizedlist>
+      <listitem>
+        <para>
+	   The undocumented special handling of ~ and +variable+ in formtemplates has been removed in favor of 
+	   using &lt;noparse&gt; and \@variable\@ (the standard templating mechanisms).  Locally 
+	   provided formtemplate styles still using these mechanisms will break.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+	   Serving backup files and files from the CVS directories is turned off by default via the acs-kernel parameter
+     	   ExcludedFiles in section request-processor (The variable provides a string match glob list of files and is defaulted to "*/CVS/* *~")
+	</para>
+      </listitem>
+
+  </itemizedlist>
+
+
+
   <para><phrase role="cvstag">($Id$)</phrase></para>
+  </sect2>
 
+
   <sect2>
     <title>Version 4.6.3</title>
     <para><ulink url="release-notes-4-6-3.html">Release Notes for 4.6.3</ulink></para>
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 -N -r1.15 -r1.16
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml	11 Nov 2003 10:28:29 -0000	1.15
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml	11 Dec 2003 21:39:49 -0000	1.16
@@ -4,11 +4,11 @@
 <!ENTITY % myvars SYSTEM "../variables.ent">
 %myvars;
 ]>
-<sect1 id="aolserver" xreflabel="Install AOLserver 3.3+ad13">
+<sect1 id="aolserver" xreflabel="Install AOLserver 3.3oacs1">
   <title>Install AOLserver 3.3oacs1</title>
 
   <authorblurb>
-    by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink>
+    <para>by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink></para>
   </authorblurb>
 
   <orderedlist>
@@ -115,7 +115,7 @@
 	  sets database environment variables before starting
 	  AOLserver; this allows the AOLserver instance can
 	  communicate with the database.  There is one script each for
-	  Oracle and PostGreSQL.  They don't conflict, so if you plan
+	  Oracle and PostgreSQL.  They don't conflict, so if you plan
 	  to use both databases, install both.</para>
       </formalpara>
       <itemizedlist>
@@ -130,7 +130,7 @@
 chmod 750 nsd-oracle</action></screen>
             </listitem>
             <listitem>
-              <para>PostGreSQL</para>
+              <para>PostgreSQL</para>
               <screen>[root@yourserver aolserver]# <userinput>cd /usr/local/aolserver/bin</userinput>
 [root@yourserver bin]# <userinput>cp /tmp/&tarballpath;/packages/acs-core-docs/www/files/nsd-postgres.txt ./nsd-postgres</userinput>
 [root@yourserver bin]# <userinput>chmod 755 nsd-postgres</userinput>
@@ -168,7 +168,7 @@
 wget --passive http://www.tdom.org/tDOM-0.7.8.tar.gz
 tar xzf tDOM-0.7.8.tar.gz
 cd tDOM-0.7.8/unix</action> </screen>
-      <para>Edit the file CONFIG and change this section: 
+      <para>Edit the file CONFIG and change this section:</para>
 <programlisting># ----------------------------------------------------
 # aolsrc="/usr/src/aolserver-3.4"
 # ../configure --enable-threads --disable-tdomalloc \
@@ -203,7 +203,6 @@
 cp libtdom0.7.8.so /usr/local/aolserver/bin/
 cd /usr/local/aolserver/bin
 ln -s libtdom0.7.8.so libtdom.so</action></screen>
-</para>
     </listitem>
     <listitem>
       <para><link linkend="install-nsopenssl">Install nsopenssl</link>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/credits.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/credits.xml,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/credits.xml	28 Oct 2003 22:07:41 -0000	1.10
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/credits.xml	11 Dec 2003 21:39:49 -0000	1.11
@@ -8,7 +8,7 @@
   <title>Credits</title>
 
   <authorblurb>
-	by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink>
+    <para>By <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink></para>
   </authorblurb>
 
   <para><ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink> put
@@ -60,7 +60,7 @@
   <para>
     <emphasis role="strong">All questions and comments</emphasis> regarding
     this guide should be posted on the <ulink
-    url="http://openacs.org/bboard">OpenACS bboards</ulink>.
+    url="http://openacs.org/forums/">OpenACS forums</ulink>.
   </para>
 
   <para><phrase role="cvstag">($Id$)</phrase></para>
@@ -81,16 +81,15 @@
     <para>These are a few of my sources:</para>
     <itemizedlist>
       <listitem><para> 
-          <ulink url="http://developer.arsdigita.com/doc/unix-install.html">ArsDigita installation guide</ulink>
+          ArsDigita installation guide
         </para></listitem>
 
       <listitem><para>
-          <ulink
-          url="http://openacs.org/doc/openacs/install/">OpenACS 3.x installation guide</ulink>
+          OpenACS 3.x installation guide
         </para></listitem> 
 
       <listitem><para> 
-          <ulink url="http://www.orchardlabs.com/freebsd/">Gilbert Wong's FreeBSD
+          <ulink url="http://www.orchardlabs.com/">Gilbert Wong's FreeBSD
           installation guide</ulink>
         </para></listitem> 
 
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/database-maintenance.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/database-maintenance.xml,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/database-maintenance.xml	24 Jun 2003 03:37:04 -0000	1.2
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/database-maintenance.xml	11 Dec 2003 21:39:49 -0000	1.3
@@ -1,13 +1,13 @@
   <sect1 id="database-management">
     <title>Database Management</title>
-    
+
     <authorblurb>
-      by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+      <para>By <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
     </authorblurb>
-    
+
     <sect2 id="remote-postgres">
-      <title>Running a PostGreSQL database on another server</title>
-      
+      <title>Running a PostgreSQL database on another server</title>
+
       <para>To run a database on a different machine than the
       webserver requires changes to the database configuration file
       and access control file, and to the OpenACS service's
@@ -93,7 +93,7 @@
         your server in <computeroutput>/etc/inittab</computeroutput>,
         reread the inittab with <computeroutput>/sbin/init
         q</computeroutput>, and then <computeroutput>restart-aolserver
-        <emphasis>service0</emphasis></computeroutput>.</para>
+        <replaceable>service0</replaceable></computeroutput>.</para>
     
       <para>Then, to drop the db, just do:</para>
       <programlisting>
@@ -126,9 +126,10 @@
     line:</para>
     <programlisting>
 0 1 * * * /usr/local/pgsql/bin/vacuumdb birdnotes</programlisting>
+    <para><phrase role="cvstag">($Id$)</phrase></para>
+
   </sect2>
 
-    <para><phrase role="cvstag">($Id$)</phrase></para>
 </sect1>
     
   <!--
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/macinstall.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/macinstall.xml,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/macinstall.xml	20 Aug 2003 16:20:18 -0000	1.3
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/macinstall.xml	11 Dec 2003 21:39:49 -0000	1.4
@@ -4,6 +4,7 @@
 <!ENTITY % myvars SYSTEM "../variables.ent">
 %myvars;
 ]>
+
 <sect1 id="mac-installation">
 <title>OpenACS Installation Guide for Mac OS X</title>
   <para>There are several resources for installing on OS X.</para>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml	14 Oct 2003 10:03:23 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml	11 Dec 2003 21:39:49 -0000	1.6
@@ -6,14 +6,16 @@
 ]>
 <sect1 id="maintenance-web">
   <title>Hosting Web Sites</title>
-    
+
     <authorblurb>
-      by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+      <para>By <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
     </authorblurb>
     
     <para>Maintenance tasks, optional software, and alternate configurations for AOLserver.</para>
     
-    <sect2 id="install-openacs-keepalive" xreflabel="Keep AOLServer alive">
+    <sect2 id="install-openacs-keepalive" xreflabel="Keep AOLserver alive">
+	<title>Keep AOLserver Alive</title> 
+
       <para>Assuming AOLserver started cleanly in the previous step, we'll set it up so that it's always running, and automatically restarts whenever it dies or is stopped.  This step is strongly recommended, even for development sites, because it makes install and maintenance much simpler.  </para>
       
       <para>The Reference Platform uses Daemontools to control AOLserver.  A simpler method, using <computeroutput>init</computeroutput>, is <link linkend="install-openacs-inittab">here</link>.</para>
@@ -86,7 +88,7 @@
 
         <listitem>
           <para>Install a script to automate the stopping and starting
-          of aolserver services via daemontools.  You can then restart a service via <computeroutput>restart-aolserver <replaceable>service0</replaceable></computeroutput></para>
+          of AOLserver services via daemontools.  You can then restart a service via <computeroutput>restart-aolserver <replaceable>service0</replaceable></computeroutput></para>
           <screen>[root@yourserver root]# <userinput>cp /var/lib/aolserver/<replaceable>service0</replaceable>/packages/acs-core-docs/www/files/restart-aolserver-daemontools.txt /usr/local/bin/restart-aolserver</userinput>
 [root@yourserver root]# <userinput>chmod 755 /usr/local/bin/restart-aolserver</userinput>
 [root@yourserver root]#</screen>
@@ -104,7 +106,7 @@
             <para>
 
         Most of this information comes from Tom Jackson's <ulink
-          url="http://zmbh.com/daemontools-aolserver/aolserver+daemontools.html">AOLServer+Daemontools
+          url="http://zmbh.com/daemontools-aolserver/aolserver+daemontools.html">AOLserver+Daemontools
           Mini-HOWTO</ulink>.
 </para>
         </listitem>
@@ -301,18 +303,20 @@
 <programlisting>set hostname               [ns_info hostname]
 set address                127.0.0.1 </programlisting>
 </para>
+    </formalpara>
+
     <para>If you want to install two services with different host
     names sharing the same ip, you'll need nsvhr to redirect requests
     based on the contents of the tcp headers.  See <ulink
     url="http://borkware.com/rants/aolserver-vhosting/">AOLserver
     Virtual Hosting with TCP</ulink> by <ulink url="mailto:markd@borkware.com">markd</ulink>.
 </para>
-  </formalpara>
+
   </sect2>
 
     <sect2 id="install-ssl">
       <title>Installing SSL Support</title>
-        <para>nsopenssl is an open-sounce module for Aolserver which
+        <para>nsopenssl is an open-sounce module for AOLserver which
         adds support for the ssl encryption layer.  To use it, you
         must <link linkend="install-nsopenssl">install</link> the software, create or purchase certificates,
         and configure your OpenACS instance to use it.</para>
@@ -322,7 +326,7 @@
             <programlisting>#ns_param   nsopenssl       ${bindir}/nsopenssl.so
 </programlisting>
           </listitem>
-          <listitem id="ssl-certificates" linkref="Generate ssl certificates">
+          <listitem id="ssl-certificates" xreflabel="Generate ssl certificates">
             <para>Prepare a certificate directory for the service.</para>
             <screen>[service0@yourserver etc]$ <userinput>mkdir /var/lib/aolserver/<replaceable>service0</replaceable>/etc/certs</userinput>
 [service0@yourserver etc]$ <userinput>chmod 700 /var/lib/aolserver/<replaceable>service0</replaceable>/etc/certs</userinput>
@@ -422,11 +426,12 @@
       </listitem>
     </orderedlist>
   </sect2>
+  <sect2 id="uptime">
+    <title>External uptime validation</title>
+    <para>The <ulink url="http://uptime.openacs.org/uptime/">OpenACS uptime site</ulink> can monitor your site and send you an email whenever your site fails to respond.  If you test the url <computeroutput>http://<replaceable>yourserver.test</replaceable>/SYSTEM/dbtest.tcl</computeroutput>, you should get back the string <computeroutput>success</computeroutput>.</para>
 
 
-
-    
     <para><phrase role="cvstag">($Id$)</phrase></para>
-  </sect1>
-  
-  
\ No newline at end of file
+
+  </sect2>
+</sect1>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml	11 Nov 2003 10:28:29 -0000	1.15
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml	11 Dec 2003 21:39:49 -0000	1.16
@@ -8,7 +8,7 @@
   <title>Install OpenACS &version;</title>
 
   <authorblurb>
-    by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink>
+    <para>by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink></para>
   </authorblurb>
 
   <sect2 id="openacs-setup">
@@ -324,15 +324,11 @@
             </formalpara>
             <itemizedlist>
               <listitem id="create-service-db-user">
-                <para>PostGreSQL:</para>
+                <para>PostgreSQL:</para>
                 <para>Create a user in the database matching the service
-            name.  With default PostGreSQL authentication the name of
-            the user of the process will be matched to this account
-            automatically.</para>
+            name.  With default PostgreSQL authentication, a system user connecting locally automatically authenticates as the postgres user of the same name, if one exists.  We currently use postgres "super-users" for everything, which means that anyone with access to any of the openacs system accounts on a machine has full access to all postgresql databases on that machine.</para>
                 <screen>[root@yourserver root]# <userinput>su - postgres</userinput>
-[postgres@yourserver pgsql]$ <userinput>createuser <replaceable>service0</replaceable></userinput>
-Shall the new user be allowed to create databases? (y/n) <userinput>y</userinput>
-Shall the new user be allowed to create more new users? (y/n) <userinput>y</userinput>
+[postgres@yourserver pgsql]$ <userinput>createuser -a -d <replaceable>service0</replaceable></userinput>
 CREATE USER
 [postgres@yourserver pgsql]$ <userinput>exit</userinput>
 logout
@@ -349,14 +345,15 @@
 createdb -E UNICODE <replaceable>service0</replaceable></action></screen>
               </listitem>
               <listitem>
-                <para>Automate daily database Vacuuming.  This is a process which cleans out discarded data from the database.  A quick way to automate vacuuming is to edit the cron file for the database user.</para>
+                <para>Automate daily database Vacuuming.  This is a process which cleans out discarded data from the database.  A quick way to automate vacuuming is to edit the cron file for the database user.  Recommended: <computeroutput>VACUUM ANALYZE</computeroutput> every hour and <computeroutput>VACUUM FULL ANALYZE</computeroutput> every day.</para>
                 <indexterm>
                   <primary>Postgres</primary>
                   <secondary>Vacuuming</secondary>
                 </indexterm>
                 <screen>[service0@yourserver service0]$ <userinput>export EDITOR=emacs;crontab -e</userinput></screen>
                 <para>Add this line to the file.  The numbers and stars at the beginning are cron columns that specify when the program should be run - in this case, whenever the minute is 0 and the hour is 1, i.e., 1:00 am every day.</para>
-                <programlisting>0 1 * * * /usr/local/pgsql/bin/vacuumdb --analyze <replaceable>service0</replaceable></programlisting>
+                <programlisting>0 1-23 * * * /usr/local/pgsql/bin/vacuumdb --full --analyze <replaceable>service0</replaceable>
+0 0 * * * /usr/local/pgsql/bin/vacuumdb --full --analyze <replaceable>service0</replaceable></programlisting>
               </listitem>
               <listitem>
                 <para><link linkend="install-openfts-postgres">Add Full Text Search Support</link> (OPTIONAL)</para>
@@ -442,9 +439,9 @@
           </listitem>
           <listitem>
             <para>
-	  AOLServer is very configurable. These settings should get you
+	  AOLserver is very configurable. These settings should get you
 	  started, but for more options, read the <ulink
-	  url="http://aolserver.com/docs/admin/config.html">AOLServer
+	  url="http://aolserver.com/docs/admin/config.html">AOLserver
 	  docs</ulink>.
 	</para>
           </listitem>
@@ -470,10 +467,10 @@
 	  <computeroutput>nsd-postgres</computeroutput> with
 	  <computeroutput>nsd-oracle</computeroutput>).</para>
         <para>If you want to use port 80, there are complications.
-	  First, Aolserver must be root to use system ports such as
+	  First, AOLserver must be root to use system ports such as
 	  80, but refuses to run as root for security reasons.  Thus
 	  you must start as root and specify a non-root user ID and
-	  Group ID which Aolserver will switch to after claiming the
+	  Group ID which AOLserver will switch to after claiming the
 	  port.  To do so, find the UID and GID of the
 	  <replaceable>service0</replaceable> user via
 	  <computeroutput>grep <replaceable>service0</replaceable>
@@ -490,9 +487,8 @@
       </listitem>
       <listitem id="connect-to-aolserver">
         <para>
-	  Attempt to connect to the service from a web browser.  You should specify a URL like:
-	</para>
-	<computeroutput>http://<replaceable>yourserver.test</replaceable>:8000</computeroutput>
+	  Attempt to connect to the service from a web browser.  You should specify a URL like: <computeroutput>http://<replaceable>yourserver.test</replaceable>:8000</computeroutput></para>
+
 	<para>
 	  You should see a page that looks like <ulink
         url="files/openacs-start.html">this</ulink>.  If you <link
@@ -594,10 +590,10 @@
 		  You&#39;ll see the final Installer page, &quot;OpenACS
 		  Installation: Complete.&quot; It will tell you that the server is
 		  being restarted; note that unless you already set up a way for
-		  AOLServer to restart itself (ie. inittab or daemontools),
+		  AOLserver to restart itself (ie. inittab or daemontools),
 		  you&#39;ll need to manually restart your service.
 		</para>
-        <screen>[service0@yourserver service0]$ <userinput>/usr/local/aolserver/bin/nsd-postgres -t /var/lib/aolserver/<emphasis><replaceable>service0</replaceable></emphasis>/config.tcl</userinput></screen>
+        <screen>[service0@yourserver service0]$ <userinput>/usr/local/aolserver/bin/nsd-postgres -t /var/lib/aolserver/<replaceable>service0</replaceable>/config.tcl</userinput></screen>
       </listitem>
 
       <listitem><para> 
@@ -650,7 +646,7 @@
         <para>Put in the appropriate lines for the database you are running.  If you will use both databases, put in both sets of lines.</para>
         <itemizedlist>
           <listitem>
-            <para>PostGreSQL:</para>
+            <para>PostgreSQL:</para>
             <programlisting>export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/pgsql/lib
 export PATH=$PATH:/usr/local/pgsql/bin</programlisting>
           </listitem>
@@ -679,7 +675,7 @@
 </screen>
         <itemizedlist>
           <listitem>
-            <para>For PostGreSQL, you should see:</para>
+            <para>For PostgreSQL, you should see:</para>
         <screen>
 LD_LIBRARY_PATH=LD_LIBRARY_PATH=:/usr/local/pgsql/lib
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin/X11:/usr/X11R6/bin:/root/bin:/usr/local/pgsql/bin:/usr/local/pgsql/bin</screen>
@@ -702,9 +698,11 @@
       </listitem>
       <listitem><para>Test your <link linkend="backup-recovery">backup and recovery</link> procedure.</para>
       </listitem>
+      <listitem><para>Set up <xref linkend="uptime"/>.</para>
+      </listitem>
     </itemizedlist>
 
+  <para><phrase role="cvstag">($Id$)</phrase></para>
   </sect2>
 
-  <para><phrase role="cvstag">($Id$)</phrase></para>
 </sect1>
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 -N -r1.12 -r1.13
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/oracle.xml	26 Sep 2003 09:51:21 -0000	1.12
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/oracle.xml	11 Dec 2003 21:39:49 -0000	1.13
@@ -8,26 +8,23 @@
   <title>Install Oracle 8.1.7</title>
 
   <authorblurb>
-	by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink>
+	<para>By <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink></para>
   </authorblurb>
 
-  <para>
-
-	Skip this page if you're not interested in Oracle.
-
-  </para>
-
   <note>
 	<para>
+	Skip this section if you're not interested in Oracle.
+	</para>
 
-	  OpenACS &version; does not yet work with Oracle 9i
 
+	<para>
+        OpenACS &version; does not yet work with Oracle 9i
 	</para>
 
 	<para>
 
 	  This document assumes that you'll be installing Oracle on the same
-	  box as AOLServer. For more details on a remote Oracle installation,
+	  box as AOLserver. For more details on a remote Oracle installation,
 	  see Daryl Biberdorf's <ulink
 	  url="http://openacs.org/new-file-storage/one-file?file_id=273">document</ulink>.
   
@@ -127,7 +124,7 @@
     <para>
 
       For additional resources/documentation, please see this <ulink
-      url="http://openacs.org/bboard/q-and-a-fetch-msg.tcl?msg_id=0003o2&amp;topic_id=11&amp;topic=OpenACS">thread</ulink>
+      url="http://openacs.org/forums/message-view?message_id=28829">thread</ulink>
       and <ulink
       url="http://openacs.org/forums/message-view?message_id=67108">Andrew
       Piskorski's mini-guide</ulink>..
@@ -587,59 +584,55 @@
             </para></listitem>
         </itemizedlist>
       </listitem>
-      
+
       <listitem><para>
 
           The &quot;Unix Group Name&quot; screen in the OUI:
-          
+
         </para>
-        
+
         <itemizedlist>
           <listitem><para> 
-              
+
               The Unix Group name needs to be set to
               &#39;<computeroutput>oinstall</computeroutput>&#39; ( we made
               this Unix group earlier ).
-              
+
             </para></listitem>
-          
+
           <listitem><para>
-              
+
               Click &quot;Next&quot;
-              
+
             </para></listitem>
-          
-          <listitem><para> 
-              
+
+          <listitem>
+	    <para>
               A popup window appears instantly, requesting you
               to run a script as root:
-              
-            </para></listitem>
-          
-        <itemizedlist>
-          <listitem><para>
-              
-              Debian users need to link
-              <computeroutput>/bin/awk</computeroutput> to
-              <computeroutput>/usr/bin/awk</computeroutput> before
-              running the script below
-              
             </para>
-            
+          </listitem>
+        <listitem>
+          <itemizedlist>
+            <listitem>
+              <para>
+                Debian users need to link
+                <computeroutput>/bin/awk</computeroutput> to
+                <computeroutput>/usr/bin/awk</computeroutput> before
+                running the script below
+              </para>
             <programlisting>
 joueser:~$ su -
 root:~# ln -s /usr/bin/awk /bin/awk</programlisting>
           </listitem>
         </itemizedlist>
-        
-      <listitem><para>
-          
+      </listitem>
+      <listitem>
+        <para>
           Open a new terminal window, then type:
-          
         </para>
-        
-        <programlisting>
-joeuser:~$ su -
+
+        <programlisting>joeuser:~$ su -
 root:~# cd /ora8/m01/app/oracle/product/8.1.7
 root:~# ./orainstRoot.sh  
 ; You should see:
@@ -648,162 +641,124 @@
 root:~# mkdir -p /usr/local/java
 root:~# exit
 joeuser:~$ exit</programlisting>
+
       </listitem>
 
       <listitem><para>
-          
           Click &quot;Retry&quot;
-          
         </para></listitem>
     </itemizedlist>
   </listitem>
-    
-    <listitem><para>
-        
+
+    <listitem>
+      <para>
         The &quot;Available Products&quot; screen in the OUI:
-        
       </para>
-      
+
       <itemizedlist>
         <listitem><para>
-            
             Select &quot;Oracle 8i Enterprise Edition 8.1.7.1.0&quot;
-            
-          </para></listitem>
-        
-        <listitem><para>
+        </para></listitem>
 
+        <listitem><para>
             Click &quot;Next&quot;
-            
           </para></listitem>
+
       </itemizedlist>
     </listitem>
-    
-    <listitem><para>
-        
+
+    <listitem>
+      <para>
         The &quot;Installation Types&quot; screen
-        
       </para>
-      
+
       <itemizedlist>
-        <listitem><para>
-            
+        <listitem>
+          <para>
             Select the &quot;Custom&quot; installation type.
-            
-          </para></listitem>
-        
+          </para>
+        </listitem>
+
         <listitem><para>
-            
             Click &quot;Next&quot;
-            
           </para></listitem>
       </itemizedlist>
     </listitem>
-    
+
     <listitem><para>
-        
         The &quot;Available Product Components&quot; screen
-        
       </para>
-      
+
       <itemizedlist>
         <listitem><para>
-            
             In addition to the defaults, make sure that &quot;Oracle SQLJ
             8.1.7.0,&quot; &quot;Oracle Protocol Support 8.1.7.0.0,&quot; and
             &quot;Linux Documentation 8.1.7.0.0&quot; are also checked.
-            
           </para></listitem>
-        
+
         <listitem><para>
-            
             Click &quot;Next&quot;
-            
           </para></listitem>
-        
+
         <listitem><para>
-            
             A progress bar will appear for about 1 minute.
-            
           </para></listitem>
       </itemizedlist>
     </listitem>
-    
+
     <listitem><para>
-        
         The &quot;Component Locations&quot; screen in the OUI
-        
       </para>
-      
+
       <itemizedlist>
         <listitem><para> 
-            
             Click on the &quot;Java Runtime Environment 1.1.8&quot; It
             should have the path
             &quot;<computeroutput>/ora8/m01/app/oracle/jre/1.1.8</computeroutput>&quot;
-            
           </para></listitem>
-        
+
         <listitem><para>
-            
             Click &quot;Next&quot;
-            
           </para></listitem>
-        
+
         <listitem><para>
-            
             A progress bar will appear for about 1 minute.
-            
           </para></listitem>
       </itemizedlist>
     </listitem>
-    
+
     <listitem><para>
-        
         The &quot;Privileged Operation System Groups&quot; screen in the
         OUI
-        
       </para>
-      
+
       <itemizedlist>
         <listitem><para>
-            
             Enter &quot;dba&quot; for &quot;Database Administrator
             (OSDBA) Group&quot;
-            
           </para></listitem>
-        
-        <listitem><para>              
 
+        <listitem><para>
             Enter &quot;dba&quot; for the &quot;Database Operator
             (OSOPER) Group&quot;
-
           </para></listitem>
 
           <listitem><para>
-
             Click &quot;Next&quot;
-
           </para></listitem>
 
         <listitem><para>
-
             A progress bar will appear for about 1 minute.
-
           </para></listitem>
       </itemizedlist>
     </listitem>
 
     <listitem><para>
-
         The &quot;Authentication Methods&quot; screen
-        
       </para>
       <itemizedlist>
         <listitem><para>
-
             Click &quot;Next&quot;
-
           </para></listitem>
       </itemizedlist>
     </listitem>
@@ -2015,7 +1970,7 @@
       Log back in again. If adding the
       <computeroutput>nls_date_format</computeroutput> line doesn&#39;t
       help, you can ask for advice in our <ulink
-      url="http://www.openacs.org/bboard/">OpenACS forum</ulink>.
+      url="http://www.openacs.org/forums/">OpenACS forums</ulink>.
     </para>
   </sect2>
 
@@ -2118,8 +2073,9 @@
         </tbody>
       </tgroup>
     </informaltable>
+
+    <para><phrase role="cvstag">($Id$)</phrase></para>
   </sect2>
 
-  <para><phrase role="cvstag">($Id$)</phrase></para>
 
 </sect1>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/os.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/os.xml,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/os.xml	28 Oct 2003 22:07:41 -0000	1.10
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/os.xml	11 Dec 2003 21:39:49 -0000	1.11
@@ -4,11 +4,11 @@
 <!ENTITY % myvars SYSTEM "../variables.ent">
 %myvars;
 ]>
-<sect1 id="unix-installation">
-  <title>Install Unix-like system and supporting software</title>
+<sect1 id="unix-installation" xreflabel="Install a Unix-like OS">
+  <title>Install a Unix-like system and supporting software</title>
   
   <authorblurb>
-    by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+    <para>by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
   </authorblurb>
   <sect2 id="unix-install">
     <title>a Unix-like system</title>
@@ -22,7 +22,7 @@
           <title>BSD Note</title>
           <para>BSD users: in most places in these instructions, gmake
           will work better than make.  (<ulink
-          href="http://openacs.org/forums/message-view?message_id=136910">more
+          url="http://openacs.org/forums/message-view?message_id=136910">more
           information on FreeBSD installation</ulink>)</para>
         </note>
 </listitem>
@@ -46,8 +46,10 @@
     <para>To install a machine to the specifications of the Reference
     Platform, do the <link linkend="install-redhat">walkthrough of the
     Red Hat 8.0 Install for OpenACS</link>.</para>
+
+    <para><phrase role="cvstag">($Id$)</phrase></para>
   </sect2>
 
-  <para><phrase role="cvstag">($Id$)</phrase></para>
+
   
 </sect1>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml	11 Nov 2003 10:28:29 -0000	1.9
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml	11 Dec 2003 21:39:49 -0000	1.10
@@ -8,7 +8,7 @@
     <title>Install additional supporting software</title>
 
     <authorblurb>
-      by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+      <para>By <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
     </authorblurb>
     
       <para>This section assumes that the source tarballs for supporting
@@ -73,12 +73,13 @@
 [root@yourserver tmp]# </screen>
       <para>Debian users:</para>
       <screen><action>apt-get install psgml</action></screen>
+      <para>Note: The new nxml mode for emacs, when used in combination with psgml, provides a pretty good set of functionality that makes DocBook editing much less painless.  In particular, nxml does syntax testing in real-time so that you can see syntax errors immediately instead of in the output of the xsltproc hours or days later.  For debian, <computeroutput>apt-get install nxml</computeroutput>.</para>
     </sect1>
 
     <sect1 id="install-daemontools">
       <title>Install Daemontools (OPTIONAL)</title>
       <para>Daemontools is a collection of programs for controlling
-      other processes.  We use daemontools to run and monitor AOLServer.  It is
+      other processes.  We use daemontools to run and monitor AOLserver.  It is
       installed in /package.  These commands install daemontools and
       svgroup.  svgroup is a script for granting permissions, to allow
       users other than root to use daemontools for specific
@@ -232,7 +233,7 @@
               <secondary>rcpthosts error message</secondary>
             </indexterm>
 (I'm not sure if this next step is 100% necessary, but when I skip it
-I get problems.  If you get the error <computeroutput>553 sorry, that domain isn't in my list of allowed rcpthosts (#5.7.1)</computeroutput> then you need to do this.)  AOLServer sends outgoing mail via the ns_sendmail
+I get problems.  If you get the error <computeroutput>553 sorry, that domain isn't in my list of allowed rcpthosts (#5.7.1)</computeroutput> then you need to do this.)  AOLserver sends outgoing mail via the ns_sendmail
 command, which pipes a command to the sendmail executable.  Or, in our
 case, the qmail replacement wrapper for the sendmail executable.  In
 some cases, though, the outgoing mail requset is apparently sent
@@ -461,12 +462,12 @@
           <primary>full text search</primary>
           <secondary>installation</secondary>
         </indexterm>
-      <para>If you want full text search, and you are running PostGreSQL, install this module to support FTS.  Do this step after you have installed both PostGreSQL and
-      Aolserver.  You will need the <link linkend="openfts-download">openfts
+      <para>If you want full text search, and you are running PostgreSQL, install this module to support FTS.  Do this step after you have installed both PostgreSQL and
+      AOLserver.  You will need the <link linkend="openfts-download">openfts
       tarball</link> in <computeroutput>/tmp</computeroutput>.</para>
           <orderedlist>
             <listitem>
-              <para>Install Tsearch.  This is a PostGreSQL module that
+              <para>Install Tsearch.  This is a PostgreSQL module that
 	  OpenFTS requires.</para>
               <screen>[root@yourserver root]# <userinput>su - postgres</userinput>
 [postgres@yourserver pgsql]$ <userinput>cd /usr/local/src/postgresql-7.2.4/contrib/tsearch/</userinput>
@@ -554,15 +555,15 @@
       </sect2>
 
       <sect2 id="install-openfts-postgres">
-        <title>Install OpenFTS prerequisites in PostGreSQL instance</title> 
+        <title>Install OpenFTS prerequisites in PostgreSQL instance</title> 
         <indexterm>
           <primary>full text search</primary>
           <secondary>installation</secondary>
         </indexterm>
         <para>If you are installing Full Text Search, add required
         packages to the new database.  (In order for full text search
         to work, you must also <link
-        linkend="install-openfts">install</link> the PostGreSQL
+        linkend="install-openfts">install</link> the PostgreSQL
         OpenFTS module and prerequisites.)</para>
         <screen>[service0@yourserver service0]$ <userinput>/usr/local/pgsql/bin/psql <replaceable>service0</replaceable> -f /usr/local/src/postgresql-7.2.4/contrib/tsearch/tsearch.sql</userinput>
 BEGIN
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/overview.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/overview.xml,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/overview.xml	11 Nov 2003 14:55:29 -0000	1.17
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/overview.xml	11 Dec 2003 21:39:49 -0000	1.18
@@ -4,199 +4,213 @@
 <!ENTITY % myvars SYSTEM "../variables.ent">
 %myvars;
 ]>
-    
-    <sect1 id="install-steps">
-      <title>Basic Steps</title>
-      <para>
-	  The basic steps to getting OpenACS up and running are: 
-	</para>
-      
-      <orderedlist>
-        <listitem><para>Install an OS (<link
-      linkend="unix-install">Linux, FreeBSD, OpenBSD</link>, <xref linkend="install-redhat"/>, <xref linkend="mac-installation"/>, <xref
-              linkend="win2k-installation"/>).</para>
-        </listitem>
-        
-        <listitem><para>Install a database (<link
-	  linkend="oracle">Oracle</link> or
-	  <link linkend="postgres">PostgreSQL</link>).</para>
-        </listitem> 
 
-        <listitem>
-          <para><link linkend="aolserver">Install the AOLserver webserver</link>.</para>
-        </listitem>
-        
-        <listitem><para>Create a unique database and system user.
-      Install the OpenACS tarball, start and AOLserver instance, and
-      use the OpenACS web pages to complete installation
-      (<xref linkend="openacs"/>).</para>
-        </listitem>
-        
-      </orderedlist>
-      <sect2 id="install-rpms">
-        <title>Binaries and other shortcuts</title>
-        <orderedlist>
-          <listitem>
-            <para>The patched version of AOLserver we use is not currently
-      available in a precompiled binary.  </para>
-          </listitem>
-          <listitem>
-            <para>
-        The packaged version of
-      PostGreSQL in Debian and Red Hat and FreeBSD ports works fine.</para>
-          </listitem>
-          <listitem>
-            <para>Jonathan Marsden has created RPMs (at
-      <ulink
-      url="http://www.xc.org/jonathan/openacs/openacs4-rpm-based-install.html">http://www.xc.org</ulink>)
-      for OpenACS 4.5 but there are not yet any for version
-      &version;.  </para>
-          </listitem>
-          <listitem>
-        <para>An experimental script <link
-      linkend="install-with-script">automates OpenACS checkout and
-      installation</link>. 
-</para>
-          </listitem>
-<!--          <listitem>
-            <para>The <link linkend="quick">Quick Guide</link> lists the essential steps for a minimal install.
-</para>
-          </listitem>
--->
-        </orderedlist>
-      </sect2>
-      <sect2 id="install-requirements">
-        <title>Requirements</title>
+<sect1 id="install-steps">
+  <title>Basic Steps</title>
+
+  <para>
+    The basic steps for getting OpenACS installed are:
+  </para>
+
+  <orderedlist>
+    <listitem><para>Install an OS and supporting software (see <xref linkend="unix-installation"/> or <xref linkend="install-redhat"/> for more details).</para>
+    </listitem>
+
+    <listitem><para>Install a database (see <xref linkend="oracle"/> or
+        <xref linkend="postgres"/>).</para>
+    </listitem>
+
+    <listitem>
+      <para> Install AOLserver (see <xref linkend="aolserver"/>).</para>
+    </listitem>
+
+    <listitem><para>Create a unique database and system user.
+        Install the OpenACS tarball, start and AOLserver instance, and
+        use the OpenACS web pages to complete installation
+        (see <xref linkend="openacs"/>).</para>
+    </listitem>
+  </orderedlist>
+
+  <para> There are specific instructions available for Mac OS X and
+    Windows2000 available (see <xref linkend="mac-installation"/> or
+    <xref linkend="win2k-installation"/> for those).</para>
+
+  <sect2 id="install-rpms">
+    <title>Binaries and other shortcuts</title>
+
+    <orderedlist>
+      <listitem>
+        <para>The patched version of AOLserver we use is not currently
+          available in a precompiled binary.  </para>
+      </listitem>
+      <listitem>
         <para>
-	  You will need a PC (or equivalent) with at least these minimum
-	  requirements:
-	</para>
-        <itemizedlist>
-          <listitem><para>Pentium processor</para></listitem>
-          <listitem><para>128 MB RAM
-		  (much more if you want Oracle)</para></listitem> 
-          <listitem><para>4 GB hard drive</para></listitem>
-          <listitem><para>A Unix-like operating system with tcl, tdom, and
-      a mail transport agent.  (<xref
-                linkend="individual-programs"/>)</para>
-          </listitem>
-        </itemizedlist><para>
-	  All of the software that you will need is free and open-source,
-	  except for Oracle. You can obtain a free copy of Oracle for
-	  development purposes. This is described in the <xref
-            linkend="install-oracle-getit"/> section.
-	</para>
-        <figure id="compatibility-matrix">
-          <title>Compatibility Matrix</title>
-          <informaltable>
-            <tgroup cols="8">
-              <colspec colname="c1"/>
-              <colspec colname="c2"/>
-              <colspec colname="3.2.5"/>
-              <colspec colname="4.5"/>
-              <colspec colname="4.6"/>
-              <colspec colname="4.6.1"/>
-              <colspec colname="4.6.2"/>
-              <colspec colname="4.6.3"/>
-              <colspec colname="5.0.0"/>
-              <spanspec align="center" colsep="0" rowsep="0" spanname="version" namest="c1" nameend="c2"/>
-              <tbody>
-                <row>
-                  <entry spanname="version">OpenACS Version</entry>
-                  <entry colname="3.2.5">3.2.5</entry>
-                  <entry colname="4.5">4.5</entry>
-                  <entry colname="4.6">4.6</entry>
-                  <entry colname="4.6.1">4.6.1</entry>
-                  <entry colname="4.6.2">4.6.2</entry>
-                  <entry colname="4.6.3">4.6.3</entry>
-                  <entry colname="5.0.0">5.0.0</entry>
-                </row>
-                <row>
-                  <entry morerows="6">AolServer</entry>
-                  <entry>3</entry>
-                  <entry namest="3.2.5" nameend="3.2.5" align="center">Verified</entry>
-                </row>
-                <row>
-                  <entry>3.3+ad13</entry>
-                  <entry namest="4.5" nameend="5.0.0" align="center">Verified</entry>
-                </row>
-                <row>
-                  <entry>3.3oacs1</entry>
-                  <entry namest="4.6.2" nameend="5.0.0" align="center">Verified</entry>
-                </row>  
-                <row>
-                  <entry>3.4.2</entry>
-                  <entry namest="4.6.2" align="center">No</entry>
-                </row>  
-                <row>
-                  <entry>3.4.2oacs1</entry>
-                  <entry namest="4.6.2" align="center">Verified</entry>
-                </row>  
-                <row>
-                  <entry>3.5.5</entry>
-                  <entry namest="4.6.2" align="center">Verified</entry>
-                </row>  
-                <row>
-                  <entry>4</entry>
-                  <entry namest="3.2.5" nameend="4.6.3"
-                    align="center">Verified but not for production</entry>
-                </row>
-                <row>
-                  <entry morerows="2">PostGreSQL</entry>
-                  <entry>7.0</entry>
-                  <entry namest="3.2.5" nameend="3.2.5" align="center">Verified</entry>
-                </row>
-                <row>
-                  <entry>7.2.x</entry>
-                  <entry namest="4.5" nameend="4.6.3" align="center">Verified</entry>
-                </row>
-                <row>
-                  <entry>7.3.2 - 7.3.4</entry>
-                  <entry namest="3.2.5" nameend="4.6.2" align="center">No</entry>
-                  <entry namest="4.6.3" nameend="5.0.0" align="center">Verified</entry>
-                </row>
-                <row>
-                  <entry morerows="2">Oracle</entry>
-                  <entry>8.1.6</entry>
-                  <entry namest="4.5" nameend="4.6.3" align="center">Verified</entry>
-                </row>
-                <row>
-                  <entry>8.1.7</entry>
-                  <entry namest="4.5" nameend="5.0.0" align="center">Verified</entry>
-                </row>
-                <row>
-                  <entry>9i</entry>
-                  <entry namest="3.2.5" nameend="4.6.3" align="center">No</entry>
-                  <entry namest="5.0.0" nameend="5.0.0" align="center">Untested</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </informaltable>
-        </figure>
-      </sect2>
+          The packaged version of
+          PostgreSQL in Debian and Red Hat and FreeBSD ports works fine.</para>
+      </listitem>
+      <listitem>
+        <para>An experimental script <link
+            linkend="install-with-script">automates the OpenACS checkout and
+            installation</link>.
+        </para>
+      </listitem>
+    </orderedlist>
+  </sect2>
 
-    <sect2 id="how-to-use">
-      <title>How to use this guide</title>
-      <itemizedlist>
-        <listitem>
-          <para><computeroutput>This</computeroutput> is text you will see on
-            screen, such as a <computeroutput><guibutton><accel>B</accel>utton</guibutton></computeroutput> or <computeroutput><guilabel><accel>link</accel></guilabel></computeroutput>
-            in a radio button list or menu.</para>
-        </listitem>
-        <listitem><para><userinput>This is text that you will type.</userinput></para></listitem>
-        <listitem>
-          <para>This is text from a program or file which you may need to
-examine or edit:</para>
-          <programlisting>if {$database == "oracle"} {
-    set db_password        "mysitepassword"
+
+  <sect2 id="install-requirements">
+    <title>System Requirements</title>
+    <para>
+      You will need a PC (or equivalent) with at least these minimum
+      requirements:
+    </para>
+    <itemizedlist>
+      <listitem><para>128MB RAM (much more if you want Oracle)</para></listitem> 
+      <listitem><para>1GB free space on your hard drive (much more if you want Oracle)</para></listitem>
+      <listitem><para>A Unix-like operating system with Tcl, tDOM, and
+          a mail transport agent like sendmail or qmail. (see <xref
+            linkend="individual-programs"/>)</para>
+      </listitem>
+    </itemizedlist><para>
+      All of the software that you will need is free and open-source,
+      except for Oracle. You can obtain a free copy of Oracle for
+      development purposes. This is described in the <xref
+        linkend="install-oracle-getit"/> section.
+    </para>
+
+    <table id="compatibility-matrix">
+      <title>Version Compatibility Matrix</title>
+      <tgroup cols="9">
+        <colspec colname="c1"/>
+        <colspec colname="c2"/>
+        <colspec colname="3.2.5"/>
+        <colspec colname="4.5"/>
+        <colspec colname="4.6"/>
+        <colspec colname="4.6.1"/>
+        <colspec colname="4.6.2"/>
+        <colspec colname="4.6.3"/>
+        <colspec colname="5.0.0"/>
+        <thead>
+          <row>
+            <entry align="center" namest="c1" nameend="c2">OpenACS Version</entry>
+            <entry colname="3.2.5">3.2.5</entry>
+            <entry colname="4.5"> 4.5 </entry>
+            <entry colname="4.6"> 4.6 </entry>
+            <entry colname="4.6.1">4.6.1</entry>
+            <entry colname="4.6.2">4.6.2</entry>
+            <entry colname="4.6.3">4.6.3</entry>
+            <entry colname="5.0.0">5.0.0</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry morerows="6">AOLserver</entry>
+            <entry>3</entry>
+            <entry namest="3.2.5" nameend="3.2.5" align="center">Verified</entry>
+            <entry namest="4.5" nameend="5.0.0" align="center">No</entry>
+          </row>
+          <row>
+            <entry>3.3+ad13</entry>
+            <entry namest="3.2.5" nameend="3.2.5" align="center">Untested</entry>
+            <entry namest="4.5" nameend="5.0.0" align="center">Verified</entry>
+          </row>
+          <row>
+            <entry>3.3oacs1</entry>
+            <entry namest="3.2.5" nameend="3.2.5" align="center">Untested</entry>
+            <entry namest="4.5" nameend="5.0.0" align="center">Verified</entry>
+          </row>
+          <row>
+            <entry>3.4.2</entry>
+            <entry namest="3.2.5" nameend="5.0.0" align="center">No</entry>
+          </row>
+          <row>
+            <entry>3.4.2oacs1</entry>
+            <entry namest="3.2.5" nameend="4.6.1" align="center">Untested</entry>
+            <entry namest="4.6.2" nameend="4.6.3" align="center">Verified</entry>
+            <entry namest="5.0.0" nameend="5.0.0" align="center">Untested</entry>
+          </row>
+          <row>
+            <entry>3.5.5</entry>
+            <entry namest="3.2.5" nameend="4.6.1" align="center">Untested</entry>
+            <entry namest="4.6.2" nameend="4.6.3" align="center">Verified</entry>
+            <entry namest="5.0.0" nameend="5.0.0" align="center">No</entry>
+          </row>
+          <row>
+            <entry>4.0</entry>
+            <entry namest="3.2.5" nameend="4.6.1" align="center">Untested</entry>
+            <entry namest="4.6.2" nameend="5.0.0" align="center">Verified</entry>
+          </row>
+          <row>
+            <entry morerows="3">PostgreSQL</entry>
+            <entry>7.0</entry>
+            <entry namest="3.2.5" nameend="3.2.5" align="center">Verified</entry>
+            <entry namest="4.5" nameend="5.0.0" align="center">No</entry>
+          </row>
+          <row>
+            <entry>7.2.x</entry>
+            <entry namest="4.5" nameend="4.6.3" align="center">Verified</entry>
+            <entry namest="5.0.0" nameend="5.0.0" align="center">No</entry>
+          </row>
+          <row>
+            <entry>7.3.2 - 7.3.4</entry>
+            <entry namest="3.2.5" nameend="4.6.2" align="center">No</entry>
+            <entry namest="4.6.3" nameend="5.0.0" align="center">Verified</entry>
+          </row>
+          <row>
+            <entry>7.4</entry>
+            <entry namest="3.2.5" nameend="4.6.3" align="center">No</entry>
+            <entry namest="5.0.0" nameend="5.0.0" align="center">Untested</entry>
+          </row>
+          <row>
+            <entry morerows="2">Oracle</entry>
+            <entry>8.1.6</entry>
+            <entry namest="4.5" nameend="5.0.0" align="center">Verified</entry>
+          </row>
+          <row>
+            <entry>8.1.7</entry>
+            <entry namest="4.5" nameend="5.0.0" align="center">Verified</entry>
+          </row>
+          <row>
+            <entry>9i</entry>
+            <entry namest="3.2.5" nameend="4.6.3" align="center">No</entry>
+            <entry namest="5.0.0" nameend="5.0.0" align="center">Untested</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+
+    <para>
+      At the time of writing AOLserver 4.0 has been tested with OpenACS and works but has not been used in 
+      production.  OpenACS 5.0.0 installs successfully on PostgreSQL 7.4 and Oracle 9i but not all packages 
+      outside core have been tested.
+    </para>
+  </sect2>
+
+  <sect2 id="how-to-use">
+    <title>How to use this guide</title>
+
+    <itemizedlist>
+      <listitem>
+        <para><computeroutput>This</computeroutput> is text you will see on
+          screen, such as a <computeroutput><guibutton><accel>B</accel>utton</guibutton></computeroutput> or <computeroutput><guilabel><accel>link</accel></guilabel></computeroutput>
+          in a radio button list or menu.</para>
+      </listitem>
+      <listitem><para><userinput>This is text that you will type.</userinput></para></listitem>
+      <listitem>
+        <para>This is text from a program or file which you may need to
+          examine or edit:</para>
+        <programlisting>if {$database == "oracle"} {
+          set db_password        "mysitepassword"
 }</programlisting>
-        </listitem>
-        <listitem>
-          <para>This is text that you will
-<computeroutput>see</computeroutput> and <userinput>type</userinput> in a command shell, including <replaceable>text you may have to
-change</replaceable>.  It is followed by a list of just the commands,
-which you can copy and paste.</para>
-          <screen>[root@localhost root]# <userinput>su - nsadmin</userinput>
+      </listitem>
+      <listitem>
+        <para>This is text that you will
+          <computeroutput>see</computeroutput> and <userinput>type</userinput> in a command shell, including <replaceable>text you may have to
+            change</replaceable>.  It is followed by a list of just the commands,
+          which you can copy and paste.</para>
+        <screen>
+[root@localhost root]# <userinput>su - nsadmin</userinput>
 [nsadmin@localhost aolserver]$ <userinput>svc -d /service/<replaceable>server1</replaceable></userinput>
 [nsadmin@localhost aolserver]$ <userinput>dropdb <replaceable>server1</replaceable></userinput>
 DROP DATABASE
@@ -206,185 +220,180 @@
 svc -d /service/<replaceable>server1</replaceable>
 dropdb <replaceable>server1</replaceable>
 createdb <replaceable>server1</replaceable></action></screen>
-        </listitem>
-      </itemizedlist>
+      </listitem>
+    </itemizedlist>
   </sect2>
-      <sect2>
-        <title>Paths and Users</title>
-        
-        <figure>
-          <title>Assumptions in this Chapter</title>
-          <informaltable>
-            <tgroup cols="2">
-              <tbody>
-                <row>
-                  <entry>Fully qualified domain name of your server</entry>
-                  <entry><replaceable>yourserver.test</replaceable></entry>
-                </row>
-                <row>
-                  <entry>name of administrative access account</entry>
-                  <entry>remadmin</entry>
-                </row>
-                <row>
-                  <entry>OpenACS service</entry>
-                  <entry><indexterm>
-                      <primary>service0</primary>
-                    </indexterm>
-<replaceable>service0</replaceable></entry>
-                </row>
-                <row>
-                  <entry>OpenACS service account</entry>
-                  <entry><replaceable>service0</replaceable></entry>
-                </row>
-                <row>
-                  <entry>OpenACS database name</entry>
-                  <entry><replaceable>service0</replaceable></entry>
-                </row>
-                <row>
-                  <entry>Root of OpenACS service file tree</entry>
-                  <entry><replaceable>/var/lib/aolserver/service0</replaceable></entry>
-                </row>
-                <row>
-                  <entry>Location of source code tarballs for new software</entry>
-                  <entry>/tmp</entry>
-                </row>
-                <row>
-                  <entry>The OpenACS tarball contains some files which
+
+
+  <sect2>
+    <title>Paths and Users</title>
+    
+   <table pgwide="1">
+      <title>Default directories for a standard install</title>
+        <tgroup cols="2">
+          <tbody>
+            <row>
+              <entry>Fully qualified domain name of your server</entry>
+              <entry><replaceable>yourserver.test</replaceable></entry>
+            </row>
+            <row>
+              <entry>name of administrative access account</entry>
+              <entry>remadmin</entry>
+            </row>
+            <row>
+              <entry>OpenACS service</entry>
+              <entry><indexterm>
+                  <primary>service0</primary>
+                </indexterm>
+                <replaceable>service0</replaceable></entry>
+            </row>
+            <row>
+              <entry>OpenACS service account</entry>
+              <entry><replaceable>service0</replaceable></entry>
+            </row>
+            <row>
+              <entry>OpenACS database name</entry>
+              <entry><replaceable>service0</replaceable></entry>
+            </row>
+            <row>
+              <entry>Root of OpenACS service file tree (SERVERROOT)</entry>
+              <entry><replaceable>/var/lib/aolserver/service0</replaceable></entry>
+            </row>
+            <row>
+              <entry>Location of source code tarballs for new software</entry>
+              <entry>/tmp</entry>
+            </row>
+            <row>
+              <entry>The OpenACS tarball contains some files which
                 are useful while setting up other software.  Those
                 files are located at:</entry>
-                  <entry>/tmp/&tarballpath;/packages/acs-core-docs/www/files</entry>
-                </row>
-                <row>
-                  <entry>Database backup directory</entry>
-                  <entry><replaceable>/var/lib/aolserver/service0/database-backup</replaceable></entry>
-                </row>
-                <row>
-                  <entry>Service config files</entry>
-                  <entry><replaceable>/var/lib/aolserver/service0/etc</replaceable></entry>
-                </row>
-                <row>
-                  <entry>Service log files</entry>
-                  <entry><replaceable>/var/lib/aolserver/service0/log</replaceable></entry>
-                </row>
-                <row>
-                  <entry>Compile directory</entry>
-                  <entry>/usr/local/src</entry>
-                </row>
-                <row>
-                  <entry>PostGreSQL directory</entry>
-                  <entry>/usr/local/pgsql</entry>
-                </row>
-                <row>
-                  <entry>AOLServer directory</entry>
-                  <entry>/usr/local/aolserver</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </informaltable>
-        </figure>
+              <entry>/tmp/&tarballpath;/packages/acs-core-docs/www/files</entry>
+            </row>
+            <row>
+              <entry>Database backup directory</entry>
+              <entry><replaceable>/var/lib/aolserver/service0/database-backup</replaceable></entry>
+            </row>
+            <row>
+              <entry>Service config files</entry>
+              <entry><replaceable>/var/lib/aolserver/service0/etc</replaceable></entry>
+            </row>
+            <row>
+              <entry>Service log files</entry>
+              <entry><replaceable>/var/lib/aolserver/service0/log</replaceable></entry>
+            </row>
+            <row>
+              <entry>Compile directory</entry>
+              <entry>/usr/local/src</entry>
+            </row>
+            <row>
+              <entry>PostgreSQL directory</entry>
+              <entry>/usr/local/pgsql</entry>
+            </row>
+            <row>
+              <entry>AOLserver directory</entry>
+              <entry>/usr/local/aolserver</entry>
+            </row>
+          </tbody>
+        </tgroup>
+    </table>
 
-        <para>
-	  None of these locations are set in stone - they're simply
-	  the values that we've chosen.  The values that you'll
-	  probably want to change, such as service name, are
-	  <replaceable>marked like this</replaceable>.  The other
-	  values we recommend you leave unchanged unless you have a
-	  reason to change them.</para>
-        
-        <note>
-          <para>
-	  Some of the paths and user accounts have been changed from
-	  those recommended in previous versions of this document to
-	  improve security and maintainability.  See <ulink
+    <para>
+      None of these locations are set in stone - they're simply
+      the values that we've chosen.  The values that you'll
+      probably want to change, such as service name, are
+      <replaceable>marked like this</replaceable>.  The other
+      values we recommend you leave unchanged unless you have a
+      reason to change them.</para>
+
+    <note>
+      <para>
+        Some of the paths and user accounts have been changed from
+        those recommended in previous versions of this document to
+        improve security and maintainability.  See <ulink
 	  url="http://openacs.org/forums/message-view?message_id=82934">this
-	  thread</ulink> for discussion.
-</para>
-        </note>
+	  thread</ulink> for discussion.</para>
+    </note>
 
-        
-      </sect2>
+  </sect2>
 
-      <sect2 id="install-stuck">
-	<title>Getting Help during installation</title>
-	
-	<para>
-	  We'll do our best to assure that following our instructions will get
-	  you to the promised land. If something goes wrong, don't
-	  panic. There are plenty of ways to get help. Here are some tips:
-	</para>
 
-	<itemizedlist>
-	  <listitem>
-            <para>
-		  Keep track of the commands you are run and record their output. I
-		  like to do my installations in a shell inside of emacs
-		  (<computeroutput>M-x shell</computeroutput>) so that I can save
-		  the output if needed. An alternative would be to use the
-		  <computeroutput>script</computeroutput> command.
-		</para>
-	  </listitem>
+  <sect2 id="install-stuck">
+    <title>Getting Help during installation</title>
 
-	  <listitem>
-            <para>
-		  We'll point out where the error logs for the various pieces of
-		  software are. Output from those logs will help us help you. Don't
-		  worry if you feel overwhelmed by all the information in the error
-		  logs. Over time, you'll find that they make more and more
-		  sense. Soon, you'll actually look forward to errors so that you
-		  can run to the log and diagnose the problem. 
-		</para>
-	  </listitem>
+    <para>
+      We'll do our best to assure that following our instructions will get
+      you to the promised land. If something goes wrong, don't
+      panic. There are plenty of ways to get help. Here are some tips:
+    </para>
 
-	  <listitem>
-            <para>
-		  Search the <ulink url="http://openacs.org/bboard/">bboards at
-		  openacs.org</ulink> - you'll often find many people who have
-		  struggled through the same spot that you're in.
-		</para>
-	  </listitem>
+    <itemizedlist>
+      <listitem>
+        <para>
+          Keep track of the commands you are run and record their output. I
+          like to do my installations in a shell inside of emacs
+          (<computeroutput>M-x shell</computeroutput>) so that I can save
+          the output if needed. An alternative would be to use the
+          <computeroutput>script</computeroutput> command.
+        </para>
+      </listitem>
 
-	  <listitem>
-            <para>
- The bottom of each page has a link to OpenACS.org, where you can post
-		  comments and read other users comments about the
-		  contents of the page.
-		</para>
-	  </listitem>
+      <listitem>
+        <para>
+          We'll point out where the error logs for the various pieces of
+          software are. Output from those logs will help us help you. Don't
+          worry if you feel overwhelmed by all the information in the error
+          logs. Over time, you'll find that they make more and more
+          sense. Soon, you'll actually look forward to errors so that you
+          can run to the log and diagnose the problem. 
+        </para>
+      </listitem>
 
-	  <listitem>
-            <para>
-		  Ask questions at the irc channel on <ulink url="http://freenode.net">freenode.net</ulink>
-		  (#openacs). They're knowledgeable and quite friendly
-		  if you can keep them on topic.
-		</para>
-	  </listitem>
+      <listitem>
+        <para>
+          Search the <ulink url="http://openacs.org/forums/">forums at
+            openacs.org</ulink> - you'll often find many people who have
+          struggled through the same spot that you're in.
+        </para>
+      </listitem>
 
-	  <listitem>
-            <para>
-		  Post a question on the <ulink
-		  url="http://openacs.org/bboard/">bboards</ulink>. Make sure
-		  you've done a search first. When you do post, be sure to include
-		  your setup information (OS, etc) as well as the exact commands
-		  that are failing with the accompanying error.  If
-		  there's a SQL error in the TCL error or in the log,
-		  post that too.
-		</para>
-	  </listitem>
+      <listitem>
+        <para>
+          The bottom of each page has a link to OpenACS.org, where you can post
+          comments and read other users comments about the
+          contents of the page.
+        </para>
+      </listitem>
 
-	  <listitem>
-            <para>
-		  If you find errors in this document or if you have ideas about
-		  making it better, please post them in our
-		  <ulink
-          url="http://openacs.org/bugtracker/openacs/">BugTracker</ulink>.
+      <listitem>
+        <para>
+          Ask questions at the irc channel on <ulink url="http://freenode.net">freenode.net</ulink>
+          (#openacs). They're knowledgeable and quite friendly
+          if you can keep them on topic.
         </para>
-          </listitem>
-        </itemizedlist>
-    <para><phrase role="cvstag">($Id: overview.xml,v 1.12 2003/10/28
-    22:07:41 joela Exp $)</phrase></para>
+      </listitem>
 
-      </sect2>
-    </sect1>
+      <listitem>
+        <para>
+          Post a question on the <ulink
+            url="http://openacs.org/forums/">forums</ulink>. Make sure
+          you've done a search first. When you do post, be sure to include
+          your setup information (OS, etc) as well as the exact commands
+          that are failing with the accompanying error.  If
+          there's a SQL error in the TCL error or in the log,
+          post that too.
+        </para>
+      </listitem>
 
+      <listitem>
+        <para>
+          If you find errors in this document or if you have ideas about
+          making it better, please post them in our
+          <ulink
+            url="http://openacs.org/bugtracker/openacs/">BugTracker</ulink>.
+        </para>
+      </listitem>
+    </itemizedlist>
+    <para><phrase role="cvstag">($Id$)</phrase></para>
+  </sect2>
 
-
+</sect1>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/postgres.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/postgres.xml,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/postgres.xml	11 Nov 2003 10:28:29 -0000	1.15
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/postgres.xml	11 Dec 2003 21:39:49 -0000	1.16
@@ -5,16 +5,16 @@
 %myvars;
 ]>
 
-<sect1 id="postgres">
-  <title>Install PostGreSQL</title>
+<sect1 id="postgres" xreflabel="Install PostgreSQL">
+  <title>Install PostgreSQL</title>
 
   <authorblurb>
-	by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink>
+    <para>by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink></para>
   </authorblurb>
   
   <para>Skip this section if you will run only Oracle.</para>
 
-  <para>OpenACS &version; will run with <link linkend="source-postgresql">PostGreSQL</link> 7.2.x, 7.3.2,
+  <para>OpenACS &version; will run with <link linkend="source-postgresql">PostgreSQL</link> 7.2.x, 7.3.2,
   7.3.3, and 7.3.4.  7.3.4 is the recommended version of PostgreSQL.</para>
 
   <itemizedlist>
@@ -35,7 +35,7 @@
     <listitem>
         <formalpara id="install-postgres-rpm">
         <title>Using the Red Hat RPM</title>
-       <para>Red Hat users: If you install PostGreSQL 7.3.2 from the Red Hat 9 RPM, you
+       <para>Red Hat users: If you install PostgreSQL 7.3.2 from the Red Hat 9 RPM, you
   can skip a few steps.  These shell commands add some links for compatibility with the directories from a source-based install; start the service; create a new group for web service
   users, and modify the postgres user's
   environment (<link linkend="install-postgres-env">more
@@ -67,7 +67,7 @@
   <orderedlist>
     <listitem>
       <formalpara>
-        <title>Unpack PostGreSQL.</title>
+        <title>Unpack PostgreSQL.</title>
         <para>If you have not downloaded the postgresql tarball to
         <computeroutput>/tmp/postgresql-7.3.4.tar.gz</computeroutput>,
         <link linkend="source-postgresql">get it</link>.</para>
@@ -128,7 +128,7 @@
 	  Change to the postgres user and run <computeroutput>./configure</computeroutput> to set the compilation options automatically. This is the point at which you can
 	  configure PostgreSQL in various ways. For example, if you want to
 	  enable
-	  Unicode<indexterm><primary>Unicode</primary><secondary>in PostGreSQL</secondary></indexterm> support, add the flags <computeroutput>--enable-locale</computeroutput> and <computeroutput>--enable-multibyte</computeroutput>. If you want to see what the other possibilities are, run <computeroutput>./configure --help</computeroutput>.
+	  Unicode<indexterm><primary>Unicode</primary><secondary>in PostgreSQL</secondary></indexterm> support, add the flags <computeroutput>--enable-locale</computeroutput> and <computeroutput>--enable-multibyte</computeroutput>. If you want to see what the other possibilities are, run <computeroutput>./configure --help</computeroutput>.
 	</para>
       </formalpara>
       <screen>[root@yourserver src]# <userinput>su - postgres</userinput>
@@ -404,7 +404,7 @@
     <listitem>
       <formalpara id="postgres-tune">
         <title>Tune postgres.  (OPTIONAL)</title>
-        <para>The default values for PostGreSQL are very conservative; we can safely change some of them and improve performance.</para>  
+        <para>The default values for PostgreSQL are very conservative; we can safely change some of them and improve performance.</para>  
       </formalpara>
       <orderedlist>
         <listitem>
@@ -419,7 +419,7 @@
 kernel.shmmax = 134217728</programlisting>
         </listitem>
         <listitem>
-          <para>Edit the PostGreSQL config file, <computeroutput>/usr/local/pgsql/data/postgresql.conf</computeroutput>, to use more memory.  These values should improve performance in most cases.  (<ulink url="http://openacs.org/forums/message-view?message_id=94071">more information</ulink>)</para>
+          <para>Edit the PostgreSQL config file, <computeroutput>/usr/local/pgsql/data/postgresql.conf</computeroutput>, to use more memory.  These values should improve performance in most cases.  (<ulink url="http://openacs.org/forums/message-view?message_id=94071">more information</ulink>)</para>
           <programlisting>#       Shared Memory Size
 #
 shared_buffers = 15200      # 2*max_connections, min 16
@@ -433,7 +433,7 @@
 #
 checkpoint_segments = 3     # in logfile segments (16MB each), min 1
 </programlisting>
-          <para>Restart postgres (<computeroutput>service postgres restart</computeroutput>) so that the changes take effect.</para>
+          <para>Restart postgres (<computeroutput>service postgresql restart</computeroutput>) so that the changes take effect.</para>
         </listitem>
       </orderedlist>
     </listitem>
@@ -476,9 +476,10 @@
         </para></listitem>
       
     </itemizedlist>
+  <para><phrase role="cvstag">($Id$)</phrase></para>
   </sect2>
 
-  <para><phrase role="cvstag">($Id$)</phrase></para>
 
+
 </sect1>
 
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/quick.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/quick.xml,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/quick.xml	28 Oct 2003 22:07:41 -0000	1.3
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/quick.xml	11 Dec 2003 21:39:49 -0000	1.4
@@ -15,15 +15,15 @@
       <title>Purpose of this document</title>
       <para>
 	  This page describes a minimal installation of OpenACS with
-	  PostGreSQL (not Oracle).  It will produce a working OpenACS
+	  PostgreSQL (not Oracle).  It will produce a working OpenACS
 	  installation in under an hour.  It excludes source control,
 	  full text search, ssl, managed services (daemontools),
 	  DocBook, and qmail.  
 	</para>
     </sect2>
     <sect2>
       <title>For Red Hat 9</title>
-          <para>Install PostGreSQL 7.3.2 from RPM.  Select
+          <para>Install PostgreSQL 7.3.2 from RPM.  Select
         <computeroutput>Menu &gt; System Settings &gt; Add/Remove
         Applications</computeroutput> and select <computeroutput>Database Server</computeroutput>.</para>
           <xi:include href="postgres.xml#install-postgres-rpm"  xmlns:xi="http://www.w3.org/2001/XInclude">
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/recovery.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/recovery.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/recovery.xml	11 Nov 2003 16:57:20 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/recovery.xml	11 Dec 2003 21:39:49 -0000	1.7
@@ -1,16 +1,15 @@
 <?xml version='1.0' ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 <!ENTITY % myvars SYSTEM "../variables.ent">
 %myvars;
 ]>
   <sect1 id="backup-recovery">
     <title>Backup and Recovery</title>
     <authorblurb>
-    by <ulink url="mailto:dhogaza@pacifier.com">Don Baccus</ulink>
-
-      with additions by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>  </authorblurb>
-
+      <para>By <ulink url="mailto:dhogaza@pacifier.com">Don Baccus</ulink> with additions
+      by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
+  </authorblurb>
   <sect2 id="install-next-backups">
     <title>Backup Strategy</title>
     <para>
@@ -20,63 +19,63 @@
     </para>
     <itemizedlist>
       <listitem><para>
-          Store everything on a fault-tolerant disk array (RAID 1 or 5
-          or better).
-        </para></listitem>
+      Store everything on a fault-tolerant disk array (RAID 1 or 5
+      or better).
+      </para></listitem>
       <listitem><para>
-          Use battery backup.
-        </para></listitem>
+      Use battery backup.
+      </para></listitem>
       <listitem><para>
-          Use more reliable hardware, such as SCSI instead of IDE.
-        </para></listitem>
-      </itemizedlist>
+      Use more reliable hardware, such as SCSI instead of IDE.
+      </para></listitem>
+    </itemizedlist>
 
-      <para>These steps improve the chances of successful recovery:</para>
-      <itemizedlist>
-        <listitem><para>
-          Store backups on a third disk on another controller
-        </para></listitem>
-        <listitem><para>
-          Store backups on a different computer on a different network
-          in a different physical location.  (Compared to off-line
-          backup such as tapes and CDRs, on-line backup is faster and
-          more likely to succeed, but requires maintenance of another machine.)
-        </para></listitem>
-        <listitem><para>
-          Plan and configure for recovery from the beginning.
-        </para></listitem>
-        <listitem><para>
-          Test your recovery strategy from time to time.
-        </para></listitem>
-        <listitem><para>
-          Make it easy to maintain and test your recovery strategy, so
-          that you are more likely to do it.
-        </para></listitem>
-      </itemizedlist>
+    <para>These steps improve the chances of successful recovery:</para>
+    <itemizedlist>
+      <listitem><para>
+      Store backups on a third disk on another controller
+      </para></listitem>
+      <listitem><para>
+      Store backups on a different computer on a different network
+      in a different physical location.  (Compared to off-line
+      backup such as tapes and CDRs, on-line backup is faster and
+      more likely to succeed, but requires maintenance of another machine.)
+      </para></listitem>
+      <listitem><para>
+      Plan and configure for recovery from the beginning.
+      </para></listitem>
+      <listitem><para>
+      Test your recovery strategy from time to time.
+      </para></listitem>
+      <listitem><para>
+      Make it easy to maintain and test your recovery strategy, so
+      that you are more likely to do it.
+      </para></listitem>
+    </itemizedlist>
 
-      <para>
-        OpenACS installations comprise files and database contents.
-        If you follow the reference install and put all files,
-        including configuration files, in
-        <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/</computeroutput>,
-        and back up the database nightly to a file in
-        <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/database-backup</computeroutput>,
-        then you can apply standard file-based backup strategies to
-        <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable></computeroutput>
-</para>
+    <para>
+      OpenACS installations comprise files and database contents.
+      If you follow the reference install and put all files,
+      including configuration files, in
+      <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/</computeroutput>,
+      and back up the database nightly to a file in
+      <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/database-backup</computeroutput>,
+      then you can apply standard file-based backup strategies to
+      <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable></computeroutput>
+    </para>
   </sect2>
   
   <sect2 id="snapshot-backup">
-    <title>Snapshot backup and recovery</title>
+    <title>Manual backup and recovery</title>
     
-      <para>This section describes how to make a one-time backup and
-      restore of the files and database.  This is useful for rolling back to
-      known-good versions of a service, such as at initial
-      installation and just before an upgrade.  First, you back up the
-      database to a file within the file tree.  Then, you back up the
-      file tree.  All of the information needed to rebuild the site,
-      including the AOLserver config files, is then in tree for
-      regular file system backup.</para>
+    <para>This section describes how to make a one-time backup and
+    restore of the files and database.  This is useful for rolling back to
+    known-good versions of a service, such as at initial
+    installation and just before an upgrade.  First, you back up the
+    database to a file within the file tree.  Then, you back up the
+    file tree.  All of the information needed to rebuild the site,
+    including the AOLserver config files, is then in tree for
+    regular file system backup.</para>
     <orderedlist>
       <listitem>
         <formalpara>
@@ -91,196 +90,196 @@
             </formalpara>
             <itemizedlist>
               <listitem><para> 
-          Download the backup script. Save the file <ulink
-          url="files/export-oracle.txt">export-oracle.txt</ulink> as
-          <computeroutput>/tmp/export-oracle.txt</computeroutput>
-        </para></listitem>
+              Download the backup script. Save the file <ulink
+              url="files/export-oracle.txt">export-oracle.txt</ulink> as
+              <computeroutput>/tmp/export-oracle.txt</computeroutput>
+              </para></listitem>
               
               <listitem><para>
-          Login as root. The following commands will install the export script:
-        </para> 
-                <programlisting>
-joeuser:~$ su -
-Password: ***********
-root:~# cp /tmp/export-oracle.txt /usr/sbin/export-oracle
-root:~# chmod 700 /usr/sbin/export-oracle</programlisting>
-      </listitem>
+              Login as root. The following commands will install the export script:
+              </para> 
+              <programlisting>
+                joeuser:~$ su -
+                Password: ***********
+                root:~# cp /tmp/export-oracle.txt /usr/sbin/export-oracle
+              root:~# chmod 700 /usr/sbin/export-oracle</programlisting>
+              </listitem>
 
-      <listitem><para>
-        Setup the export directory; this is the directory where backups will
-        be stored. We recommend the directory
-        <computeroutput>/ora8/m02/oracle-exports</computeroutput>.</para>
+              <listitem><para>
+              Setup the export directory; this is the directory where backups will
+              be stored. We recommend the directory
+              <computeroutput>/ora8/m02/oracle-exports</computeroutput>.</para>
 
-        <programlisting>
-root:~# mkdir /ora8/m02/oracle-exports
-root:~# chown oracle.dba /ora8/m02/oracle-exports
-root:~# chmod 770 /ora8/m02/oracle-exports</programlisting>
-      </listitem>
+              <programlisting>
+                root:~# mkdir /ora8/m02/oracle-exports
+                root:~# chown oracle.dba /ora8/m02/oracle-exports
+              root:~# chmod 770 /ora8/m02/oracle-exports</programlisting>
+              </listitem>
 
-      <listitem><para> 
-          Now edit
-          <computeroutput>/usr/sbin/export-oracle</computeroutput> and
-          change the <computeroutput>SERVICE_NAME</computeroutput> and
-          <computeroutput>DATABASE_PASSWORD</computeroutput> fields to
-          their correct values. If you want to use a directory other than
-          <computeroutput>/ora8/m02/oracle-exports</computeroutput>, you
-          also need to change the
-          <computeroutput>exportdir</computeroutput> setting.
-        </para>
-        <para>
-          Test the export procedure by running the command:
-        </para>
+              <listitem><para> 
+              Now edit
+              <computeroutput>/usr/sbin/export-oracle</computeroutput> and
+              change the <computeroutput>SERVICE_NAME</computeroutput> and
+              <computeroutput>DATABASE_PASSWORD</computeroutput> fields to
+              their correct values. If you want to use a directory other than
+              <computeroutput>/ora8/m02/oracle-exports</computeroutput>, you
+              also need to change the
+              <computeroutput>exportdir</computeroutput> setting.
+              </para>
+              <para>
+                Test the export procedure by running the command:
+              </para>
 
-        <programlisting>
-root:~# /usr/sbin/export-oracle
-mv: /ora8/m02/oracle-exports/oraexport-service_name.dmp.gz: No such file or directory
+              <programlisting>
+                root:~# /usr/sbin/export-oracle
+                mv: /ora8/m02/oracle-exports/oraexport-service_name.dmp.gz: No such file or directory
 
-Export: Release 8.1.6.1.0 - Production on Sun Jun 11 18:07:45 2000
+                Export: Release 8.1.6.1.0 - Production on Sun Jun 11 18:07:45 2000
 
-(c) Copyright 1999 Oracle Corporation.  All rights reserved.
+                (c) Copyright 1999 Oracle Corporation.  All rights reserved.
 
 
-Connected to: Oracle8i Enterprise Edition Release 8.1.6.1.0 - Production
-With the Partitioning option
-JServer Release 8.1.6.0.0 - Production
-Export done in US7ASCII character set and US7ASCII NCHAR character set
-. exporting pre-schema procedural objects and actions
-. exporting foreign function library names for user SERVICE_NAME 
-. exporting object type definitions for user SERVICE_NAME 
-About to export SERVICE_NAME&#39;s objects ...
-. exporting database links
-. exporting sequence numbers
-. exporting cluster definitions
-. about to export SERVICE_NAME&#39;s tables via Conventional Path ...
-. exporting synonyms
-. exporting views
-. exporting stored procedures
-. exporting operators
-. exporting referential integrity constraints
-. exporting triggers
-. exporting indextypes
-. exporting bitmap, functional and extensible indexes
-. exporting posttables actions
-. exporting snapshots
-. exporting snapshot logs
-. exporting job queues
-. exporting refresh groups and children
-. exporting dimensions
-. exporting post-schema procedural objects and actions
-. exporting statistics
-Export terminated successfully without warnings.</programlisting>
+                Connected to: Oracle8i Enterprise Edition Release 8.1.6.1.0 - Production
+                With the Partitioning option
+                JServer Release 8.1.6.0.0 - Production
+                Export done in US7ASCII character set and US7ASCII NCHAR character set
+                . exporting pre-schema procedural objects and actions
+                . exporting foreign function library names for user SERVICE_NAME 
+                . exporting object type definitions for user SERVICE_NAME 
+                About to export SERVICE_NAME&#39;s objects ...
+                . exporting database links
+                . exporting sequence numbers
+                . exporting cluster definitions
+                . about to export SERVICE_NAME&#39;s tables via Conventional Path ...
+                . exporting synonyms
+                . exporting views
+                . exporting stored procedures
+                . exporting operators
+                . exporting referential integrity constraints
+                . exporting triggers
+                . exporting indextypes
+                . exporting bitmap, functional and extensible indexes
+                . exporting posttables actions
+                . exporting snapshots
+                . exporting snapshot logs
+                . exporting job queues
+                . exporting refresh groups and children
+                . exporting dimensions
+                . exporting post-schema procedural objects and actions
+                . exporting statistics
+              Export terminated successfully without warnings.</programlisting>
 
               </listitem>
             </itemizedlist>
           </listitem>
           <listitem>
             <formalpara>
-              <title>PostGreSQL</title>
+              <title>PostgreSQL</title>
               <para>Create a backup file and verify that it was created and has a reasonable size (several megabytes).</para>
             </formalpara>
             <screen>[root@localhost root]# <userinput>su - service0</userinput>
-[service0@localhost service0]$ <userinput>pg_dump -f /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/before_upgrade_to_4.6.dmp <replaceable>service0</replaceable></userinput>
-[service0@localhost service0]$ <userinput>ls -al /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/before_upgrade_to_4.6.dmp </userinput>
--rw-rw-r-x    1 service0  service0   4005995 Feb 21 18:28 /var/lib/aolserver/service0/database-backup/before_upgrade_to_4.6.dmp
-[service0@localhost service0]$ <userinput>exit</userinput>
-[root@localhost root]#
-<action>su - service0
-pg_dump -f /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/before_upgrade_to_4.6.dmp <replaceable>openacs-dev</replaceable>
-ls -al /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/before_upgrade_to_4.6.dmp
-exit</action></screen>
+            [service0@localhost service0]$ <userinput>pg_dump -f /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/before_upgrade_to_4.6.dmp <replaceable>service0</replaceable></userinput>
+            [service0@localhost service0]$ <userinput>ls -al /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/before_upgrade_to_4.6.dmp </userinput>
+            -rw-rw-r-x    1 service0  service0   4005995 Feb 21 18:28 /var/lib/aolserver/service0/database-backup/before_upgrade_to_4.6.dmp
+            [service0@localhost service0]$ <userinput>exit</userinput>
+            [root@localhost root]#
+            <action>su - service0
+            pg_dump -f /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/before_upgrade_to_4.6.dmp <replaceable>openacs-dev</replaceable>
+            ls -al /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/before_upgrade_to_4.6.dmp
+            exit</action></screen>
           </listitem>
         </itemizedlist>
       </listitem>
       <listitem id="backup-file-system">
         <formalpara>
-        <title>Back up the file system</title>
-        <para>Back up all of the files in the service, including the
-        database backup file but excluding the auto-generated
-      <computeroutput>supervise</computeroutput> directory, which is
-      unneccesary and has complicated permissions.  </para>
+          <title>Back up the file system</title>
+          <para>Back up all of the files in the service, including the
+          database backup file but excluding the auto-generated
+          <computeroutput>supervise</computeroutput> directory, which is
+          unneccesary and has complicated permissions.  </para>
         </formalpara>
-      <para>In the tar command,</para>
-      <itemizedlist>
-        <listitem>
-          <para><computeroutput>c</computeroutput> create a
-          new tar archive</para>
-        </listitem>
-        <listitem>
-          <para><computeroutput>p</computeroutput> preserves permissions.</para>
-        </listitem>
-        <listitem>
-          <para><computeroutput>s</computeroutput> preserves file sort order</para>
-        </listitem>
-        <listitem>
-          <para><computeroutput>j</computeroutput> compresses the output with bz2.</para>
-        </listitem>
-        <listitem>
-          <para>The <computeroutput>--exclude</computeroutput> clauses skips some daemontools files that
-          are owned by root and thus cannot be backed up by the
-          service owner.  These files are autogenerated and we don't
-          break anything by omitting them.</para>
-        </listitem>
-        <listitem>
-          <para>The <computeroutput>--file</computeroutput> clause
-          specifies the name of the output file to be generated; we
-          manually add the correct extensions.</para>
-        </listitem>
-        <listitem>
-          <para>The last clause,
-          <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/</computeroutput>,
-          specifies the starting point for backup.  Tar defaults to
-          recursive backup.</para>
-        </listitem>
-      </itemizedlist>
-      <screen>[root@yourserver root]# <userinput>su - <replaceable>service0</replaceable></userinput>
-[service0@yourserver service0]$ <userinput>tar -cpsj --exclude /var/lib/aolserver/<replaceable>service0</replaceable>/etc/daemontools/supervise --file /tmp/<replaceable>service0</replaceable>-backup.tar.bz2 /var/lib/aolserver/<replaceable>service0</replaceable>/ </userinput>
-tar: Removing leading `/' from member names
-[service0@yourserver service0]$</screen>
-</listitem>
+        <para>In the tar command,</para>
+        <itemizedlist>
+          <listitem>
+            <para><computeroutput>c</computeroutput> create a
+            new tar archive</para>
+          </listitem>
+          <listitem>
+            <para><computeroutput>p</computeroutput> preserves permissions.</para>
+          </listitem>
+          <listitem>
+            <para><computeroutput>s</computeroutput> preserves file sort order</para>
+          </listitem>
+          <listitem>
+            <para><computeroutput>j</computeroutput> compresses the output with bz2.</para>
+          </listitem>
+          <listitem>
+            <para>The <computeroutput>--exclude</computeroutput> clauses skips some daemontools files that
+            are owned by root and thus cannot be backed up by the
+            service owner.  These files are autogenerated and we don't
+            break anything by omitting them.</para>
+          </listitem>
+          <listitem>
+            <para>The <computeroutput>--file</computeroutput> clause
+            specifies the name of the output file to be generated; we
+            manually add the correct extensions.</para>
+          </listitem>
+          <listitem>
+            <para>The last clause,
+            <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/</computeroutput>,
+            specifies the starting point for backup.  Tar defaults to
+            recursive backup.</para>
+          </listitem>
+        </itemizedlist>
+        <screen>[root@yourserver root]# <userinput>su - <replaceable>service0</replaceable></userinput>
+        [service0@yourserver service0]$ <userinput>tar -cpsj --exclude /var/lib/aolserver/<replaceable>service0</replaceable>/etc/daemontools/supervise --file /tmp/<replaceable>service0</replaceable>-backup.tar.bz2 /var/lib/aolserver/<replaceable>service0</replaceable>/ </userinput>
+        tar: Removing leading `/' from member names
+        [service0@yourserver service0]$</screen>
+      </listitem>
       <listitem>
         <formalpara>
-        <title>Suffer a catastrophic failure on your production system</title>
+          <title>Suffer a catastrophic failure on your production system</title>
           <para>(We'll simulate this step)</para>
         </formalpara>
         <screen>[root@yourserver root]# <userinput>svc -d /service/service0</userinput>
-[root@yourserver root]# <userinput>mv /var/lib/aolserver/service0/ /var/lib/aolserver/service0.lost</userinput>
-[root@yourserver root]#<userinput> rm /service/service0</userinput>
-rm: remove symbolic link `/service/service0'? y
-[root@yourserver root]# <userinput>ps -auxw | grep service0</userinput>
-root      1496  0.0  0.0  1312  252 ?        S    16:58   0:00 supervise service0
-[root@yourserver root]#<userinput> kill<replaceable> 1496</replaceable></userinput>
-[root@yourserver root]# <userinput>ps -auxw | grep service0</userinput>
-[root@yourserver root]# <userinput>su - postgres</userinput>
-[postgres@yourserver pgsql]$ <userinput>dropdb service0</userinput>
-DROP DATABASE
-[postgres@yourserver pgsql]$ <userinput>dropuser service0</userinput>
-DROP USER
-[postgres@yourserver pgsql]$ <userinput>exit</userinput>
-logout
-[root@yourserver root]#</screen>
+        [root@yourserver root]# <userinput>mv /var/lib/aolserver/service0/ /var/lib/aolserver/service0.lost</userinput>
+        [root@yourserver root]#<userinput> rm /service/service0</userinput>
+        rm: remove symbolic link `/service/service0'? y
+        [root@yourserver root]# <userinput>ps -auxw | grep service0</userinput>
+        root      1496  0.0  0.0  1312  252 ?        S    16:58   0:00 supervise service0
+        [root@yourserver root]#<userinput> kill<replaceable> 1496</replaceable></userinput>
+        [root@yourserver root]# <userinput>ps -auxw | grep service0</userinput>
+        [root@yourserver root]# <userinput>su - postgres</userinput>
+        [postgres@yourserver pgsql]$ <userinput>dropdb service0</userinput>
+        DROP DATABASE
+        [postgres@yourserver pgsql]$ <userinput>dropuser service0</userinput>
+        DROP USER
+        [postgres@yourserver pgsql]$ <userinput>exit</userinput>
+        logout
+        [root@yourserver root]#</screen>
       </listitem>
       <listitem>
-        <formalpara>
+        <formalpara id="recovery">
           <title>Recovery</title>
           <para></para>
         </formalpara>
-      <orderedlist>
-        <listitem>
-          <para>Restore the operating system and required software.
-          You can do this with standard backup processes or by
-          keeping copies of the install material (OS CDs, OpenACS
-          tarball and supporting software) and repeating the install
-          guide.  Recreate the service user (<replaceable>service0</replaceable>).</para>
-        </listitem>
+        <orderedlist>
           <listitem>
+            <para>Restore the operating system and required software.
+            You can do this with standard backup processes or by
+            keeping copies of the install material (OS CDs, OpenACS
+            tarball and supporting software) and repeating the install
+            guide.  Recreate the service user (<replaceable>service0</replaceable>).</para>
+          </listitem>
+          <listitem>
             <para>Restore the OpenACS files and database backup file.</para>
-<screen>[root@yourserver root]# <userinput>su - <replaceable>service0</replaceable></userinput>
-[service0@yourserver service0]$ <userinput>cd /var/lib/aolserver</userinput>
-[service0@yourserver aolserver]$<userinput> tar xjf /tmp/service0-backup.tar.bz2</userinput>
-[service0@yourserver aolserver]$ <userinput>chmod -R 775 <replaceable>service0</replaceable></userinput>
-[service0@yourserver aolserver]$ <userinput>chown -R <replaceable>service0.web</replaceable> <replaceable>service0</replaceable></userinput>
+            <screen>[root@yourserver root]# <userinput>su - <replaceable>service0</replaceable></userinput>
+            [service0@yourserver service0]$ <userinput>cd /var/lib/aolserver</userinput>
+            [service0@yourserver aolserver]$<userinput> tar xjf /tmp/service0-backup.tar.bz2</userinput>
+            [service0@yourserver aolserver]$ <userinput>chmod -R 775 <replaceable>service0</replaceable></userinput>
+            [service0@yourserver aolserver]$ <userinput>chown -R <replaceable>service0.web</replaceable> <replaceable>service0</replaceable></userinput>
 
-</screen>
+            </screen>
           </listitem>
           <listitem>
             <para>Restore the database</para>
@@ -293,12 +292,12 @@
                 <orderedlist>
                   <listitem>
                     <para>Set up a clean Oracle database user and
-                  tablespace (<link
-                  linkend="install-openacs-prepare-oracle">more information</link>).</para>
+                    tablespace with the same names as the ones exported from (<link
+                    linkend="install-openacs-prepare-oracle">more information</link>).</para>
                   </listitem>
                   <listitem>
                     <para>Invoke the import command</para>
-                    <screen><action>imp <replaceable>service0</replaceable>/<replaceable>service0</replaceable> FILE=/var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/nighty_backup.dmp</action></screen>
+                    <screen><action>imp <replaceable>service0</replaceable>/<replaceable>service0</replaceable> FILE=/var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/nighty_backup.dmp FULL=Y</action></screen>
                   </listitem>
                 </orderedlist>
               </listitem>
@@ -308,30 +307,30 @@
                   <para></para>
                 </formalpara>
                 <para>Because of a bug in Postgres backup-recovery, database objects are not guaranteed to be created in the right order.  To compensate, we pre-creating some critical items first, which leads to some harmless errors.</para>
-          <screen>[root@yourserver root]# <userinput>su - postgres</userinput>
-[postgres@yourserver pgsql]$ <userinput>createuser <replaceable>service0</replaceable></userinput>
-Shall the new user be allowed to create databases? (y/n) <userinput>y</userinput>
-Shall the new user be allowed to create more new users? (y/n) <userinput>y</userinput>
-CREATE USER
-[service0@yourserver web]$ <userinput>createdb <replaceable>service0</replaceable></userinput>
-CREATE DATABASE
-[service0@yourserver web]$<userinput> psql -f /var/lib/aolserver/<replaceable>service0</replaceable>/packages/acs-kernel/sql/postgresql/postgresql.sql <replaceable>service0</replaceable></userinput>
-<emphasis>(many lines omitted)</emphasis>
-[service0@yourserver web]$ <userinput>psql <replaceable>service0</replaceable> &lt; /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/<replaceable>database-backup.dmp</replaceable></userinput>
-<emphasis>(many lines omitted)</emphasis>
-[service0@yourserver web]$ <userinput>exit</userinput>
-[postgres@yourserver pgsql]$ <userinput>exit</userinput>
-logout
-</screen>
+                <screen>[root@yourserver root]# <userinput>su - postgres</userinput>
+                [postgres@yourserver pgsql]$ <userinput>createuser <replaceable>service0</replaceable></userinput>
+                Shall the new user be allowed to create databases? (y/n) <userinput>y</userinput>
+                Shall the new user be allowed to create more new users? (y/n) <userinput>y</userinput>
+                CREATE USER
+                [service0@yourserver web]$ <userinput>createdb <replaceable>service0</replaceable></userinput>
+                CREATE DATABASE
+                [service0@yourserver web]$<userinput> psql -f /var/lib/aolserver/<replaceable>service0</replaceable>/packages/acs-kernel/sql/postgresql/postgresql.sql <replaceable>service0</replaceable></userinput>
+                <emphasis>(many lines omitted)</emphasis>
+                [service0@yourserver web]$ <userinput>psql <replaceable>service0</replaceable> &lt; /var/lib/aolserver/<replaceable>service0</replaceable>/database-backup/<replaceable>database-backup.dmp</replaceable></userinput>
+                <emphasis>(many lines omitted)</emphasis>
+                [service0@yourserver web]$ <userinput>exit</userinput>
+                [postgres@yourserver pgsql]$ <userinput>exit</userinput>
+                logout
+                </screen>
               </listitem>
             </itemizedlist>
           </listitem>
           <listitem>
             <para>Activate the service</para>
-<screen>[root@yourserver root]# <userinput>ln -s /var/lib/aolserver/<replaceable>service0</replaceable>/etc/daemontools /service/<replaceable>service0</replaceable></userinput>
-[root@yourserver root]# <userinput>sleep 10</userinput>
-[root@yourserver root]# <userinput>svgroup web /service/<replaceable>service0</replaceable></userinput>
-[root@yourserver root]#</screen>
+            <screen>[root@yourserver root]# <userinput>ln -s /var/lib/aolserver/<replaceable>service0</replaceable>/etc/daemontools /service/<replaceable>service0</replaceable></userinput>
+            [root@yourserver root]# <userinput>sleep 10</userinput>
+            [root@yourserver root]# <userinput>svgroup web /service/<replaceable>service0</replaceable></userinput>
+            [root@yourserver root]#</screen>
           </listitem>
         </orderedlist>
       </listitem>
@@ -340,177 +339,63 @@
 
   <sect2 id="automated-backup">
     <title>Automated Backup (OPTIONAL)</title>
-  <para>Backup can encompass all files in
-    <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable></computeroutput>.  Use one cron job to back up the database to a file in
-      <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/database-backup</computeroutput>, and a second cron job to back up the entire file tree.</para>
-      <sect3 id="postgres-quick-backup">
-        <title>Postgres automatic backup</title>
-        <para>Backing up the database consists of creating a file
-        which is a picture of the database at a particular moment.
-        Postgres can be backed up while running.  </para>
-        <para>Depending on your overall backup strategy, you can
-        create a series of database backup files (recommended for a development server where you are using <xref linkend="backups-with-cvs"/>), or you can create a
-        single nightly backup file which is then collected into a
-        bigger backup file that includes the other parts of the
-        service.  The latter technique is more generally recommended.  To make a new file every
-        night, edit the crontab file for <replaceable>service0</replaceable>:</para>
-    <screen>[service0@yourserver service0]$ <userinput>export EDITOR=emacs;crontab -e</userinput></screen>
-    <para>Add this line to the file.  The numbers and stars at the beginning are cron columns that specify when the program should be run - in this case, whenever the minute is 0 and the hour is 1, i.e., 1:00 am every day.</para>
-    <programlisting>0 1 * * * /usr/local/pgsql/bin/pg_dump -f /var/lib/aolserver/service0/database-backup/service0_`date +\%Y-\%m-\%d`.dmp service0</programlisting>
-    <para>If you plan to back up the whole <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable></computeroutput> directory, then it would be redundant to keep a history of database backups.  In that case, set up the cron job to overwrite the previous backup each time:</para>
-    <programlisting>0 1 * * * /usr/local/pgsql/bin/pg_dump -f /var/lib/aolserver/service0/database-backup/service0_nightly.dmp service0</programlisting>
-      </sect3>
-    </sect2>
-    <sect2>
-      <title>A full Backup/Recovery cycle</title>
-      <para><emphasis>On a test service</emphasis>, make sure that your backup-recovery process work.  After backing up the database and file system, delete the service as detailed below and then recover it.</para>    
-    </sect2>
-
-    <sect2 id="other-backup-strategies">
-        <title>Other Backup Strategies</title>
-        <para>Earlier strategies, included here because this section
-        hasn't been fully updated yet.</para>
-      <sect3 id="install-export-oracle">
-        <title>Set Up Nightly Oracle Exports</title>
-        <para>Edit the backup script to save the backup
-      file in <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/database-backup</computeroutput>.
-      While you&#39;re working with Oracle, you should configure it to do
-      automatic exports. An export is a separate backup copy of the
-      database.  This copy includes all of the database&#39;s state at the
-      time that the export was initiated. If your database is corrupted,
-      you can restore from one of these backups. You should do this step as
-      <computeroutput>root</computeroutput>.
-    </para>
-      <para>
-          Automating backups is accomplished using the UNIX
-          <computeroutput>crontab</computeroutput> facility.</para>
-      
-          <para>
-          While still <computeroutput>root</computeroutput>, run the
-          following command. You can replace the
-          <computeroutput>EDITOR=&quot;emacs -nw&quot;</computeroutput>
-          portion with whatever editor your prefer, such as
-          <computeroutput>EDITOR=vi</computeroutput>.
-        </para>
-        <programlisting>
-root:~# export EDITOR=&quot;emacs -nw&quot;
-root:~# crontab -e</programlisting>
-
-        <para>Now add the following line on a line by itself </para>
-
-        <programlisting>
-0 23 * * * /usr/sbin/export-oracle</programlisting>
-
+    <para>The recommended backup strategy for a production sit is to use an automated script which first backs up the database to a file in <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/database-backup</computeroutput> and then backs up all of <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable></computeroutput> to a single zip file, and then copies that zip file to another computer.</para>
+    <orderedlist>
+      <listitem>
+        <para>Make sure that the manual backup process described above works.</para>
+      </listitem>
+      <listitem>
+        <para>Customize the default backup script.  Edit <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/etc/backup.sh</computeroutput> with your specific parameters.</para>
+      </listitem>
+      <listitem>
         <para>
-          Save the file, exit the editor. Verify that the addition
-          succeeded by checking the output of the following command.</para>
-
-        <programlisting>
-root:~# crontab -l | grep export-oracle
-0 23 * * * /usr/sbin/export-oracle
-root:~# exit
-; Logout</programlisting>
-
-      <para>If you see the line, go ahead and log out.</para>
-    </sect3>
-    <sect3 id="install-export-postgres">
-    <title>Set up nightly Postgres exports</title>
-
-    <para>This is an alternate method to the crontabls - backup.
-      Dowload <ulink url="files/acs-pgbackup-init.txt">this script</ulink>
-      to <computeroutput>/tmp</computeroutput>. At the top of the script
-      are several variables that you'll need to customize:
-    </para>
-
-    <itemizedlist>
-      <listitem><para>
-          <computeroutput>bak</computeroutput> - location where you want
-          local backups to be saved
-        </para></listitem>
-
-      <listitem><para>
-          <computeroutput>servername</computeroutput> - name of your server
-          (and database instance)
-        </para></listitem>
-
-      <listitem><para>
-          <computeroutput>ftp_user</computeroutput> - username on your ftp
-          account 
-        </para></listitem>
-
-      <listitem><para>
-          <computeroutput>ftp_password</computeroutput> - password on your
-          ftp account
-        </para></listitem>
-
-      <listitem><para>
-          <computeroutput>ftp_dir</computeroutput> - path on the remote
-          server where your backups will be uploaded
-        </para></listitem>
-
-      <listitem><para>
-          <computeroutput>ftp_server</computeroutput> - your ftp server
-        </para></listitem>
-    </itemizedlist>
-
-    <para>
-
-      Next, we'll save this file to our server's
-      <computeroutput>tcl</computeroutput> directory so that it will be
-      loaded on startup. It will automatically be run every night at
-      midnight. Note that this script only backs up the database - not the
-      OpenACS scripts and file content.
-    </para>
-
-    <programlisting>
-joeuser:~$ cp /tmp/acs-pgbackup-init.txt ~/var/lib/aolserver/birdnotes/tcl/acs-pgbackup-init.tcl
-joeuser:~$ restart-aolserver birdnotes</programlisting>
-
+        Make sure the file is executable:</para>
+<programlisting>chmod +x backup.sh</programlisting>
+      </listitem>
+      <listitem>
         <para>
-      That's it! The script will email you with each successful backup (or
-      if it fails, it will send you an email with the reason)
-    </para>
-      </sect3>
-    </sect2>
+        Set this file to run automatically by adding a line to root's crontab. (Typically, with <computeroutput>export EDITOR=emacs; crontab -e</computeroutput>.)  This example runs the backup script at 1:30 am every day.</para>
+        <programlisting>30 1 * * * *        sh /var/lib/aolserver/<replaceable>service0</replaceable>/etc/backup.sh</programlisting>
+      </listitem>
+    </orderedlist>
+
+  </sect2>
   <sect2 id="backups-with-cvs">
     <title>Using CVS for backup-recovery</title>
-            <para>If you are already using CVS, you probably don't
-              need to do anything to back up your files.  Just make
-              sure that your current work is checked into the system.
-              You can then roll back based on date - note the
-              current system time, down to the minute.  For maximum
-              safety, you can apply a tag to your current
-              files.  You will still need to back up your database.</para>
-          <para>  Note that, if you did the CVS options in this document, the <computeroutput>/var/lib/aolserver/service0/etc</computeroutput> directory is not included in cvs and you may want to add it.</para>
-            <screen>[root@localhost root]# <userinput>su - service0</userinput>
-[service0@localhost service0]$ <userinput>cd /var/lib/aolserver/<replaceable>service0</replaceable></userinput>
-[service0@localhost service0]$ <userinput>cvs commit -m "last-minute commits before upgrade to 4.6"</userinput>
-cvs commit: Examining .
-cvs commit: Examining bin
-(many lines omitted)
-[service0@localhost service0]$ <userinput>cvs tag before_upgrade_to_4_6</userinput>
-cvs server: Tagging bin
-T bin/acs-4-0-publish.sh
-T bin/ad-context-server.pl
-(many lines omitted)
-[service0@localhost service0]$ <userinput>exit</userinput>
-[root@localhost root]# 
-<action>su - service0
-cd /var/lib/aolserver/<replaceable>service0</replaceable>
-cvs commit -m "last-minute commits before upgrade to 4.6"
-cvs tag before_upgrade_to_4_6
-exit</action></screen>
-          <para>To restore files from a cvs tag such as the one used above:</para>
-          <screen>[root@localhost root]# <userinput>su - service0</userinput>
-[service0@localhost service0]$ <userinput>cd /var/lib/aolserver/<replaceable>service0</replaceable></userinput>
-[service0@localhost service0]$ <userinput>cvs up -r current</userinput>
-[service0@localhost service0]$ <userinput>exit</userinput>
-<action><userinput>su - service0</userinput>
-cd /var/lib/aolserver/<replaceable>service0</replaceable>
-cvs up -r current</action></screen>
+    <para>CVS-only backup is often appropriate for development sites.  If you are already using CVS and your data is not important, you probably don't
+    need to do anything to back up your files.  Just make
+    sure that your current work is checked into the system.
+    You can then roll back based on date - note the
+    current system time, down to the minute.  For maximum
+    safety, you can apply a tag to your current
+    files.  You will still need to back up your database.</para>
+    <para>  Note that, if you did the CVS options in this document, the <computeroutput>/var/lib/aolserver/service0/etc</computeroutput> directory is not included in cvs and you may want to add it.</para>
+    <screen>[root@localhost root]# <userinput>su - service0</userinput>
+    [service0@localhost service0]$ <userinput>cd /var/lib/aolserver/<replaceable>service0</replaceable></userinput>
+    [service0@localhost service0]$ <userinput>cvs commit -m "last-minute commits before upgrade to 4.6"</userinput>
+    cvs commit: Examining .
+    cvs commit: Examining bin
+    (many lines omitted)
+    [service0@localhost service0]$ <userinput>cvs tag before_upgrade_to_4_6</userinput>
+    cvs server: Tagging bin
+    T bin/acs-4-0-publish.sh
+    T bin/ad-context-server.pl
+    (many lines omitted)
+    [service0@localhost service0]$ <userinput>exit</userinput>
+    [root@localhost root]# 
+    <action>su - service0
+    cd /var/lib/aolserver/<replaceable>service0</replaceable>
+    cvs commit -m "last-minute commits before upgrade to 4.6"
+    cvs tag before_upgrade_to_4_6
+    exit</action></screen>
+    <para>To restore files from a cvs tag such as the one used above:</para>
+    <screen>[root@localhost root]# <userinput>su - service0</userinput>
+    [service0@localhost service0]$ <userinput>cd /var/lib/aolserver/<replaceable>service0</replaceable></userinput>
+    [service0@localhost service0]$ <userinput>cvs up -r current</userinput>
+    [service0@localhost service0]$ <userinput>exit</userinput>
+    <action><userinput>su - service0</userinput>
+    cd /var/lib/aolserver/<replaceable>service0</replaceable>
+    cvs up -r current</action></screen>
   </sect2>
-    
     <para><phrase role="cvstag">($Id$)</phrase></para>
-</sect1>
-    
-  
\ No newline at end of file
+</sect1>
\ No newline at end of file
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/red-hat.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/red-hat.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/red-hat.xml	5 Nov 2003 11:48:12 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/red-hat.xml	11 Dec 2003 21:39:49 -0000	1.6
@@ -8,7 +8,7 @@
     <title>Install Red Hat 8/9</title>
 
     <authorblurb>
-      by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+      <para>by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
     </authorblurb>
     
     <para>This section takes a blank PC and sets up some supporting
@@ -63,7 +63,7 @@
       <listitem id="install-first-step"><para>Unplug the network cable from your
           computer.  We don't want to connect to the network
           until we're sure the computer is secure.  
-<indexterm>
+           <indexterm>
             <primary>security</primary>
             <secondary>definition</secondary>
           </indexterm>
@@ -101,7 +101,6 @@
 	<computeroutput><guibutton><accel>N</accel>ext</guibutton></computeroutput>.</para>
       </listitem>
 
-
       <listitem>
         <para>Reformat the hard drive.  If you know what you're doing,
 	do this step on your own.  Otherwise:  we're going to let the
@@ -159,7 +158,7 @@
           </indexterm>Select any additional languages you want the
 	  computer to support and then click
 	  <computeroutput><guibutton><accel>N</accel>ext</guibutton></computeroutput></para></listitem>
-      <listitem><para>Choose your time zone and click <computeroutput><guibutton><accel>N</accel>ext</guibutton></computeroutput>.</para></listitem>.
+      <listitem><para>Choose your time zone and click <computeroutput><guibutton><accel>N</accel>ext</guibutton></computeroutput>.</para></listitem>
       <listitem><para>Type in a root
 password, twice.</para>
       </listitem>
@@ -172,17 +171,18 @@
 risk that's still screened by the firewall, or a resource hog.  Just
 don't install a database or web server, because that would conflict
 with the database and web server we'll install later.
-<literallayout>check <computeroutput><guilabel>Editors</guilabel></computeroutput> (this installs emacs<indexterm><primary>emacs</primary><secondary>installation</secondary></indexterm>),
-click <computeroutput><guilabel>Details</guilabel></computeroutput> next to <computeroutput><guilabel>Text-based Internet</guilabel></computeroutput>, check <computeroutput><guilabel>lynx</guilabel></computeroutput>, and click <computeroutput><guibutton><accel>O</accel>K</guibutton></computeroutput>;
-check <computeroutput><guilabel>Authoring and Publishing</guilabel></computeroutput> (<indexterm><primary>docbook</primary><secondary>installation</secondary></indexterm>this installs docbook),
-uncheck <computeroutput><guilabel>Server Configuration Tools</guilabel></computeroutput>,
-uncheck <computeroutput><guilabel>Web Server</guilabel></computeroutput>,
-uncheck <computeroutput><guilabel>Windows File Server</guilabel></computeroutput>,
-check <computeroutput><guilabel>SQL Database
-Server</guilabel></computeroutput> (this installs PostGreSQL,
-check <computeroutput><guilabel>Development Tools</guilabel></computeroutput> (this installs gmake and other build tools),
-uncheck <computeroutput><guilabel>Administration Tools</guilabel></computeroutput>, and
-uncheck <computeroutput><guilabel>Printing Support</guilabel></computeroutput>. </literallayout></para>
+</para><simplelist>
+<member>check <computeroutput><guilabel>Editors</guilabel></computeroutput> (this installs emacs<indexterm><primary>emacs</primary><secondary>installation</secondary></indexterm>),</member>
+<member>click <computeroutput><guilabel>Details</guilabel></computeroutput> next to <computeroutput><guilabel>Text-based Internet</guilabel></computeroutput>, check <computeroutput><guilabel>lynx</guilabel></computeroutput>, and click <computeroutput><guibutton><accel>O</accel>K</guibutton></computeroutput>;</member>
+<member>check <computeroutput><guilabel>Authoring and Publishing</guilabel></computeroutput> (<indexterm><primary>docbook</primary><secondary>installation</secondary></indexterm>this installs docbook),</member>
+<member>uncheck <computeroutput><guilabel>Server Configuration Tools</guilabel></computeroutput>,</member>
+<member>uncheck <computeroutput><guilabel>Web Server</guilabel></computeroutput>,</member>
+<member>uncheck <computeroutput><guilabel>Windows File Server</guilabel></computeroutput>,</member>
+<member>check <computeroutput><guilabel>SQL Database Server</guilabel></computeroutput> (this installs PostgreSQL),</member>
+<member>check <computeroutput><guilabel>Development Tools</guilabel></computeroutput> (this installs gmake and other build tools),</member>
+<member>uncheck <computeroutput><guilabel>Administration Tools</guilabel></computeroutput>, and</member>
+<member>uncheck <computeroutput><guilabel>Printing Support</guilabel></computeroutput>.</member>
+</simplelist>
 <para>At the bottom, check <computeroutput><guilabel><accel>S</accel>elect Individual Packages</guilabel></computeroutput> and click <computeroutput><guibutton><accel>N</accel>ext</guibutton></computeroutput></para>
 
 </listitem>
@@ -193,21 +193,23 @@
 <computeroutput><guilabel><accel>F</accel>lat
 View</guilabel></computeroutput> and wait. In a minute, a
 list of packages will appear.</para>
-<literallayout>uncheck <computeroutput><guilabel>apmd</guilabel></computeroutput> (monitors power, not very useful for servers), 
-check <computeroutput><guilabel>ImageMagick</guilabel></computeroutput> (required for the <indexterm><primary>photo-album</primary><secondary>installation</secondary><see>ImageMagick</see></indexterm>photo-album packages, 
-uncheck<computeroutput><guilabel>isdn4k-utils</guilabel></computeroutput> (unless you are using isdn, this installs a useless daemon), 
-check <computeroutput><guilabel>mutt</guilabel></computeroutput> (a mail program that reads Maildir),
-uncheck <computeroutput><guilabel>nfs-utils</guilabel></computeroutput> (nfs is a major security risk), 
-uncheck <computeroutput><guilabel>pam-devel</guilabel></computeroutput> (I don't remember why, but we don't want this), 
-uncheck <computeroutput><guilabel>portmap</guilabel></computeroutput>, 
-uncheck <computeroutput><guilabel>postfix</guilabel></computeroutput> (this is an MTA, but we're going to install qmail later), 
-check
-<computeroutput><guilabel>postgresql-devel</guilabel></computeroutput>,
-uncheck <computeroutput><guilabel>rsh</guilabel></computeroutput> (rsh is a security hole), 
-uncheck <computeroutput><guilabel>sendmail</guilabel></computeroutput> (sendmail is an insecure MTA; we're going to install qmail instead later),
-check <computeroutput><guilabel>tcl</guilabel></computeroutput> (we need tcl), and 
-uncheck <computeroutput><guilabel>xinetd</guilabel></computeroutput> (xinetd handles incoming tcp connections.  We'll install a different, more secure program, ucspi-tcp).
-Click <computeroutput><guibutton><accel>N</accel>ext</guibutton></computeroutput></literallayout>
+<simplelist>
+<member>uncheck <computeroutput><guilabel>apmd</guilabel></computeroutput> (monitors power, not very useful for servers), </member>
+<member>check <computeroutput><guilabel>ImageMagick</guilabel></computeroutput> (required for the <indexterm><primary>photo-album</primary><secondary>installation</secondary><see>ImageMagick</see></indexterm>photo-album packages, </member>
+<member>uncheck<computeroutput><guilabel>isdn4k-utils</guilabel></computeroutput> (unless you are using isdn, this installs a useless daemon), </member>
+<member>check <computeroutput><guilabel>mutt</guilabel></computeroutput> (a mail program that reads Maildir),</member>
+<member>uncheck <computeroutput><guilabel>nfs-utils</guilabel></computeroutput> (nfs is a major security risk), </member>
+<member>uncheck <computeroutput><guilabel>pam-devel</guilabel></computeroutput> (I don't remember why, but we don't want this), </member>
+<member>uncheck <computeroutput><guilabel>portmap</guilabel></computeroutput>, </member>
+<member>uncheck <computeroutput><guilabel>postfix</guilabel></computeroutput> (this is an MTA, but we're going to install qmail later), </member>
+<member>check  <computeroutput><guilabel>postgresql-devel</guilabel></computeroutput>,</member>
+<member>uncheck <computeroutput><guilabel>rsh</guilabel></computeroutput> (rsh is a security hole), </member>
+<member>uncheck <computeroutput><guilabel>sendmail</guilabel></computeroutput> (sendmail is an insecure MTA; we're going to install qmail instead later),</member>
+<member>check <computeroutput><guilabel>tcl</guilabel></computeroutput> (we need tcl), and </member>
+<member>uncheck <computeroutput><guilabel>xinetd</guilabel></computeroutput> (xinetd handles incoming tcp connections.  We'll install a different, more secure program, ucspi-tcp).</member>
+<member>Click <computeroutput><guibutton><accel>N</accel>ext</guibutton></computeroutput></member>
+</simplelist>
+
 </listitem>
   <listitem><para>Red Hat isn't completely happy with the combination
 of packages we've selected, and wants to satisfy some dependencies.
@@ -252,36 +254,57 @@
       <listitem>
         <para>Lock down SSH</para>
         <orderedlist>
-          <listitem><para><indexterm>
-                <primary>ssh</primary>
-              </indexterm>
-SSH is the protocol we use to connect
-            securely to the computer (replacing telnet, which is
-            insecure).  sshd is the daemon that listens for incoming
-            ssh connections.  As a security precaution, we are now going
-	to tell ssh not to allow anyone to connect directly to this
-	computer as root.  Type this into the shell:
-    <screen><userinput>emacs /etc/ssh/sshd_config</userinput></screen></para></listitem>
-          <listitem><literallayout>Search for the word "root" by typing C-s (that's emacs-speak for control-s) and then <userinput>root</userinput>.   
-Make the following changes:
-<programlisting>#Protocol 2,1</programlisting> to
-            <programlisting>Protocol 2</programlisting> 
-            (this prevents any connections via SSH 1, which is insecure)
-<programlisting>#PermitRootLogin yes</programlisting> to
-            <programlisting>PermitRootLogin no</programlisting> 
-            (this prevents the root user from logging in remotely via
-            ssh.  If you do this, be sure to create a remote access
-            account, such as "remadmin", which you can use to get ssh
-            before using "su" to become root.)
-<programlisting>#PermitEmptyPasswords no</programlisting> to <programlisting>PermitEmptyPasswords no</programlisting> (this blocks passwordless accounts)
-
- and save and exit by typing C-x C-s C-x C-c</literallayout></listitem>
-          <listitem>Restart sshd so that the change takes effect.<screen role='screen'><userinput>service sshd restart</userinput></screen>
+          <listitem>
+            <para>
+              <indexterm><primary>ssh</primary></indexterm>
+              SSH is the protocol we use to connect
+              securely to the computer (replacing telnet, which is
+              insecure).  sshd is the daemon that listens for incoming
+              ssh connections.  As a security precaution, we are now going
+              to tell ssh not to allow anyone to connect directly to this
+              computer as root.  Type this into the shell:
+            </para>
+            <screen><userinput>emacs /etc/ssh/sshd_config</userinput></screen>
           </listitem>
+          <listitem>
+	    <para>Search for the word "root" by typing <userinput>C-s</userinput> (that's emacs-speak for control-s) and then <userinput>root</userinput>.</para>
+          </listitem>
+          <listitem>
+            <para>Make the following changes:</para>
+            <simplelist>
+              <member><computeroutput>#Protocol 2,1</computeroutput> to
+                <computeroutput>Protocol 2</computeroutput> 
+                (this prevents any connections via SSH 1, which is insecure)</member>
+              <member><computeroutput>#PermitRootLogin yes</computeroutput> to
+                <computeroutput>PermitRootLogin no</computeroutput> 
+                (this prevents the root user from logging in remotely via
+                ssh.  If you do this, be sure to create a remote access
+                account, such as "remadmin", which you can use to get ssh
+                before using "su" to become root)</member>
+              <member><computeroutput>#PermitEmptyPasswords no</computeroutput> to <computeroutput>PermitEmptyPasswords no</computeroutput>
+                (this blocks passwordless accounts) and save and exit by typing <userinput>C-x C-s C-x C-c</userinput></member>
+           </simplelist>
+          </listitem>
+          <listitem><para>Restart sshd so that the change takes effect.<screen role='screen'><userinput>service sshd restart</userinput></screen></para>
+          </listitem>
         </orderedlist>
       </listitem>
-      <listitem><para>Red Hat still installed a few services we
-don't need, and which can be security holes.  Use the service command to turn them off, and then use chkconfig to automatically edit the System V init directories to permanently (The System V init directories are the ones in /etc/rc.d.  They consist of a bunch of scripts for starting and stopping programs, and directories of symlinks for each system level indicating which services should be up and down at any given service level.  We'll use this system for PostGreSQL, but we'll use daemontools to perform a similar function for AOLServer.  (The reason for this discrepencies is that, while daemontools is better, it's a pain in the ass to deal with and nobody's had any trouble leaving PostGreSQL the way it is.)</para>
+      <listitem> 
+       <para>
+         Red Hat still installed a few services we don't need, and
+         which can be security holes.  Use the service command to turn
+         them off, and then use chkconfig to automatically edit the
+         System V init directories to permanently (The System V init
+         directories are the ones in /etc/rc.d.  They consist of a
+         bunch of scripts for starting and stopping programs, and
+         directories of symlinks for each system level indicating
+         which services should be up and down at any given service
+         level.  We'll use this system for PostgreSQL, but we'll use
+         daemontools to perform a similar function for AOLserver.
+         (The reason for this discrepencies is that, while daemontools
+         is better, it's a pain in the ass to deal with and nobody's
+         had any trouble leaving PostgreSQL the way it is.)
+       </para>
 <screen>[root@yourserver root]# <userinput>service pcmcia stop</userinput>
 [root@yourserver root]# <userinput>service netfs stop</userinput>
 [root@yourserver root]# <userinput>chkconfig --del pcmcia</userinput>
@@ -291,7 +314,7 @@
 service netfs stop
 chkconfig --del pcmcia
 chkconfig --del netfs</action></screen>
-        <para>If you installed PostGreSQL, do also
+        <para>If you installed PostgreSQL, do also
 <computeroutput>service postgresql start</computeroutput> and <computeroutput>chkconfig --add postgresql</computeroutput>.</para>
       </listitem>
       <listitem>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/software.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/software.xml,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/software.xml	5 Nov 2003 11:48:12 -0000	1.10
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/software.xml	11 Dec 2003 21:39:49 -0000	1.11
@@ -8,7 +8,7 @@
     <sect1 id="individual-programs">
       <title>Prerequisite Software</title>    
   <authorblurb>
-      by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+      <para>by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
     </authorblurb>
     
     <para>
@@ -23,7 +23,7 @@
             url="http://openacs.org/projects/openacs/download/">OpenACS &version;</ulink></title>
             <para>The OpenACS tarball comprises the core packages and
             many useful additional packages.  This includes a full set
-            of documentation.  The tarball works with both PostGreSQL
+            of documentation.  The tarball works with both PostgreSQL
             and Oracle.</para>
           </formalpara>
         </listitem>
@@ -190,18 +190,10 @@
           AOLserver is available at <ulink url="http://aolserver.com">aolserver.com</ulink> 
         </para></listitem>
                 
-                <listitem><para> 
-          ArsDigita's AOLserver distribution (including
-          internationalization patches, nscache, nsrewrite, nssha1 and the
-          oracle driver) is available at <ulink
-          url="http://www.arsdigita.com/acs-repository/download-verify?version_id=2081">arsdigita.com</ulink>
-          </para></listitem>
-                
                 <listitem><para>
-
           The OpenACS PostgreSQL driver (nspostgres.so) is available from
           <ulink
-          url="http://prdownloads.sourceforge.net/aolserver/nspostgres-3.5beta1.tar.gz?download">SourceForge. If
+          url="http://prdownloads.sourceforge.net/aolserver/nspostgres-3.5.tar.gz?download">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
@@ -233,10 +225,12 @@
             <listitem id="nsopenssl-download">
               <formalpara>
                 <title><ulink
-              url="http://www.scottg.net/download/nsopenssl-2.1.tar.gz">nsopenssl 2.1</ulink>, OPTIONAL</title>
+              url="http://www.scottg.net/download/nsopenssl-2.1a.tar.gz">nsopenssl 2.1a</ulink>, OPTIONAL</title>
                 <para>Provides SSL capabilities for AOLserver.  It requires
 	    OpenSSL.  You need this if you want users to make
-	    secure (https) connections to your webserver.</para>
+	    secure (https) connections to your webserver. (<ulink
+              url="http://www.scottg.net/webtools/aolserver/modules/nsopenssl/">home
+              page</ulink>)</para>
               </formalpara>
             </listitem>
             
@@ -279,7 +273,7 @@
               <formalpara>
                 <title><ulink
                url="http://unc.dl.sourceforge.net/sourceforge/openfts/Search-OpenFTS-tcl-0.3.2.tar.gz">OpenFTS TCL 0.3.2</ulink>, OPTIONAL</title>
-                <para>Adds full-text-search to PostGreSQL and includes a
+                <para>Adds full-text-search to PostgreSQL and includes a
                driver for AOLserver.  You need this if you want users
                to be able to search for any text on your site.</para>
               </formalpara>
@@ -304,7 +298,7 @@
         calender entries, and notes) is stored in the database.
         OpenACS seperates the database with an abstraction layer,
         which means that several different databases all function
-        identically.  Currently OpenACS supports PostGreSQL 7.2 and
+        identically.  Currently OpenACS supports PostgreSQL 7.2 and
         Oracle 8.1.7.  While you can run the core OpenACS on any
         supported database, not all contributed packages support all
         databases.</para>
@@ -313,7 +307,7 @@
             <listitem>
               
               <formalpara>
-                <title>Oracle 8.1.7 (Either this or PostGreSQL is REQUIRED)</title>
+                <title>Oracle 8.1.7 (Either this or PostgreSQL is REQUIRED)</title>
                 <para>You can register and download Oracle from <ulink
               url="http://otn.oracle.com/software/content.html">Oracle
               TechNet</ulink>.  You need this if you want to use an
@@ -322,8 +316,8 @@
             </listitem>
             <listitem>
               <formalpara id="source-postgresql">
-                <title><ulink url="http://sourceforge.net/projects/pgsql/">PostGreSQL 7.3.4</ulink> (Either this or Oracle is REQUIRED)</title>
-                <para>You need this if you want to use a PostGreSQL database.</para>
+                <title><ulink url="http://sourceforge.net/projects/pgsql/">PostgreSQL 7.3.4</ulink> (Either this or Oracle is REQUIRED)</title>
+                <para>You need this if you want to use a PostgreSQL database.</para>
               </formalpara>
             </listitem>
           </itemizedlist>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml	20 Aug 2003 16:20:19 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml	11 Dec 2003 21:39:49 -0000	1.7
@@ -5,39 +5,22 @@
 %myvars;
 ]>
 <sect1 id="upgrade-detail">
-    <title>Support for upgrades.</title>
+    <title>Upgrading</title>
   <authorblurb>
-    by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink>
+    <para>by <ulink url="mailto:joel@aufrecht.org">Joel Aufrecht</ulink></para>
   </authorblurb>
+  <sect2 id="upgrade-overview">
+    <title>Overview</title>
   <para>Starting with Version 4.5, all OpenACS core packages support
     automatic upgrade.  That means that, if you have OpenACS 4.5
     or better, you should always be able to upgrade all of your core
     packages automatically.  If you haven't changed anything, no
     manual intervention should be required.  If you are running
     OpenACS prior to 4.5, upgrading will require manual effort.</para>
-
-  <sect2 id="upgrade-4.5-to-4.6">
-<title>Checklist</title>
-    <para>The required platform for OpenACS 4.6 is the same as
-    4.5, with the excepion of OpenFTS.  You now need OpenFTS 0.3.2, not 0.2.
-    OpenACS 4.6 does not support PostGreSQL 7.3.</para>
-    <itemizedlist mark="circle">
-      <listitem><para>A computer with OpenACS 4.5.</para>
-      </listitem>
-      <listitem><para><ulink url="http://openacs.org/projects/openacs/download/">OpenACS 4.6 tarball</ulink></para>
-      </listitem>
-      <listitem><para>Required for Full Text Search on PostGreSQL: <ulink url="http://openfts.sourceforge.net">OpenFTS 0.3.2</ulink></para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-  <sect2>
-    <title>Overview</title>
+    <para>It's always a good idea to precede an upgrade attempt with a <link linkend="snapshot-backup">snapshot backup</link>.</para>
     <para>OpenACS consists of files and a database schema.  The files
-    in the OpenACS 4.6 tarball include database upgrade scripts.  To start the
-    upgrade, replace your existing files with the new files and
-    then restart the server.  Then, browse to the APM, which will
-    detect the new packages and offer to run the appropriate database upgrade
-    scripts.  After restarting the server again, the upgrade is
+    in a new tarball include database upgrade scripts.  To start the
+    upgrade, replace your existing files with the new files and then browse to the APM, which will detect the new packages and offer to run the appropriate database upgrade scripts.  After restarting the server again, the upgrade is
     complete.</para>
     <figure>
       <title>Assumptions in this section</title>
@@ -65,11 +48,30 @@
       </informaltable>
     </figure>
   </sect2>
-  <sect2><title><indexterm>
-        <primary>upgrade</primary>
+  <sect2 id="upgrade-4.6.3-to-5">
+    <title>Upgrading 4.6.3 to 5.0</title>
+    <para>Current working notes in <ulink url="http://openacs.org/forums/message-view?message_id=143497">Forum OpenACS Development: 4.6.3 upgrade to 5-HEAD: final results</ulink>.</para>
+  </sect2>
+
+  <sect2 id="upgrade-4.5-to-4.6">
+    <title>Upgrading 4.5 to 4.6</title>
+    <indexterm>
+      <primary>upgrade</primary>
         <secondary>OpenACS 4.5 to 4.6</secondary>
-        <secondary>Linux/Unix</secondary>
-</indexterm>Upgrading on Linux/Unix</title>
+        <tertiary>Linux/Unix</tertiary>
+</indexterm>
+<para>The required platform for OpenACS 4.6 is the same as
+    4.5, with the excepion of OpenFTS.  You now need OpenFTS 0.3.2, not 0.2.
+    OpenACS 4.6 does not support PostgreSQL 7.3.</para>
+    <itemizedlist mark="circle">
+      <listitem><para>A computer with OpenACS 4.5.</para>
+      </listitem>
+      <listitem><para><ulink url="http://openacs.org/projects/openacs/download/">OpenACS 4.6 tarball</ulink></para>
+      </listitem>
+      <listitem><para>Required for Full Text Search on PostgreSQL: <ulink url="http://openfts.sourceforge.net">OpenFTS 0.3.2</ulink></para>
+      </listitem>
+    </itemizedlist>
+    <para>Upgrade Sequence</para>
     <orderedlist>
       <listitem>
         <formalpara>
@@ -141,9 +143,9 @@
         </orderedlist>
       </listitem>
       <listitem>
-        <formalpara>
-          <title>Stop the server</title>
-        </formalpara>
+        <para>
+         Stop the server
+        </para>
         <screen>[root@localhost root]# <userinput>svc -d /service/<replaceable>openacs-dev</replaceable></userinput></screen>
       </listitem>
       <listitem>
@@ -170,9 +172,9 @@
 exit</action></screen>
           </listitem>
           <listitem>
-            <formalpara>
-              <title>Upgrading files with CVS</title>
-            </formalpara>
+            <para>
+              <emphasis role="strong">Upgrading files with CVS</emphasis>
+	    </para>
             <orderedlist>
               
               <listitem>
@@ -229,9 +231,9 @@
         </itemizedlist>
       </listitem>
       <listitem>
-        <formalpara>
-          <title>Start the server</title>
-        </formalpara>
+        <para>
+          <emphasis role="strong">Start the server</emphasis>
+        </para>
         <screen>[root@localhost root]# <userinput>svc -u /service/<replaceable>openacs-dev</replaceable></userinput></screen>
       </listitem>
       <listitem>
@@ -304,11 +306,12 @@
       <listitem>
         <formalpara>
           <title>Rollback</title>
-          <para>If anything goes wrong, <link linkend="rollback-database">roll back</link> to the backup snapshot.</para>
+          <para>If anything goes wrong, <link linkend="recovery">roll back</link> to the backup snapshot.</para>
         </formalpara>
       </listitem>
     </orderedlist>
+    <para><phrase role="cvstag">($Id$)</phrase></para>
   </sect2>
-  <para><phrase role="cvstag">($Id$)</phrase></para>
-
 </sect1>
+
+
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/win2kinstall.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/win2kinstall.xml,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/win2kinstall.xml	28 Oct 2003 22:07:41 -0000	1.8
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/win2kinstall.xml	11 Dec 2003 21:39:49 -0000	1.9
@@ -8,12 +8,14 @@
 <title>OpenACS Installation Guide for Windows2000</title>
 
 <authorblurb>
-<para>By <ulink url="mailto:mburke@arsdigita.com">Matthew Burke</ulink> and <ulink url="mailto:curtisg@arsdigita.com">Curtis Galloway</ulink></para>
+<para>by Matthew Burke and Curtis Galloway</para>
 </authorblurb>
     
   <para><emphasis role="strong">NOTE:</emphasis> These instructions were
-    valid for ACS v4, but have not been tested with OpenACS. Currently
-    (8/2002), the best option to get OpenACS &version; running on Windows
+	valid for ACS v4, but have not been tested with OpenACS and the ArsDigita binary 
+	distributions are no longer available.	
+    Currently
+    (10/2003), the best option to get OpenACS &version; running on Windows
     is to use <ulink url="http://vmware.com">VMware</ulink> and John
     Sequeira's <ulink
     url="http://www.pobox.com/~johnseq/projects/oasisvm/">Oasis VM
@@ -22,11 +24,11 @@
 
 
     <itemizedlist>
-      <listitem><para>Source: <ulink url="http://software.arsdigita.com/dist">http://software.arsdigita.com/dist</ulink></para></listitem>
+      <listitem><para>Source: <ulink url="http://openacs.org/projects/openacs/download/">http://openacs.org/projects/openacs/download</ulink></para></listitem>
 
-      <listitem><para>Bug reports: <ulink url="mailto:acs-bugs@arsdigita.com">acs-bugs@arsdigita.com</ulink></para></listitem>
+      <listitem><para>Bug reports: <ulink url="http://openacs.org/bugtracker/openacs/">http://openacs.org/bugtracker/openacs</ulink></para></listitem>
 
-      <listitem><para>Philosophy: <ulink url="http://photo.net/wtr/thebook/community">http://photo.net/wtr/thebook/community</ulink>
+      <listitem><para>Philosophy: <ulink url="http://photo.net/wtr/thebook/community/">http://photo.net/wtr/thebook/community</ulink>
       (the community chapter of <emphasis>Philip and Alex&#39;s Guide to Web
       Publishing</emphasis>)</para></listitem>
 
@@ -76,7 +78,7 @@
 
       <listitem><para><ulink url="http://www.aolserver.com">AOLserver</ulink> (free)</para></listitem>
 
-      <listitem><para><ulink url="http://arsdigita.com/free-tools/oracle-driver">ArsDigita
+      <listitem><para><ulink url="http://prdownloads.sourceforge.net/aolserver/nsoracle-2.6.tar.gz?download">
       Oracle driver for AOLserver</ulink> (free)</para></listitem>
     </itemizedlist>
 
@@ -155,14 +157,8 @@
     </orderedlist>
 
     <para>For more information on Oracle configuration look at <ulink url="http://photo.net/wtr/oracle-tips">http://photo.net/wtr/oracle-tips</ulink>
-    or search the <ulink url="http://photo.net/bboard/q-and-a?topic=web/db">Web/db Q&amp;A
-    Forum</ulink>. One other note: the &quot;nuke a user&quot; admin page and
+    or search the <ulink url="http://openacs.org/forums/">OpenACS forums</ulink>. One other note: the &quot;nuke a user&quot; admin page and
     Intermedia won&#39;t run unless you set <computeroutput>open_cursors = 500</computeroutput>
-    for your database. For more information on Oracle configuration look at
-    <ulink url="http://photo.net/wtr/oracle-tips.html">http://photo.net/wtr/oracle-tips.html</ulink>
-    or search the <ulink url="http://photo.net/bboard/q-and-a.tcl?topic=web/db">Web/db Q&amp;A
-    Forum</ulink>. One other note: the &quot;nuke a user&quot; admin page and
-    Intermedia won&#39;t run unless you set <computeroutput>open_cursors = 500</computeroutput>
     for your database.</para>
 
     </sect2>
@@ -266,7 +262,7 @@
     </sect2>
 
 <sect2 id="win2kinstall-aolserver">
-<title>Configuring AOLServer</title>
+<title>Configuring AOLserver</title>
 
 
     <para>You will need two configuration files. The first is a Tcl file with
@@ -383,7 +379,7 @@
 <sect2 id="win2kinstall-add-yourself">
 <title>Adding Yourself as a User and Making Yourself a Sysadmin</title>
 <para>
-    The ArsDigita Community System will define two users: system and
+    OpenACS will define two users: system and
     anonymous. It will also define a user group of system administrators.
     You&#39;ll want to add yourself as a user (at /register/ ) and then add
     yourself as as member of the site-wide administration group. Start by
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/apm-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/apm-design.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/kernel/apm-design.xml	20 Aug 2003 16:20:19 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/apm-design.xml	11 Dec 2003 21:39:49 -0000	1.6
@@ -4,12 +4,12 @@
 <!ENTITY % myvars SYSTEM "../variables.ent">
 %myvars;
 ]>
-<sect1 id="apm-design" xreflabel="OpenACS &version; Package Manager Design">
-<title>OpenACS &version; Package Manager Design</title>
+<sect1 id="apm-design" xreflabel="Package Manager Design">
+<title>Package Manager Design</title>
 
 
 <authorblurb>
-by <ulink url="mailto:bquinn@arsdigita.com">Bryan Quinn</ulink> 
+<para>By Bryan Quinn</para>
 </authorblurb>
 
 
@@ -71,7 +71,7 @@
 <listitem><para><emphasis role="strong">OpenACS Applications:</emphasis> a &quot;program or group of programs
 designed for end users&quot; (the <ulink url="http://www.pcwebopaedia.com/TERM/a/application.html">Webopedia
 definition</ulink>); also known as <emphasis>modules</emphasis>, for historical reasons.
-Examples of applications include <ulink url="/doc/bboard">Bboard</ulink> and <ulink url="/doc/news">News</ulink>. 
+Examples of applications include <ulink url="/doc/forums">Forums</ulink> and <ulink url="/doc/news">News</ulink>. 
 
 
 </para></listitem>
@@ -91,11 +91,11 @@
 
 <para>This architecture supports the growth of collaborative commerce. For
 example, Jane User starts a forum focusing on the merits of View Cameras by
-creating an instance of the Bboard application for her personal subsite on an
+creating an instance of the Forum application for her personal subsite on an
 OpenACS Installation. Jack User discovers Jane&#39;s forum and includes a link to
 it in his subsite. As interest in Jane&#39;s forum grows, she creates a
 subsite specializing in providing information about View cameras. This
-subsite now includes several package instances beyond Bboard; it could
+subsite now includes several package instances beyond Forum; it could
 potentially include its own Ecommerce capabilities (ala <ulink url="http://shopping.yahoo.com">Yahoo! Shopping</ulink>). This could include a
 knowledge management application that allows users to spread expertise about
 view cameras and a portal application that links to reliable camera models
@@ -193,9 +193,9 @@
 
 <para>Consistent use of the APM format and tools will go a long way toward
 solving the maintainability problems listed above. Moreover, APM is the
-substrate that will enable us to soon establish a central package repository,
-where both ArsDigita and third-party developers will be able publish their
-packages for other ACS users to download and install.</para>
+substrate that will enable us to establish a central package repository,
+where developers will be able publish their
+packages for other OpenACS users to download and install.</para>
 
 <para>For a simple illustration of the difference between ACS without APM
 (pre-3.3) and ACS with APM (3.3 and beyond), consider a hypothetical ACS
@@ -209,7 +209,7 @@
     <imagedata fileref="images/acs-without-apm-vs-with-apm.png" format="PNG" align="center"/>
   </imageobject>
   <textobject>
-    <emphasis role="strong">OpenACS without APM vs. with APM</emphasis>
+    <para><emphasis role="strong">OpenACS without APM vs. with APM</emphasis></para>
   </textobject>
 </mediaobject>
 
@@ -879,7 +879,7 @@
 <para>The central piece of the data model is the <computeroutput>apm_package_types</computeroutput>
 table where each package is registered. When a new application or service is
 installed on an OpenACS instance, a corresponding row in this table is inserted
-with information about the type of package, e.g. if the <ulink url="/doc/bboard">bboard package</ulink> is installed on your OpenACS server, a row
+with information about the type of package, e.g. if the <ulink url="/doc/forum">forum package</ulink> is installed on your OpenACS server, a row
 in <computeroutput>apm_package_types</computeroutput> will be created, noting that it&#39;s an
 application package type.</para>
 
@@ -1077,7 +1077,7 @@
 
 <row>
 <entry>1.0</entry>
-<entry>Edited for OpenACS &version; Beta release</entry>
+<entry>Edited for OpenACS 4.5 Beta release</entry>
 <entry>03/02/2002</entry>
 <entry>Roberto Mello</entry>
 </row>
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/apm-requirements.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/apm-requirements.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/kernel/apm-requirements.xml	20 Aug 2003 16:20:19 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/apm-requirements.xml	11 Dec 2003 21:39:49 -0000	1.7
@@ -4,11 +4,11 @@
 <!ENTITY % myvars SYSTEM "../variables.ent">
 %myvars;
 ]>
-<sect1 id="apm-requirements" xreflabel="OpenACS &version; Package Manager Requirements">
-<title>OpenACS &version; Package Manager Requirements</title>
+<sect1 id="apm-requirements" xreflabel="Package Manager Requirements">
+<title>Package Manager Requirements</title>
 
 <authorblurb>
-by <ulink url="mailto:bquinn@arsdigita.com">Bryan Quinn</ulink> and <ulink url="mailto:tnight@arsdigita.com">Todd Nightingale</ulink> 
+<para>By Bryan Quinn and Todd Nightingale</para>
 </authorblurb>
 
 <sect2 id="apm-requirements-intro">
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/bootstrap-acs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/bootstrap-acs.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/bootstrap-acs.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/bootstrap-acs.xml	11 Dec 2003 21:39:49 -0000	1.5
@@ -8,7 +8,7 @@
 <title>Bootstrapping OpenACS</title>
 
 <authorblurb>
-by <ulink url="mailto:jsalz@mit.edu">Jon Salz</ulink> 
+<para>By <ulink url="mailto:jsalz@mit.edu">Jon Salz</ulink> </para>
 </authorblurb>
 
 <itemizedlist>
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml	20 Aug 2003 16:20:19 -0000	1.8
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/db-api.xml	11 Dec 2003 21:39:49 -0000	1.9
@@ -8,8 +8,7 @@
 <title>Database Access API</title>
 
 <authorblurb>
-by <ulink url="mailto:jsalz@mit.edu">Jon Salz</ulink>. Revised and expanded by 
-Roberto Mello (rmello at fslc dot usu dot edu), July 2002. 
+<para>By <ulink url="mailto:jsalz@mit.edu">Jon Salz</ulink>. Revised and expanded by Roberto Mello (rmello at fslc dot usu dot edu), July 2002. </para>
 </authorblurb>
 
 <itemizedlist>
@@ -975,9 +974,9 @@
     <para>
 	Performs the SQL query <computeroutput>sql</computeroutput>, saving results in variables
     of the form
-    <computeroutput><emphasis>var_name</emphasis>:1</computeroutput>, <computeroutput><emphasis>var_name</emphasis>:2</computeroutput>, etc,
-    setting <computeroutput><emphasis>var_name</emphasis>:rowcount</computeroutput> to the total number
-    of rows, and setting <computeroutput><emphasis>var_name</emphasis>:columns</computeroutput> to a
+    <computeroutput><replaceable>var_name</replaceable>:1</computeroutput>, <computeroutput><replaceable>var_name</replaceable>:2</computeroutput>, etc,
+    setting <computeroutput><replaceable>var_name</replaceable>:rowcount</computeroutput> to the total number
+    of rows, and setting <computeroutput><replaceable>var_name</replaceable>:columns</computeroutput> to a
     list of column names. 
     </para>
 
@@ -1006,7 +1005,7 @@
 
     <para>
     You may also add additional, computed columns to the multirow, using the
-    <computeroutput>-extend { <emphasis>col_1</emphasis> <emphasis>col_2</emphasis> ... }</computeroutput> switch. This is
+    <computeroutput>-extend { <replaceable>col_1</replaceable> <replaceable>col_2</replaceable> ... }</computeroutput> switch. This is
     useful for things like constructing a URL for the object retrieved by
     the query.
     </para>                                                                                                                                           
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/groups-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/groups-design.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/groups-design.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/groups-design.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="groups-design" xreflabel="OpenACS 4 Groups Design">
-<title>OpenACS 4 Groups Design</title>
+<title>Groups Design</title>
 
 <authorblurb>
-by <ulink url="http://planitia.org">Rafael H. Schloming</ulink> and <ulink url="mailto:mthomas@arsdigita.com">Mark Thomas</ulink> 
+<para>By <ulink url="http://planitia.org">Rafael H. Schloming</ulink> and Mark Thomas</para>
 </authorblurb>
 
 
@@ -688,7 +688,7 @@
 
 </term>
  
-<listitem><para><ulink url="mailto:mthomas@arsdigita.com">Mark Thomas</ulink></para></listitem>
+<listitem><para>Mark Thomas</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -721,7 +721,7 @@
 <entry>Initial Revision</entry>
 <entry>08/30/2000</entry>
 <entry>
-<ulink url="mailto:mthomas@arsdigita.com">Mark Thomas</ulink>
+Mark Thomas
 </entry>
 </row>
 
@@ -730,7 +730,7 @@
 <entry>Additional revisions; tried to clarify membership/compostion</entry>
 <entry>09/08/2000</entry>
 <entry>
-<ulink url="mailto:mthomas@arsdigita.com">Mark Thomas</ulink>
+Mark Thomas
 </entry>
 </row>
 </tbody></tgroup></informaltable>
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/groups-requirements.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/groups-requirements.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/groups-requirements.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/groups-requirements.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="groups-requirements" xreflabel="OpenACS 4 Groups Requirements">
-<title>OpenACS 4 Groups Requirements</title>
+<title>Groups Requirements</title>
 
 <authorblurb>
-by <ulink url="http://planitia.org">Rafael H. Schloming</ulink>, <ulink url="mailto:mthomas@arsdigita.com">Mark Thomas</ulink> 
+<para>By <ulink url="http://planitia.org">Rafael H. Schloming</ulink>, Mark Thomas</para>
 </authorblurb>
 
 
@@ -36,7 +36,7 @@
 and their departments) or regions (the Boston office, the LA office); a
 person who is employed by (is a member of) a specific department is also a
 member of the division and the corporation, and works at (is a member of, but
-in a different sense) a particular office. OpenACS 4&#39;s Parties and Groups
+in a different sense) a particular office. OpenACS&#39;s Parties and Groups
 system will support such complex relations faithfully.</para>
 
 <para><emphasis role="strong">Historical Motivations</emphasis></para>
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/i18n-requirements.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/i18n-requirements.xml,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-core-docs/www/xml/kernel/i18n-requirements.xml	20 Aug 2003 16:20:19 -0000	1.2
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/i18n-requirements.xml	11 Dec 2003 21:39:50 -0000	1.3
@@ -8,12 +8,12 @@
   <title>OpenACS Internationalization Requirements</title>
 
   <authorblurb>
-      by Henry Minsky, 
+      <para>by Henry Minsky, 
        <ulink url="mailto:yon@openforce.net">Yon Feldman</ulink>, 
        <ulink url="mailto:lars@collaboraid.biz">Lars Pind</ulink>,
        <ulink url="mailto:peter@collaboraid.biz">Peter Marklund</ulink>, 
        <ulink url="mailto:christian@collaboraid.biz">Christian Hvid</ulink>,
-       and others.
+       and others.</para>
   </authorblurb>
 
   <sect2 id="i18n-requirements-introduction">
@@ -118,8 +118,12 @@
 cleanly back into the code base, it would require making a new fork
 of the source code for each locale.</para>
 
-</sect2><sect2 id="III._System/Application_Overview"><title>System/Application Overview</title>
+</sect2>
 
+<sect2 id="system-application-overview">
+
+<title>System/Application Overview</title>
+
 <para>A globalized application will perform some or all of the
 following steps to handle a page request for a specific
 locale:</para>
@@ -214,8 +218,8 @@
 
 <listitem>
 <para>A developer needs to author a web site which operates in
-multiple languages simultaneously. For example, arsDigita.com with
-content and navigation in English, German, and Japanese.</para>
+multiple languages simultaneously. For example, www.un.org with
+content and navigation in multiple languages.</para>
 
 <para>The site would have an end-user visible UI to support these
 languages, and the content management system must allow articles to
@@ -313,7 +317,7 @@
 
 <blockquote>
 <para>See
-<ulink url="http://acs40.arsdigita.com/doc/acs-content-repository/requirements.html">Content
+<ulink url="/doc/acs-content-repository/requirements.html#100-20">Content
 Repository Requirement 100.20</ulink></para>
 
 <para><emphasis>10.10</emphasis> Provide a consistent
@@ -369,8 +373,10 @@
 </itemizedlist>
 </blockquote>
 
-</sect2><sect2 id="VI.C_Resource_Bundles_/_Content_Repository"><title>Resource Bundles / Content Repository</title>
+</sect2><sect2 id="resource-bundles">
 
+<title>Resource Bundles / Content Repository</title>
+
 <para><emphasis>30.0</emphasis></para>
 <para>A mechanism must be provided for a developer to group a set
 of arbitrary content resources together, keyed by a unique
@@ -380,7 +386,7 @@
 localizable nav-bar mechanism for a site? A navigation bar might be
 made up of a set of text strings and graphics, where the graphics
 themselves are locale-specific, such as images of English or
-Japanese text (as on www.arsdigita.com). It should be easy to
+Japanese text (as on www.un.org). It should be easy to
 specify alternate configurations of text and graphics to lay out
 the page for different locales.</para>
 
@@ -677,7 +683,7 @@
 column size declarations in the schema are large enough to
 accomodate required data (such as email addresses in
 Japanese).  <remark>Since 5.0.0, this is covered in the database
-install instructions for both PostGreSQL and Oracle.</remark></para>
+install instructions for both PostgreSQL and Oracle.</remark></para>
 </blockquote>
 
 </sect2><sect2 id="VI.I_Email_and_Messaging"><title>Email and
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-design.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-design.xml	30 Sep 2003 12:10:01 -0000	1.6
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-design.xml	11 Dec 2003 21:39:50 -0000	1.7
@@ -5,13 +5,10 @@
 %myvars;
 ]>
 <sect1 id="object-system-design" xreflabel="OpenACS 4 Object Model Design">
-<title>OpenACS 4 Object Model Design</title>
+<title>Object Model Design</title>
 
 <authorblurb>
-by <ulink url="mailto:psu@arsdigita.com">Pete Su</ulink>,
-   <ulink url="mailto:mcyoon@arsdigita.com">Michael Yoon</ulink>,
-   <ulink url="mailto:richardl@arsdigita.com">Richard Li</ulink>
-   and <ulink url="mailto:rhs@arsdigita.com">Rafael Schloming</ulink>
+<para>By Pete Su, Michael Yoon, Richard Li, Rafael Schloming</para>
 </authorblurb>
 
 <sect2 id="object-system-design-essentials">
@@ -82,7 +79,7 @@
 include:</para>
 
 <itemizedlist>
-<listitem><para>Bboard messages</para></listitem>
+<listitem><para>forum messages</para></listitem>
 
 <listitem><para>A user home page</para></listitem>
 
@@ -215,10 +212,9 @@
 <para>&quot;Scope&quot; is a term best explained by example. Consider some
 hypothetical rows in the <computeroutput>address_book</computeroutput> table:</para>
 
-<blockquote>
  
 <informaltable>
-<tgroup cols="3">
+<tgroup cols="5">
 <tbody>
 <row>
 <entry><emphasis role="strong">...</emphasis></entry>
@@ -252,7 +248,6 @@
 <entry>...</entry>
 </row>
 </tbody></tgroup></informaltable>
-</blockquote>
 
 <para>The first row represents an entry in User 123&#39;s personal address book,
 the second row represents an entry in User Group 456&#39;s shared address
@@ -269,8 +264,8 @@
 abstract name for the default security domain to which the object belongs.
 Each context has a unique identifier, and all the contexts in a system form a
 tree. Often this tree will reflect an observed hierarchy in a site, e.g. a
-bboard message would probably list a bboard topic as its context, and a
-bboard topic might list a subsite as its context. Thus, contexts make it
+forum message would probably list a forum topic as its context, and a
+forum topic might list a subsite as its context. Thus, contexts make it
 easier to break the site up into security domains according to its natural
 structure. An object&#39;s context is stored in the <computeroutput>context_id</computeroutput>
 column of the <computeroutput>acs_objects</computeroutput> table.</para>
@@ -1473,8 +1468,8 @@
 <title>Authors</title>
 
 
-<para><ulink url="mailto:psu@arsdigita.com">Pete Su</ulink> generated this document
-from material culled from other documents by <ulink url="mailto:mcyoon@arsdigita.com">Michael Yoon</ulink>, <ulink url="mailto:richardl@arsdigita.com">Richard Li</ulink> and <ulink url="mailto:rhs@arsdigita.com">Rafael Schloming</ulink>. But, any remaining lies
+<para>Pete Su generated this document
+from material culled from other documents by Michael Yoon, Richard Li and Rafael Schloming. But, any remaining lies
 are his and his alone.</para>
 
 </sect2>
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-req.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-req.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-req.xml	20 Aug 2003 16:20:19 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/object-system-req.xml	11 Dec 2003 21:39:50 -0000	1.6
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="object-system-requirements" xreflabel="OpenACS 4 Object Model Requirements">
-<title>OpenACS 4 Object Model Requirements</title>
+<title>Object Model Requirements</title>
 
 <authorblurb>
-By <ulink url="mailto:psu@arsdigita.com">Pete Su</ulink> 
+<para>By Pete Su</para>
 </authorblurb>
 
 
@@ -119,7 +119,6 @@
 <para>&quot;Scope&quot; is a term best explained by example. Consider some
 hypothetical rows in the <computeroutput>address_book</computeroutput> table:</para>
 
-<blockquote>
  
 <informaltable>
 <tgroup cols="4">
@@ -156,7 +155,6 @@
 <entry>...</entry>
 </row>
 </tbody></tgroup></informaltable>
-</blockquote>
 
 <para>The first row represents an entry in User 123&#39;s personal address book,
 the second row represents an entry in User Group 456&#39;s shared address
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="permissions-design" xreflabel="OpenACS 4 Permissions Design">
-<title>OpenACS 4 Permissions Design</title>
+<title>Permissions Design</title>
 
 <authorblurb>
-by <ulink url="mailto:jmp@arsdigita.com">John Prevost</ulink> and <ulink url="http://planitia.org">Rafael H. Schloming</ulink> 
+<para>By John Prevost and <ulink url="http://planitia.org">Rafael H. Schloming</ulink> </para>
 </authorblurb>
 
 <sect2 id="permissions-design-essentials">
@@ -162,8 +162,8 @@
 questions about permissions. For example, a number of the above tables
 describe &quot;direct&quot; or explicit permissions. Inheritance and default
 values can, however, introduce permissions which are not directly specified.
-(For example, read access on a bboard allows read access on all the messages
-in the bboard.)</para>
+(For example, read access on a forum allows read access on all the messages
+in the forum.)</para>
 
 <para>The following views provide flattened versions of inherited
 information:</para>
@@ -355,7 +355,7 @@
 );
 </programlisting>
 
-<para>These procedures are defined in <ulink url="http://acs40.arsdigita.com/doc/sql/display-sql?url=acs-permissions-create.sql&amp;package_key=acs-kernel">
+<para>These procedures are defined in <ulink url="/doc/sql/display-sql?url=acs-permissions-create.sql&amp;package_key=acs-kernel">
 <computeroutput>permissions-create.sql</computeroutput></ulink></para>
 
 <para><emphasis role="strong">Tcl Procedures</emphasis></para>
@@ -462,7 +462,7 @@
 
 </term>
  
-<listitem><para><ulink url="mailto:jmp@arsdigita.com">John Prevost</ulink></para></listitem>
+<listitem><para>John Prevost</para></listitem>
 </varlistentry>
 </variablelist>
 
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-requirements.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-requirements.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-requirements.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-requirements.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="permissions-requirements" xreflabel="OpenACS 4 Permissions Requirements">
-<title>OpenACS 4 Permissions Requirements</title>
+<title>Permissions Requirements</title>
 
 <authorblurb>
-by <ulink url="mailto:jmp@arsdigita.com">John McClary Prevost</ulink> 
+<para>By John McClary Prevost</para>
 </authorblurb>
 
 <sect2 id="permissions-requirements-intro">
@@ -104,7 +104,7 @@
 
 
 <para>Examples of the essential question addressed by the Permissions system:
-Can jane@attacker.com delete the web security bboard? Can the Boston office
+Can jane@attacker.com delete the web security forum? Can the Boston office
 (a party) within the VirtuaCorp intranet/website create its own news
 instance?</para>
 
@@ -167,7 +167,7 @@
 <para>Privileges must be designed with appropriate scope for a given OpenACS
 package. Some privileges are of general utility (e.g. &quot;read&quot; and
 &quot;write&quot;). Others are of more limited use (e.g. &quot;moderate&quot;
-- applies mainly to a package like bboard, where many users are contributing
+- applies mainly to a package like forum, where many users are contributing
 content simultaneously). A package defining its own privileges should do so
 with moderation, being careful not to overload a privilege like
 &quot;read&quot; to mean too many things.</para>
@@ -192,8 +192,8 @@
 <blockquote><para><emphasis role="strong">70.10 Context</emphasis></para>
 
 <para>There must be a method for objects to receive default access control from
-some context. For example, if you do not have read access to a bboard, you
-should not have read access to a message in that bboard.</para>
+some context. For example, if you do not have read access to a forum, you
+should not have read access to a message in that forum.</para>
 
 </blockquote><blockquote><para><emphasis role="strong">70.20 Overriding</emphasis></para>
 
@@ -205,7 +205,7 @@
 
 <para>It must be possible to allow a party more access to some target than they
 would get by default. (For example, a user does not have the right to edit
-any message on a bboard. But a user does possibly have the right to edit
+any message on a forum. But a user does possibly have the right to edit
 their own messages.)</para>
 
 </blockquote><blockquote><para><emphasis role="strong">70.20.20 Negative Overriding</emphasis></para>
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/rp-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/rp-design.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/kernel/rp-design.xml	20 Aug 2003 16:20:19 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/rp-design.xml	11 Dec 2003 21:39:50 -0000	1.6
@@ -5,11 +5,11 @@
 %myvars;
 ]>
 <sect1 id="rp-design" xreflabel="OpenACS 4 Request Processor Design">
-<title>OpenACS 4 Request Processor Design</title>
+<title>Request Processor Design</title>
 
 
 <authorblurb>
-by <ulink url="http://planitia.org">Rafael H. Schloming</ulink> 
+<para>By <ulink url="http://planitia.org">Rafael H. Schloming</ulink> </para>
 </authorblurb>
 
 
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/rp-requirements.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/rp-requirements.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/rp-requirements.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/rp-requirements.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -5,11 +5,11 @@
 %myvars;
 ]>
 <sect1 id="rp-requirements" xreflabel="OpenACS 4 Request Processor Requirements">
-<title>OpenACS 4 Request Processor Requirements</title>
+<title>Request Processor Requirements</title>
 
 
 <authorblurb>
-by <ulink url="http://planitia.org">Rafael H. Schloming</ulink> 
+<para>By <ulink url="http://planitia.org">Rafael H. Schloming</ulink> </para>
 </authorblurb>
 
 
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/security-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/security-design.xml,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/kernel/security-design.xml	20 Aug 2003 16:20:19 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/security-design.xml	11 Dec 2003 21:39:50 -0000	1.6
@@ -5,12 +5,10 @@
 %myvars;
 ]>
 <sect1 id="security-design" xreflabel="OpenACS 4 Security Design">
-<title>OpenACS 4 Security Design</title>
+<title>Security Design</title>
 
 <authorblurb>
-
-by <ulink url="mailto:richardl@arsdigita.com">Richard Li</ulink>, <ulink url="mailto:ashah@arsdigita.com">Archit Shah</ulink> 
-
+<para>By Richard Li and Archit Shah</para>
 </authorblurb>
 
 
@@ -114,8 +112,6 @@
 <para>The authentication system issues up to four signed cookies (see below),
 with each cookie serving a different purpose. These cookies are:</para>
 
-<blockquote>
- 
 <informaltable>
 <tgroup cols="4">
 <tbody>
@@ -154,7 +150,6 @@
 <entry>yes</entry>
 </row>
 </tbody></tgroup></informaltable>
-</blockquote>
 
 <itemizedlist>
 <listitem><para>ad_session_id</para>
@@ -298,8 +293,6 @@
 The current state of the permanent login cookies is not taken into account
 when determining the appropriate action. 
 </para>
-<blockquote>
- 
 <informaltable>
 <tgroup cols="5">
 <tbody>
@@ -375,7 +368,6 @@
 <entry>delete</entry>
 </row>
 </tbody></tgroup></informaltable>
-</blockquote>
 
 <para><computeroutput>ad_user_login</computeroutput>
 calls<computeroutput>sec_setup_session</computeroutput> which actually calls
@@ -484,15 +476,15 @@
 
 </sect3>
 
-<sect4 id="secure-session-properties">
+<sect3 id="secure-session-properties">
 <title>Secure Session Properties</title>
 
 <para>Session properties can be set as secure. In this case,
 <computeroutput>ad_set_client_property</computeroutput> will fail if the connection is not
 secure. <computeroutput>ad_get_client_property</computeroutput> will behave as if the property
 had not been set if the property was not set securely.</para>
 
-</sect4>
+</sect3>
 
 <sect3 id="digital-signatures">
 <title>Digital Signatures &amp; Signed Cookies</title>
@@ -829,14 +821,14 @@
 
 <itemizedlist>
 
-<listitem>URL sharing could be dangerous. If I happen to be browsing Amazon
+<listitem><para>URL sharing could be dangerous. If I happen to be browsing Amazon
 while logged in and I email a friend, he could conceivably receive it and follow
 it before my session has expired, gaining all of the privileges I
-had.</listitem>
+had.</para></listitem>
 
-<listitem>User-entered URLs are harder to handler. If a user is in the middle of
+<listitem><para>User-entered URLs are harder to handler. If a user is in the middle of
 a session and then types in the URL of some page, he could be kicked out of his
-session.</listitem>
+session.</para></listitem>
 
 </itemizedlist>
 
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/security-notes.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/security-notes.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/security-notes.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/security-notes.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -5,11 +5,11 @@
 %myvars;
 ]>
 <sect1 id="security-notes" xreflabel="OpenACS 4 Security Notes">
-<title>OpenACS 4 Security Notes</title>
+<title>Security Notes</title>
 
 
 <authorblurb>
-by <ulink url="mailto:richardl@arsdigita.com">Richard Li</ulink> 
+<para>By Richard Li</para>
 </authorblurb>
 
 <para>
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/security-requirements.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/security-requirements.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/security-requirements.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/security-requirements.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="security-requirements" xreflabel="OpenACS 4 Security Requirements">
-<title>OpenACS 4 Security Requirements</title>
+<title>Security Requirements</title>
 
 <authorblurb>
-by <ulink url="mailto:richardl@arsdigita.com">Richard Li</ulink> 
+<para>By Richard Li</para>
 </authorblurb>
 
 
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/subsites-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/subsites-design.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/subsites-design.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/subsites-design.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="subsites-design" xreflabel="OpenACS 4 Subsites Design Document">
-<title>OpenACS 4 Subsites Design Document</title>
+<title>Subsites Design Document</title>
 
 <authorblurb>
-by <ulink url="http://planitia.org">Rafael H. Schloming</ulink> 
+<para>By <ulink url="http://planitia.org">Rafael H. Schloming</ulink> </para>
 </authorblurb>
 
 <para><emphasis>*Note* This document has not gone through the any of the
@@ -36,7 +36,7 @@
 a particular user community. This definition covers a very broad range of
 requirements: from a Geocities style homepage where a user can install
 whatever available application he wants (e.g. a single user could have their
-own news and bboard), to a highly structured project subsite with multiple
+own news and forums), to a highly structured project subsite with multiple
 interdependent applications. Thus, flexibility in application deployment is
 the overarching philosophy of subsites.</para>
 
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/subsites-requirements.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/subsites-requirements.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/subsites-requirements.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/subsites-requirements.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -5,10 +5,10 @@
 %myvars;
 ]>
 <sect1 id="subsites-requirements" xreflabel="OpenACS 4 Subsites Requirements">
-<title>OpenACS 4 Subsites Requirements</title>
+<title>Subsites Requirements</title>
 
 <authorblurb>
-by <ulink url="http://planitia.org">Rafael H. Schloming</ulink> and <ulink url="mailto:dennis@arsdigita.com">Dennis Gregorovic</ulink> 
+<para>By <ulink url="http://planitia.org">Rafael H. Schloming</ulink> and Dennis Gregorovic</para>
 </authorblurb>
 
 
@@ -83,26 +83,26 @@
 subcommunities.</para></listitem>
 </orderedlist>
 
-<para>Joe Programmer is working on the bboard package and wants to make it
+<para>Joe Programmer is working on the forum package and wants to make it
 subsite-aware. Using [ad_conn package_id], Joe adds code that only displays
-bboard messages associated with the current package instance. Joe is happy to
+forum messages associated with the current package instance. Joe is happy to
 realize that ad_parameter is already smart enough to return configuration
 parameters for the current package instance, and so he has to do no extra
 work to tailor configuration parameters to the current subsite.</para>
 
 <para>Jane Admin maintains www.company.com. She learns of Joe&#39;s work and
-would like to set up individual bboards for the Boston and Austin offices of
+would like to set up individual forums for the Boston and Austin offices of
 her company. The first thing she does is use the APM to install the new
-bboard package.</para>
+forum package.</para>
 
 <para>Next, Jane uses the Subsite UI to create subsites for the Boston and
-Austin offices. Then Jane uses the Subsite UI to create bboards for each
+Austin offices. Then Jane uses the Subsite UI to create forums for each
 office.</para>
 
-<para>Now, the Boston office employees have their own bboard at
-http://www.company.com/offices/boston/bboard, and similarly for the Austin
+<para>Now, the Boston office employees have their own forum at
+http://www.company.com/offices/boston/forum, and similarly for the Austin
 office. At this point, the Boston and Austin office admins can customize the
-configurations for each of their bboards, or they can just use the
+configurations for each of their forums, or they can just use the
 defaults.</para>
 
 
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/tcl-doc.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/tcl-doc.xml,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/kernel/tcl-doc.xml	20 Aug 2003 16:20:19 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/tcl-doc.xml	11 Dec 2003 21:39:50 -0000	1.5
@@ -9,7 +9,7 @@
 
 
 <authorblurb>
-by <ulink url="mailto:jsalz@mit.edu">Jon Salz</ulink> on 3 July 2000 
+<para>By <ulink url="mailto:jsalz@mit.edu">Jon Salz</ulink> on 3 July 2000 </para>
 </authorblurb>
 
 <itemizedlist>
Index: openacs-4/packages/acs-core-docs/www/xml/non-xml/release-notes-4-5.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/non-xml/release-notes-4-5.html,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-core-docs/www/xml/non-xml/release-notes-4-5.html	20 Aug 2003 16:20:19 -0000	1.1
+++ openacs-4/packages/acs-core-docs/www/xml/non-xml/release-notes-4-5.html	11 Dec 2003 21:39:50 -0000	1.2
@@ -1,4 +1,3 @@
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
@@ -73,7 +72,7 @@
 	
 <a href="unix-install.html">Installing on Unix/Linux
 </a> or 
-<a href="win-install.html">Installing on Windows
+<a href="win2k-installation.html">Installing on Windows
 </a>.  Note
 	that the Windows documentation is not current for OpenACS 4.5,
 	but an alternative is to use John Sequeira's 
@@ -117,7 +116,7 @@
 	  installing the Open FTS driver for OpenACS.  It's included in the
 	  package as a text file and is also summarized at the end of the
 	  installation documentation in the section, 
-<a href="nextsteps.html#install-next-openfts">Set Up OpenFTS
+<a href="install-full-text-search.html">Set Up OpenFTS
 </a>.  As with the Oracle version, there
 	  are steps you must take manually in order to get this feature
 	  working.
Index: openacs-4/packages/acs-core-docs/www/xml/non-xml/release-notes-4-6.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/non-xml/release-notes-4-6.html,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-core-docs/www/xml/non-xml/release-notes-4-6.html	20 Aug 2003 16:20:19 -0000	1.1
+++ openacs-4/packages/acs-core-docs/www/xml/non-xml/release-notes-4-6.html	11 Dec 2003 21:39:50 -0000	1.2
@@ -17,7 +17,7 @@
 	&quot;delete&quot; an illegal name for PL/SQL procedures and functions.
   </p><p>
 	You may want to begin by reading our installation documentation for
-	<a href="unix-install.html">Installing on Unix/Linux</a> or <a href="win-install.html">Installing on Windows</a>.  Note
+	<a href="unix-install.html">Installing on Unix/Linux</a> or <a href="win2k-installation.html">Installing on Windows</a>.  Note
 	that the Windows documentation is not current for OpenACS 4.6,
 	but an alternative is to use John Sequeira's <a href="http://www.pobox.com/~johnseq/projects/oasisvm/" target="_top">Oasis VM
 	project</a>.
@@ -40,7 +40,7 @@
 	  If you're using PostgreSQL be sure to read the documentation on
 	  installing the Open FTS driver for OpenACS.  It's included in the
 	  package as a text file and is also summarized at the end of the
-	  installation documentation in the section, <a href="nextsteps.html#install-next-openfts">Set Up OpenFTS</a>.  As with the Oracle version, there
+	  installation documentation in the section, <a href="install-full-text-search.html">Set Up OpenFTS</a>.  As with the Oracle version, there
 	  are steps you must take manually in order to get this feature
 	  working.
 	</p></div><div class="sect2"><div class="titlepage"><div><h3 class="title"><a name="release-notes-testing"></a>Testing Notes</h3></div></div><p>
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 -N -r1.13 -r1.14
--- openacs-4/packages/acs-datetime/acs-datetime.info	10 Nov 2003 16:36:31 -0000	1.13
+++ openacs-4/packages/acs-datetime/acs-datetime.info	11 Dec 2003 21:39:50 -0000	1.14
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-datetime" url="http://openacs.org/acs-repository/apm/packages/acs-datetime" type="apm_service">
+<package key="acs-datetime" url="http://openacs.org/repository/apm/packages/acs-datetime" type="apm_service">
     <package-name>Date and Time Utilities</package-name>
     <pretty-plural>Date and Time Utilities</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
     <version name="4.0" url="http://openacs.org/apms/acs-datetime-4.0.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <summary>Service package to support date and time functions</summary>
+        <summary>An API for date and time functions</summary>
         <release-date>2003-11-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Note: this version of the package requires acs-event(s) for a helper function. This requirement may go away in the future. </description>
 
         <provides url="acs-datetime" version="4.0"/>
         <requires url="acs-events" version="0.1d"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
-        <requires url="acs-templating" version="5.0.0a5"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
+        <requires url="acs-templating" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-developer-support/acs-developer-support.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/acs-developer-support.info,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-developer-support/acs-developer-support.info	10 Nov 2003 16:36:31 -0000	1.11
+++ openacs-4/packages/acs-developer-support/acs-developer-support.info	11 Dec 2003 21:39:50 -0000	1.12
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
 
 <package key="acs-developer-support" url="http://openacs.org/repository/apm/packages/acs-developer-support/" type="apm_service">
     <package-name>Developer Support</package-name>
@@ -8,23 +8,30 @@
     <singleton-p>t</singleton-p>
     <auto-mount>ds</auto-mount>
 
-    <version name="5.0d2" url="http://openacs.org/repository/download/apm/acs-developer-support-5.0d2.apm">
+    <version name="5.0d3" url="http://openacs.org/repository/download/apm/acs-developer-support-5.0d3.apm">
         <owner url="mailto:lars@pinds.com">Lars Pind</owner>
-        <summary>Routines used to aggregate request/response information for debugging.</summary>
+        <summary>Profiling for requests including database timing information.</summary>
         <release-date>2003-11-10</release-date>
-        <vendor url="http://openacs.org/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Developer support stores timing and other logged information for requests 
+        to support debugging and tuning and supports user switching and a Tcl Sell to invoke arbitrary tcl code on the server.
+        </description>
 
-        <provides url="acs-developer-support" version="5.0d2"/>
+        <provides url="acs-developer-support" version="5.0d3"/>
         <requires url="acs-kernel" version="4.6.2"/>
 
+        <callbacks>
+        </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DatabaseEnabledP"  default="0" description="Remember information about every database request?" section_name="developer-support"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="UserSwitchingEnabledP"  default="0" description="Will present a widget on every page that allows you to switch user" section_name="developer-support"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EnabledIPs"  default="*" description="remember information for which client hosts?" section_name="developer-support"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DataLifetime"  default="900" description="Number of seconds to keep connection data" section_name="developer-support"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DataSweepInterval"  default="900" description="Number of seconds between sweeping for old data" section_name="developer-support"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EnabledIPs"  default="*" description="remember information for which client hosts?" section_name="developer-support"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EnabledOnStartupP"  default="0" description="Remember information about connections, for developers' benefit?" section_name="developer-support"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PackageWatchList"  description="A space separated list of keys for packages that you are developing on and that will have full watches (automatic reloading of tcl libraries and xql files) activated on every server startup.
+" section_name="developer-support"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowCommentsInlineP"  default="0" description="Controls whether comments are shown inline in the ds_link." section_name="developer-support"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="UserSwitchingEnabledP"  default="0" description="Will present a widget on every page that allows you to switch user" section_name="developer-support"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl	17 May 2003 09:45:46 -0000	1.3
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-init.tcl	11 Dec 2003 21:39:50 -0000	1.4
@@ -30,4 +30,4 @@
     ds_set_user_switching_enabled [ad_parameter -package_id [ds_instance_id] UserSwitchingEnabledP acs-developer-support 0]
 }
 
-
+ds_watch_packages
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 -N -r1.20 -r1.21
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	10 Nov 2003 13:11:00 -0000	1.20
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	11 Dec 2003 21:39:50 -0000	1.21
@@ -189,7 +189,7 @@
 
         # JCD: don't bind if there was an error since this can potentially mess up the traceback 
         # making bugs much harder to track down 
-        if { !$errno && [string equal [db_type] "postgresql"] } {
+        if { ($errno == 0 || $errno == 2) && [string equal [db_type] "postgresql"] } {
             upvar bind bind
             set errno [catch {
                 if { [info exists bind] && [llength $bind] != 0 } {
@@ -440,3 +440,23 @@
 	}
     }
 }
+
+ad_proc -private ds_watch_packages {} {
+    Watch tcl libraries and xql files for packages listed
+    in the PackageWatchList parameter on server startup.
+
+    @author Peter Marklund
+} {
+    set package_watch_string [parameter::get_from_package_key \
+                                  -package_key acs-developer-support \
+                                  -parameter PackageWatchList]
+
+    foreach package_key [split $package_watch_string] {
+        if { [apm_package_enabled_p $package_key] } {
+            ns_log Notice "Developer-support - watching all files for package $package_key"
+            apm_watch_all_files $package_key        
+        } else {
+            ns_log Notice "developer support - not watching file for package $package_key as package is not enabled"
+        }
+    }
+}
\ No newline at end of file
Index: openacs-4/packages/acs-developer-support/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/index.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-developer-support/www/index.tcl	3 Nov 2003 11:08:10 -0000	1.7
+++ openacs-4/packages/acs-developer-support/www/index.tcl	11 Dec 2003 21:39:51 -0000	1.8
@@ -25,7 +25,7 @@
 <hr>
 
 <ul>
-<li><a href=\"shell.tcl\">OpenACS Shell</a>
+<li><a href=\"shell\">OpenACS Shell</a>
 <li>Developer support information is currently
 [ad_decode $enabled_p 1 \
     "on (<a href=\"set-enabled?enabled_p=0\">turn it off</a>)" \
Index: openacs-4/packages/acs-developer-support/www/shell.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/shell.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-developer-support/www/shell.tcl	8 Nov 2003 12:11:47 -0000	1.2
+++ openacs-4/packages/acs-developer-support/www/shell.tcl	11 Dec 2003 21:39:51 -0000	1.3
@@ -12,14 +12,15 @@
 set context $page_title
 
 if { ![acs_user::site_wide_admin_p] } {
-  ad_script_abort
+    ad_return_warning "Error" "Sorry, only site-wide admins may use this."
+    ad_script_abort
 }
 
 set result ""
 
 ad_form -name shell -form {
     {
-      script:text(textarea)
+      script:text(textarea),nospell
       {label {Input tcl_script}}
       {html {cols 80 rows 10}}
     }
Index: openacs-4/packages/acs-events/acs-events.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/acs-events.info,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-events/acs-events.info	10 Nov 2003 16:36:31 -0000	1.12
+++ openacs-4/packages/acs-events/acs-events.info	11 Dec 2003 21:39:51 -0000	1.13
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-events" url="http://openacs.org/acs-repository/apm/packages/acs-events" type="apm_service">
+<package key="acs-events" url="http://openacs.org/repository/apm/packages/acs-events" type="apm_service">
     <package-name>Events</package-name>
     <pretty-plural>Events</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="0.4d" url="http://openacs.org/acs-repository/download/apm/acs-events-0.4d.apm">
+    <version name="0.4d" url="http://openacs.org/repository/download/apm/acs-events-0.4d.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <summary>Supports relationships between intervals in time, activities, and parties.</summary>
+        <summary>API support for relationships between intervals in time, activities, and parties.</summary>
         <release-date>2003-11-10</release-date>
-        <vendor url="http://openacs.org/">OpenACS</vendor>
-        <description format="text/html">The ACS events service is primarily intended for use by writers of application packages and other service packages. The service allows developers to specify and manipulate relationships (possibly recurring) between an object and another object.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">The events service is primarily intended for use by writers of application packages and other service packages. The service allows developers to specify and manipulate relationships (possibly recurring) between an object and another object.</description>
 
         <provides url="acs-events" version="0.4d"/>
 
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 -N -r1.8 -r1.9
--- openacs-4/packages/acs-interface/acs-interface.info	8 Oct 2003 16:05:23 -0000	1.8
+++ openacs-4/packages/acs-interface/acs-interface.info	11 Dec 2003 21:39:51 -0000	1.9
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="acs-interface" url="http://www.arsdgita.com/acs-repository/apm/packages/acs-interface" type="apm_service">
+<package key="acs-interface" url="http://openacs.org/repository/apm/packages/acs-interface" type="apm_service">
     <package-name>ACS Interface</package-name>
     <pretty-plural>ACS Interfaces</pretty-plural>
     <singleton-p>t</singleton-p>
 
-    <version name="5.0d1" url="http://www.arsdigita.com/acs-repository/download/apm/acs-interface-5.0d1.apm">
+    <version name="5.0d1" url="http://openacs.org/repository/download/apm/acs-interface-5.0d1.apm">
         <database-support>
              <database>oracle</database>
         </database-support>
-        <owner url="mailto:khy@arsdigita.com">Khy Huang</owner>
-        <summary>Stores meta data for a label and set of methods. Objects can register their package that provides these methods. </summary>
+        <owner url="mailto:doc@openacs.org">Khy Huang</owner>
+        <summary>Define interfaces for object types.</summary>
         <release-date>2001-02-08</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/html">Define interfaces for object types.  Used by Site Wide Search.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Stores metadata for a label and a set of methods. Objects can register their package that provides these methods.   Used by Site Wide Search.</description>
 
         <provides url="acs-interface" version="5.0d1"/>
         <requires url="acs-kernel" version="4.6.2"/>
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 -N -r1.49 -r1.50
--- openacs-4/packages/acs-kernel/acs-kernel.info	10 Nov 2003 14:28:55 -0000	1.49
+++ openacs-4/packages/acs-kernel/acs-kernel.info	11 Dec 2003 21:39:51 -0000	1.50
@@ -7,13 +7,14 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://openacs.org/repository/download/apm/acs-kernel-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-kernel-5.0.0b4.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>Routines and data models providing the foundation for OpenACS-based Web services.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://openacs.org/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, partiies and the supporting PL/SQL and PL/pgSQL procedures.</description>
 
-        <provides url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql	30 Sep 2003 12:10:02 -0000	1.11
+++ openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql	11 Dec 2003 21:39:51 -0000	1.12
@@ -251,9 +251,10 @@
 declare
   security_context_root acs_objects.object_id%TYPE;
 begin
-  if :new.object_id = :old.object_id and
-     :new.context_id = :old.context_id and
-     :new.security_inherit_p = :old.security_inherit_p then
+  if :new.object_id = :old.object_id
+     and (:new.context_id = :old.context_id
+	  or (:new.context_id is null and :old.context_id is null))
+     and :new.security_inherit_p = :old.security_inherit_p then
     return;
   end if;
 
@@ -263,7 +264,7 @@
   security_context_root := -4;
 
   -- Remove my old ancestors from my descendants.
-  for pair in ( select object_id from acs_object_contexts where 
+  for pair in ( select object_id from acs_object_contexts where
                 ancestor_id = :old.object_id) loop
     delete from acs_object_context_index
     where object_id = pair.object_id
Index: openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql	30 Sep 2003 12:10:02 -0000	1.7
+++ openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql	11 Dec 2003 21:39:51 -0000	1.8
@@ -257,9 +257,14 @@
 create index group_elem_idx_group_idx on group_element_index (group_id);
 create index group_elem_idx_element_idx on group_element_index (element_id);
 create index group_elem_idx_rel_id_idx on group_element_index (rel_id);
-create index group_elem_idx_container_idx on group_element_index (container_id);
 create index group_elem_idx_rel_type_idx on group_element_index (rel_type);
 
+-- The index on container_id is not very good
+-- and in some cases can be quite detrimental
+-- see http://openacs.org/forums/message-view?message_id=142769
+-- create index group_elem_idx_container_idx on group_element_index (container_id);
+
+
 comment on table group_element_index is '
  This table is for internal use by the parties system.  It as an auxiliary
  table, a denormalization of data, that is used to improve performance.
Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b1-5.0.0b2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b1-5.0.0b2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b1-5.0.0b2.sql	11 Dec 2003 21:39:51 -0000	1.2
@@ -0,0 +1,73 @@
+-- The index on container_id is not very good 
+-- and in some cases can be quite detrimental
+-- see http://openacs.org/forums/message-view?message_id=142769
+
+drop index group_elem_idx_container_idx;
+
+create or replace trigger acs_objects_context_id_up_tr
+after update on acs_objects
+for each row
+declare
+  security_context_root acs_objects.object_id%TYPE;
+begin
+  if :new.object_id = :old.object_id 
+     and (:new.context_id = :old.context_id 
+	  or (:new.context_id is null and :old.context_id is null))
+     and :new.security_inherit_p = :old.security_inherit_p then
+    return;
+  end if;
+
+  -- Hate the hardwiring but magic objects aren't defined yet (PG doesn't
+  -- mind because function bodies aren't compiled until first called)
+
+  security_context_root := -4;
+
+  -- Remove my old ancestors from my descendants.
+  for pair in ( select object_id from acs_object_contexts where 
+                ancestor_id = :old.object_id) loop
+    delete from acs_object_context_index
+    where object_id = pair.object_id
+      and ancestor_id in ( select ancestor_id from acs_object_contexts
+                           where object_id = :old.object_id );
+  end loop;
+
+  -- Kill all my old ancestors.
+  delete from acs_object_context_index
+  where object_id = :old.object_id;
+
+  insert into acs_object_context_index
+   (object_id, ancestor_id, n_generations)
+  values
+   (:new.object_id, :new.object_id, 0);
+
+  if :new.context_id is not null and :new.security_inherit_p = 't' then
+     -- Now insert my new ancestors for my descendants.
+    for pair in (select *
+		 from acs_object_context_index
+		 where ancestor_id = :new.object_id) loop
+      insert into acs_object_context_index
+       (object_id, ancestor_id, n_generations)
+      select
+       pair.object_id, ancestor_id,
+       n_generations + pair.n_generations + 1 as n_generations
+      from acs_object_context_index
+      where object_id = :new.context_id;
+    end loop;
+  else
+    if :new.object_id != 0 then
+      -- We need to make sure that :NEW.OBJECT_ID and all of its
+      -- children have security_context_root as an ancestor.
+      for pair in (select *
+		   from acs_object_context_index
+		   where ancestor_id = :new.object_id)
+      loop
+        insert into acs_object_context_index
+          (object_id, ancestor_id, n_generations)
+        values
+          (pair.object_id, security_context_root, pair.n_generations + 1);
+      end loop;
+    end if;
+  end if;
+end;
+/
+show errors
Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b2-5.0.0b3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b2-5.0.0b3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b2-5.0.0b3.sql	11 Dec 2003 21:39:51 -0000	1.2
@@ -0,0 +1,10 @@
+-- Drop all_users since it masks the oracle all_users view (used by
+-- third party admin tools among other things)
+drop view all_users;
+
+create or replace view acs_users_all
+as
+select pa.*, pe.*, u.*
+from  parties pa, persons pe, users u
+where  pa.party_id = pe.person_id
+and pe.person_id = u.user_id;
Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b3-5.0.0b4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b3-5.0.0b4.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b3-5.0.0b4.sql	11 Dec 2003 21:39:51 -0000	1.2
@@ -0,0 +1,37 @@
+-- DRB: fixes bug 1142
+
+create or replace view registered_users
+as
+  select p.email, p.url, pe.first_names, pe.last_name,
+  u.user_id,u.authority_id,u.username,u.password,u.salt,u.screen_name,u.priv_name,u.priv_email,u.email_verified_p,u.email_bouncing_p,u.no_alerts_until,u.last_visit,u.second_to_last_visit,u.n_sessions,u.password_question,u.password_answer,u.password_changed_date,
+  mr.member_state
+  from parties p, persons pe, users u, group_member_map m, membership_rels mr
+  where party_id = person_id
+  and person_id = user_id
+  and u.user_id = m.member_id
+  and m.rel_id = mr.rel_id
+  and m.group_id = (select acs.magic_object_id('registered_users') from dual)
+  and m.container_id = m.group_id
+  and m.rel_type = 'membership_rel'
+  and mr.member_state = 'approved'
+  and u.email_verified_p = 't';
+
+create or replace view cc_users
+as
+select
+o.object_id,o.object_type,o.context_id,o.security_inherit_p,o.creation_user,o.creation_date,o.creation_ip,o.last_modified,o.modifying_user,o.modifying_ip,
+pa.party_id, pa.email, pa.url, 
+pe.person_id, pe.first_names, pe.last_name, 
+u.user_id,u.authority_id,username,u.password,u.salt,u.screen_name,u.priv_name,u.priv_email,u.email_verified_p,u.email_bouncing_p,u.no_alerts_until,u.last_visit,u.second_to_last_visit,u.n_sessions,u.password_question,u.password_answer,password_changed_date,
+mr.member_state, mr.rel_id
+from acs_objects o, parties pa, persons pe, users u, group_member_map m, membership_rels mr, acs_magic_objects mo
+where o.object_id = pa.party_id
+and pa.party_id = pe.person_id
+and pe.person_id = u.user_id
+and u.user_id = m.member_id
+and m.group_id = mo.object_id
+and mo.name = 'registered_users'
+and m.rel_id = mr.rel_id
+and m.container_id = m.group_id
+and m.rel_type = 'membership_rel';
+
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 -N -r1.24 -r1.25
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql	3 Dec 2003 23:38:27 -0000	1.24
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql	11 Dec 2003 21:39:52 -0000	1.25
@@ -138,7 +138,7 @@
 
     return magic_object_id__object_id;
    
-end;' language 'plpgsql' with(isstrict,iscachable);
+end;' language 'plpgsql' immutable strict;
 
 -- ******************************************************************
 -- * Community Core API
@@ -161,7 +161,7 @@
 
 -- faster simpler view
 -- does not check for registered user/banned etc
-create view all_users
+create or replace view acs_users_all
 as
 select pa.*, pe.*, u.*
 from  parties pa, persons pe, users u
@@ -180,8 +180,8 @@
   and amo.name = 'registered_users'
   and m.group_id = amo.object_id
   and m.rel_id = mr.rel_id
-  and m.rel_type = 'membership_rel'
-  and m.container_id = m.group_id;
+  and m.container_id = m.group_id
+  and m.rel_type = 'membership_rel';
 
 
 -----------------------------------
Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql	17 May 2003 01:47:10 -0000	1.18
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql	11 Dec 2003 21:39:52 -0000	1.19
@@ -57,7 +57,7 @@
 
 -- support for tree queries on acs_object_types
 
-create function acs_object_type_get_tree_sortkey(varchar) returns varbit as '
+create or replace function acs_object_type_get_tree_sortkey(varchar) returns varbit as '
 declare
   p_object_type    alias for $1;
 begin
@@ -81,7 +81,7 @@
 
         return new;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 create trigger acs_object_type_insert_tr before insert 
 on acs_object_types for each row 
@@ -570,13 +570,14 @@
 
 
 -- procedure drop_type
-create function acs_object_type__drop_type (varchar,boolean)
+create or replace function acs_object_type__drop_type (varchar,boolean)
 returns integer as '
 declare
   drop_type__object_type            alias for $1;  
   drop_type__cascade_p              alias for $2;  -- default ''f''
   row                               record;
 begin
+    -- XXX: drop_type cascade_p is ignored (ignored in oracle too, but defaults f)
 
     -- drop all the attributes associated with this type
     for row in select attribute_name 
@@ -598,7 +599,7 @@
 
 
 -- function pretty_name
-create function acs_object_type__pretty_name (varchar)
+create or replace function acs_object_type__pretty_name (varchar)
 returns varchar as '
 declare
   pretty_name__object_type            alias for $1;  
@@ -610,26 +611,19 @@
 
     return v_pretty_name;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function is_subtype_p
-create function acs_object_type__is_subtype_p (varchar,varchar)
+create or replace function acs_object_type__is_subtype_p (varchar,varchar)
 returns boolean as '
 declare
   is_subtype_p__object_type_1          alias for $1;  
   is_subtype_p__object_type_2          alias for $2;  
   v_result                             integer;       
 begin
-    -- select count(*) into v_result
-    --  where exists (select 1 
-    --                 from acs_object_types t 
-    --                where t.object_type	= is_subtype_p__object_type_2
-    --              connect by prior t.object_type = t.supertype
-    --                start with t.supertype = is_subtype_p__object_type_1);
-
     select count(*) into v_result
-     where exists (select 1 
+     where exists (select 1
                      from acs_object_types t, acs_object_types t2
                     where t.object_type = is_subtype_p__object_type_2
                       and t2.object_type = is_subtype_p__object_type_1
@@ -640,11 +634,11 @@
     end if;
 
     return ''f'';
-   
-end;' language 'plpgsql';
 
+end;' language 'plpgsql' stable;
 
 
+
 -- show errors
 
 
Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-object-util.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-object-util.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-object-util.sql	8 Dec 2001 01:17:59 -0000	1.3
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-object-util.sql	11 Dec 2003 21:39:52 -0000	1.4
@@ -1,6 +1,6 @@
 -- moved from site-wide search to acs-kernel
 
-create function acs_object_util__object_type_exist_p (varchar)
+create or replace function acs_object_util__object_type_exist_p (varchar)
 returns boolean as '
 declare
     p_object_type       alias for $1;
@@ -13,10 +13,10 @@
     where  object_type = p_object_type;
  
     return v_exist_p;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
-create function acs_object_util__get_object_type (integer)
+create or replace function acs_object_util__get_object_type (integer)
 returns varchar as '
 declare
     p_object_id         alias for $1;
@@ -26,16 +26,16 @@
     from acs_objects
     where object_id = p_object_id;
 
-    return v_object_type;
-
     if not found then
-        raise exception ''Invalid Object id: % '', p_object_id;
+        raise exception ''acs_object_util__get_object_type: Invalid Object id: % '', p_object_id;
     end if;
 
-end;' language 'plpgsql';
+    return v_object_type;
 
+end;' language 'plpgsql' stable;
 
-create function acs_object_util__type_ancestor_type_p (varchar,varchar)
+
+create or replace function acs_object_util__type_ancestor_type_p (varchar,varchar)
 returns boolean as '
 declare
     p_object_type1      alias for $1;
@@ -55,11 +55,11 @@
                    where p_object_type2 = o2.object_type
                      and o1.object_type = p_object_type1
                      and o1.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey));
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 
-create function acs_object_util__object_ancestor_type_p (integer,varchar)
+create or replace function acs_object_util__object_ancestor_type_p (integer,varchar)
 returns boolean as '
 declare
     p_object_id         alias for $1;
@@ -71,10 +71,10 @@
 
     v_exist_p := acs_object_util__type_ancestor_type_p (v_object_type, p_object_type);
     return v_exist_p;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
-create function acs_object_util__object_type_p (integer,varchar)
+create or replace function acs_object_util__object_type_p (integer,varchar)
 returns boolean as '
 declare
     p_object_id         alias for $1;
@@ -83,4 +83,4 @@
 begin
     v_exist_p := acs_object_util__object_ancestor_type_p(p_object_id, p_object_type);
     return v_exist_p;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql,v
diff -u -N -r1.44 -r1.45
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql	22 Sep 2003 11:52:14 -0000	1.44
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql	11 Dec 2003 21:39:52 -0000	1.45
@@ -187,18 +187,19 @@
 	last_modified		timestamptz default current_timestamp not null,
 	modifying_user		integer,
 	modifying_ip		varchar(50),
-        tree_sortkey            varbit,
+        tree_sortkey            varbit
+				constraint acs_objects_tree_sortkey_un unique
+				constraint acs_objects_tree_sortkey_nn not null,
+        max_child_sortkey       varbit,
         constraint acs_objects_context_object_un
 	unique (context_id, object_id)
 );
 
-create index acs_objects_context_object_idx on
-       acs_objects (context_id, object_id);
+-- The unique constriant about will force create of this index...
+-- create index acs_objects_context_object_idx onacs_objects (context_id, object_id);
+-- The unique constraint should generate an index automatically so this is not needed
+-- create index acs_objs_tree_skey_idx on acs_objects (tree_sortkey);
 
-create index acs_objs_tree_skey_idx on acs_objects (tree_sortkey);
-
--- alter table acs_objects modify constraint acs_objects_context_object_un enable;
-
 create index acs_objects_creation_user_idx on acs_objects (creation_user);
 create index acs_objects_modify_user_idx on acs_objects (modifying_user);
 
@@ -230,106 +231,94 @@
 
 -- tree query support for acs_objects
 
-create function acs_objects_get_tree_sortkey(integer) returns varbit as '
+create or replace function acs_objects_get_tree_sortkey(integer) returns varbit as '
 declare
   p_object_id    alias for $1;
 begin
   return tree_sortkey from acs_objects where object_id = p_object_id;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
-create function acs_objects_insert_tr () returns opaque as '
+create function acs_objects_insert_tr() returns opaque as '
 declare
-        v_parent_sk     varbit default null;
-        v_max_value     integer;
+        v_parent_sk    		varbit default null;
+        v_max_child_sortkey	varbit;
 begin
-        if new.context_id is null then 
-            select max(tree_leaf_key_to_int(tree_sortkey)) into v_max_value 
-              from acs_objects 
-             where context_id is null;
-        else 
-            select max(tree_leaf_key_to_int(tree_sortkey)) into v_max_value 
-              from acs_objects 
-             where context_id = new.context_id;
+        if new.context_id is null then
+ 	    new.tree_sortkey := int_to_tree_key(new.object_id+1000);
+        else
+            SELECT tree_sortkey, tree_increment_key(max_child_sortkey)
+	    INTO v_parent_sk, v_max_child_sortkey
+            FROM acs_objects
+            WHERE object_id = new.context_id 
+            FOR UPDATE;
 
-            select tree_sortkey into v_parent_sk 
-              from acs_objects 
-             where object_id = new.context_id;
+	    UPDATE acs_objects 
+	    SET max_child_sortkey = v_max_child_sortkey
+	    WHERE object_id = new.context_id;
+
+            new.tree_sortkey := v_parent_sk || v_max_child_sortkey;
         end if;
 
-
-        new.tree_sortkey := tree_next_key(v_parent_sk, v_max_value);
-
+	new.max_child_sortkey := null;
         return new;
-
 end;' language 'plpgsql';
 
 create trigger acs_objects_insert_tr before insert 
 on acs_objects for each row 
 execute procedure acs_objects_insert_tr ();
 
+
 create function acs_objects_update_tr () returns opaque as '
 declare
         v_parent_sk     varbit default null;
-        v_max_value     integer;
-        ctx_id          integer;
-        v_rec           record;
-        clr_keys_p      boolean default ''t'';
+        v_max_child_sortkey	varbit;
+        v_old_parent_length	integer;
 begin
-        if new.object_id = old.object_id and 
-           ((new.context_id = old.context_id) or
-            (new.context_id is null and old.context_id is null)) then
+        if new.object_id = old.object_id
+           and ((new.context_id = old.context_id)
+                or (new.context_id is null 
+	            and old.context_id is null)) then
 
            return new;
 
         end if;
 
-        for v_rec in select object_id
-                       from acs_objects 
-                      where tree_sortkey between new.tree_sortkey and tree_right(new.tree_sortkey)
-                   order by tree_sortkey
-        LOOP
-            if clr_keys_p then
-               update acs_objects set tree_sortkey = null
-               where tree_sortkey between new.tree_sortkey and tree_right(new.tree_sortkey);
-               clr_keys_p := ''f'';
-            end if;
-            
-            select context_id into ctx_id
-              from acs_objects 
-             where object_id = v_rec.object_id;
+	-- the tree sortkey is going to change so get the new one and update it and all its
+	-- children to have the new prefix...
+	v_old_parent_length := length(new.tree_sortkey) + 1;
 
-            if ctx_id is null then 
-                select max(tree_leaf_key_to_int(tree_sortkey)) into v_max_value
-                  from acs_objects 
-                 where context_id is null;
-            else 
-                select max(tree_leaf_key_to_int(tree_sortkey)) into v_max_value
-                  from acs_objects 
-                 where context_id = ctx_id;
+	if new.context_id is null then
+            v_parent_sk := int_to_tree_key(new.object_id+1000);
+        else
+	    SELECT tree_sortkey, tree_increment_key(max_child_sortkey)
+	    INTO v_parent_sk, v_max_child_sortkey
+            FROM acs_objects
+            WHERE object_id = new.context_id
+            FOR UPDATE;
 
-                select tree_sortkey into v_parent_sk 
-                  from acs_objects 
-                 where object_id = ctx_id;
-            end if;
+	    UPDATE acs_objects
+            SET max_child_sortkey = v_max_child_sortkey
+  	    WHERE object_id = new.context_id;
 
-            update acs_objects 
-               set tree_sortkey = tree_next_key(v_parent_sk, v_max_value)
-             where object_id = v_rec.object_id;
+  	    v_parent_sk := v_parent_sk || v_max_child_sortkey;
+	end if;
 
-        end LOOP;
+	UPDATE acs_objects
+	SET tree_sortkey = v_parent_sk || substring(tree_sortkey, v_old_parent_length)
+        WHERE tree_sortkey between new.tree_sortkey and tree_right(new.tree_sortkey);
 
         return new;
-
 end;' language 'plpgsql';
 
-create trigger acs_objects_update_tr after update 
+create trigger acs_objects_update_tr after update
 on acs_objects
-for each row 
+for each row
 execute procedure acs_objects_update_tr ();
 
 -- show errors
 
 comment on table acs_objects is '
+The root table for the acs object heirarchy.  It all starts here folks.
 ';
 
 comment on column acs_objects.context_id is '
@@ -422,9 +411,10 @@
         inner record;
         security_context_root integer;
 begin
-  if new.object_id = old.object_id and
-     new.context_id = old.context_id and
-     new.security_inherit_p = old.security_inherit_p then
+  if new.object_id = old.object_id
+     and ((new.context_id = old.context_id)
+	  or (new.context_id is null and old.context_id is null))
+     and new.security_inherit_p = old.security_inherit_p then
     return new;
   end if;
 
@@ -549,13 +539,15 @@
 -- ACS_OBJECT PACKAGE --
 ------------------------
 
-create function acs_object__initialize_attributes (integer)
+create or replace function acs_object__initialize_attributes (integer)
 returns integer as '
 declare
   initialize_attributes__object_id              alias for $1;  
   v_object_type                                 acs_objects.object_type%TYPE;
 begin
-   -- XXX This should be fixed to initialize supertypes properly.
+   if  initialize_attributes__object_id is null then 
+	raise exception ''acs_object__initialize_attributes called with null object_id'';
+   end if;
 
    -- Initialize dynamic attributes
    insert into acs_attribute_values
@@ -592,7 +584,7 @@
 
 
 -- function new
-create function acs_object__new (integer,varchar,timestamptz,integer,varchar,integer,boolean)
+create or replace function acs_object__new (integer,varchar,timestamptz,integer,varchar,integer,boolean)
 returns integer as '
 declare
   new__object_id              alias for $1;  -- default null
@@ -633,7 +625,7 @@
 end;' language 'plpgsql';
 
 -- function new
-create function acs_object__new (integer,varchar,timestamptz,integer,varchar,integer)
+create or replace function acs_object__new (integer,varchar,timestamptz,integer,varchar,integer)
 returns integer as '
 declare
   new__object_id              alias for $1;  -- default null
@@ -784,11 +776,11 @@
 
   return object_name;
   
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function default_name
-create function acs_object__default_name (integer)
+create or replace function acs_object__default_name (integer)
 returns varchar as '
 declare
   default_name__object_id   alias for $1;  
@@ -801,12 +793,12 @@
   and o.object_type = ot.object_type;
 
   return object_type_pretty_name || '' '' || default_name__object_id;
-  
-end;' language 'plpgsql';
 
+end;' language 'plpgsql' stable strict;
 
+
 -- procedure get_attribute_storage
-create function acs_object__get_attribute_storage (integer,varchar)
+create or replace function acs_object__get_attribute_storage (integer,varchar)
 returns text as '
 declare
   object_id_in           alias for $1;  
@@ -859,7 +851,7 @@
      a.object_type = t.object_type;
 
    if NOT FOUND then 
-      raise EXCEPTION ''-20000: No such attribute %::% in acs_object.get_attribute_storage.'', v_object_type, attribute_name_in;
+      raise EXCEPTION ''-20000: No such attribute % for object % in acs_object.get_attribute_storage.'', attribute_name_in, object_id_in;
    end if;
 
    -- This should really be done in a trigger on acs_attributes,
@@ -898,10 +890,10 @@
          where 
            object_type = v_object_type;
          if NOT FOUND then 
-            raise EXCEPTION ''-20000: No data found for attribute %::% in acs_object.get_attribute_storage'', v_object_type, attribute_name_in;
+            raise EXCEPTION ''-20000: No data found for attribute %::% object_id % in acs_object.get_attribute_storage'', v_object_type, attribute_name_in, object_id_in;
          end if;
        else
-         raise EXCEPTION ''-20000: No table name specified for storage specific static attribute %::% in acs_object.get_attribute_storage.'',v_object_type, attribute_name_in;
+         raise EXCEPTION ''-20000: No table name specified for storage specific static attribute %::% object_id % in acs_object.get_attribute_storage.'',v_object_type, attribute_name_in, object_id_in;
        end if;
   
      end if;
@@ -913,7 +905,7 @@
        where object_type = v_object_type 
        and table_name = v_table_name;
        if NOT FOUND then 
-          raise EXCEPTION ''-20000: No data found for attribute %::% in acs_object.get_attribute_storage'', v_object_type, attribute_name_in;
+          raise EXCEPTION ''-20000: No data found for attribute %::% object_id % in acs_object.get_attribute_storage'', v_object_type, attribute_name_in, object_id_in;
        end if;
    end if;
 
@@ -937,68 +929,72 @@
 
    return v_column || '','' || v_table_name || '','' || v_key_sql; 
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
-create function acs_object__get_attr_storage_column(text) 
+create or replace function acs_object__get_attr_storage_column(text) 
 returns text as '
 declare
         v_vals  alias for $1;
         v_idx   integer;
 begin
         v_idx := strpos(v_vals,'','');
-        if v_idx = 0 then 
-           raise exception ''invalid storage format: acs_object.get_attr_storage_column'';
+        if v_idx = 0 or v_vals is null then 
+           raise exception ''invalid storage format: acs_object.get_attr_storage_column %'',v_vals;
         end if;
 
         return substr(v_vals,1,v_idx - 1);
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' immutable;
 
-create function acs_object__get_attr_storage_table(text) 
+create or replace function acs_object__get_attr_storage_table(text) 
 returns text as '
 declare
         v_vals  alias for $1;
         v_idx   integer;
         v_tmp   varchar;
 begin
         v_idx := strpos(v_vals,'','');
-        if v_idx = 0 then 
-           raise exception ''invalid storage format: acs_object.get_attr_storage_table'';
+
+        if v_idx = 0 or v_vals is null then 
+           raise exception ''invalid storage format: acs_object.get_attr_storage_table %'',v_vals;
         end if;
+
         v_tmp := substr(v_vals,v_idx + 1);
         v_idx := strpos(v_tmp,'','');
         if v_idx = 0 then 
-           raise exception ''invalid storage format: acs_object.get_attr_storage_table'';
+           raise exception ''invalid storage format: acs_object.get_attr_storage_table %'',v_vals;
         end if;
 
         return substr(v_tmp,1,v_idx - 1);
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' immutable;
 
-create function acs_object__get_attr_storage_sql(text) 
+create or replace function acs_object__get_attr_storage_sql(text) 
 returns text as '
 declare
         v_vals  alias for $1;
         v_idx   integer;
         v_tmp   varchar;
 begin
         v_idx := strpos(v_vals, '','');
-        if v_idx = 0 then 
-           raise exception ''invalid storage format: acs_object.get_attr_storage_sql'';
+
+        if v_idx = 0 or v_vals is null then 
+           raise exception ''invalid storage format: acs_object.get_attr_storage_sql %'',v_vals;
         end if;
+
         v_tmp := substr(v_vals, v_idx + 1);
         v_idx := strpos(v_tmp, '','');
         if v_idx = 0 then 
-           raise exception ''invalid storage format: acs_object.get_attr_storage_sql'';
+           raise exception ''invalid storage format: acs_object.get_attr_storage_sql %'',v_vals;
         end if;
 
         return substr(v_tmp, v_idx + 1);
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' immutable;
 
 -- function get_attribute
-create function acs_object__get_attribute (integer,varchar)
+create or replace function acs_object__get_attribute (integer,varchar)
 returns text as '
 declare
   object_id_in           alias for $1;  
@@ -1028,11 +1024,11 @@
 
    return v_return;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- procedure set_attribute
-create function acs_object__set_attribute (integer,varchar,varchar)
+create or replace function acs_object__set_attribute (integer,varchar,varchar)
 returns integer as '
 declare
   object_id_in           alias for $1;  
@@ -1044,6 +1040,10 @@
   v_return               text; 
   v_storage              text;
 begin
+   if value_in is null then 
+	-- this will fail more cryptically in the execute so catch now. 
+	raise exception ''acs_object__set_attribute: attempt to set % to null for object_id %'',attribute_name_in, object_id_in;
+   end if;
 
    v_storage := acs_object__get_attribute_storage(object_id_in, attribute_name_in);
 
@@ -1058,7 +1058,7 @@
 
 
 -- function check_context_index
-create function acs_object__check_context_index (integer,integer,integer)
+create or replace function acs_object__check_context_index (integer,integer,integer)
 returns boolean as '
 declare
   check_context_index__object_id              alias for $1;  
@@ -1068,6 +1068,9 @@
   n_gens                                      integer;       
 begin
    -- Verify that this row exists in the index.
+   if check_context_index__object_id is null or check_context_index__ancestor_id is null then
+	raise exception ''object_id or ancestor_id is null in acs_object__check_context_index'';
+   end if;	
    select case when count(*) = 0 then 0 else 1 end into n_rows
    from acs_object_context_index
    where object_id = check_context_index__object_id
@@ -1218,14 +1221,18 @@
 
 
 -- function check_path
-create function acs_object__check_path (integer,integer)
+create or replace function acs_object__check_path (integer,integer)
 returns boolean as '
 declare
   check_path__object_id              alias for $1;  
   check_path__ancestor_id            alias for $2;  
   check_path__context_id             acs_objects.context_id%TYPE;
   check_path__security_inherit_p     acs_objects.security_inherit_p%TYPE;
 begin
+   if check_path__object_id is null or check_path__ancestor_id then
+	raise exception ''acs_object__check_path called with null object_id or ancestor_id'';
+   end if;
+
    if check_path__object_id = check_path__ancestor_id then
      return ''t'';
    end if;
@@ -1250,11 +1257,11 @@
    return acs_object__check_path(check_path__context_id, 
                                  check_path__ancestor_id);
   
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- function check_representation
-create function acs_object__check_representation (integer)
+create or replace function acs_object__check_representation (integer)
 returns boolean as '
 declare
   check_representation__object_id              alias for $1;  
@@ -1264,6 +1271,10 @@
   v_rec                                        record;  
   row                                          record; 
 begin
+   if check_representation__object_id is null then 
+	raise exception ''acs_object__check_representation called for null object_id'';
+   end if;
+
    result := ''t'';
    PERFORM acs_log__notice(''acs_object.check_representation'',
                   ''Running acs_object.check_representation on object_id = '' 
Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql	17 May 2003 01:47:10 -0000	1.26
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql	11 Dec 2003 21:39:52 -0000	1.27
@@ -452,7 +452,7 @@
 
 
 -- procedure revoke_permission
-create function acs_permission__revoke_permission (integer, integer, varchar)
+create or replace function acs_permission__revoke_permission (integer, integer, varchar)
 returns integer as '
 declare
     revoke_permission__object_id         alias for $1;
@@ -488,4 +488,4 @@
                    and m.member_id = permission_p__party_id
                    and p.privilege = h.privilege
                    and p.grantee_id = m.party_id);
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql	9 Dec 2001 04:49:30 -0000	1.11
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql	11 Dec 2003 21:39:52 -0000	1.12
@@ -120,7 +120,7 @@
 
 
 -- function role_pretty_name
-create function acs_rel_type__role_pretty_name (varchar)
+create or replace function acs_rel_type__role_pretty_name (varchar)
 returns varchar as '
 declare
   role_pretty_name__role        alias for $1;  
@@ -132,7 +132,7 @@
 
     return v_pretty_name;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function role_pretty_plural
@@ -148,7 +148,7 @@
 
     return v_pretty_plural;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- procedure create_type
@@ -262,15 +262,21 @@
 
 
 -- procedure drop_type
-create function acs_rel_type__drop_type (varchar,boolean)
+create or replace function acs_rel_type__drop_type (varchar,boolean)
 returns integer as '
 declare
   drop_type__rel_type               alias for $1;  
   drop_type__cascade_p              alias for $2;  -- default ''f''  
 begin
-    -- XXX do cascade_p
+    -- XXX do cascade_p.
+    -- JCD: cascade_p seems to be ignored in acs_o_type__drop_type anyway...
+
+    if drop_type__cascade_p is null then 
+	drop_type__cascade_p := ''f'';
+    end if;
+
     delete from acs_rel_types
-    where rel_type = drop_type__rel_type;
+	  where rel_type = drop_type__rel_type;
 
     PERFORM acs_object_type__drop_type(drop_type__rel_type, 
                                        drop_type__cascade_p);
Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v
diff -u -N -r1.46 -r1.47
--- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql	25 Sep 2003 08:59:01 -0000	1.46
+++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql	11 Dec 2003 21:39:52 -0000	1.47
@@ -74,7 +74,7 @@
 ';
 
 
-create function inline_0 ()
+create or replace function inline_0 ()
 returns integer as '
 begin
 -- Create a new object type for packages.
@@ -101,7 +101,7 @@
 
 -- show errors
 
-create function inline_1 ()
+create or replace function inline_1 ()
 returns integer as '
 declare
  attr_id acs_attributes.attribute_id%TYPE;
@@ -414,7 +414,7 @@
 
 -- Metadata for the apm_package_versions object.
 
-create function inline_2 ()
+create or replace function inline_2 ()
 returns integer as '
 declare
  attr_id acs_attributes.attribute_id%TYPE;
@@ -822,7 +822,7 @@
 
 -- Metadata for the apm_parameter and apm_parameter_value system.
 
-create function inline_4 ()
+create or replace function inline_4 ()
 returns integer as '
 declare
  attr_id acs_attributes.attribute_id%TYPE;
@@ -947,7 +947,7 @@
 -- show errors
 
 
-create function inline_5 ()
+create or replace function inline_5 ()
 returns integer as '
 declare
  attr_id acs_attributes.attribute_id%TYPE;
@@ -1071,7 +1071,7 @@
 ';
 
 
-create function inline_6 ()
+create or replace function inline_6 ()
 returns integer as '
 declare 
         dummy   integer;
@@ -1101,7 +1101,7 @@
 -- show errors
 
 
-create function inline_7 ()
+create or replace function inline_7 ()
 returns integer as '
 declare
         dummy   integer;
@@ -1127,7 +1127,7 @@
 
 drop function inline_7 ();
 
-create function apm__register_package (varchar,varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
+create or replace function apm__register_package (varchar,varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
 returns integer as '
 declare
   package_key            alias for $1;  
@@ -1157,7 +1157,7 @@
 
 
 -- function update_package
-create function apm__update_package (varchar,varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
+create or replace function apm__update_package (varchar,varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
 returns varchar as '
 declare
   package_key            alias for $1;  
@@ -1187,12 +1187,16 @@
 
 
 -- procedure unregister_package
-create function apm__unregister_package (varchar,boolean)
+create or replace function apm__unregister_package (varchar,boolean)
 returns integer as '
 declare
   package_key            alias for $1;  
   cascade_p              alias for $2;  -- default ''t''  
 begin
+   if cascade_p is null then 
+	cascade_p := ''t'';
+   end if;
+
    PERFORM apm_package_type__drop_type(
 	package_key,
 	cascade_p
@@ -1203,7 +1207,7 @@
 
 
 -- function register_p
-create function apm__register_p (varchar)
+create or replace function apm__register_p (varchar)
 returns integer as '
 declare
   register_p__package_key            alias for $1;  
@@ -1215,11 +1219,11 @@
 
     return v_register_p;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- procedure register_application
-create function apm__register_application (varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
+create or replace function apm__register_application (varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
 returns integer as '
 declare
   package_key            alias for $1;  
@@ -1248,7 +1252,7 @@
 
 
 -- procedure unregister_application
-create function apm__unregister_application (varchar,boolean)
+create or replace function apm__unregister_application (varchar,boolean)
 returns integer as '
 declare
   package_key            alias for $1;  
@@ -1264,7 +1268,7 @@
 
 
 -- procedure register_service
-create function apm__register_service (varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
+create or replace function apm__register_service (varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
 returns integer as '
 declare
   package_key            alias for $1;  
@@ -1293,12 +1297,16 @@
 
 
 -- procedure unregister_service
-create function apm__unregister_service (varchar,boolean)
+create or replace function apm__unregister_service (varchar,boolean)
 returns integer as '
 declare
   package_key            alias for $1;  
   cascade_p              alias for $2;  -- default ''f''  
 begin
+   if cascade_p is null then 
+	cascade_p := ''f'';
+   end if;
+
    PERFORM apm__unregister_package (
 	package_key,
 	cascade_p
@@ -1309,7 +1317,7 @@
 
 
 -- function register_parameter
-create function apm__register_parameter (integer,varchar,varchar,varchar,varchar,varchar,varchar,integer,integer)
+create or replace function apm__register_parameter (integer,varchar,varchar,varchar,varchar,varchar,varchar,integer,integer)
 returns integer as '
 declare
   register_parameter__parameter_id           alias for $1;  -- default null  
@@ -1366,7 +1374,7 @@
 
 
 -- function update_parameter
-create function apm__update_parameter (integer,varchar,varchar,varchar,varchar,varchar,integer,integer)
+create or replace function apm__update_parameter (integer,varchar,varchar,varchar,varchar,varchar,integer,integer)
 returns varchar as '
 declare
   update_parameter__parameter_id           alias for $1;  
@@ -1394,7 +1402,7 @@
 
 
 -- function parameter_p
-create function apm__parameter_p (varchar,varchar)
+create or replace function apm__parameter_p (varchar,varchar)
 returns integer as '
 declare
   parameter_p__package_key            alias for $1;  
@@ -1408,11 +1416,11 @@
 
     return v_parameter_p;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- procedure unregister_parameter
-create function apm__unregister_parameter (integer)
+create or replace function apm__unregister_parameter (integer)
 returns integer as '
 declare
   unregister_parameter__parameter_id           alias for $1;  -- default null
@@ -1428,7 +1436,7 @@
 
 
 -- function id_for_name
-create function apm__id_for_name (varchar,varchar)
+create or replace function apm__id_for_name (varchar,varchar)
 returns integer as '
 declare
   id_for_name__parameter_name         alias for $1;  
@@ -1442,11 +1450,11 @@
 
     return a_parameter_id;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function get_value
-create function apm__get_value (integer,integer)
+create or replace function apm__get_value (integer,integer)
 returns varchar as '
 declare
   get_value__parameter_id           alias for $1;  
@@ -1459,11 +1467,11 @@
 
     return value;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function get_value
-create function apm__get_value (integer,varchar)
+create or replace function apm__get_value (integer,varchar)
 returns varchar as '
 declare
   get_value__package_id             alias for $1;  
@@ -1480,11 +1488,11 @@
 	get_value__package_id
     );	
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- procedure set_value
-create function apm__set_value (integer,integer,varchar)
+create or replace function apm__set_value (integer,integer,varchar)
 returns integer as '
 declare
   set_value__parameter_id           alias for $1;  
@@ -1515,7 +1523,7 @@
 
 
 -- procedure set_value
-create function apm__set_value (integer,varchar,varchar)
+create or replace function apm__set_value (integer,varchar,varchar)
 returns integer as '
 declare
   set_value__package_id             alias for $1;  
@@ -1549,7 +1557,7 @@
 
 -- create or replace package body apm_package
 -- procedure initialize_parameters
-create function apm_package__initialize_parameters (integer,varchar)
+create or replace function apm_package__initialize_parameters (integer,varchar)
 returns integer as '
 declare
   ip__package_id             alias for $1;  
@@ -1575,7 +1583,7 @@
 
 
 -- function new
-create function apm_package__new (integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer)
+create or replace function apm_package__new (integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer)
 returns integer as '
 declare
   new__package_id             alias for $1;  -- default null  
@@ -1651,7 +1659,7 @@
   end if;
 end;' language 'plpgsql';
   
-create function apm_package__delete (integer) returns integer as '
+create or replace function apm_package__delete (integer) returns integer as '
 declare
    delete__package_id   alias for $1;
    cur_val              record;
@@ -1678,7 +1686,7 @@
     return 0;
 end;' language 'plpgsql';
 
-create function apm_package__initial_install_p (varchar) returns integer as '
+create or replace function apm_package__initial_install_p (varchar) returns integer as '
 declare
 	initial_install_p__package_key  alias for $1;
         v_initial_install_p             integer;
@@ -1693,44 +1701,35 @@
         else
            return v_initial_install_p;
         end if;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
-create function apm_package__singleton_p (varchar) returns integer as '
+create or replace function apm_package__singleton_p (varchar) returns integer as '
 declare
 	singleton_p__package_key        alias for $1;
         v_singleton_p                   integer;
 begin
-        select 1 into v_singleton_p
+        select count(*) into v_singleton_p
 	from apm_package_types
 	where package_key = singleton_p__package_key
         and singleton_p = ''t'';
-	
-        if NOT FOUND then 
-           return 0;
-        else
-           return v_singleton_p;
-        end if;
-end;' language 'plpgsql';
 
-create function apm_package__num_instances (varchar) returns integer as '
+        return v_singleton_p;
+end;' language 'plpgsql' stable;
+
+create or replace function apm_package__num_instances (varchar) returns integer as '
 declare
         num_instances__package_key     alias for $1;
         v_num_instances                integer;
 begin
         select count(*) into v_num_instances
 	from apm_packages
 	where package_key = num_instances__package_key;
-	
-	-- exception
-	if NOT FOUND then
-           return 0;
-        else 
-           return v_num_instances;
-        end if;
-        
-end;' language 'plpgsql';
 
-create function apm_package__name (integer) returns varchar as '
+        return v_num_instances;
+
+end;' language 'plpgsql' stable;
+
+create or replace function apm_package__name (integer) returns varchar as '
 declare
     name__package_id       alias for $1;
     v_result               apm_packages.instance_name%TYPE;
@@ -1741,9 +1740,9 @@
 
     return v_result;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
-create function apm_package__highest_version (varchar) returns integer as '
+create or replace function apm_package__highest_version (varchar) returns integer as '
 declare
      highest_version__package_key    alias for $1;
      v_version_id                    apm_package_versions.version_id%TYPE;
@@ -1759,9 +1758,9 @@
       else
          return v_version_id;
       end if;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
-create function apm_package__parent_id (integer) returns integer as '
+create or replace function apm_package__parent_id (integer) returns integer as '
 declare
     apm_package__parent_id__package_id alias for $1;
     v_package_id apm_packages.package_id%TYPE;
@@ -1773,15 +1772,12 @@
                          from site_nodes sn2
                          where sn2.object_id = apm_package__parent_id__package_id);
 
-    if NOT FOUND then
-        return -1;
-    else
-        return v_package_id;
-    end if;
-end;' language 'plpgsql';
+    return v_package_id;
 
+end;' language 'plpgsql' stable strict;
+
 -- create or replace package body apm_package_version 
-create function apm_package_version__new (integer,varchar,varchar,varchar,varchar,varchar,varchar,timestamptz,varchar,varchar,varchar,boolean,boolean) returns integer as '
+create or replace function apm_package_version__new (integer,varchar,varchar,varchar,varchar,varchar,varchar,timestamptz,varchar,varchar,varchar,boolean,boolean) returns integer as '
 declare
       apm_pkg_ver__version_id           alias for $1;  -- default null
       apm_pkg_ver__package_key		alias for $2;
@@ -1831,7 +1827,7 @@
 
 
 -- procedure delete
-create function apm_package_version__delete (integer)
+create or replace function apm_package_version__delete (integer)
 returns integer as '
 declare
   delete__version_id             alias for $1;  
@@ -1852,7 +1848,7 @@
 
 
 -- procedure enable
-create function apm_package_version__enable (integer)
+create or replace function apm_package_version__enable (integer)
 returns integer as '
 declare
   enable__version_id             alias for $1;  
@@ -1865,7 +1861,7 @@
 
 
 -- procedure disable
-create function apm_package_version__disable (integer)
+create or replace function apm_package_version__disable (integer)
 returns integer as '
 declare
   disable__version_id             alias for $1;  
@@ -1879,7 +1875,7 @@
 
 
 -- function copy
-create function apm_package_version__copy (integer,integer,varchar,varchar,boolean)
+create or replace function apm_package_version__copy (integer,integer,varchar,varchar,boolean)
 returns integer as '
 declare
   copy__version_id             alias for $1;  
@@ -1930,7 +1926,7 @@
 
 
 -- function edit
-create function apm_package_version__edit (integer,integer,varchar,varchar,varchar,varchar,varchar,timestamptz,varchar,varchar,varchar,boolean,boolean)
+create or replace function apm_package_version__edit (integer,integer,varchar,varchar,varchar,varchar,varchar,timestamptz,varchar,varchar,varchar,boolean,boolean)
 returns integer as '
 declare
   edit__new_version_id         alias for $1;  -- default null  
@@ -1984,7 +1980,7 @@
 end;' language 'plpgsql';
 
 -- function add_interface
-create function apm_package_version__add_interface (integer,integer,varchar,varchar)
+create or replace function apm_package_version__add_interface (integer,integer,varchar,varchar)
 returns integer as '
 declare
   add_interface__interface_id         alias for $1;  -- default null  
@@ -2011,7 +2007,7 @@
 
 
 -- procedure remove_interface
-create function apm_package_version__remove_interface (integer)
+create or replace function apm_package_version__remove_interface (integer)
 returns integer as '
 declare
   remove_interface__interface_id           alias for $1;  
@@ -2024,7 +2020,7 @@
 
 
 -- procedure remove_interface
-create function apm_package_version__remove_interface (varchar,varchar,integer)
+create or replace function apm_package_version__remove_interface (varchar,varchar,integer)
 returns integer as '
 declare
   remove_interface__interface_uri          alias for $1;  
@@ -2042,7 +2038,7 @@
 
 
 -- function add_dependency
-create function apm_package_version__add_dependency (integer,integer,varchar,varchar)
+create or replace function apm_package_version__add_dependency (integer,integer,varchar,varchar)
 returns integer as '
 declare
   add_dependency__dependency_id          alias for $1;  -- default null  
@@ -2069,7 +2065,7 @@
 
 
 -- procedure remove_dependency
-create function apm_package_version__remove_dependency (integer)
+create or replace function apm_package_version__remove_dependency (integer)
 returns integer as '
 declare
   remove_dependency__dependency_id          alias for $1;  
@@ -2082,7 +2078,7 @@
 
 
 -- procedure remove_dependency
-create function apm_package_version__remove_dependency (varchar,varchar,integer)
+create or replace function apm_package_version__remove_dependency (varchar,varchar,integer)
 returns integer as '
 declare
   remove_dependency__dependency_uri         alias for $1;  
@@ -2100,7 +2096,7 @@
 
 
 -- function sortable_version_name
-create function apm_package_version__sortable_version_name (varchar)
+create or replace function apm_package_version__sortable_version_name (varchar)
 returns varchar as '
 declare
   version_name           alias for $1;  
@@ -2172,10 +2168,10 @@
 	    a_start := a_end + 1;
 	end loop;
     
-end;' language 'plpgsql';
+end;' language 'plpgsql' immutable;
 
 -- function version_name_greater
-create function apm_package_version__version_name_greater (varchar,varchar)
+create or replace function apm_package_version__version_name_greater (varchar,varchar)
 returns integer as '
 declare
   version_name_one       alias for $1;  
@@ -2192,10 +2188,10 @@
 	end if; end if;
 
 	return 0;   
-end;' language 'plpgsql';
+end;' language 'plpgsql' immutable;
 
 -- function upgrade_p
-create function apm_package_version__upgrade_p (varchar,varchar,varchar)
+create or replace function apm_package_version__upgrade_p (varchar,varchar,varchar)
 returns integer as '
 declare
   upgrade_p__path                   alias for $1;  
@@ -2239,11 +2235,11 @@
 	-- Invalid version number.
 	-- return 0;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' immutable;
 
 
 -- procedure upgrade
-create function apm_package_version__upgrade (integer)
+create or replace function apm_package_version__upgrade (integer)
 returns integer as '
 declare
   upgrade__version_id             alias for $1;  
@@ -2267,7 +2263,7 @@
 
 -- create or replace package body apm_package_type
 -- procedure create_type
-create function apm_package_type__create_type (varchar,varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
+create or replace function apm_package_type__create_type (varchar,varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
 returns integer as '
 declare
   create_type__package_key            alias for $1;  
@@ -2293,7 +2289,7 @@
 
 
 -- function update_type
-create function apm_package_type__update_type (varchar,varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
+create or replace function apm_package_type__update_type (varchar,varchar,varchar,varchar,varchar,boolean,boolean,varchar,integer)
 returns varchar as '
 declare
   update_type__package_key            alias for $1;  
@@ -2323,7 +2319,7 @@
 
 
 -- procedure drop_type
-create function apm_package_type__drop_type (varchar,boolean)
+create or replace function apm_package_type__drop_type (varchar,boolean)
 returns integer as '
 declare
   drop_type__package_key            alias for $1;  
@@ -2361,7 +2357,7 @@
 
 
 -- function num_parameters
-create function apm_package_type__num_parameters (varchar)
+create or replace function apm_package_type__num_parameters (varchar)
 returns integer as '
 declare
   num_parameters__package_key            alias for $1;  
@@ -2373,7 +2369,7 @@
 
     return v_count;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 
@@ -2383,7 +2379,7 @@
 
 -- create or replace package body apm_parameter_value
 -- function new
-create function apm_parameter_value__new (integer,integer,integer,varchar)
+create or replace function apm_parameter_value__new (integer,integer,integer,varchar)
 returns integer as '
 declare
   new__value_id               alias for $1;  -- default null  
@@ -2411,7 +2407,7 @@
 
 
 -- procedure delete
-create function apm_parameter_value__delete (integer)
+create or replace function apm_parameter_value__delete (integer)
 returns integer as '
 declare
   delete__value_id               alias for $1;  -- default null
@@ -2425,7 +2421,7 @@
 
 
 -- function new
-create function apm_application__new (integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer)
+create or replace function apm_application__new (integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer)
 returns integer as '
 declare
   application_id         alias for $1;  -- default null  
@@ -2455,7 +2451,7 @@
 
 
 -- procedure delete
-create function apm_application__delete (integer)
+create or replace function apm_application__delete (integer)
 returns integer as '
 declare
   delete__application_id         alias for $1;  
@@ -2475,7 +2471,7 @@
 
 -- create or replace package body apm_service
 -- function new
-create function apm_service__new (integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer)
+create or replace function apm_service__new (integer,varchar,varchar,varchar,timestamptz,integer,varchar,integer)
 returns integer as '
 declare
   service_id             alias for $1;  -- default null  
@@ -2505,7 +2501,7 @@
 
 
 -- procedure delete
-create function apm_service__delete (integer)
+create or replace function apm_service__delete (integer)
 returns integer as '
 declare
   delete__service_id    alias for $1;  
Index: openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql	18 Sep 2003 17:11:37 -0000	1.16
+++ openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql	11 Dec 2003 21:39:52 -0000	1.17
@@ -114,7 +114,7 @@
 --
 -- * Create constraints for creation_user and modifying_user
 
-create function inline_0 ()
+create or replace function inline_0 ()
 returns integer as '
 declare
   attr_id acs_attributes.attribute_id%TYPE;
@@ -255,6 +255,8 @@
 	url		varchar(200)
 );
 
+create index parties_email_lower_idx on parties(lower(email));
+
 comment on table parties is '
  Party is the supertype of person and organization. It exists because
  many other types of object can have relationships to parties.
@@ -269,7 +271,7 @@
 -- PARTY PACKAGE --
 -------------------
 
-create function party__new (integer,varchar,timestamptz,integer,varchar,varchar,varchar,integer)
+create or replace function party__new (integer,varchar,timestamptz,integer,varchar,varchar,varchar,integer)
 returns integer as '
 declare
   new__party_id               alias for $1;  -- default null  
@@ -295,7 +297,7 @@
   
 end;' language 'plpgsql';
 
-create function party__delete (integer)
+create or replace function party__delete (integer)
 returns integer as '
 declare
   party_id               alias for $1;  
@@ -305,7 +307,7 @@
   return 0; 
 end;' language 'plpgsql';
 
-create function party__name (integer)
+create or replace function party__name (integer)
 returns varchar as '
 declare
   party_id               alias for $1;  
@@ -316,23 +318,19 @@
    return null;
   end if;
   
-end;' language 'plpgsql';
+end;' language 'plpgsql' immutable strict;
 
-create function party__email (integer)
+create or replace function party__email (integer)
 returns varchar as '
 declare
-  email__party_id	alias for $1;  
-  party_email           varchar(200);  
+  email__party_id		alias for $1;
 begin
-  select email
-  into party_email
-  from parties
-  where party_id = email__party_id;
 
-  return party_email;
-  
-end;' language 'plpgsql';
+  return email from parties where party_id = email__party_id;
 
+end;' language 'plpgsql' stable strict;
+
+
 -- show errors
 
 -------------
@@ -391,7 +389,7 @@
 -- create or replace package body person
 -- function new
 select define_function_args('person__new','person_id,object_type;person,creation_date;now(),creation_user,creation_ip,email,url,first_names,last_name,context_id');
-create function person__new (integer,varchar,timestamptz,integer,varchar,varchar,varchar,varchar,varchar,integer)
+create or replace function person__new (integer,varchar,timestamptz,integer,varchar,varchar,varchar,varchar,varchar,integer)
 returns integer as '
 declare
   new__person_id              alias for $1;  -- default null  
@@ -422,7 +420,7 @@
 
 
 -- procedure delete
-create function person__delete (integer)
+create or replace function person__delete (integer)
 returns integer as '
 declare
   delete__person_id     alias for $1;  
@@ -437,54 +435,43 @@
 
 
 -- function name
-create function person__name (integer)
+create or replace function person__name (integer)
 returns varchar as '
 declare
   name__person_id        alias for $1;  
-  person_name            varchar(200);  
 begin
-  select first_names || '' '' || last_name
-  into person_name
+
+  return first_names || '' '' || last_name
   from persons
   where person_id = name__person_id;
 
-  return person_name;
-  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function first_names
-create function person__first_names (integer)
+create or replace function person__first_names (integer)
 returns varchar as '
 declare
   first_names__person_id        alias for $1;  
-  person_first_names     varchar(200);  
 begin
-  select first_names
-  into person_first_names
+  return first_names
   from persons
   where person_id = first_names__person_id;
-
-  return person_first_names;
   
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function last_name
-create function person__last_name (integer)
+create or replace function person__last_name (integer)
 returns varchar as '
 declare
   last_name__person_id        alias for $1;  
-  person_last_name      varchar(200);  
 begin
-  select last_name
-  into person_last_name
+  return last_name
   from persons
   where person_id = last_name__person_id;
 
-  return person_last_name;
-  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- show errors
@@ -524,6 +511,9 @@
         unique (authority_id, username)
 );
 
+create index users_username_lower_idx on users(lower(username));
+create index users_screenname_lower_idx on users(lower(screen_name));
+
 create table user_preferences (
 	user_id			integer constraint user_prefs_user_id_fk
 				references users (user_id)
@@ -538,7 +528,7 @@
         timezone                varchar(100)
 );
 
-create function inline_1 ()
+create or replace function inline_1 ()
 returns integer as '
 begin
 
@@ -730,7 +720,7 @@
 end;' language 'plpgsql';
 
 
-create function acs_user__new(varchar,varchar,varchar,char,char) 
+create or replace function acs_user__new(varchar,varchar,varchar,char,char) 
 returns integer as '
 declare
         email   alias for $1;
@@ -761,7 +751,7 @@
 
 
 -- function receives_alerts_p
-create function acs_user__receives_alerts_p (integer)
+create or replace function acs_user__receives_alerts_p (integer)
 returns boolean as '
 declare
   receives_alerts_p__user_id                alias for $1;  
@@ -774,11 +764,11 @@
 
   return counter;
   
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 -- procedure approve_email
-create function acs_user__approve_email (integer)
+create or replace function acs_user__approve_email (integer)
 returns integer as '
 declare
   approve_email__user_id        alias for $1;  
@@ -792,7 +782,7 @@
 
 
 -- procedure unapprove_email
-create function acs_user__unapprove_email (integer)
+create or replace function acs_user__unapprove_email (integer)
 returns integer as '
 declare
   unapprove_email__user_id      alias for $1;  
@@ -806,7 +796,7 @@
 
 
 -- procedure delete
-create function acs_user__delete (integer)
+create or replace function acs_user__delete (integer)
 returns integer as '
 declare
   delete__user_id       alias for $1;  
Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql	28 Aug 2003 09:41:38 -0000	1.24
+++ openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql	11 Dec 2003 21:39:52 -0000	1.25
@@ -3,7 +3,7 @@
 --
 -- @author rhs@mit.edu
 -- @creation-date 2000-08-22
--- @cvs-id groups-body-create.sql,v 1.1.4.1 2001/01/12 22:58:33 mbryzek Exp
+-- @cvs-id $Id$
 --
 
 --------------
@@ -921,7 +921,7 @@
 
   return name__group_name;
   
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 create or replace function acs_group__member_p (integer, integer, boolean)
 returns boolean as '
@@ -944,9 +944,10 @@
 	   and rels.object_id_one = p_group_id
            and rels.object_id_two = p_party_id;
   end if;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
+
 -- function check_representation
 create or replace function acs_group__check_representation (integer)
 returns boolean as '
@@ -956,6 +957,11 @@
   comp                   record;
   memb                   record;      
 begin
+   if group_id is null then 
+        --maybe we should just return ''f'' instead?
+	raise exception ''acs_group__check_representation called with null group_id'';
+   end if;
+
    res := ''t'';
    PERFORM acs_log__notice(''acs_group.check_representation'',
                   ''Running check_representation on group '' || group_id);
Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql	28 Aug 2003 09:41:38 -0000	1.16
+++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql	11 Dec 2003 21:39:52 -0000	1.17
@@ -293,9 +293,14 @@
 create index group_elem_idx_group_idx on group_element_index (group_id);
 create index group_elem_idx_element_idx on group_element_index (element_id);
 create index group_elem_idx_rel_id_idx on group_element_index (rel_id);
-create index group_elem_idx_container_idx on group_element_index (container_id);
 create index group_elem_idx_rel_type_idx on group_element_index (rel_type);
 
+-- The index on container_id is not very good 
+-- and in some cases can be quite detrimental
+-- see http://openacs.org/forums/message-view?message_id=142769
+-- create index group_elem_idx_container_idx on group_element_index (container_id);
+
+
 comment on table group_element_index is '
  This table is for internal use by the parties system.  It as an auxiliary
  table, a denormalization of data, that is used to improve performance.
@@ -382,7 +387,7 @@
     end if;
     return ''f'';
   end if;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 
Index: openacs-4/packages/acs-kernel/sql/postgresql/lob.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/lob.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-kernel/sql/postgresql/lob.sql	7 Apr 2001 15:54:55 -0000	1.2
+++ openacs-4/packages/acs-kernel/sql/postgresql/lob.sql	11 Dec 2003 21:39:52 -0000	1.3
@@ -23,7 +23,7 @@
 	refcount		integer not null default 0
 );
 
-create function on_lobs_delete() returns opaque as '
+create or replace function on_lobs_delete() returns opaque as '
 begin
 	delete from lob_data where lob_id = old.lob_id;
 	return old;
@@ -47,7 +47,7 @@
 -- and PG 7.0.  The ACS doesn't share LOBs between tables
 -- or rows within a table anyway, I don't think/hope.
 
-create function on_lob_ref() returns opaque as '
+create or replace function on_lob_ref() returns opaque as '
 begin
 	if TG_OP = ''UPDATE'' then
 		if new.lob = old.lob then
@@ -76,30 +76,34 @@
 
 end;' language 'plpgsql';
 
-create function empty_lob() returns integer as '
+create or replace function empty_lob() returns integer as '
 begin
 	return nextval(''lob_sequence'');
 end;' language 'plpgsql';
 
-create function lob_get_data(integer) returns text as '
+create or replace function lob_get_data(integer) returns text as '
 declare
-        lob_id  integer;
+        p_lob_id alias for $1;
         v_rec   record;
         v_data  text default '''';
 begin
-        for v_rec in select data, segment from lob_data order by segment;
+        for v_rec in select data, segment from lob_data where lob_id = p_lob_id order by segment;
             v_data := v_data || v_rec.data;
         end if;
 
         return v_data;
 
 end;' language 'plpgsql';
 
-create function lob_copy(integer, integer) returns integer as '
+create or replace function lob_copy(integer, integer) returns integer as '
 declare
         from_id         alias for $1;
         to_id           alias for $2;
 begin
+	if from_id is null then 
+	    raise exception ''lob_copy: attempt to copy null from_id to % to_id'',to_id;
+        end if;
+
         insert into lobs (lob_id,refcount) values (to_id,0);
 
         insert into lob_data
@@ -111,7 +115,7 @@
 
 end;' language 'plpgsql';
 
-create function lob_length(integer) returns integer as '
+create or replace function lob_length(integer) returns integer as '
 declare
         id  alias for $1;
 begin
Index: openacs-4/packages/acs-kernel/sql/postgresql/postgresql.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/postgresql.sql,v
diff -u -N -r1.33 -r1.34
--- openacs-4/packages/acs-kernel/sql/postgresql/postgresql.sql	9 Nov 2003 12:51:52 -0000	1.33
+++ openacs-4/packages/acs-kernel/sql/postgresql/postgresql.sql	11 Dec 2003 21:39:52 -0000	1.34
@@ -41,7 +41,7 @@
 
         return 0;
 
-end;' language 'plpgsql' with (iscachable);
+end;' language 'plpgsql' immutable;
 
 
 create function instr(varchar,char,integer) returns integer as '
@@ -51,7 +51,7 @@
         dir             alias for $3;
 begin
         return instr(str,pat,dir,1);
-end;' language 'plpgsql' with (iscachable);
+end;' language 'plpgsql' immutable;
 
 
 create function instr(varchar,char) returns integer as '
@@ -60,7 +60,7 @@
         pat             alias for $2;
 begin
         return instr(str,pat,1,1);
-end;' language 'plpgsql' with (iscachable);
+end;' language 'plpgsql' immutable;
 
 
 -- Splits string on requested character. Returns requested element
@@ -94,7 +94,7 @@
     return null;
   end if;
   return substr(p_string, v_left_split+1, (v_right_split - v_left_split - 1));
-end;' language 'plpgsql' with (iscachable);
+end;' language 'plpgsql' immutable;
 
 
 create function get_func_drop_command (varchar) returns varchar as '
@@ -179,6 +179,10 @@
         v_tmp   text;
         v_cnt   integer default -1;
 begin
+        if v_src is null then 
+	     return null;
+        end if;
+
         v_tmp := v_src;
         LOOP
             v_pos := position(''\n'' in v_tmp);
@@ -194,9 +198,9 @@
 
         return v_ret || rpad(v_cnt,10) || v_tmp;
 
-end;' language 'plpgsql' with (iscachable);
+end;' language 'plpgsql' immutable strict;
 
-create function get_func_definition (varchar,oidvector) returns text as '
+create or replace function get_func_definition (varchar,oidvector) returns text as '
 declare
         fname           alias for $1;
         args            alias for $2;
@@ -216,12 +220,12 @@
           from pg_proc p 
          where proname = fname::name
            and proargtypes = args;
-        
+
          v_funcdef := v_funcdef || ''
 create function '' || fname || ''('';
-        
+
          v_pos := position('' '' in v_args);
-        
+
          while nargs < v_nargs loop
              nargs := nargs + 1;
              if nargs = v_nargs then 
@@ -238,13 +242,13 @@
                          end into v_one_type 
                from pg_type 
               where oid = v_one_arg;
-             v_funcdef := v_funcdef || v_one_type;            
+             v_funcdef := v_funcdef || v_one_type;
          end loop;
          v_funcdef := v_funcdef || '') returns '' || v_rettype || '' as \\\'\\n'' || v_src || ''\\\' language \\\'plpgsql\\\';'';
-        
+
         return v_funcdef;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 create function get_func_header(varchar,oidvector) returns text as '
 declare
@@ -258,7 +262,7 @@
 
         return substr(v_src, 1, pos + 4);
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 create view acs_func_defs as 
 select get_func_definition(proname,proargtypes) as definition, 
@@ -283,7 +287,7 @@
 	create or replace function bitfromint4 (integer) returns bit varying as ''
 	begin 
     	    return "bit"($1);
-	end;'' language ''plpgsql'';
+	end;'' language ''plpgsql'' immutable strict;
    end if;
    return 1;
 end;' language 'plpgsql';
@@ -302,52 +306,15 @@
 	create or replace function bittoint4 (bit varying) returns integer as ''
 	begin 
     	    return "int4"($1);
-	end;'' language ''plpgsql'';
+	end;'' language ''plpgsql'' immutable strict;
    end if;
    return 1;
 end;' language 'plpgsql';
 
 select inline_1();
 drop function inline_1();
 
-create function inline_0 () returns integer as '
--- Create a bitfromint4(integer) function if it doesn''t exists.
--- Due to a bug in PG 7.3 this function is absent in PG 7.3.
-declare
-    v_bitfromint4_count integer;
-begin
-    select into v_bitfromint4_count count(*) from pg_proc where proname = ''bitfromint4'';
-    if v_bitfromint4_count = 0 then
-	create or replace function bitfromint4 (integer) returns bit varying as ''
-	begin 
-    	    return "bit"($1);
-	end;'' language ''plpgsql'';
-   end if;
-   return 1;
-end;' language 'plpgsql';
 
-select inline_0();
-drop function inline_0();
-
-create function inline_1 () returns integer as '
--- Create a bitfromint4(integer) function if it doesn''t exists.
--- Due to a bug in PG 7.3 this function is absent in PG 7.3.
-declare
-    v_bittoint4_count integer;
-begin
-    select into v_bittoint4_count count(*) from pg_proc where proname = ''bittoint4'';
-    if v_bittoint4_count = 0 then
-	create or replace function bittoint4 (bit varying) returns integer as ''
-	begin 
-    	    return "int4"($1);
-	end;'' language ''plpgsql'';
-   end if;
-   return 1;
-end;' language 'plpgsql';
-
-select inline_1();
-drop function inline_1();
-
 -- tree query support, m-vgID method.
 
 -- DRB: I've replaced the old, text-based tree sort keys with a 
@@ -405,7 +372,7 @@
     return substring(bitfromint4(cast (-2^31 + p_intkey as int4)), 1, 32);
   end if;
 
-end;' language 'plpgsql' with (isstrict, iscachable);
+end;' language 'plpgsql' immutable strict;
 
 create function tree_key_to_int(varbit, integer) returns integer as '
 
@@ -441,7 +408,7 @@
     return bittoint4(substring(p_tree_key, v_parent_pos, 8));
   end if;
 
-end;' language 'plpgsql' with (isstrict, iscachable);
+end;' language 'plpgsql' immutable strict;
 
 create function tree_ancestor_key(varbit, integer) returns varbit as '
 
@@ -470,7 +437,7 @@
 
   return substring(p_tree_key, 1, v_pos - 1);
 
-end;' language 'plpgsql' with (isstrict, iscachable);
+end;' language 'plpgsql' immutable strict;
 
 create function tree_root_key(varbit) returns varbit as '
 
@@ -487,7 +454,7 @@
       return substring(p_tree_key, 1, 8);
   end if;
 
-end;' language 'plpgsql' with (isstrict, iscachable);
+end;' language 'plpgsql' immutable strict;
 
 create function tree_leaf_key_to_int(varbit) returns integer as '
 
@@ -516,19 +483,17 @@
     return bittoint4(substring(p_tree_key, v_leaf_pos, 8));
   end if;
 
-end;' language 'plpgsql' with (isstrict, iscachable);
+end;' language 'plpgsql' immutable strict;
 
 create function tree_next_key(varbit, integer) returns varbit as '
-
--- Create a new child of the given key with a leaf key number one greater than
--- the child value parameter.  If the child value parameter is null, make the
--- child the first child of the parent.
-
 declare
   p_parent_key      alias for $1;
   p_child_value     alias for $2;
   v_child_value     integer;
 begin
+-- Create a new child of the given key with a leaf key number one greater than
+-- the child value parameter.  If the child value parameter is null, make the
+-- child the first child of the parent.
 
   if p_child_value is null then
     v_child_value := 0;
@@ -542,7 +507,7 @@
     return p_parent_key || int_to_tree_key(v_child_value);
   end if;
 
-end;' language 'plpgsql' with(iscachable);
+end;' language 'plpgsql' immutable;
 
 create function tree_increment_key(varbit)
 returns varbit as '
@@ -557,7 +522,7 @@
     end if;
 
     return int_to_tree_key(v_child_sort_key);
-end;' language 'plpgsql' with(iscachable);
+end;' language 'plpgsql' immutable;
 
 create function tree_left(varbit) returns varbit as '
 
@@ -572,7 +537,7 @@
   else
     return key || ''X00''::varbit;
   end if;
-end;' language 'plpgsql' with(iscachable);
+end;' language 'plpgsql' immutable;
 
 create function tree_right(varbit) returns varbit as '
 
@@ -588,7 +553,7 @@
   else
     return key || ''XFFFFFFFF''::varbit;
   end if;
-end;' language 'plpgsql' with(iscachable);
+end;' language 'plpgsql' immutable;
 
 create function tree_level(varbit) returns integer as '
 
@@ -619,15 +584,15 @@
   end loop;
 
   return v_level;
-end;' language 'plpgsql' with(iscachable);
+end;' language 'plpgsql' immutable;
 
 create function tree_ancestor_p(varbit, varbit) returns boolean as '
 declare
   p_potential_ancestor      alias for $1;
   p_potential_child         alias for $2;
 begin
   return position(p_potential_ancestor in p_potential_child) = 1;
-end;' language 'plpgsql' with(iscachable);
+end;' language 'plpgsql' immutable;
 
 -- PG does not allow recursive SQL functions during CREATE, but you can fool it easily
 -- with CREATE OR REPLACE, a feature added in 7.2.
@@ -651,10 +616,12 @@
   union
   select tree_ancestor_keys($1, $2 + 1)
   where $2 < tree_level($1)
-' language 'sql' with (isstrict);
+' language 'sql' immutable strict;
 
-create function tree_ancestor_keys(varbit) returns setof varbit as '
 
+------------------------------
+-- TREE_ANCESTOR_KEYS
+
 -- Return the set of tree_sortkeys for all of the ancestors of the given
 -- tree_sortkey ancestors.
 
@@ -697,10 +664,11 @@
 -- WARNING: subselects in where clauses that call this function and join on an outer table appear
 -- to reliably kill PG 7.1.2, at least if "exists" is involved.   PG 7.2 doesn''t die on my test
 -- case, so it appears to have been fixed.
+create or replace function tree_ancestor_keys(varbit) returns setof varbit as '
 
   select tree_ancestor_keys($1, 1)
 
-' language 'sql' with (isstrict);
+' language 'sql' immutable strict;
 
 ----------------------------------------------------------------------------
 
Index: openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql	20 Apr 2001 02:03:49 -0000	1.7
+++ openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql	11 Dec 2003 21:39:52 -0000	1.8
@@ -15,7 +15,7 @@
 
 -- create or replace package body rel_constraint
 
-create function rel_constraint__new(varchar,integer,varchar,integer) 
+create or replace function rel_constraint__new(varchar,integer,varchar,integer) 
 returns integer as '
 declare
         nam     alias for $1;
@@ -36,7 +36,7 @@
 end;' language 'plpgsql';
 
 -- function new
-create function rel_constraint__new (integer,varchar,varchar,integer,char,integer,integer,integer,varchar)
+create or replace function rel_constraint__new (integer,varchar,varchar,integer,char,integer,integer,integer,varchar)
 returns integer as '
 declare
   new__constraint_id          alias for $1;  -- default null  
@@ -72,7 +72,7 @@
 
 
 -- procedure delete
-create function rel_constraint__delete (integer)
+create or replace function rel_constraint__delete (integer)
 returns integer as '
 declare
   constraint_id          alias for $1;  
@@ -84,27 +84,26 @@
 
 
 -- function get_constraint_id
-create function rel_constraint__get_constraint_id (integer,char,integer)
+create or replace function rel_constraint__get_constraint_id (integer,char,integer)
 returns integer as '
 declare
   get_constraint_id__rel_segment            alias for $1;  
   get_constraint_id__rel_side               alias for $2;  
   get_constraint_id__required_rel_segment   alias for $3;  
   v_constraint_id                           rel_constraints.constraint_id%TYPE;
 begin
-    select constraint_id into v_constraint_id
+
+    return constraint_id
     from rel_constraints
     where rel_segment = get_constraint_id__rel_segment
       and rel_side = get_constraint_id__rel_side
       and required_rel_segment = get_constraint_id__required_rel_segment;
 
-    return v_constraint_id;
+end;' language 'plpgsql' stable strict;
 
-end;' language 'plpgsql';
 
-
 -- function violation
-create function rel_constraint__violation (integer)
+create or replace function rel_constraint__violation (integer)
 returns varchar as '
 declare
   violation__rel_id                 alias for $1;  
@@ -148,11 +147,11 @@
 
     return v_error;
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 -- function violation_if_removed
-create function rel_constraint__violation_if_removed (integer)
+create or replace function  rel_constraint__violation_if_removed (integer)
 returns varchar as '
 declare
   violation_if_removed__rel_id                 alias for $1;  
@@ -188,7 +187,7 @@
     return v_error;
 
    
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 
Index: openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-body-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-body-create.sql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-body-create.sql	17 Mar 2003 21:58:36 -0000	1.10
+++ openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-body-create.sql	11 Dec 2003 21:39:52 -0000	1.11
@@ -15,7 +15,7 @@
 ------------------
 
 -- rel_segment__new -- full version
-create function rel_segment__new (integer,varchar,timestamptz,integer,varchar,varchar,varchar,varchar,integer,varchar,integer)
+create or replace function rel_segment__new (integer,varchar,timestamptz,integer,varchar,varchar,varchar,varchar,integer,varchar,integer)
 returns integer as '
 declare
   new__segment_id        alias for $1;  -- default null  
@@ -45,7 +45,7 @@
 end;' language 'plpgsql';
 
 -- rel_segment__new -- overloaded version for specifying only non-default values
-create function rel_segment__new (varchar,integer,varchar)
+create or replace function rel_segment__new (varchar,integer,varchar)
 returns integer as '
 declare
   new__segment_name      alias for $1;  
@@ -62,7 +62,7 @@
 
 
 -- procedure delete
-create function rel_segment__delete (integer)
+create or replace function rel_segment__delete (integer)
 returns integer as '
 declare
   delete__segment_id            alias for $1;  
@@ -86,23 +86,21 @@
 
 
 -- function get
-create function rel_segment__get (integer,varchar)
+create or replace function rel_segment__get (integer,varchar)
 returns integer as '
 declare
   get__group_id         alias for $1;  
   get__rel_type         alias for $2;  
-  v_segment_id          rel_segments.segment_id%TYPE;
 begin
-   select min(segment_id) into v_segment_id
+
+   return min(segment_id)
    from rel_segments
    where group_id = get__group_id
      and rel_type = get__rel_type;
-
-   return v_segment_id;
   
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
-create function rel_segment__get_or_new(integer,varchar) returns integer as '
+create or replace function rel_segment__get_or_new(integer,varchar) returns integer as '
 declare
         gid     alias for $1;
         typ     alias for $2;
@@ -111,7 +109,7 @@
 end;' language 'plpgsql';
 
 -- function get_or_new
-create function rel_segment__get_or_new (integer,varchar,varchar)
+create or replace function rel_segment__get_or_new (integer,varchar,varchar)
 returns integer as '
 declare
   get_or_new__group_id          alias for $1;  
@@ -160,20 +158,17 @@
 
 
 -- function name
-create function rel_segment__name (integer)
+create or replace function rel_segment__name (integer)
 returns varchar as '
 declare
   name__segment_id             alias for $1;  
   name__segment_name           varchar(200);  
 begin
-  select segment_name
-  into name__segment_name
+  return segment_name
   from rel_segments
   where segment_id = name__segment_id;
 
-  return name__segment_name;
-  
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 
Index: openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql	22 Jun 2002 20:54:47 -0000	1.16
+++ openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql	11 Dec 2003 21:39:52 -0000	1.17
@@ -6,7 +6,7 @@
 -- @cvs-id site-nodes-create.sql,v 1.6.2.2 2001/01/12 22:53:32 dennis Exp
 --
 
-create function inline_0 ()
+create or replace function inline_0 ()
 returns integer as '
 declare
         dummy   integer;
@@ -62,14 +62,14 @@
 create index site_nodes_parent_id_idx on site_nodes(parent_id,object_id,node_id);
 create index site_nodes_tree_skey_idx on site_nodes (tree_sortkey);
 
-create function site_node_get_tree_sortkey(integer) returns varbit as '
+create or replace function site_node_get_tree_sortkey(integer) returns varbit as '
 declare
   p_node_id         alias for $1;
 begin
   return tree_sortkey from site_nodes where node_id = p_node_id;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
-create function site_node_insert_tr () returns opaque as '
+create or replace function site_node_insert_tr () returns opaque as '
 declare
         v_parent_sk     varbit default null;
         v_max_value     integer;
@@ -98,7 +98,7 @@
 on site_nodes for each row 
 execute procedure site_node_insert_tr ();
 
-create function site_node_update_tr () returns opaque as '
+create or replace function site_node_update_tr () returns opaque as '
 declare
         v_parent_sk     varbit default null;
         v_max_value     integer;
@@ -205,7 +205,7 @@
 
 select define_function_args ('site_node__new', 'node_id,parent_id,name,object_id,directory_p,pattern_p,creation_user,creation_ip');
 
-create function site_node__new (integer,integer,varchar,integer,boolean,boolean,integer,varchar)
+create or replace function site_node__new (integer,integer,varchar,integer,boolean,boolean,integer,varchar)
 returns integer as '
 declare
   new__node_id                alias for $1;  -- default null  
@@ -250,7 +250,7 @@
 
 
 -- procedure delete
-create function site_node__delete (integer)
+create or replace function site_node__delete (integer)
 returns integer as '
 declare
   delete__node_id                alias for $1;  
@@ -265,7 +265,7 @@
 
 
 -- function find_pattern
-create function site_node__find_pattern (integer)
+create or replace function site_node__find_pattern (integer)
 returns integer as '
 declare
   find_pattern__node_id         alias for $1;  
@@ -291,7 +291,7 @@
 
 
 -- function node_id
-create function site_node__node_id (varchar,integer)
+create or replace function site_node__node_id (varchar,integer)
 returns integer as '
 declare
   node_id__url           alias for $1;  
@@ -352,7 +352,7 @@
 
 
 -- function url
-create function site_node__url (integer)
+create or replace function site_node__url (integer)
 returns varchar as '
 declare
   url__node_id           alias for $1;  
Index: openacs-4/packages/acs-kernel/sql/postgresql/utilities-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/utilities-create.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/sql/postgresql/utilities-create.sql	12 Jul 2003 01:10:36 -0000	1.3
+++ openacs-4/packages/acs-kernel/sql/postgresql/utilities-create.sql	11 Dec 2003 21:39:52 -0000	1.4
@@ -39,6 +39,6 @@
       ELSE 
         return ''f'';   
       END IF; END IF;
-END;' language 'plpgsql';
+END;' language 'plpgsql' immutable strict;
 
 
Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b1-5.0.0b2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b1-5.0.0b2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b1-5.0.0b2.sql	11 Dec 2003 21:39:52 -0000	1.2
@@ -0,0 +1,306 @@
+-- The index on container_id is not very good 
+-- and in some cases can be quite detrimental
+-- see http://openacs.org/forums/message-view?message_id=142769
+
+drop index group_elem_idx_container_idx;
+
+-- There is already a unique constraint on context_id, object_id so the explicitly added one 
+-- is not needed...
+--
+drop index acs_objects_context_object_idx;
+
+-- recreate acs_objects_get_tree_sortkey with isstrict, iscachable.
+--
+create or replace function acs_objects_get_tree_sortkey(integer) returns varbit as '
+declare
+  p_object_id    alias for $1;
+begin
+  return tree_sortkey from acs_objects where object_id = p_object_id;
+end;' language 'plpgsql' with (isstrict, iscachable);
+
+
+------------------------------------------------------------
+--
+--  Now update tree_sortkey in the process fix dups and add max_child_sortkey
+--
+
+-- We need a table for the new tree_sortkey
+--
+-- Get the root nodes specially
+--
+CREATE TABLE tmp_newtree as
+  SELECT object_id, int_to_tree_key(object_id+1000) as tree_sortkey
+    FROM acs_objects
+   where context_id is null;
+
+--now add an index on object_id since we need it for the next function...
+create unique index tmp_newtree_idx on tmp_newtree(object_id);
+
+create or replace function __tmp_newtree() returns integer as ' 
+DECLARE
+        ngen    integer;
+        nrows   integer;
+        totrows integer;
+	rec     record; 
+	childkey varbit;
+	last_context integer;
+BEGIN
+    totrows := 0;
+    ngen := 0;
+
+    LOOP
+        ngen := ngen + 1;
+ 	nrows := 0;
+	last_context := -9999;
+
+	-- loop over those which have a parent in newtree but are not themselves in newtree.
+	FOR rec IN SELECT o.object_id, o.context_id, n.tree_sortkey
+                     FROM acs_objects o, tmp_newtree n
+                    WHERE n.object_id = o.context_id
+                      and not exists (select 1 from tmp_newtree e where e.object_id = o.object_id)
+                 ORDER BY o.context_id, o.object_id LOOP
+
+	    if last_context = rec.context_id THEN 
+		childkey := tree_increment_key(childkey);
+            else
+		childkey := tree_increment_key(null);
+                last_context := rec.context_id;
+	    end if;
+
+	    insert into tmp_newtree values (rec.object_id, rec.tree_sortkey || childkey);
+
+	    if (nrows % 5000) = 0 and nrows > 0 then 
+               raise notice ''ngen % row %'',ngen,nrows;
+	    end if;
+	    nrows := nrows + 1;
+        END LOOP;
+
+	totrows := totrows + nrows;
+        raise notice ''ngen % totrows %'',ngen,nrows;
+
+	if nrows = 0 then 
+	    exit;
+	end if;
+    END LOOP;
+
+    return totrows;
+end;' language plpgsql;
+
+select __tmp_newtree();
+drop function __tmp_newtree();
+
+-- make sure unique constraint can be added 
+ALTER TABLE tmp_newtree add constraint tmp_newtree_sk_un unique(tree_sortkey);
+
+-- compute the new maxchilds.
+CREATE TABLE tmp_maxchild as
+    SELECT context_id as object_id, max(tree_leaf_key_to_int(t.tree_sortkey)) as max_child_sortkey
+      FROM acs_objects o, tmp_newtree t where t.object_id = o.object_id 
+     GROUP BY context_id;
+
+create index tmp_maxchild_idx on tmp_maxchild(object_id);
+
+-- we are going to use a unique constraint on this column now
+drop index acs_objs_tree_skey_idx; 
+
+-- Drop the triggers on acs_objects
+--
+-- these change anyway
+--
+drop trigger acs_objects_context_id_up_tr on acs_objects;
+drop function acs_objects_context_id_up_tr();
+drop trigger acs_objects_update_tr on acs_objects;
+drop function acs_objects_update_tr();
+drop trigger acs_objects_insert_tr on acs_objects;
+drop function acs_objects_insert_tr();
+--
+-- dont want to mess up modification dates.
+--
+drop trigger acs_objects_last_mod_update_tr on acs_objects;
+drop function acs_objects_last_mod_update_tr();
+
+
+-- add the max_child_sortkey
+--
+alter table acs_objects add max_child_sortkey varbit;
+
+-- Actually update the tree_sortkeys in acs_objects...
+-- 
+UPDATE acs_objects
+   SET tree_sortkey = (select tree_sortkey from tmp_newtree n where n.object_id = acs_objects.object_id),
+       max_child_sortkey = (select int_to_tree_key(max_child_sortkey) from tmp_maxchild n where n.object_id = acs_objects.object_id);
+
+-- Drop the temp tables as we no longer need them...
+--
+drop table tmp_newtree;
+drop table tmp_maxchild;
+
+-- add back the unique not null constraint on tree_sortkey
+-- 
+ALTER TABLE acs_objects add constraint acs_objects_tree_sortkey_un unique(tree_sortkey);
+ALTER TABLE acs_objects ALTER COLUMN tree_sortkey SET NOT NULL;
+
+
+
+-- Recreate the triggers
+--
+create function acs_objects_last_mod_update_tr () returns opaque as '
+begin
+  new.last_modified := now();
+
+  return new;
+
+end;' language 'plpgsql';
+
+create trigger acs_objects_last_mod_update_tr before update on acs_objects
+for each row execute procedure acs_objects_last_mod_update_tr ();
+
+
+create function acs_objects_insert_tr() returns opaque as '
+declare
+        v_parent_sk             varbit default null;
+        v_max_child_sortkey     varbit;
+begin
+        if new.context_id is null then
+            new.tree_sortkey := int_to_tree_key(new.object_id+1000);
+        else
+            SELECT tree_sortkey, tree_increment_key(max_child_sortkey)
+            INTO v_parent_sk, v_max_child_sortkey
+            FROM acs_objects
+            WHERE object_id = new.context_id
+            FOR UPDATE;
+
+            UPDATE acs_objects
+            SET max_child_sortkey = v_max_child_sortkey
+            WHERE object_id = new.context_id;
+
+            new.tree_sortkey := v_parent_sk || v_max_child_sortkey;
+        end if;
+
+        new.max_child_sortkey := null;
+        return new;
+end;' language 'plpgsql';
+
+create trigger acs_objects_insert_tr before insert
+on acs_objects for each row
+execute procedure acs_objects_insert_tr ();
+
+--
+-- 
+
+create function acs_objects_update_tr() returns opaque as '
+declare
+        v_parent_sk     varbit default null;
+        v_max_child_sortkey	varbit;
+        v_old_parent_length	integer;
+begin
+        if new.object_id = old.object_id and ( new.context_id = old.context_id
+            or (new.context_id is null and old.context_id is null) ) then
+           return new;
+        end if;
+
+	-- the tree sortkey is going to change so get the new one and update it and all its
+	-- children to have the new prefix...
+	v_old_parent_length := length(new.tree_sortkey) + 1;
+
+	if new.context_id is null then
+            v_parent_sk := int_to_tree_key(new.object_id+1000);
+        else
+	    SELECT tree_sortkey, tree_increment_key(max_child_sortkey)
+	    INTO v_parent_sk, v_max_child_sortkey
+            FROM acs_objects
+            WHERE object_id = new.context_id
+            FOR UPDATE;
+
+	    UPDATE acs_objects
+            SET max_child_sortkey = v_max_child_sortkey
+  	    WHERE object_id = new.context_id;
+
+  	    v_parent_sk := v_parent_sk || v_max_child_sortkey;
+	end if;
+
+	UPDATE acs_objects
+	SET tree_sortkey = v_parent_sk || substring(tree_sortkey, v_old_parent_length)
+        WHERE tree_sortkey between new.tree_sortkey and tree_right(new.tree_sortkey);
+
+        return new;
+end;' language 'plpgsql';
+
+create trigger acs_objects_update_tr after update
+on acs_objects
+for each row
+execute procedure acs_objects_update_tr ();
+
+
+
+create or replace function acs_objects_context_id_up_tr () returns opaque as '
+declare
+        pair    record;
+        outer record;
+        inner record;
+        security_context_root integer;
+begin
+  if new.object_id = old.object_id
+     and ((new.context_id = old.context_id)
+	  or (new.context_id is null and old.context_id is null))
+     and new.security_inherit_p = old.security_inherit_p then
+    return new;
+  end if;
+
+  -- Remove my old ancestors from my descendants.
+  for outer in select object_id from acs_object_context_index where 
+               ancestor_id = old.object_id and object_id <> old.object_id loop
+    for inner in select ancestor_id from acs_object_context_index where
+                 object_id = old.object_id and ancestor_id <> old.object_id loop
+      delete from acs_object_context_index
+      where object_id = outer.object_id
+        and ancestor_id = inner.ancestor_id;
+    end loop;
+  end loop;
+
+  -- Kill all my old ancestors.
+  delete from acs_object_context_index
+  where object_id = old.object_id;
+
+  insert into acs_object_context_index
+   (object_id, ancestor_id, n_generations)
+  values
+   (new.object_id, new.object_id, 0);
+
+  if new.context_id is not null and new.security_inherit_p = ''t'' then
+     -- Now insert my new ancestors for my descendants.
+    for pair in select *
+		 from acs_object_context_index
+		 where ancestor_id = new.object_id 
+    LOOP
+      insert into acs_object_context_index
+       (object_id, ancestor_id, n_generations)
+      select
+       pair.object_id, ancestor_id,
+       n_generations + pair.n_generations + 1 as n_generations
+      from acs_object_context_index
+      where object_id = new.context_id;
+    end loop;
+  else
+    security_context_root = acs__magic_object_id(''security_context_root'');
+    if new.object_id != security_context_root then
+    -- We need to make sure that new.OBJECT_ID and all of its
+    -- children have security_context_root as an ancestor.
+    for pair in  select *
+		 from acs_object_context_index
+		 where ancestor_id = new.object_id 
+      LOOP
+        insert into acs_object_context_index
+         (object_id, ancestor_id, n_generations)
+        values
+         (pair.object_id, security_context_root, pair.n_generations + 1);
+      end loop;
+    end if;
+  end if;
+
+  return new;
+
+end;' language 'plpgsql';
+
+create trigger acs_objects_context_id_up_tr after update on acs_objects
+for each row execute procedure acs_objects_context_id_up_tr ();
Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b2-5.0.0b3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b2-5.0.0b3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b2-5.0.0b3.sql	11 Dec 2003 21:39:52 -0000	1.2
@@ -0,0 +1,17 @@
+-- Drop all_users since it masks the oracle all_users view (used by
+-- third party admin tools among other things)
+
+drop view all_users;
+
+create or replace view acs_users_all
+as
+select pa.*, pe.*, u.*
+from  parties pa, persons pe, users u
+where  pa.party_id = pe.person_id
+and pe.person_id = u.user_id;
+
+
+-- we do case folded searches on these...
+create index users_username_lower_idx on users(lower(username));
+create index users_screenname_lower_idx on users(lower(screen_name));
+create index parties_email_lower_idx on parties(lower(email));
Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql	11 Dec 2003 21:39:52 -0000	1.2
@@ -0,0 +1,802 @@
+-- function check_representation
+create or replace function acs_group__check_representation (integer)
+returns boolean as '
+declare
+  group_id               alias for $1;  
+  res                    boolean; 
+  comp                   record;
+  memb                   record;      
+begin
+   if group_id is null then 
+        --maybe we should just return ''f'' instead?
+	raise exception ''acs_group__check_representation called with null group_id'';
+   end if;
+
+   res := ''t'';
+   PERFORM acs_log__notice(''acs_group.check_representation'',
+                  ''Running check_representation on group '' || group_id);
+
+   if acs_object__check_representation(group_id) = ''f'' then
+     res := ''f'';
+   end if;
+
+   for comp in select c.rel_id
+             from acs_rels r, composition_rels c
+             where r.rel_id = c.rel_id
+             and r.object_id_one = group_id 
+   LOOP
+     if composition_rel__check_representation(comp.rel_id) = ''f'' then
+       res := ''f'';
+     end if;
+   end loop;
+
+   for memb in  select m.rel_id
+             from acs_rels r, membership_rels m
+             where r.rel_id = m.rel_id
+             and r.object_id_one = group_id 
+   LOOP
+     if membership_rel__check_representation(memb.rel_id) = ''f'' then
+       res := ''f'';
+     end if;
+   end loop;
+
+   PERFORM acs_log__notice(''acs_group.check_representation'',
+                  ''Done running check_representation on group '' || group_id);
+
+   return res;
+  
+end;' language 'plpgsql';
+
+-- check for null input raise exception.
+
+create or replace function acs_object__check_context_index (integer,integer,integer)
+returns boolean as '
+declare
+  check_context_index__object_id              alias for $1;  
+  check_context_index__ancestor_id            alias for $2;  
+  check_context_index__n_generations          alias for $3;  
+  n_rows                                      integer;       
+  n_gens                                      integer;       
+begin
+   -- Verify that this row exists in the index.
+   if check_context_index__object_id is null or check_context_index__ancestor_id is null then
+	raise exception ''object_id or ancestor_id is null in acs_object__check_context_index'';
+   end if;	
+   select case when count(*) = 0 then 0 else 1 end into n_rows
+   from acs_object_context_index
+   where object_id = check_context_index__object_id
+   and ancestor_id = check_context_index__ancestor_id;
+
+   if n_rows = 1 then
+     -- Verify that the count is correct.
+     select n_generations into n_gens
+     from acs_object_context_index
+     where object_id = check_context_index__object_id
+     and ancestor_id = check_context_index__ancestor_id;
+
+     if n_gens != check_context_index__n_generations then
+       PERFORM acs_log__error(''acs_object.check_representation'', 
+                              ''Ancestor '' ||
+                     check_context_index__ancestor_id || '' of object '' || 
+                     check_context_index__object_id ||
+		     '' reports being generation '' || n_gens ||
+		     '' when it is actually generation '' || 
+                     check_context_index__n_generations ||
+		     ''.'');
+       return ''f'';
+     else
+       return ''t'';
+     end if;
+   else
+     PERFORM acs_log__error(''acs_object.check_representation'', 
+                            ''Ancestor '' ||
+                            check_context_index__ancestor_id || 
+                            '' of object '' || check_context_index__object_id 
+                            || '' is missing an entry in acs_object_context_index.'');
+     return ''f'';
+   end if;
+  
+end;' language 'plpgsql';
+
+
+-- function check_path
+create or replace function acs_object__check_path (integer,integer)
+returns boolean as '
+declare
+  check_path__object_id              alias for $1;  
+  check_path__ancestor_id            alias for $2;  
+  check_path__context_id             acs_objects.context_id%TYPE;
+  check_path__security_inherit_p     acs_objects.security_inherit_p%TYPE;
+begin
+   if check_path__object_id is null or check_path__ancestor_id then 
+	raise exception ''acs_object__check_path called with null object_id or ancestor_id'';
+   end if;
+   if check_path__object_id = check_path__ancestor_id then
+     return ''t'';
+   end if;
+
+   select context_id, security_inherit_p 
+   into check_path__context_id, check_path__security_inherit_p
+   from acs_objects
+   where object_id = check_path__object_id;
+
+   -- we should be able to handle the case where check_path fails 
+   -- should we not?
+
+   if check_path__object_id = 0 and check_path__context_id is null then 
+      return ''f'';
+   end if;
+
+   if check_path__context_id is null or check_path__security_inherit_p = ''f'' 
+   then
+     check_path__context_id := 0;
+   end if;
+
+   return acs_object__check_path(check_path__context_id, 
+                                 check_path__ancestor_id);
+  
+end;' language 'plpgsql';
+
+
+
+create or replace function acs_object__check_representation (integer)
+returns boolean as '
+declare
+  check_representation__object_id              alias for $1;  
+  result                                       boolean;       
+  check_representation__object_type            acs_objects.object_type%TYPE;
+  n_rows                                       integer;    
+  v_rec                                        record;  
+  row                                          record; 
+begin
+   if check_representation__object_id is null then 
+	raise exception ''acs_object__check_representation called for null object_id'';
+   end if;
+
+   result := ''t'';
+   PERFORM acs_log__notice(''acs_object.check_representation'',
+                  ''Running acs_object.check_representation on object_id = '' 
+                  || check_representation__object_id || ''.'');
+
+   select object_type into check_representation__object_type
+   from acs_objects
+   where object_id = check_representation__object_id;
+
+   PERFORM acs_log__notice(''acs_object.check_representation'',
+                  ''OBJECT STORAGE INTEGRITY TEST'');
+
+   for v_rec in  select t.object_type, t.table_name, t.id_column
+             from acs_object_type_supertype_map m, acs_object_types t
+	     where m.ancestor_type = t.object_type
+	     and m.object_type = check_representation__object_type
+	     union
+	     select object_type, table_name, id_column
+	     from acs_object_types
+	     where object_type = check_representation__object_type 
+     LOOP
+
+        for row in execute ''select case when count(*) = 0 then 0 else 1 end as n_rows from '' || quote_ident(v_rec.table_name) || '' where '' || quote_ident(v_rec.id_column) || '' = '' || check_representation__object_id
+        LOOP
+            n_rows := row.n_rows;
+            exit;
+        end LOOP;
+
+        if n_rows = 0 then
+           result := ''f'';
+           PERFORM acs_log__error(''acs_object.check_representation'',
+                     ''Table '' || v_rec.table_name || 
+                     '' (primary storage for '' ||
+		     v_rec.object_type || 
+                     '') doesn''''t have a row for object '' ||
+		     check_representation__object_id || '' of type '' || 
+                     check_representation__object_type || ''.'');
+        end if;
+
+   end loop;
+
+   PERFORM acs_log__notice(''acs_object.check_representation'',
+                  ''OBJECT CONTEXT INTEGRITY TEST'');
+
+   if acs_object__check_object_ancestors(check_representation__object_id, 
+                                         check_representation__object_id, 0) = ''f'' then
+     result := ''f'';
+   end if;
+
+   if acs_object__check_object_descendants(check_representation__object_id, 
+                                           check_representation__object_id, 0) = ''f'' then
+     result := ''f'';
+   end if;
+   for row in  select object_id, ancestor_id, n_generations
+	       from acs_object_context_index
+	       where object_id = check_representation__object_id
+	       or ancestor_id = check_representation__object_id 
+   LOOP
+     if acs_object__check_path(row.object_id, row.ancestor_id) = ''f'' then
+       PERFORM acs_log__error(''acs_object.check_representation'',
+		     ''acs_object_context_index contains an extraneous row: ''
+                     || ''object_id = '' || row.object_id || 
+                     '', ancestor_id = '' || row.ancestor_id || 
+                     '', n_generations = '' || row.n_generations || ''.'');
+       result := ''f'';
+     end if;
+   end loop;
+
+   PERFORM acs_log__notice(''acs_object.check_representation'',
+		  ''Done running acs_object.check_representation '' || 
+		  ''on object_id = '' || check_representation__object_id || ''.'');
+
+   return result;
+  
+end;' language 'plpgsql';
+
+
+create or replace function acs_object__get_attr_storage_column(text) 
+returns text as '
+declare
+        v_vals  alias for $1;
+        v_idx   integer;
+begin
+        v_idx := strpos(v_vals,'','');
+        if v_idx = 0 or v_vals is null then 
+           raise exception ''invalid storage format: acs_object.get_attr_storage_column %'',v_vals;
+        end if;
+
+        return substr(v_vals,1,v_idx - 1);
+
+end;' language 'plpgsql' immutable;
+
+create or replace function acs_object__get_attr_storage_table(text) 
+returns text as '
+declare
+        v_vals  alias for $1;
+        v_idx   integer;
+        v_tmp   varchar;
+begin
+        v_idx := strpos(v_vals,'','');
+
+        if v_idx = 0 or v_vals is null then 
+           raise exception ''invalid storage format: acs_object.get_attr_storage_table %'',v_vals;
+        end if;
+
+        v_tmp := substr(v_vals,v_idx + 1);
+        v_idx := strpos(v_tmp,'','');
+        if v_idx = 0 then 
+           raise exception ''invalid storage format: acs_object.get_attr_storage_table %'',v_vals;
+        end if;
+
+        return substr(v_tmp,1,v_idx - 1);
+
+end;' language 'plpgsql' immutable;
+
+create or replace function acs_object__get_attr_storage_sql(text) 
+returns text as '
+declare
+        v_vals  alias for $1;
+        v_idx   integer;
+        v_tmp   varchar;
+begin
+        v_idx := strpos(v_vals, '','');
+
+        if v_idx = 0 or v_vals is null then 
+           raise exception ''invalid storage format: acs_object.get_attr_storage_sql %'',v_vals;
+        end if;
+
+        v_tmp := substr(v_vals, v_idx + 1);
+        v_idx := strpos(v_tmp, '','');
+        if v_idx = 0 then 
+           raise exception ''invalid storage format: acs_object.get_attr_storage_sql %'',v_vals;
+        end if;
+
+        return substr(v_tmp, v_idx + 1);
+
+end;' language 'plpgsql' immutable;
+
+
+
+create or replace function acs_object__get_attribute_storage (integer,varchar)
+returns text as '
+declare
+  object_id_in           alias for $1;  
+  attribute_name_in      alias for $2;  
+
+--  these three are the out variables
+  v_column               varchar;  
+  v_table_name           varchar;  
+  v_key_sql              text;
+  
+  v_object_type          acs_attributes.object_type%TYPE;
+  v_static               acs_attributes.static_p%TYPE;
+  v_attr_id              acs_attributes.attribute_id%TYPE;
+  v_storage              acs_attributes.storage%TYPE;
+  v_attr_name            acs_attributes.attribute_name%TYPE;
+  v_id_column            varchar(200);   
+  v_sql                  text;  
+  v_return               text;  
+  v_rec                  record;
+begin
+   --   select 
+   --     object_type, id_column
+   --   from
+   --     acs_object_types
+   --   connect by
+   --     object_type = prior supertype
+   --   start with
+   --     object_type = (select object_type from acs_objects 
+   --                    where object_id = object_id_in)
+
+   -- Determine the attribute parameters
+   select
+     a.attribute_id, a.static_p, a.storage, a.table_name, a.attribute_name,
+     a.object_type, a.column_name, t.id_column 
+   into 
+     v_attr_id, v_static, v_storage, v_table_name, v_attr_name, 
+     v_object_type, v_column, v_id_column
+   from 
+     acs_attributes a,
+     (select o2.object_type, o2.id_column
+       from acs_object_types o1, acs_object_types o2
+      where o1.object_type = (select object_type
+                                from acs_objects o
+                               where o.object_id = object_id_in)
+        and o1.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey)
+     ) t
+   where   
+     a.attribute_name = attribute_name_in
+   and
+     a.object_type = t.object_type;
+
+   if NOT FOUND then 
+      raise EXCEPTION ''-20000: No such attribute % for object % in acs_object.get_attribute_storage.'', attribute_name_in, object_id_in;
+   end if;
+
+   -- This should really be done in a trigger on acs_attributes,
+   -- instead of generating it each time in this function
+
+   -- If there is no specific table name for this attribute,
+   -- figure it out based on the object type
+   if v_table_name is null or v_table_name = '''' then
+
+     -- Determine the appropriate table name
+     if v_storage = ''generic'' then
+       -- Generic attribute: table name/column are hardcoded
+
+       v_column := ''attr_value'';
+
+       if v_static = ''f'' then
+         v_table_name := ''acs_attribute_values'';
+         v_key_sql := ''(object_id = '' || object_id_in || '' and '' ||
+                      ''attribute_id = '' || v_attr_id || '')'';
+       else
+         v_table_name := ''acs_static_attr_values'';
+         v_key_sql := ''(object_type = '''''' || v_object_type || '''''' and '' ||
+                      ''attribute_id = '' || v_attr_id || '')'';
+       end if;
+
+     else
+       -- Specific attribute: table name/column need to be retreived
+ 
+       if v_static = ''f'' then
+         select 
+           table_name, id_column 
+         into 
+           v_table_name, v_id_column
+         from 
+           acs_object_types 
+         where 
+           object_type = v_object_type;
+         if NOT FOUND then 
+            raise EXCEPTION ''-20000: No data found for attribute %::% object_id % in acs_object.get_attribute_storage'', v_object_type, attribute_name_in, object_id_in;
+         end if;
+       else
+         raise EXCEPTION ''-20000: No table name specified for storage specific static attribute %::% object_id % in acs_object.get_attribute_storage.'',v_object_type, attribute_name_in, object_id_in;
+       end if;
+  
+     end if;
+   else 
+     -- There is a custom table name for this attribute.
+     -- Get the id column out of the acs_object_tables
+     -- Raise an error if not found
+     select id_column into v_id_column from acs_object_type_tables
+       where object_type = v_object_type 
+       and table_name = v_table_name;
+       if NOT FOUND then 
+          raise EXCEPTION ''-20000: No data found for attribute %::% object_id % in acs_object.get_attribute_storage'', v_object_type, attribute_name_in, object_id_in;
+       end if;
+   end if;
+
+   if v_column is null or v_column = '''' then
+
+     if v_storage = ''generic'' then
+       v_column := ''attr_value'';
+     else
+       v_column := v_attr_name;
+     end if;
+
+   end if;
+
+   if v_key_sql is null or v_key_sql = '''' then
+     if v_static = ''f'' then   
+       v_key_sql := v_id_column || '' = '' || object_id_in ; 
+     else
+       v_key_sql := v_id_column || '' = '''''' || v_object_type || '''''''';
+     end if;
+   end if;
+
+   return v_column || '','' || v_table_name || '','' || v_key_sql; 
+
+end;' language 'plpgsql' strict;
+
+
+create or replace function acs_object__initialize_attributes (integer)
+returns integer as '
+declare
+  initialize_attributes__object_id              alias for $1;  
+  v_object_type                                 acs_objects.object_type%TYPE;
+begin
+   if  initialize_attributes__object_id is null then 
+	raise exception ''acs_object__initialize_attributes called with null object_id'';
+   end if;
+
+   -- Initialize dynamic attributes
+   insert into acs_attribute_values
+    (object_id, attribute_id, attr_value)
+   select
+    initialize_attributes__object_id, a.attribute_id, a.default_value
+   from acs_attributes a, acs_objects o
+   where a.object_type = o.object_type
+   and o.object_id = initialize_attributes__object_id
+   and a.storage = ''generic''
+   and a.static_p = ''f'';
+
+   -- Retrieve type for static attributes
+   select object_type into v_object_type from acs_objects
+     where object_id = initialize_attributes__object_id;
+
+   -- Initialize static attributes
+   -- begin
+     insert into acs_static_attr_values
+      (object_type, attribute_id, attr_value)
+     select
+      v_object_type, a.attribute_id, a.default_value
+     from acs_attributes a, acs_objects o
+     where a.object_type = o.object_type
+       and o.object_id = initialize_attributes__object_id
+       and a.storage = ''generic''
+       and a.static_p = ''t''
+       and not exists (select 1 from acs_static_attr_values
+                       where object_type = a.object_type);
+   -- exception when no_data_found then null;
+
+   return 0; 
+end;' language 'plpgsql';
+
+
+
+create or replace function acs_object__set_attribute (integer,varchar,varchar)
+returns integer as '
+declare
+  object_id_in           alias for $1;  
+  attribute_name_in      alias for $2;  
+  value_in               alias for $3;  
+  v_table_name           varchar;  
+  v_column               varchar;  
+  v_key_sql              text; 
+  v_return               text; 
+  v_storage              text;
+begin
+   if value_in is null then
+	-- this will fail more cryptically in the execute so catch now. 
+	raise exception ''acs_object__set_attribute: attempt to set % to null for object_id %'',attribute_name_in, object_id_in;
+   end if;
+
+   v_storage := acs_object__get_attribute_storage(object_id_in, attribute_name_in);
+
+   v_column     := acs_object__get_attr_storage_column(v_storage);
+   v_table_name := acs_object__get_attr_storage_table(v_storage);
+   v_key_sql    := acs_object__get_attr_storage_sql(v_storage);
+
+   execute ''update '' || v_table_name || '' set '' || quote_ident(v_column) || '' = '' || quote_literal(value_in) || '' where '' || v_key_sql;
+
+   return 0; 
+end;' language 'plpgsql';
+
+
+create or replace function acs_object_util__get_object_type (integer)
+returns varchar as '
+declare
+    p_object_id         alias for $1;
+    v_object_type       varchar(100);
+begin
+    select object_type into v_object_type
+    from acs_objects
+    where object_id = p_object_id;
+
+    if not found then
+        raise exception ''acs_object_util__get_object_type: Invalid Object id: % '', p_object_id;
+    end if;
+
+    return v_object_type;
+
+end;' language 'plpgsql' stable;
+
+create or replace function acs_objects_get_tree_sortkey(integer) returns varbit as '
+declare
+  p_object_id    alias for $1;
+begin
+  return tree_sortkey from acs_objects where object_id = p_object_id;
+end;' language 'plpgsql' stable strict;
+
+create or replace function acs_rel_type__drop_type (varchar,boolean)
+returns integer as '
+declare
+  drop_type__rel_type               alias for $1;  
+  drop_type__cascade_p              alias for $2;  -- default ''f''  
+begin
+    -- XXX do cascade_p.
+    -- JCD: cascade_p seems to be ignored in acs_o_type__drop_type anyway...
+
+    if drop_type__cascade_p is null then 
+	drop_type__cascade_p := ''f'';
+    end if;
+
+    delete from acs_rel_types
+	  where rel_type = drop_type__rel_type;
+
+    PERFORM acs_object_type__drop_type(drop_type__rel_type, 
+                                       drop_type__cascade_p);
+
+    return 0; 
+end;' language 'plpgsql';
+
+
+
+create or replace function apm__unregister_package (varchar,boolean)
+returns integer as '
+declare
+  package_key            alias for $1;  
+  cascade_p              alias for $2;  -- default ''t''  
+begin
+   if cascade_p is null then 
+	cascade_p := ''t'';
+   end if;
+
+   PERFORM apm_package_type__drop_type(
+	package_key,
+	cascade_p
+   );
+
+   return 0; 
+end;' language 'plpgsql';
+
+
+create or replace function apm__unregister_service (varchar,boolean)
+returns integer as '
+declare
+  package_key            alias for $1;  
+  cascade_p              alias for $2;  -- default ''f''  
+begin
+   if cascade_p is null then 
+	cascade_p := ''f'';
+   end if;
+
+   PERFORM apm__unregister_package (
+	package_key,
+	cascade_p
+   );
+
+   return 0; 
+end;' language 'plpgsql';
+
+create or replace function apm_package__num_instances (varchar) returns integer as '
+declare
+        num_instances__package_key     alias for $1;
+        v_num_instances                integer;
+begin
+        select count(*) into v_num_instances
+	from apm_packages
+	where package_key = num_instances__package_key;
+
+        return v_num_instances;
+
+end;' language 'plpgsql' stable;
+
+
+
+create or replace function lob_copy(integer, integer) returns integer as '
+declare
+        from_id         alias for $1;
+        to_id           alias for $2;
+begin
+	if from_id is null then 
+	    raise exception ''lob_copy: attempt to copy null from_id to % to_id'',to_id;
+        end if;
+
+        insert into lobs (lob_id,refcount) values (to_id,0);
+
+        insert into lob_data
+             select to_id as lob_id, segment, byte_len, data
+               from lob_data
+              where lob_id = from_id;
+
+        return null;
+
+end;' language 'plpgsql';
+
+
+create or replace function apm_package__parent_id (integer) returns integer as '
+declare
+    apm_package__parent_id__package_id alias for $1;
+    v_package_id apm_packages.package_id%TYPE;
+begin
+    select sn1.object_id
+    into v_package_id
+    from site_nodes sn1
+    where sn1.node_id = (select sn2.parent_id
+                         from site_nodes sn2
+                         where sn2.object_id = apm_package__parent_id__package_id);
+
+    return v_package_id;
+
+end;' language 'plpgsql' stable strict;
+
+create or replace function apm_package__singleton_p (varchar) returns integer as '
+declare
+	singleton_p__package_key        alias for $1;
+        v_singleton_p                   integer;
+begin
+        select count(*) > 0 into v_singleton_p
+	from apm_package_types
+	where package_key = singleton_p__package_key
+        and singleton_p = ''t'';
+
+        return v_singleton_p;
+end;' language 'plpgsql' stable;
+
+create or replace function number_src(text) returns text as '
+declare
+        v_src   alias for $1;
+        v_pos   integer;
+        v_ret   text default '''';
+        v_tmp   text;
+        v_cnt   integer default -1;
+begin
+        if v_src is null then 
+	     return null;
+        end if;
+        v_tmp := v_src;
+        LOOP
+            v_pos := position(''\n'' in v_tmp);
+            v_cnt := v_cnt + 1;
+
+            exit when v_pos = 0;
+
+            if v_cnt != 0 then
+              v_ret := v_ret || rpad(v_cnt,10) || substr(v_tmp,1,v_pos);
+            end if;
+            v_tmp := substr(v_tmp,v_pos + 1);
+        end LOOP;
+
+        return v_ret || rpad(v_cnt,10) || v_tmp;
+
+end;' language 'plpgsql' immutable strict;
+
+create or replace function party__email (integer)
+returns varchar as '
+declare
+  email__party_id		alias for $1;
+begin
+
+  return email from parties where party_id = email__party_id;
+
+end;' language 'plpgsql' stable strict;
+
+create or replace function person__first_names (integer)
+returns varchar as '
+declare
+  first_names__person_id        alias for $1;  
+begin
+  return first_names
+  from persons
+  where person_id = first_names__person_id;
+  
+end;' language 'plpgsql' stable strict;
+
+
+create or replace function person__last_name (integer)
+returns varchar as '
+declare
+  last_name__person_id        alias for $1;  
+begin
+  return last_name
+  from persons
+  where person_id = last_name__person_id;
+
+end;' language 'plpgsql' stable strict;
+
+
+create or replace function person__name (integer)
+returns varchar as '
+declare
+  name__person_id        alias for $1;  
+begin
+
+  return first_names || '' '' || last_name
+  from persons
+  where person_id = name__person_id;
+
+end;' language 'plpgsql';
+
+
+create or replace function rel_constraint__get_constraint_id (integer,char,integer)
+returns integer as '
+declare
+  get_constraint_id__rel_segment            alias for $1;  
+  get_constraint_id__rel_side               alias for $2;  
+  get_constraint_id__required_rel_segment   alias for $3;  
+  v_constraint_id                           rel_constraints.constraint_id%TYPE;
+begin
+    return constraint_id
+    from rel_constraints
+    where rel_segment = get_constraint_id__rel_segment
+      and rel_side = get_constraint_id__rel_side
+      and required_rel_segment = get_constraint_id__required_rel_segment;
+
+end;' language 'plpgsql' stable strict;
+
+create or replace function rel_segment__get (integer,varchar)
+returns integer as '
+declare
+  get__group_id         alias for $1;  
+  get__rel_type         alias for $2;  
+begin
+
+   return min(segment_id)
+   from rel_segments
+   where group_id = get__group_id
+     and rel_type = get__rel_type;
+  
+end;' language 'plpgsql' stable strict;
+
+create or replace function rel_segment__name (integer)
+returns varchar as '
+declare
+  name__segment_id             alias for $1;  
+  name__segment_name           varchar(200);  
+begin
+  return segment_name
+  from rel_segments
+  where segment_id = name__segment_id;
+
+end;' language 'plpgsql' stable strict;
+
+---- DRB: fixes bug 1144
+
+create or replace view registered_users
+as
+  select p.email, p.url, pe.first_names, pe.last_name, u.*, mr.member_state
+  from parties p, persons pe, users u, group_member_map m, membership_rels mr, acs_magic_objects amo
+  where party_id = person_id
+  and person_id = user_id
+  and u.user_id = m.member_id
+  and m.rel_id = mr.rel_id
+  and amo.name = 'registered_users'
+  and m.group_id = amo.object_id
+  and m.container_id = m.group_id
+  and m.rel_type = 'membership_rel'
+  and mr.member_state = 'approved'
+  and u.email_verified_p = 't';
+
+create or replace view cc_users
+as
+select o.*, pa.*, pe.*, u.*, mr.member_state, mr.rel_id
+from acs_objects o, parties pa, persons pe, users u, group_member_map m, membership_rels mr, acs_magic_objects amo
+where o.object_id = pa.party_id
+  and pa.party_id = pe.person_id
+  and pe.person_id = u.user_id
+  and u.user_id = m.member_id
+  and amo.name = 'registered_users'
+  and m.group_id = amo.object_id
+  and m.rel_id = mr.rel_id
+  and m.container_id = m.group_id
+  and m.rel_type = 'membership_rel';
+
Index: openacs-4/packages/acs-lang/acs-lang.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v
diff -u -N -r1.31 -r1.32
--- openacs-4/packages/acs-lang/acs-lang.info	10 Nov 2003 14:28:55 -0000	1.31
+++ openacs-4/packages/acs-lang/acs-lang.info	11 Dec 2003 21:39:52 -0000	1.32
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-lang" url="http://www.openacs.org/acs-repository/apm/packages/acs-lang" type="apm_service">
+<package key="acs-lang" url="http://openacs.org/repository/apm/packages/acs-lang" type="apm_service">
     <package-name>Localization</package-name>
     <pretty-plural>Localization</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/acs-repository/download/apm/acs-lang-5.0.0a5.apm">
+    <version name="5.0.0b5" url="http://openacs.org/repository/download/apm/acs-lang-5.0.0b5.apm">
         <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
-        <summary>OpenACS Internationalization Utilities</summary>
+        <summary>OpenACS Internationalization Support.</summary>
         <release-date>2003-11-07</release-date>
         <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
-        <description format="text/plain">OpenACS Internationalization Utilities. Routines for manipulating Locales,
-request processor hooks, templating, message catalog, and
-locale-specific formatting functions.</description>
+        <description format="text/plain">Internationalization and localization support routines and admin UI for manipulating Locales,
+request processor hooks, templating, accessing and managing the message catalog, and
+locale-specific formatting functions for localizing dates, times, monetary amounts etc.</description>
 
-        <provides url="acs-lang" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-lang" version="5.0.0b5"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
         <requires url="ref-timezones" version="4.0"/>
 
         <callbacks>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.13
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	11 Dec 2003 21:39:52 -0000	1.14
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-lang" package_version="5.0d3" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="available-in-this-language">Available in English</msg>
+  <description key="available-in-this-language">The language referred to in the message body should be the language of the locale, not a localized version of "English".</description>
+
   <msg key="English">English</msg>
   <msg key="French">French</msg>
   <msg key="German">German</msg>
Index: openacs-4/packages/acs-lang/lib/conflict-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/conflict-link.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/lib/conflict-link.adp	11 Dec 2003 21:39:52 -0000	1.2
@@ -0,0 +1,5 @@
+<if @conflict_count@ gt 0>
+  <p>
+    <font color="red"><b>&raquo;</b></font> <a href="@message_conflicts_url@">Resolve message conflicts</a>
+  </p>
+</if>
Index: openacs-4/packages/acs-lang/lib/conflict-link.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/conflict-link.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/lib/conflict-link.tcl	11 Dec 2003 21:39:52 -0000	1.2
@@ -0,0 +1,22 @@
+# Optional parameters:
+#
+# package_key
+# locale
+
+# Default params to empty string
+# and build the link export list
+set link_export_list [list]
+foreach param {package_key locale} {
+    if { ![info exists $param] } {
+        set $param ""
+    } else {
+        # param provided
+        lappend link_export_list $param
+    }
+}
+
+set conflict_count [lang::message::conflict_count \
+                        -package_key $package_key \
+                        -locale $locale]
+
+set message_conflicts_url [export_vars -base message-conflicts $link_export_list]
Index: openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql	22 Sep 2003 11:49:01 -0000	1.10
+++ openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql	11 Dec 2003 21:39:53 -0000	1.11
@@ -26,9 +26,6 @@
                        on delete cascade
                        constraint lang_message_keys_p_key_nn
                        not null,
-    upgrade_status     varchar2(30)
-                       constraint lang_message_keys_us_ck
-                       check (upgrade_status in ('no_upgrade', 'added','deleted')),
     description        clob,
     constraint lang_message_keys_pk
     primary key (message_key, package_key)
@@ -47,6 +44,11 @@
                        constraint lang_messages_locale_nn
                        not null,
     message            clob,
+    deleted_p          char(1) default 'f'
+                       constraint lang_messages_dp_ck check (deleted_p in ('t','f')),
+    sync_time          date,
+    conflict_p         char(1) default 'f'
+                       constraint lang_messages_cp_ck check (conflict_p in ('t','f')),
     upgrade_status     varchar2(30)
                        constraint lang_messages_us_ck
                        check (upgrade_status in ('no_upgrade', 'added', 'deleted', 'updated')),
@@ -81,6 +83,14 @@
                        constraint lang_messages_audit_l_nn
                        not null,
     old_message        clob,
+    deleted_p          char(1) default 'f'
+                       constraint lang_messages_audit_dp_ck check (deleted_p in ('t','f')),
+    sync_time          date,
+    conflict_p         char(1) default 'f'
+                       constraint lang_messages_audit_cp_ck check (conflict_p in ('t','f')),
+    upgrade_status     varchar2(30)
+                       constraint lang_messages_audit_us_ck
+                       check (upgrade_status in ('no_upgrade', 'added', 'deleted', 'updated')),
     comment_text       clob,
     overwrite_date     date default sysdate not null,
     overwrite_user     integer
Index: openacs-4/packages/acs-lang/sql/oracle/upgrade-5.0.0b4-5.0.0b5.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/Attic/upgrade-5.0.0b4-5.0.0b5.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/oracle/upgrade-5.0.0b4-5.0.0b5.sql	11 Dec 2003 21:39:53 -0000	1.2
@@ -0,0 +1,27 @@
+-- Datamodel changes in message-catalog.sql related to the new message catalog upgrade support.
+-- See Tcl proc lang::catalog::import_messages.
+--
+-- @author Peter Marklund
+
+-- The lang_messages_keys.upgrade_status column carry any information over the corresponding
+-- en_US row in the lang_messages table and were not being kept in sync.
+alter table lang_message_keys drop column upgrade_status;
+
+-- Add new columns to the lang_messages table 
+alter table lang_messages add deleted_p char(1) default 'f'
+                              constraint lang_messages_dp_ck check (deleted_p in ('t','f'));
+alter table lang_messages add sync_time date;
+alter table lang_messages add conflict_p  char(1) default 'f'
+                              constraint lang_messages_cp_ck check (conflict_p in ('t','f'));
+update lang_messages set deleted_p = 'f', conflict_p = 'f';
+
+-- Add new columns to the lang_messages_audit tables
+alter table lang_messages_audit add deleted_p char(1) default 'f'
+                              constraint lang_messages_audit_dp_ck check (deleted_p in ('t','f'));
+alter table lang_messages_audit add sync_time date;
+alter table lang_messages_audit add conflict_p  char(1) default 'f'
+                              constraint lang_messages_audit_cp_ck check (conflict_p in ('t','f'));
+alter table lang_messages_audit add upgrade_status     varchar2(30)
+                              constraint lang_messages_audit_us_ck
+                              check (upgrade_status in ('no_upgrade', 'added', 'deleted', 'updated'));
+update lang_messages_audit set deleted_p = 'f', conflict_p = 'f', upgrade_status = 'no_upgrade';
Index: openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql	22 Sep 2003 11:49:01 -0000	1.13
+++ openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql	11 Dec 2003 21:39:53 -0000	1.14
@@ -27,9 +27,6 @@
                        on delete cascade
                        constraint lang_message_keys_package_key_nn
                        not null,
-    upgrade_status     varchar(30)
-                       constraint lang_message_keys_us_ck
-                       check (upgrade_status in ('no_upgrade', 'added','deleted')),
     description        text,
     constraint lang_message_keys_pk
     primary key (message_key, package_key)
@@ -48,6 +45,9 @@
                        constraint lang_messages_locale_nn
                        not null,
     message            text,
+    deleted_p          boolean default 'f',
+    sync_time          timestamptz,
+    conflict_p         boolean default 'f',
     upgrade_status     varchar(30)
                        constraint lang_messages_us_ck
                        check (upgrade_status in ('no_upgrade', 'added', 'deleted', 'updated')),
@@ -77,10 +77,15 @@
                        references ad_locales(locale)
                        constraint lang_messages_audit_l_nn
                        not null,
-
     -- The old, overwritten message, not the new message being
     -- entered on this date by this user.
     old_message        text,
+    deleted_p          boolean default 'f',
+    sync_time          timestamptz,
+    conflict_p         boolean default 'f',
+    upgrade_status     varchar(30)
+                       constraint lang_messages_us_ck
+                       check (upgrade_status in ('no_upgrade', 'added', 'deleted', 'updated')),
     comment_text       text,
     overwrite_date     timestamptz 
                        default now() 
@@ -141,5 +146,3 @@
 );
 
 end;
-
-
Index: openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.0.0b4-5.0.0b5.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.0.0b4-5.0.0b5.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.0.0b4-5.0.0b5.sql	11 Dec 2003 21:39:53 -0000	1.2
@@ -0,0 +1,27 @@
+-- Datamodel changes in message-catalog.sql related to the new message catalog upgrade support.
+-- See Tcl proc lang::catalog::import_messages.
+--
+-- @author Peter Marklund
+
+-- The lang_messages_keys.upgrade_status column carry any information over the corresponding
+-- en_US row in the lang_messages table and were not being kept in sync.
+alter table lang_message_keys drop column upgrade_status;
+
+-- Add new columns to the lang_messages table 
+alter table lang_messages add deleted_p boolean;
+alter table lang_messages alter column deleted_p set default 'f';
+alter table lang_messages add sync_time timestamptz;
+alter table lang_messages add conflict_p boolean;
+alter table lang_messages alter column conflict_p set default 'f';
+update lang_messages set deleted_p = 'f', conflict_p = 'f';
+
+-- Add new columns to the lang_messages_audit tables
+alter table lang_messages_audit add deleted_p boolean;
+alter table lang_messages_audit alter column deleted_p set default 'f';
+alter table lang_messages_audit add sync_time timestamptz;
+alter table lang_messages_audit add conflict_p boolean;
+alter table lang_messages_audit alter column conflict_p set default 'f';
+alter table lang_messages_audit add    upgrade_status     varchar(30)
+                                       constraint lang_messages_us_ck
+                                       check (upgrade_status in ('no_upgrade', 'added', 'deleted', 'updated'));
+update lang_messages_audit set deleted_p = 'f', conflict_p = 'f', upgrade_status = 'no_upgrade';
Index: openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql	11 Aug 2003 16:16:21 -0000	1.2
+++ openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql	11 Dec 2003 21:39:53 -0000	1.3
@@ -4,8 +4,10 @@
 
   <fullquery name="lang::audit::changed_message.lang_message_audit">
     <querytext>
-          insert into lang_messages_audit (package_key, message_key, locale, old_message, comment_text, overwrite_user) 
-            values (:package_key, :message_key, :locale, empty_clob(), empty_clob(), :overwrite_user) 
+          insert into lang_messages_audit (package_key, message_key, locale, old_message, comment_text, overwrite_user,
+                                           deleted_p, sync_time, conflict_p, upgrade_status) 
+            values (:package_key, :message_key, :locale, empty_clob(), empty_clob(), :overwrite_user,
+                                           :deleted_p, :sync_time, :conflict_p, :upgrade_status)  
           returning old_message, comment_text into :1, :2
     </querytext>
   </fullquery>
Index: openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql	11 Aug 2003 16:16:21 -0000	1.3
+++ openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql	11 Dec 2003 21:39:53 -0000	1.4
@@ -4,8 +4,10 @@
 
   <fullquery name="lang::audit::changed_message.lang_message_audit">
     <querytext>
-          insert into lang_messages_audit (package_key, message_key, locale, old_message, comment_text, overwrite_user) 
-            values (:package_key, :message_key, :locale, :old_message, :comment, :overwrite_user) 
+          insert into lang_messages_audit (package_key, message_key, locale, old_message, comment_text, overwrite_user,
+                                           deleted_p, sync_time, conflict_p, upgrade_status) 
+            values (:package_key, :message_key, :locale, :old_message, :comment, :overwrite_user,
+                                           :deleted_p, :sync_time, :conflict_p, :upgrade_status) 
     </querytext>
   </fullquery>
 
Index: openacs-4/packages/acs-lang/tcl/lang-audit-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-audit-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-lang/tcl/lang-audit-procs.tcl	22 Sep 2003 11:49:01 -0000	1.4
+++ openacs-4/packages/acs-lang/tcl/lang-audit-procs.tcl	11 Dec 2003 21:39:53 -0000	1.5
@@ -3,7 +3,7 @@
 
     Auditing of lang_messages
 
-    @creation-date 15 October 2000
+    @creation-date 3 December 2002
     @author Peter Marklund (peter@collaboraid.biz)
     @cvs-id $Id$
 }
@@ -16,6 +16,10 @@
         message_key
         locale
         comment
+        deleted_p
+        sync_time
+        conflict_p
+        upgrade_status
     } {
       Save a message that is overwritten.
       @author Peter Marklund
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql	19 Dec 2002 16:00:53 -0000	1.1
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql	11 Dec 2003 21:39:53 -0000	1.2
@@ -10,4 +10,47 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="lang::catalog::export.update_sync_time">
+    <querytext>
+      update lang_messages
+      set sync_time = sysdate
+      where package_key = :package_key
+      and locale = :locale
+    </querytext>
+  </fullquery>
+
+  <fullquery name="lang::catalog::last_sync_messages.last_sync_messages">
+    <querytext>
+        select message_key,
+               dbms_lob.substr(message) as message,
+               deleted_p
+        from   lang_messages
+        where  package_key = :package_key
+        and    locale = :locale
+        and    sync_time is not null
+        union
+        select lma1.message_key,
+               dbms_lob.substr(lma1.old_message) as message,
+               lma1.deleted_p
+        from   lang_messages_audit lma1
+        where  lma1.package_key = :package_key
+        and    lma1.locale = :locale
+        and    lma1.sync_time is not null
+        and    lma1.overwrite_date = (select max(lma2.overwrite_date)
+                                      from lang_messages_audit lma2
+                                      where lma2.package_key = lma1.package_key
+                                        and lma2.message_key = lma1.message_key
+                                        and lma2.locale = :locale
+                                        and lma2.sync_time is not null
+                                      )
+        and    not exists (select 1
+                           from lang_messages
+                           where package_key = lma1.package_key
+                             and message_key = lma1.message_key
+                             and locale = :locale
+                             and sync_time is not null
+                           )
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql	19 Dec 2002 16:00:53 -0000	1.1
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql	11 Dec 2003 21:39:53 -0000	1.2
@@ -10,4 +10,49 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="lang::catalog::export.update_sync_time">
+    <querytext>
+      update lang_messages
+      set sync_time = current_timestamp
+      where package_key = :package_key
+      and locale = :locale
+    </querytext>
+  </fullquery>
+
+
+  <fullquery name="lang::catalog::last_sync_messages.last_sync_messages">
+    <querytext>
+        select message_key,
+               message,
+               deleted_p
+        from   lang_messages
+        where  package_key = :package_key
+        and    locale = :locale
+        and    sync_time is not null
+        union
+        select lma1.message_key,
+               lma1.old_message,
+               lma1.deleted_p
+        from   lang_messages_audit lma1
+        where  lma1.package_key = :package_key
+        and    lma1.locale = :locale
+        and    lma1.sync_time is not null
+        and    lma1.overwrite_date = (select max(lma2.overwrite_date)
+                                      from lang_messages_audit lma2
+                                      where lma2.package_key = lma1.package_key
+                                        and lma2.message_key = lma1.message_key
+                                        and lma2.locale = :locale
+                                        and lma2.sync_time is not null
+                                      )
+        and    not exists (select 1
+                           from lang_messages
+                           where package_key = lma1.package_key
+                             and message_key = lma1.message_key
+                             and locale = :locale
+                             and sync_time is not null
+                           )
+    </querytext>
+  </fullquery>
+    
+
 </queryset>
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v
diff -u -N -r1.36 -r1.37
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	1 Nov 2003 08:45:36 -0000	1.36
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	11 Dec 2003 21:39:53 -0000	1.37
@@ -49,7 +49,7 @@
         #set default_charset [encoding system] 
         # LARS: Default to utf-8
         set default_charset utf-8
-        ns_log Warning "lang::catalog::default_charset_if_unsupported: charset $charset not supported by tcl, assuming $default_charset"
+        ns_log Warning "charset $charset not supported by tcl, assuming $default_charset"
         set charset_to_use $default_charset
     } else {
         set charset_to_use $charset
@@ -92,7 +92,7 @@
     return "[acs_package_root_dir $package_key]/catalog"
 }
 
-ad_proc -public lang::catalog::is_upgrade_backup_file { file_path } {
+ad_proc -private lang::catalog::is_upgrade_backup_file { file_path } {
     Given a file path return 1 if the path represents a 
     file with messages backed up from message catalog upgrade.
 
@@ -111,7 +111,7 @@
             set return_value 1
         } else {
             # Catalog file with unknown prefix
-            ns_log Warning "lang::catalog::is_upgrade_backup_file: The file $file_path has unknown prefix $prefix"
+            ns_log Warning "The file $file_path has unknown prefix $prefix"
             set return_value 0
         }
     }
@@ -217,22 +217,71 @@
     return $catalog_paths
 }
 
-ad_proc -public lang::catalog::reset_upgrade_status_message_keys { package_key } {
-    Before a package upgrade the upgrade status of message keys is cleared
-    so that upgrade status always reflects the last upgrade.
+ad_proc -private lang::catalog::system_package_version_name { package_key } {
+    Returns the version name of the highest version of the given
+    package_key in the system.
+} {
+    return [db_string get_version_name {}]
+}
 
+ad_proc -private lang::catalog::messages_in_db {
+    {-package_key:required}
+    {-locale:required}
+} {
+    Return a list of all messages for a certain package and locale.
+
+    @return An array list with message keys as keys and messages as
+            values.
+
+    @see lang::catalog::all_messages_for_package_and_locale
+
     @author Peter Marklund
 } {
-    db_dml reset_status {}
+    set message_list [list]
+
+    all_messages_for_package_and_locale $package_key $locale
+    template::util::multirow_foreach all_messages {
+        lappend message_list @all_messages.message_key@ @all_messages.message@
+    }
+
+    return $message_list
 }
 
-ad_proc -private lang::catalog::system_package_version_name { package_key } {
-    Returns the version name of the highest version of the given
-    package_key in the system.
+ad_proc -private lang::catalog::last_sync_messages {
+    {-package_key:required}
+    {-locale:required}
 } {
-    return [db_string get_version_name {}]
+    For a certain package, and locale, return the messages in 
+    the database the last time catalog files and db were in sync.
+    This is the message that we use as merge base during message catalog 
+    upgrades.
+
+    @return An array list with message keys as keys and messages as
+            values.
+
+    @author Peter Marklund
+} {
+    set message_list [list]
+    db_foreach last_sync_messages {} {
+        if { ![template::util::is_true $deleted_p] } {
+            lappend message_list $message_key $message
+        }
+    }
+
+    return $message_list
 }
 
+ad_proc -private lang::catalog::uninitialized_packages {} {
+    Return a list of keys for installed and enabled packages 
+    that do not have any message keys associated with them.
+    This would suggest that either the package is not internationalized,
+    or we have not yet imported the message keys for the package.
+
+    @author Peter Marklund
+} {
+    return [db_list select_uninitialized {}]
+}
+
 ##################
 #
 # Exporting procs
@@ -278,7 +327,7 @@
     # Create the catalog directory if it doesn't exist
     set catalog_dir [package_catalog_dir $filename_info(package_key)]
     if { ![file isdirectory $catalog_dir] } {
-        ns_log Notice "lang::catalog::export_to_file: Creating new catalog directory $catalog_dir"
+        ns_log Notice "Creating new catalog directory $catalog_dir"
         file mkdir $catalog_dir
     }
 
@@ -288,7 +337,7 @@
         ns_log Notice "Backing up catalog file $file_path"
         file copy -- $file_path $backup_path
     } else {
-        ns_log Notice "lang::catalog::export_to_file: Not backing up $file_path as backup file already exists"
+        ns_log Notice "Not backing up $file_path as backup file already exists"
     }
 
     # Since the output charset, and thus the filename, may have changed since
@@ -328,7 +377,7 @@
    puts $catalog_file_id "</message_catalog>"
    close $catalog_file_id       
 
-   ns_log Notice "lang::catalog::export_to_file: Wrote $message_count messages to file $file_path with encoding $file_encoding"
+   ns_log Notice "Wrote $message_count messages to file $file_path with encoding $file_encoding"
 }
 
 ad_proc -public lang::catalog::export {
@@ -373,8 +422,11 @@
                                        -locale $locale]
 
             export_to_file -descriptions_list $descriptions_list $catalog_file_path $messages_list
-        } 
-    }    
+
+            # Messages exported to file are in sync with file
+            db_dml update_sync_time {}
+        }
+    }
 }
 
 ##################
@@ -398,13 +450,13 @@
     @author Peter Marklund (peter@collaboraid.biz)
 } {
     if {![regexp {/([^/]*)\.([^/]*)\.(?:xml|cat)$} $catalog_filename match base msg_encoding]} { 
-        ns_log Warning "lang::catalog::read_file: Charset info missing in filename assuming $catalog_filename is iso-8859-1" 
+        ns_log Warning "Charset info missing in filename assuming $catalog_filename is iso-8859-1" 
         set msg_encoding iso-8859-1
     }
     
     set msg_encoding [default_charset_if_unsupported $msg_encoding]
 
-    ns_log Notice "lang::catalog::read_file: reading $catalog_filename in $msg_encoding"
+    ns_log Notice "reading $catalog_filename in $msg_encoding"
     set in [open $catalog_filename]
     fconfigure $in -encoding [ns_encodingforcharset $msg_encoding]
     set catalog_file_contents [read $in]        
@@ -422,8 +474,8 @@
       package_version
       locale
       charset
-      messages    - An array with message keys as keys and the message texts as values.
-      descriptions - An array with message keys as keys and the descriptions as values.
+      messages    - An array-list with message keys as keys and the message texts as values.
+      descriptions - An array-list with message keys as keys and the descriptions as values.
     </pre>
 
     @author Peter Marklund (peter@collaboraid.biz)
@@ -502,34 +554,30 @@
     </p>
 
     <p>
-    To determine if the import is a message catalog upgrade the package
-    version of the catalog file will be compared with the highest package version
-    currently in the system (in the database). If the package version in the
-    catalog file deviates from what is in the system then the import is considered an upgrade.
+    The import should be considered an upgrade if the package has had messages
+    imported before. In this case the proc lang::catalog::import_messages will be used
+    to register the new messages with the system and handle the upgrade logic (a merge
+    with what's in the database).
     </p>
 
-    <p>
-    For upgrades, changed messages will have their old values (the ones in the
-    database that are overwritten) backed up to a file with a name on a format along the lines of
-    overwritten_messages_upgrade.<old-version>-<new-version>.<package_key>.<locale>.<charset>.xml
-    The upgrade status of message keys and messages will be updated during an upgrade.
-    Also during package upgrades, before invoking this procedure for the catalog files of a package the upgrade 
-    status of message keys should be cleared with the proc 
-    lang::catalog::reset_upgrade_status_message_keys
-    </p>
-
     @param file_path The absolute path of the XML file to import messages from.
                      The path must be on valid format, see apm_is_catalog_file
 
+    @return An array list containing the number of messages processed, number of messages added, 
+            number of messages updated, and the number of messages deleted by the import. The keys of the
+            array list are processed, added, updated, and deleted.
+
     @see             lang::catalog::parse
     @see             lang::message::register
+    @see             lang::catalog::import_messages
     
     @author          Peter Marklund
 } {
     # Check arguments
     assert_catalog_file $file_path
 
     # Parse the catalog file and put the information in an array
+    # LARS NOTE: Change parse to take three array-names, catalog, messages, descriptions, and use upvar
     array set catalog_array [parse [read_file $file_path]]
 
     # Extract package_key, locale, and charset from the file path
@@ -544,109 +592,370 @@
         error "the package_key $catalog_array(package_key) in the file $file_path does not match the package_key $package_key in the filesystem"
     }
 
-    # Figure out if we are upgrading
-    if { ![apm_package_installed_p $package_key] } {
-        # The package is not installed so we are not upgrading
-        set upgrade_p 0
-    } else {
-        # The package is installed so this is probably an upgrade 
-        set higher_version_p [apm_higher_version_installed_p $package_key $catalog_array(package_version)]
-        # higher_version_p value < 0 means downgrade, value 0 means versions are same, 1 is an upgrade
-        # A package downgrade could be considered a form of upgrade. However, in practice versions
-        # of the catalog files are sometimes not keeping up with the version in the info file and we don't
-        # want that to trigger an upgrade.
-        set upgrade_p [ad_decode $higher_version_p 1 1 0]
-    }
-    ns_log Notice "lang::catalog::import_from_file: Loading messages in file $file_path [ad_decode $upgrade_p 0 "" ", upgrading"]"
-
     # Get the messages array, and the list of message keys to iterate over
     array set messages_array [lindex [array get catalog_array messages] 1]
     set messages_array_names [array names messages_array]
 
     # Get the descriptions array
     array set descriptions_array [lindex [array get catalog_array descriptions] 1]
 
-    if { $upgrade_p } {
-        # clear out any old upgrade status of messages
-        db_dml reset_upgrade_status_messages {}
+    ns_log Notice "Loading messages in file $file_path"
 
-        # Mark any messages that are in the system but not in the
-        # catalog file as deleted
-        all_messages_for_package_and_locale $package_key $locale           
-        template::util::multirow_foreach all_messages {
-            set message_key @all_messages.message_key@
-            if { [lsearch -exact $messages_array_names $message_key] < 0 } {
-                ns_log Notice "lang::catalog::import_from_file: Marking message $message_key in locale $locale as deleted"
-                db_dml mark_message_as_deleted {}
+    # Register messages
+    array set message_count [lang::catalog::import_messages \
+                                 -file_messages_list [array get messages_array] \
+                                 -package_key $package_key \
+                                 -locale $locale]
 
-                # One approach to deleted message keys after upgrade is to consider those
-                # keys deleted whose messages in all locales have an upgrade status
-                # of deleted in the lang_messages table.
-                # However in the somewhat unusual case where the package we are upgrading
-                # to doesn't have all locales that the old package version does, upgrade
-                # status won't be set to deleted for all locales. 
-                # The workable solution seems to be to consider a key as deleted if its
-                # en_US message has the deleted upgrade status.
-                if { [string equal $locale "en_US"] } {
-                    db_dml mark_message_key_as_deleted {}
+    # Register descriptions
+    foreach message_key $messages_array_names {
+        if { [info exists descriptions_array($message_key)] } {
+            with_catch errmsg {
+                lang::message::update_description \
+                    -package_key $catalog_array(package_key) \
+                    -message_key $message_key \
+                    -description $descriptions_array($message_key)
+            } {
+                global errorInfo
+                ns_log Error "Registering description for key ${package_key}.${message_key} in locale $locale failed with error message \"$errmsg\"\n\n$errorInfo"
+            }
+        }    
+    }
+
+    return [array get message_count]
+}
+
+ad_proc -private lang::catalog::import_messages {
+    {-file_messages_list:required}
+    {-package_key:required}
+    {-locale:required}
+} {
+    <p>
+      Import a given set of messages from a catalog file to the database
+      for a certain package and locale. If we already have messages in the db
+      for the given package and locale then a merge
+      between the database messages and the file messages will be performed. 
+    </p>
+
+    <p>
+      Foreach message to import, the base
+      messages for the merge is the messages in the db from the last time
+      db and catalog file were in sync for the corresponding message key. The first such sync point
+      is the initial import of a message. After that, any export of messages to
+      the file system will be a sync point. Also, after an upgrade, a large number
+      of the resulting messages in the db will be identical to those in the file (the
+      file messages take precedence on conflict) and those messages will also be sync points.
+      A message being in sync between db and file is indicated by the lang_message.sync_time
+      column being set to a not null value.
+    </p>
+
+    <p>
+      This proc is idempotent which means that it can be executed multiple times and after the first
+      time it's been executed it won't have any effect on the db. <b>See the corresponding
+      acs-automated-testing test case called upgrade.</b>
+    </p>
+
+    <p>
+      What follows below is a description of the logic of the proc in terms of its input, the cases considered,
+      and the logical actions taken for each case.
+    </p>    
+
+    <p>
+    There are three sets of keys, file, db, and base keys. For each key in 
+    the union of these keys there are three messages that can exist: the file message, the db message, and the base message. The
+    base message serves as the base for the merge. We will distinguish all the different permutations
+    of each of the three messages existing or not, and all permutations of the messages being different from eachother. 
+    We don't distinguish how two messages are different, only whether they are different or not.
+    In total that gives us 14 cases (permutations) to consider.
+    </p>
+
+    <pre>
+    *** Exactly one of messages exists (3 cases):
+
+    1. base message (deleted in file and db). upgrade_action=none, conflict_p=f
+
+    2. db message (added in db). upgrade_action=none, conflict_p=f
+
+    3. file message (added in file). upgrade_action=add, conflict_p=f
+
+    *** Exactly two of the messages exist (6 cases):
+
+    - Base and file message (db message deleted):
+      4. Differ (conflicting change). upgrade_action=resurrect, conflict_p=t
+      5. No difference (no conflicting change). upgrade_action=none, conflict_p=f
+
+    - Base and db message (file message deleted):
+      6. Differ (conflicting change): upgrade_action=delete, conflict_p=t
+      7. No difference (no conflicting change): upgrade_action=delete, conflict_p=f
+
+    - File and db message (message added in both db and file):
+      8. Differ (conflicting change). upgrade_action=update, conflict_p=t
+      9. No difference (identical changes). upgrade_action=none, conflict_p=f
+
+    *** All three messages exist (5 cases):
+
+    10. All the same. upgrade_action=none, conflict_p=f
+
+    11. File and base the same. upgrade_action=none, conflict_p=f
+
+    12. DB and base the same. upgrade_action=update, conflict_p=f
+
+    13. File and DB the same. upgrade_action=none, conflict_p=f
+
+    14. All different. upgrade_action=update, conflict_p=t
+    </pre>
+
+    @param file_messages_list An array list with message keys as keys and 
+                              the message of those keys as values, 
+                              i.e. (key, value, key, value, ...)
+
+    @param package_key        The package_key for the messages.
+
+    @param locale             The locale of the messages.
+
+    @return An array list containing the number of messages processed, number of messages added, 
+            number of messages updated, and the number of messages deleted by the import. The keys of the
+            array list are processed, added, updated, and deleted.
+
+    @author Peter Marklund
+    @author Lars Pind
+} {
+    set message_count(processed) 0
+    set message_count(added) 0
+    set message_count(updated) 0
+    set message_count(deleted) 0
+
+    # Form arrays for all three sets of messages
+    array set file_messages $file_messages_list
+    array set db_messages [messages_in_db \
+                               -package_key $package_key \
+                               -locale $locale]
+    array set base_messages [last_sync_messages \
+                               -package_key $package_key \
+                               -locale $locale]
+
+    foreach arrname { base_messages file_messages db_messages } {
+        set dummy [list]
+        foreach elm [lsort [array names $arrname]] {
+            lappend dummy "$elm=[set ${arrname}($elm)]"
+        }
+        ns_log Debug "lang::catalog::import_messages - $arrname: $dummy"
+    }
+
+    # Remember each time we've processed a key, so we don't process it twice
+    array set message_key_processed_p [list]
+
+    # Loop over the union of import and db keys. 
+    foreach message_key [lsort [concat [array names db_messages] [array names file_messages] [array names base_messages]]] {
+        if { [info exists message_key_processed_p($message_key)] } {
+            continue
+        }
+        set message_key_processed_p($message_key) 1
+        
+        ###########################################
+        #
+        # Figure out how db and file messages have changed with regards to the base message
+        #
+        ###########################################
+
+        # The variables indicate how the db and file messages have changed
+        # from the base message. Valid values are: none, add, update, delete
+        set db_change "none"
+        set file_change "none"
+
+        if { [info exists base_messages($message_key)] } {
+            # The base message exists
+
+            if { [info exists db_messages($message_key)] } {
+                # db message exists
+                if { ![string equal $db_messages($message_key) $base_messages($message_key)] } {
+                    # db message and base message differ
+                    set db_change "update"
                 }
+            } else {
+                # db message does not exist
+                set db_change "delete"
             }
+
+            if { [info exists file_messages($message_key)] } {
+                # file message exists
+                if { ![string equal $file_messages($message_key) $base_messages($message_key)] } {
+                    # file message and base message differ
+                    set file_change "update"
+                }
+            } else {
+                # file message does not exist
+                set file_change "delete"
+            }
+        } else {
+            # The base message does not exist
+
+            if { [info exists db_messages($message_key)] } {
+                # db message exists
+                set db_change "add"
+            }
+            if { [info exists file_messages($message_key)] } {
+                # file message exists
+                set file_change "add"
+            }
         }
-    }       
 
-    # Loop over and register the messages
-    array set overwritten_db_messages {}
-    foreach message_key $messages_array_names {
-        set qualified_key "$package_key.$message_key"
-        set new_message $messages_array($message_key)
+        ###########################################
+        #
+        # Based on the change in file and db messages, 
+        # and based on whether file and db messages differ, decide 
+        # which upgrade actions to take
+        #
+        ###########################################
 
-        # Failing to register one message should not cause the whole file import to fail
-        with_catch errmsg {
-            # If this is an upgrade - save old message if it will be overwritten
-            if { $upgrade_p } {
-                # Check if the message existed previously
-                if { [lang::message::message_exists_p $locale $qualified_key] } {
-                    # Check if message is updated, avoid variable substitution during lookup by setting upvar_level to 0
-                    set old_message [lang::message::lookup $locale $qualified_key {} {} 0]
-                    if { ![string equal $old_message $new_message] } {
-                        set overwritten_db_messages($message_key) $old_message
+        # Default values cover the cases 2, 5, 9, 10, 11, 13
+        set import_case "in 2, 5, 9, 10, 11, 13"
+        set upgrade_status "no_upgrade"
+        set conflict_p "f"
+
+        switch $db_change {
+            none {
+                switch $file_change {
+                    none {}
+                    add {
+                        # case 3
+                        set import_case 3
+                        # add message from file to db
+                        set upgrade_status "added"
                     }
+                    update {
+                        # case 12
+                        set import_case 12
+                        # update db with file message
+                        set upgrade_status "updated"
+                    }
+                    delete {
+                        # case 7
+                        set import_case 7
+                        # mark message in db deleted
+                        set upgrade_status "deleted"
+                    }
                 }
-            }    
+            }
+            add {
+                switch $file_change {
+                    none {} 
+                    add {
+                        if { ![string equal $db_messages($message_key) $file_messages($message_key)] } {
+                            # case 8
+                            set import_case 8
+                            # differing additions in db and file
+                            set upgrade_status "updated"
+                            set conflict_p "t"
+                        }
+                    }
+                }            
+            }
+            update {
+                switch $file_change {
+                    none {}
+                    update {
+                        if { ![string equal $db_messages($message_key) $file_messages($message_key)] } {
+                            # case 14
+                            set import_case 14
+                            # differing updates in file and db
+                            set upgrade_status "updated"
+                            set conflict_p "t"
+                        }
+                    }
+                    delete {
+                        # case 6
+                        set import_case 6
+                        # deletion in file but update in db
+                        set upgrade_status "deleted"
+                        set conflict_p "t"
+                    }
+                }           
+            }
+            delete {
+                switch $file_change {
+                    none {}
+                    update {
+                        # case 4
+                        set import_case 4
+                        # deletion in db but update in file
+                        set upgrade_status "added" ;# resurrect
+                        set conflict_p "t"
+                    }
+                    delete {
+                        # case 1
+                        set import_case 1
+                        # deletion in both db and file                        
+                        # no status change, no conflict
+                        # sync time should be updated below
+                    }
+                }
+            }
+        }
 
-            # Register the new message with the system
+        ###########################################
+        #
+        # Execute upgrade actions
+        #
+        ###########################################        
+
+        # For certain messages we need to move the sync point so that we have a current base for the next upgrade. 
+        if { [string equal $db_change "none"] || ![string equal $file_change "none"] } {
+            # If there is no db change then any change in the file will be reflected in 
+            # db (file takes precedence) and file and db are identical. 
+            # Also, regardless of what's happened in db, if
+            # there has been a change in the file then that change will take effect in
+            # the db and file and db are again identical (in sync).
+            set update_sync_p 1
+        } else {
+            set update_sync_p 0
+        }
+
+        # Store a new message in the database if we are adding or updating
+        if { [string equal $upgrade_status "added"] || [string equal $upgrade_status "updated"] } {
+
+            ns_log Debug "lang::catalog::import_messages - invoking lang::message::register with import_case=\"$import_case\" -update_sync=$update_sync_p $message_key $upgrade_status $conflict_p"
             lang::message::register \
-                    -upgrade=$upgrade_p \
-                    $catalog_array(locale) \
-                    $catalog_array(package_key) \
-                    $message_key \
-                    $new_message
+                -update_sync \
+                -upgrade_status $upgrade_status \
+                -conflict=$conflict_p \
+                $locale \
+                $package_key \
+                $message_key \
+                $file_messages($message_key)
 
-            if { [info exists descriptions_array($message_key)] } {
-                lang::message::update_description \
-                    -package_key $catalog_array(package_key) \
-                    -message_key $message_key \
-                    -description $descriptions_array($message_key)
-            }    
-        } {
-            global errorInfo
-            ns_log Error "Registering message for key $qualified_key in locale $locale failed with error message \"$errmsg\"\n\n$errorInfo"
+        } elseif { $update_sync_p || [string equal $upgrade_status "deleted"] } {
+            # Set the upgrade_status, deleted_p, conflict_p, and sync_time properties of the message
+
+            # If we are doing nothing, the only property of the message we might want to update in the db
+            # is the sync_time as we might have discovered that db and file are in sync
+            array unset edit_array
+            if { ![string equal $upgrade_status "no_upgrade"] } {
+                set edit_array(upgrade_status) $upgrade_status
+                set edit_array(deleted_p) [string equal $upgrade_status "deleted"]
+                set edit_array(conflict_p) $conflict_p
+            }
+            
+            ns_log Debug "lang::catalog::import_messages - invoking lang::message::edit with import_case=\"$import_case\" -update_sync=$update_sync_p $message_key [array get edit_array]"
+            lang::message::edit \
+                -update_sync=$update_sync_p \
+                $package_key \
+                $message_key \
+                $locale \
+                [array get edit_array]
+        } else {
+            ns_log Debug "lang::catalog::import_messages - not doing anything: import_case=\"$import_case\" $message_key $upgrade_status $conflict_p"
         }
-    }       
 
-    # Save any messages overwritten in database
-    if { $upgrade_p && [array size overwritten_db_messages] > 0 } {
-        set system_package_version [system_package_version_name $package_key]
-        # Note that export_messages_to_file demands a certain filename format
+        if { [lsearch -exact {added updated deleted} $upgrade_status] != -1 } {
+            incr message_count($upgrade_status)
+        } else {
+            incr message_count(processed)
+        }
 
-        ns_log Notice "lang::catalog::import_from_file: Saving overwritten messages during upgrade for package $package_key and locale $locale in file $filename"
-        set file_path [get_catalog_file_path \
-                -backup_from_version ${system_package_version} \
-                -backup_to_version $catalog_array(package_version) \
-                -package_key $package_key \
-                -locale $locale]
-        export_messages_to_file $file_path [array get overwritten_db_messages]
-    }
+    } ;# End of message key loop
+
+    return [array get message_count]
 }
 
 ad_proc -public lang::catalog::import {
@@ -657,23 +966,35 @@
 } {
     Import messages from catalog files to the database. By default all messages
     for enabled packages and enabled locales will be imported. Optionally, the import
-    can be restricted to a certain package and/or a list of locales.
+    can be restricted to a certain package and/or a list of locales. Invokes the proc
+    lang::catalog::import_messages that deals with multiple imports (upgrades).
 
     @param package_key Restrict the import to the package with this key
     @param locales     A list of locales to restrict the import to
     @param initialize  Only load messages from packages that have never before had any message imported
     @param cache       Provide this switch if you want the proc to cache all the imported messages
 
+    @return An array list containing the number of messages processed, number of messages added, 
+            number of messages updated, and the number of messages deleted by the import. The keys of the
+            array list are processed, added, updated, and deleted.
+
+    @see lang::catalog::import_messages
+
     @author Peter Marklund
 } {
+    set message_count(processed) 0
+    set message_count(added) 0
+    set message_count(updated) 0
+    set message_count(deleted) 0
+
     if { ![empty_string_p $package_key] } {
         set package_key_list $package_key
     } else {
         set package_key_list [apm_enabled_packages]
     }
 
     if { $initialize_p } {
-        set uninitialized_packages [db_list select_uninitialized {}]
+        set uninitialized_packages [uninitialized_packages]
     }
 
     foreach package_key $package_key_list {
@@ -693,23 +1014,30 @@
 
         # Issue a warning and exit if there are no catalog files
         if { [empty_string_p $catalog_files] } {
-            ns_log Warning "lang::catalog::import: No catalog files found for package $package_key"
+            ns_log Warning "No catalog files found for package $package_key"
             continue
         }
 
+        array unset loop_message_count
         foreach file_path $catalog_files {
             # Use a catch so that parse failure of one file doesn't cause the import of all files to fail
-            if { [catch {import_from_file $file_path} errMsg] } {
+            if { [catch { array set loop_message_count [lang::catalog::import_from_file $file_path] } errMsg] } {
                 global errorInfo
                 
-                ns_log Error "lang::catalog::import: The import of file $file_path failed, error message is:\n\n${errMsg}\n\nstack trace:\n\n$errorInfo\n\n"
-            }
-        }        
+                ns_log Error "The import of file $file_path failed, error message is:\n\n${errMsg}\n\nstack trace:\n\n$errorInfo\n\n"
+            } 
+        }
+
+        foreach action [array names loop_message_count] {
+            set message_count($action) [expr $message_count($action) + $loop_message_count($action)]
+        }
     }
 
     if { $cache_p } {
         lang::message::cache
     }
+
+    return [array get message_count]
 }
 
 ad_proc -private lang::catalog::get_catalog_paths_for_import {
@@ -756,7 +1084,7 @@
         if { [file exists $file_path] } {
             lappend catalog_files $file_path
         } else {
-            ns_log Error "lang::catalog::get_catalog_paths_for_import: Catalog file $file_path not found. Failed to import messages for package $package_key and locale $locale"
+            ns_log Error "Catalog file $file_path not found. Failed to import messages for package $package_key and locale $locale"
         }
     }
 
@@ -765,6 +1093,35 @@
 
 ##################
 #
+# Mischellaneous procs
+#
+##################
+
+ad_proc -public lang::catalog::package_delete {
+    {-package_key:required}
+} {
+    Unregister the I18N messages for the package.
+
+    @author Peter Marklund
+} {
+    set message_key_list [db_list all_message_keys_for_package {
+        select message_key
+        from lang_message_keys
+        where package_key = :package_key
+    }]
+
+    db_dml delete_package_keys {
+        delete from lang_message_keys
+        where package_key = :package_key
+    }
+
+    foreach message_key $message_key_list {
+        lang::message::remove_from_cache $package_key $message_key
+    }
+}
+
+##################
+#
 # Inactive and unmaintained procs
 #
 ##################
@@ -788,7 +1145,7 @@
             if [catch {
                 set translated_message [lang_babel_translate $message en_$lang]
             } errmsg] {
-                ns_log Notice "lang::catalog::translate: Error translating $message into $lang: $errmsg"
+                ns_log Notice "Error translating $message into $lang: $errmsg"
             } else {
                 lang::message::register $lang $package_key $message_key $translated_message
             }
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql	16 Oct 2003 16:25:49 -0000	1.11
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql	11 Dec 2003 21:39:53 -0000	1.12
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-  <fullquery name="lang::catalog::import.select_uninitialized">
+  <fullquery name="lang::catalog::uninitialized_packages.select_uninitialized">
     <querytext>
       select package_key
       from   apm_package_types
@@ -35,7 +35,7 @@
         and    lm.package_key = lmk.package_key
         and    lm.package_key = :package_key
         and    lm.locale = :locale
-        and    lmk.upgrade_status != 'deleted'
+        and    lm.deleted_p = 'f'
     </querytext>
   </fullquery>
 
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs-oracle.xql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-lang/tcl/lang-message-procs-oracle.xql	22 Sep 2003 11:49:01 -0000	1.7
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs-oracle.xql	11 Dec 2003 21:39:53 -0000	1.8
@@ -5,23 +5,34 @@
   <fullquery name="lang::message::register.lang_message_update">
     <querytext>
       update lang_messages
-      set    message = empty_clob(),
-             upgrade_status = :message_upgrade_status
+      set    [join $set_clauses ", "]
       where  locale = :locale 
       and    message_key = :message_key
       and    package_key = :package_key
       returning message into :1
     </querytext>
   </fullquery>
 
-  <fullquery name="lang::message::register.lang_message_insert">      
+  <fullquery name="lang::message::register.lang_message_insert">
     <querytext>
-      insert into lang_messages (package_key, message_key, locale, message, upgrade_status, creation_user) 
-      values (:package_key, :message_key, :locale, empty_clob(), :message_upgrade_status, :creation_user) 
+      insert into lang_messages ([join $col_clauses ", "]) 
+      values ([join $val_clauses ", "])
       returning message into :1
     </querytext>
   </fullquery>
 
+  <partialquery name="lang::message::register.sync_time">
+    <querytext>
+        sysdate
+    </querytext>
+  </partialquery>
+
+  <partialquery name="lang::message::register.message">
+    <querytext>
+        empty_clob()
+    </querytext>
+  </partialquery>
+
   <fullquery name="lang::message::update_description.update_description">
     <querytext>
       update lang_message_keys
@@ -32,4 +43,10 @@
     </querytext>
   </fullquery>
 
+  <partialquery name="lang::message::edit.set_sync_time_now">
+      <querytext>
+        sync_time = sysdate
+      </querytext>
+  </partialquery>
+
 </queryset>
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs-postgresql.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-lang/tcl/lang-message-procs-postgresql.xql	22 Sep 2003 11:49:01 -0000	1.8
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs-postgresql.xql	11 Dec 2003 21:39:53 -0000	1.9
@@ -1,26 +1,36 @@
-
 <?xml version="1.0"?>
 <queryset>
   <rdbms><type>postgresql</type><version>7.2</version></rdbms>
 
+  <fullquery name="lang::message::register.lang_message_update">
+      <querytext>
+        update lang_messages
+        set    [join $set_clauses ", "]
+        where  locale = :locale
+        and    message_key = :message_key
+        and    package_key = :package_key
+      </querytext>
+  </fullquery>
+
   <fullquery name="lang::message::register.lang_message_insert">      
     <querytext>
-      insert into lang_messages (package_key, message_key, locale, message, upgrade_status, creation_user) 
-      values (:package_key, :message_key, :locale, :message, :message_upgrade_status, :creation_user) 
+      insert into lang_messages ([join $col_clauses ", "]) 
+      values ([join $val_clauses ", "])
     </querytext>
   </fullquery>
 
- <fullquery name="lang::message::register.lang_message_update">
-     <querytext>
-       update lang_messages
-       set    message = :message,
-              upgrade_status = :message_upgrade_status
-       where  locale = :locale
-       and    message_key = :message_key
-       and    package_key = :package_key
-     </querytext>
- </fullquery>
+  <partialquery name="lang::message::register.sync_time">
+    <querytext>
+        current_timestamp
+    </querytext>
+  </partialquery>
 
+  <partialquery name="lang::message::register.message">
+    <querytext>
+        :message
+    </querytext>
+  </partialquery>
+
   <fullquery name="lang::message::update_description.update_description">
     <querytext>
       update lang_message_keys
@@ -30,4 +40,10 @@
     </querytext>
   </fullquery>
 
+  <partialquery name="lang::message::edit.set_sync_time_now">
+      <querytext>
+        sync_time = current_timestamp
+      </querytext>
+  </partialquery>
+
 </queryset>
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v
diff -u -N -r1.39 -r1.40
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	11 Nov 2003 12:09:06 -0000	1.39
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	11 Dec 2003 21:39:53 -0000	1.40
@@ -1,5 +1,5 @@
 #/packages/acs-lang/tcl/lang-message-procs.tcl
-ad_library {
+ad_library {  
 
     Routines for displaying web pages in multiple languages
     <p>
@@ -18,7 +18,9 @@
 namespace eval lang::message {}
 
 ad_proc -public lang::message::register { 
-    -upgrade:boolean
+    {-update_sync:boolean}
+    {-upgrade_status "no_upgrade"}
+    {-conflict:boolean}
     {-comment ""}
     locale
     package_key
@@ -34,29 +36,35 @@
     cache with the message.
     </p>
 
-    <p>
-    If we are registering a message as part of an upgrade, appropriate
-    upgrade status for the message key (added) and the message (updated or
-    added) will be set.
-    </p>
-
     @author Jeff Davis
     @author Peter Marklund
     @author Bruno Mattarollo (bruno.mattarollo@ams.greenpeace.org)
     @author Christian Hvid
 
     @see _mr
     
-    @param locale        Locale or language of the message. If a language is supplied,
-                         the default locale for the language is looked up. 
+    @param locale           Locale or language of the message. If a language is supplied,
+                            the default locale for the language is looked up. 
 
-    @param package_key   The package key of the package that the message belongs to.
-    @param message_key   The key that identifies the message within the package.
-    @param message       The message text
-    @param upgrade       A boolean switch indicating if this message is registered
-                         as part of a message catalog upgrade or not. The default
-                         (switch not provided) is that we are not upgrading.
+    @param package_key      The package key of the package that the message belongs to.
 
+    @param message_key      The key that identifies the message within the package.
+
+    @param message          The message text
+
+    @param update_sync      If this switch is provided the sync_time
+                            of the message will be set to current time. The sync time for
+                            a message should only be not null when we know that message in
+                            catalog file and db are identical (in sync). This message is then
+                            used as a merge base for message catalog upgrades. For more info,
+                            see the lang::catalog::upgrade proc. 
+
+    @param upgrade_status   Set the upgrade status of the new message to "added", "updated", "deleted". 
+                            Defaults to "no_upgrade".
+    
+    @param conflict         Set this switch if the upgrade represents a conflict between 
+                            changes made in the database and in catalog files.
+
     @see lang::message::lookup
     @see _
 } { 
@@ -67,10 +75,10 @@
         # We don't do a more throughout check since this is not
         # invoked by users.
         # let's get the default locale for that language
-        set locale [util_memoize [list ad_locale_locale_from_lang $locale]]
+        set locale [lang::util::default_locale_from_lang $locale]
     } 
 
-    # Create a globally unique key for the cache
+    # Create a globally (across packages) unique key for the cache
     set key "${package_key}.${message_key}"
 
     # Insert the message key into the database if it doesn't
@@ -79,10 +87,6 @@
 
     if { ! $key_exists_p } {
         if { [string equal $locale "en_US"] } {
-            set key_upgrade_status [ad_decode $upgrade_p 1 "added" "no_upgrade"]
-            if { $upgrade_p } {
-                ns_log Notice "lang::message::register - Giving message key $message_key an upgrade status of $key_upgrade_status"
-            }
             db_dml insert_message_key {}
         } else {
             # Non-default locale
@@ -107,62 +111,208 @@
             error "Message key '$key' in locale '$locale' has these embedded variables not present in the en_US locale: [join $missing_vars ","]. Message has not been imported."
         }
     }
+    
+    # Build up an array of columns to set
+    array set cols [list]
+    if { $update_sync_p } {
+        set cols(sync_time) [db_map sync_time]
+    } else {
+        set cols(sync_time) "null"
+    } 
+    if { [empty_string_p [string trim $message]] } {
+        set cols(message) "null"
+    } else {
+        set cols(message) [db_map message]
+    }
+    set cols(upgrade_status) :upgrade_status
 
+    set conflict_db_p [db_boolean $conflict_p]
+    set cols(conflict_p) :conflict_db_p
+
     # Different logic for update and insert
     if { [nsv_exists lang_message_$locale $key] } { 
         # Update existing message if the message has changed
 
+        # For use in audit log call
         set old_message [nsv_get lang_message_$locale $key]
+        # Peter TODO: should these attributes be cached?
+        lang::message::get \
+            -package_key $package_key \
+            -message_key $message_key \
+            -locale $locale \
+            -array old_message_array
 
-        lang::audit::changed_message $old_message $package_key $message_key $locale $comment
+        # An updated message is no longer deleted
+        set deleted_p f
+        set cols(deleted_p) :deleted_p
 
-        set message_upgrade_status [ad_decode $upgrade_p 1 "updated" "no_upgrade"]
-        if { $upgrade_p } {
-            ns_log Notice "lang::message::register - Giving message for key $message_key in locale $locale an upgrade status of $message_upgrade_status"
+        # For use in update query
+        set set_clauses [list]
+        foreach col [array names cols] {
+            lappend set_clauses "$col = $cols($col)"
         }
 
-        # Trying to avoid hitting Oracle bug#2011927    
-        if { [empty_string_p [string trim $message]] } {
-            db_dml lang_message_null_update {}
-        } else { 
-            db_dml lang_message_update {} -clobs [list $message]
+        db_transaction {
+        
+            # Update audit log
+            lang::audit::changed_message \
+                $old_message \
+                $package_key \
+                $message_key \
+                $locale \
+                $comment \
+                $old_message_array(deleted_p) \
+                $old_message_array(sync_time) \
+                $old_message_array(conflict_p) \
+                $old_message_array(upgrade_status)
+            
+            # Trying to avoid hitting Oracle bug#2011927    
+            if { [empty_string_p [string trim $message]] } {
+                db_dml lang_message_null_update {}
+            } else { 
+                set cols(message) [db_map message]
+                db_dml lang_message_update {} -clobs [list $message]
+            }
         }
-        nsv_set lang_message_$locale $key $message
-
     } else { 
         # Insert new message
 
-        db_transaction {
-            set message_upgrade_status [ad_decode $upgrade_p 1 "added" "no_upgrade"]
-            if { $upgrade_p } {
-                ns_log Notice "lang::message::register - Giving message for key $message_key in locale $locale an upgrade status of $message_upgrade_status"
-            }
+        set cols(package_key) :package_key
+        set cols(message_key) :message_key
+        set cols(locale) :locale
 
-            if { [catch {set creation_user [ad_conn user_id]}] } {
-                set creation_user [db_null]
-            }
-
-             # avoiding bug#2011927 from Oracle.
-            if { [empty_string_p [string trim $message]] } {
-                db_dml lang_message_insert_null_msg {}
-            } else {
-                # LARS:
-                # We may need to have two different lines here, one for
-                # Oracle w/clobs, one for PG w/o clobs.
-                db_dml lang_message_insert {} -clobs [list $message]
-            }
-            nsv_set lang_message_$locale $key $message
+        # We wrap this in a catch, so that it still works in the bootstrap-installer where ad_conn user_id will fail.
+        # LARS NOTE: Why not make ad_conn user_id return 0 in the bootstrap-installer?
+        catch {
+            set creation_user [ad_conn user_id] 
+            set cols(creation_user) :creation_user
         }
+        
+        set col_clauses [list]
+        set val_clauses [list]
+        foreach col [array names cols] {
+            lappend col_clauses $col
+            lappend val_clauses $cols($col)
+        }
+        
+        # avoiding bug#2011927 from Oracle.
+        if { [empty_string_p [string trim $message]] } {
+            db_dml lang_message_insert_null_msg {}
+        } else {
+            db_dml lang_message_insert {} -clobs [list $message]
+        }
     }
+
+    # Update the message catalog cache
+    nsv_set lang_message_$locale $key $message
 }
 
+ad_proc -public lang::message::delete { 
+    -package_key:required
+    -message_key:required
+    -locale:required
+} {
+    Deletes a message in a particular locale.
+
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    lang::message::edit \
+        $package_key \
+        $message_key \
+        $locale \
+        [list deleted_p t \
+              upgrade_status no_upgrade \
+              conflict_p f \
+              sync_time [db_null] \
+        ]
+}
+
+ad_proc -public lang::message::get_element {
+    -package_key:required
+    -message_key:required
+    -locale:required
+    -element:required    
+} {
+    Get value of a single attribute of a message.
+
+    @param element The name of the attribute that you want.
+
+    @see lang::message::get
+
+    @author Peter Marklund
+} {
+    lang::message::get \
+        -package_key $package_key \
+        -message_key $message_key \
+        -locale $locale \
+        -array message_array
+
+    return $message_array($element)
+}
+
+ad_proc -public lang::message::get { 
+    -package_key:required
+    -message_key:required
+    -locale:required
+    -array:required
+} {
+    Get all properties of a message in a particular locale.
+    
+    @param array Name of an array in the caller's namespace into 
+                 which you want the message properties delivered.
+
+    @return The array will contain the following entries: 
+               message_key,
+               package_key,
+               locale,
+               message,
+               deleted_p,
+               sync_time,
+               conflict_p,
+               upgrade_status,
+               creation_date_ansi,
+               creation_user,
+               key_description.
+
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    upvar 1 $array row
+
+    db_1row select_message_props {
+        select m.message_key,
+               m.package_key,
+               m.locale,
+               m.message,
+               m.deleted_p,
+               m.sync_time,
+               m.conflict_p,
+               m.upgrade_status,
+               to_char(m.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_ansi,
+               m.creation_user,
+               k.description as key_description
+        from   lang_messages m,
+               lang_message_keys k
+        where  m.package_key = :package_key
+        and    m.message_key = :message_key
+        and    m.locale = :locale
+        and    k.package_key = m.package_key
+        and    k.message_key = m.message_key
+    } -column_array row
+}
+
 ad_proc -public lang::message::unregister { 
     package_key
     message_key
 } {
     Unregisters a message key, i.e. deletes it along with all its messages
-    from the database and deleted entries in the cache.
+    from the database and deleted entries in the cache. This proc is
+    useful when installing a package.
 
+    To delete an individual message, as opposed to the entire key, 
+    use lang::message::delete.
+
+    @see lang::message::delete
+
     @author Peter Marklund
 } {
     # Deletes messages as well
@@ -172,8 +322,163 @@
           and package_key = :package_key
     }
 
+    remove_from_cache $package_key $message_key
+}
+
+ad_proc -private lang::message::edit {
+    {-update_sync:boolean}
+    package_key
+    message_key
+    locale
+    edit_array_list
+} {
+    Edit properties (meta data) of a language catalog message, but not
+    the message text itself. To update or add message catalog text, use
+    the lang::message::register proc.
+
+    <p>
+      Implementation note: some of the dynamic sql edit
+      code of this proc was copied from the auth::authority::edit proc
+      and should probably be broken out into a general API.
+    </p>
+
+    @param package_key      The package_key of the message to update
+
+    @param message_key      The message_key of the message to update
+
+    @param locale           The locale of the message to update
+
+    @param edit_array_list  An array list holding names of columns and
+                            and the values to set them to. Valid keys
+                            in this array list are any column names in the
+                            lang_messages table. 
+
+    @param update_sync      If this switch is provided the sync_time
+                            of the message will be updated to current time. If not
+                            provided no update to sync_time will be made. If sync_time
+                            is contained in the edit_array_list then that value will
+                            override the update_sync flag.
+
+    @author Peter Marklund
+} {
+    array set edit_array $edit_array_list
+
+    if { [info exists edit_array(message)] } {
+        error "The proc lang::message::edit was invoked with the message attribute in the edit array. To edit the message text of a message use the lang::message::register proc instead"
+    }
+
+    if { [info exists edit_array(deleted_p)] } {
+        set edit_array(deleted_p) [db_boolean [template::util::is_true $edit_array(deleted_p)]]
+
+        # If we are deleting we need to preserve the old message in the audit log
+        if { [template::util::is_true $edit_array(deleted_p)] } {
+
+            # Peter TODO: should these attributes be cached?
+            lang::message::get \
+                -package_key $package_key \
+                -message_key $message_key \
+                -locale $locale \
+                -array old_message_array
+
+            lang::audit::changed_message \
+                $old_message_array(message) \
+                $package_key \
+                $message_key \
+                $locale \
+                "deleted" \
+                $old_message_array(deleted_p) \
+                $old_message_array(sync_time) \
+                $old_message_array(conflict_p) \
+                $old_message_array(upgrade_status)            
+
+            # If we are deleting an en_US message we need to mark the message deleted in all locales
+            if { [string equal $locale "en_US"] } {
+                set message_locales [db_list all_message_locales {
+                    select locale
+                    from lang_messages
+                    where package_key = :package_key
+                      and message_key = :message_key
+                      and locale <> 'en_US'
+                }]
+                foreach message_locale $message_locales {
+                    lang::message::delete \
+                        -package_key $package_key \
+                        -message_key $message_key \
+                        -locale $message_locale
+                }
+            }
+        }
+    }
+
+    set set_clauses [list]
+    foreach name [array names edit_array] {
+        lappend set_clauses "$name = :$name"
+        set $name $edit_array($name)
+    }
+    if { $update_sync_p } {
+        if { ![info exists edit_array(sync_time)] } {
+            lappend set_clauses [db_map set_sync_time_now]
+        }
+    }
+
+    if { [llength $set_clauses] > 0 } {
+        
+        set sql "
+            update lang_messages
+            set    [join $set_clauses ", "]
+            where  package_key = :package_key
+            and    message_key = :message_key
+            and    locale = :locale
+        "
+        db_dml edit_message_key $sql
+    }
+}
+
+ad_proc -public lang::message::conflict_count {
+    {-package_key ""}
+    {-locale ""}
+} {
+    Return the number of messages with  conflicts (conflict_p=t) resulting
+    from catalog imports.
+    
+    @param package_key Restrict count to package with this key
+    @param locale      Restrict count to messages of this locale
+
+    @author Peter Marklund
+} {
+    # Build any package and locale where clauses
+    set where_clauses [list]
+    foreach col {package_key locale} {
+        if { ![empty_string_p [set $col]] } {
+            lappend where_clauses "$col = :${col}"
+        }
+    }
+    set where_clause [ad_decode $where_clauses "" "" "and [join $where_clauses " and "]"]
+
+    return [db_string conflict_count "
+        select count(*)
+        from lang_messages
+        where conflict_p = 't'
+        $where_clause
+    "]
+}
+
+ad_proc -private lang::message::remove_from_cache {
+    package_key
+    message_key
+} {
+    Delete a certain message key from the cache for all
+    locales.
+
+    @author Peter Marklund
+} {
+    set locales_list [db_list select_system_locales {
+        select locale
+        from   ad_locales
+    }]
+
     # Delete from the cache for all enabled locales
-    foreach locale [lang::system::get_locales] {
+    foreach locale $locales_list {
         set nsv_array lang_message_$locale
         set nsv_key "${package_key}.${message_key}"
         if { [nsv_exists $nsv_array $nsv_key] } {
@@ -309,7 +614,7 @@
     key
     {default "TRANSLATION MISSING"}
     {substitution_list {}}
-    {upvar_level 2}
+    {upvar_level 1}
     {translator_mode_p 1}
 } {
     This proc is normally accessed through the _ procedure.
@@ -353,9 +658,7 @@
 
     @param upvar_level        If there are embedded variables and no substitution list provided, this
                               parameter specifies how many levels up to fetch the values of the variables
-                              in the message. The reason the default is 2 is that the lookup proc is
-                              usually invoked by the underscore proc (_). Set upvar level to less than
-                              1 if you don't want variable interpolation to be done.
+                              in the message. The default is 1.
     
     @param translator_mode_p  Set to 0 if you do not want this call to honor translator mode. 
                               Useful if you're not using this message in the page itself, but e.g.
@@ -586,7 +889,7 @@
     @see lang::message::lookup
     @see lang::message::format
 } {
-    return [lang::message::lookup "" $key "TRANSLATION MISSING" $substitution_list]
+    return [lang::message::lookup "" $key "TRANSLATION MISSING" $substitution_list 2]
 }
 
 #####
@@ -625,7 +928,7 @@
 } {    
     @see lang::message::lookup
 } { 
-    return [lang::message::lookup $locale $key $default]
+    return [lang::message::lookup $locale $key $default {} 2]
 }
 
 ad_proc -deprecated -warn lang_babel_translate { 
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.xql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.xql	18 Aug 2003 08:10:21 -0000	1.7
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.xql	11 Dec 2003 21:39:53 -0000	1.8
@@ -22,23 +22,29 @@
   <fullquery name="lang::message::register.insert_message_key">
     <querytext> 
         insert into lang_message_keys
-            (message_key, package_key, upgrade_status)
+            (message_key, package_key)
           values
-            (:message_key, :package_key, :key_upgrade_status)
+            (:message_key, :package_key)
     </querytext>
   </fullquery>
 
   <fullquery name="lang::message::register.lang_message_null_update">
     <querytext>
       update lang_messages 
-      set    message = null,
-             upgrade_status = :message_upgrade_status
+      set    [join $set_clauses ", "]
       where  locale = :locale 
       and    package_key = :package_key
       and    message_key = :message_key
     </querytext>
   </fullquery>
 
+  <fullquery name="lang::message::register.lang_message_insert_null_msg">
+    <querytext>
+      insert into lang_messages ([join $col_clauses ", "]) 
+      values ([join $val_clauses ", "])
+    </querytext>
+  </fullquery>
+
   <fullquery name="lang::message::cache.select_locale_keys">
     <querytext>
       select locale, package_key, message_key, message 
@@ -47,13 +53,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="lang::message::register.lang_message_insert_null_msg">
-    <querytext>
-      insert into lang_messages (package_key, message_key, locale, message, upgrade_status) 
-      values (:package_key, :message_key, :locale, null, :message_upgrade_status) 
-    </querytext>
-  </fullquery>
-
   <fullquery name="lang::message::update_description.update_description_insert_null">
     <querytext>
       update lang_message_keys
Index: openacs-4/packages/acs-lang/tcl/locale-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/locale-procs.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	28 Oct 2003 10:32:08 -0000	1.24
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	11 Dec 2003 21:39:53 -0000	1.25
@@ -239,12 +239,16 @@
 }
     
 ad_proc -public lang::user::package_level_locale {
+    {-user_id ""}
     package_id
 } {
     Get the user's preferred package level locale for a package
     given by its package id.
 } {
-    set user_id [ad_conn untrusted_user_id]
+    # default to current user
+    if { [empty_string_p $user_id] } {
+        set user_id [ad_conn untrusted_user_id]
+    }
 
     # If package-level locales are turned off, or the user isn't logged in, return the empty string
     if { ![lang::system::use_package_level_locales_p] || $user_id == 0 } {
@@ -255,51 +259,64 @@
     return [util_memoize [list lang::user::package_level_locale_not_cached $user_id $package_id] [sec_session_timeout]]
 }
 
-ad_proc -public lang::user::site_wide_locale {} {
+ad_proc -public lang::user::site_wide_locale {
+    {-user_id ""}
+} {
     Get the user's preferred site wide locale.
 } {
+    # default to current user
+    if { [empty_string_p $user_id] } {
+        set user_id [ad_conn untrusted_user_id]
+    }
+
     # Cache for the lifetime of sessions (7 days)
-    return [util_memoize [list lang::user::site_wide_locale_not_cached [ad_conn user_id]] [sec_session_timeout]]
+    return [util_memoize [list lang::user::site_wide_locale_not_cached $user_id] [sec_session_timeout]]
 }
 
 ad_proc -public lang::user::site_wide_locale_not_cached {
     user_id
 } {
     Get the user's preferred site wide locale.
 } {
-    if { [ad_conn untrusted_user_id] == 0 } {
+    if { $user_id == 0 } {
 	set locale [ad_get_cookie "ad_locale"]
 	if { [empty_string_p $locale] } {
 	    set locale [lang::system::site_wide_locale]
 	}
 	return $locale
     } else {
-        set user_id [ad_conn untrusted_user_id]
         return [db_string get_user_site_wide_locale {} -default ""]
     }
 }
 
 ad_proc -public lang::user::locale {
     {-package_id ""}
     {-site_wide:boolean}
+    {-user_id ""}
 } {
     Get user locale preference for a given package instance.
     This preliminary implementation only has one site-wide setting, though.
     
     @param package_id The package for which you want to get the locale preference.
     @param site_wide Set this if you want to get the site-wide locale preference.
+    @param user_id Set this to the user you want to get the locale of, defaults to current user.
 } {
+    # default to current user
+    if { [empty_string_p $user_id] } {
+        set user_id [ad_conn untrusted_user_id]
+    }
+
     # default to current connection package
     if { [empty_string_p $package_id] } {
         set package_id [ad_conn package_id]
     }
 
     # Try package level locale first
-    set locale [package_level_locale $package_id]
+    set locale [package_level_locale -user_id $user_id $package_id]
 
     # If there's no package setting, then use the site-wide setting
     if { [empty_string_p $locale] } {
-        set locale [site_wide_locale]
+        set locale [site_wide_locale -user_id $user_id]
     } 
 
     return $locale
@@ -319,6 +336,9 @@
     if { $user_id == 0 } {
         # Not logged in, use a cookie-based client locale
 	ad_set_cookie -replace t -max_age inf "ad_locale" $locale
+
+        # Flush the site-wide user preference cache
+        util_memoize_flush [list lang::user::site_wide_locale_not_cached $user_id]
         return
     }
 
Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	4 Nov 2003 10:32:43 -0000	1.11
+++ openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	11 Dec 2003 21:39:53 -0000	1.12
@@ -7,7 +7,7 @@
 
 namespace eval lang::test {}
 
-ad_proc lang::test::get_dir {} {
+ad_proc -private lang::test::get_dir {} {
     The test directory of the acs-lang package (where this file resides).
 
     @author Peter Marklund (peter@collaboraid.biz)
@@ -16,7 +16,7 @@
     return "[acs_package_root_dir acs-lang]/tcl/test"
 }
 
-ad_proc lang::test::assert_browser_locale {accept_language expect_locale} {
+ad_proc -private lang::test::assert_browser_locale {accept_language expect_locale} {
     Assert that with given accept language header lang::conn::browser_locale returns
     the expected locale.
 
@@ -27,10 +27,443 @@
     aa_equals "accept-language header \"$accept_language\"" $browser_locale $expect_locale
 }
 
+ad_proc -private lang::test::test_package_key {} {
+    return "acs-lang-test-tmp"
+}
 
+ad_proc -private lang::test::setup_test_package {} {
+    set package_key [test_package_key]
+    set package_name "acs-lang temporary test package"
+    set package_dir [file join [acs_root_dir] packages $package_key]
+    file mkdir $package_dir
 
+    set info_file_path "${package_dir}/${package_key}.info"
+    set info_file_contents "<?xml version=\"1.0\"?>
+<package key=\"$package_key\" url=\"http://www.openacs.org/acs-repository/apm/packages/$package_key\" type=\"apm_service\">
+    <package-name>$package_name</package-name>
+    <pretty-plural>$package_name</pretty-plural>
+    <initial-install-p>f</initial-install-p>
+    <singleton-p>f</singleton-p>
+    
+    <version name=\"1.0\" url=\"http://www.openacs.org/acs-repository/download/apm/$package_key-1.0.apm\">
+        <owner url=\"mailto:peter@collaboraid.biz\">Peter Marklund</owner>
+        <summary>Temporary acs-lang test package</summary>
+        <release-date>2003-11-07</release-date>
+        <vendor url=\"http://www.collaboraid.biz\">Collaboraid</vendor>
+        <description format=\"text/plain\">Temporary test package created by acs-lang test case.</description>
+    </version>
+</package>
+"
+    template::util::write_file $info_file_path $info_file_contents
 
+    # Install the test package without catalog files
+    apm_package_install \
+        -enable \
+        [apm_package_info_file_path $package_key]
+    aa_true "Package install: package enabled" \
+        [expr [lsearch -exact [apm_enabled_packages] $package_key] != -1]
+}
 
+ad_proc -private lang::test::teardown_test_package {} {
+    apm_package_delete -remove_files=1 [test_package_key]
+}
+
+ad_proc -private lang::test::check_import_result {
+    {-package_key:required}
+    {-locale:required}
+    {-upgrade_array:required}
+    {-base_array:required}
+    {-db_array:required}
+    {-file_array:required}
+} {
+    This proc checks that the properties of messages in the database
+    are what we expect after a message catalog import or upgrade.
+
+    @author Peter Marklund
+} {
+    upvar $upgrade_array upgrade_expect
+    upvar $base_array base_messages
+    upvar $db_array db_messages
+    upvar $file_array file_messages
+
+    # Check that we have the expected message properties in the database after upgrade        
+    foreach message_key [lsort [array names upgrade_expect]] {
+        array set expect_property $upgrade_expect($message_key) 
+        switch $expect_property(message) {
+            db {
+                set expect_message $db_messages($message_key)
+            }
+            file {
+                set expect_message $file_messages($message_key)
+            }
+            base {
+                set expect_message $base_messages($message_key)
+            }
+        }
+
+        array unset message_actual
+        lang::message::get \
+            -package_key $package_key \
+            -message_key $message_key \
+            -locale $locale \
+            -array message_actual
+
+        # Check message properties
+        aa_equals "Import check: $message_key - lang_messages.message" $message_actual(message) $expect_message
+        aa_equals "Import check: $message_key - lang_messages.deleted_p" $message_actual(deleted_p) $expect_property(deleted_p)
+        aa_equals "Import check: $message_key - lang_messages.conflict_p" $message_actual(conflict_p) $expect_property(conflict_p)
+        aa_equals "Import check: $message_key - lang_messages.upgrade_status" \
+            $message_actual(upgrade_status) $expect_property(upgrade_status)
+        if { [string equal $expect_property(sync_time) "not_null"] } {
+            aa_true "Import check: $message_key - lang_messages.sync_time not null" \
+                [expr ![empty_string_p $message_actual(sync_time)]]
+        } else {
+            aa_true "Import check: $message_key - lang_messages.sync_time null" \
+                [expr [empty_string_p $message_actual(sync_time)]]
+        }
+    }
+}
+
+ad_proc -private lang::test::execute_upgrade {
+    {-locale:required}
+} {
+    Executes the logic of the upgrade test case for a certain locale.
+
+    @author Peter Marklund
+} {
+    set package_key [lang::test::test_package_key]
+
+    # The key numbers correspond to the 14 cases described in the api-doc for lang::catalog::upgrade
+    array set base_messages {
+        key01 "Key 1"
+        key04 "Key 4"
+        key05 "Key 5"
+        key06 "Key 6"
+        key07 "Key 7"
+        key10 "Key 10"
+        key11 "Key 11"
+        key12 "Key 12"
+        key13 "Key 13 differ"
+        key14 "Key 14 base"
+    }
+
+    array set db_messages {
+        key02 "Key 2"
+        key06 "Key 6 differ"
+        key07 "Key 7"
+        key08 "Key 8"
+        key09 "Key 9"
+        key10 "Key 10"
+        key11 "Key 11 differ"
+        key12 "Key 12"
+        key13 "Key 13"
+        key14 "Key 14 db"
+    }
+
+    array set file_messages {
+        key03 "Key 3"
+        key04 "Key 4 differ"
+        key05 "Key 5"
+        key08 "Key 8 differ"
+        key09 "Key 9"
+        key10 "Key 10"
+        key11 "Key 11"
+        key12 "Key 12 differ"
+        key13 "Key 13"
+        key14 "Key 14 file"
+    }
+
+    # Add the locale to each message so we can tell messages in
+    # different locales apart
+    foreach array_name {base_messages db_messages file_messages} {
+        foreach message_key [array names $array_name] {
+            append ${array_name}($message_key) " $locale"
+        }
+    }
+
+    array set upgrade_expect {
+        key01 {
+          message base
+          deleted_p t
+          conflict_p f
+          sync_time not_null
+          upgrade_status no_upgrade
+        }
+        key02 {
+          message db
+          deleted_p f
+          conflict_p f
+          sync_time null
+          upgrade_status no_upgrade
+        }
+        key03 {
+          message file
+          deleted_p f
+          conflict_p f
+          sync_time not_null
+          upgrade_status added
+        }
+        key04 {
+          message file
+          deleted_p f
+          conflict_p t
+          sync_time not_null
+          upgrade_status added
+        }
+        key05 {
+          message base
+          deleted_p t
+          conflict_p f
+          sync_time null
+          upgrade_status no_upgrade
+        }
+        key06 {
+          message db
+          deleted_p t
+          conflict_p t
+          sync_time not_null
+          upgrade_status deleted
+        }
+        key07 {
+          message db
+          deleted_p t
+          conflict_p f
+          sync_time not_null
+          upgrade_status deleted
+        }
+        key08 {
+          message file
+          deleted_p f
+          conflict_p t
+          sync_time not_null
+          upgrade_status updated
+        }
+        key09 {
+          message db
+          deleted_p f
+          conflict_p f
+          sync_time not_null
+          upgrade_status no_upgrade
+        }
+        key10 {
+          message db
+          deleted_p f
+          conflict_p f
+          sync_time not_null
+          upgrade_status added
+        }
+        key11 {
+          message db
+          deleted_p f
+          conflict_p f
+          sync_time null
+          upgrade_status no_upgrade
+        }
+        key12 {
+          message file
+          deleted_p f
+          conflict_p f
+          sync_time not_null
+          upgrade_status updated
+        }
+        key13 {
+          message db
+          deleted_p f
+          conflict_p f
+          sync_time not_null
+          upgrade_status no_upgrade
+        }
+        key14 {
+          message file
+          deleted_p f
+          conflict_p t
+          sync_time not_null
+          upgrade_status updated
+        }
+    }
+
+    #
+    # Execution plan:
+    #
+    # 1. Import some messages (base_messages below)
+    # 2. Make changes to DB (db_messages below)
+    # 3. Make changes to catalog files and import again (file_messages below)
+    # 4. Check that merged result is what we expect (upgrade_expect below)
+    # 5. Import again
+    # 6. Check that we still have the same result (verify idempotent)
+    # 7. Resolve some conflicts, but not all
+    # 8. Import again
+    # 9. Check that we have what's expected then
+    #
+
+    aa_log "-------------------------------------------------------------------"
+    aa_log "*** Executing upgrade test with locale $locale"
+    aa_log "-------------------------------------------------------------------"
+
+    #----------------------------------------------------------------------
+    # 1. Import some messages (base_messages)
+    #----------------------------------------------------------------------
+    aa_log "locale=$locale ----------1. import some messages----------"
+
+    # Write original catalog file
+    set catalog_file_path [lang::catalog::get_catalog_file_path \
+                                   -package_key $package_key \
+                                   -locale $locale]
+    lang::catalog::export_to_file $catalog_file_path [array get base_messages]
+    aa_true "Initial export: messages exported to file $catalog_file_path" [file exists $catalog_file_path]
+
+    aa_log [template::util::read_file $catalog_file_path]
+
+    # Import the catalog file
+    array unset message_count
+    array set message_count [lang::catalog::import -package_key $package_key -locales [list $locale]]
+    aa_log "Imported messages: [array get message_count]"
+
+    # Check that we have the expected messages in the database
+    array unset actual_db_messages
+    array set actual_db_messages [lang::catalog::messages_in_db -package_key $package_key -locale $locale]
+    foreach message_key [lsort [array names base_messages]] {
+        aa_equals "Initial import: message for key $message_key in db same as in file" \
+            $actual_db_messages($message_key) $base_messages($message_key)
+    }
+
+    #----------------------------------------------------------------------
+    # 2. Make changes to DB (db_messages)
+    #----------------------------------------------------------------------
+    aa_log "locale=$locale ----------2. Make changes to DB----------"
+
+    # Carry out changes to the message catalog in the db
+    foreach message_key [lsort [array names upgrade_expect]] {
+
+        set register_p 0
+        if { ![info exists db_messages($message_key)] } {
+            # Message is not supposed to exist in DB
+            if { [info exists base_messages($message_key)] } {
+                # Message currently does exist in DB: Delete
+                aa_log "Deleting message $message_key"
+                lang::message::delete \
+                    -package_key $package_key \
+                    -message_key $message_key \
+                    -locale $locale
+            }
+        } else {
+            # Message is supposed to exist in DB
+            # Is it new or changed?
+            if { ![info exists base_messages($message_key)] || \
+                     ![string equal $base_messages($message_key) $db_messages($message_key)] } {
+                # Added || updated 
+                aa_log "Adding/updating message $message_key"
+                lang::message::register \
+                    $locale \
+                    $package_key \
+                    $message_key \
+                    $db_messages($message_key)
+            }
+        }
+    }
+
+    #----------------------------------------------------------------------
+    # 3. Make changes to catalog files and import again (file_messages)
+    #----------------------------------------------------------------------
+    aa_log "locale=$locale ----------3. Make changes to catalog files and do first upgrade----------"
+
+    # Update the catalog file
+    file delete -force $catalog_file_path
+    lang::catalog::export_to_file $catalog_file_path [array get file_messages]
+    aa_true "First upgrade: catalog file $catalog_file_path updated" [file exists $catalog_file_path]
+
+    # Execute a first upgrade
+    lang::catalog::import -package_key $package_key -locales [list $locale]
+
+    #----------------------------------------------------------------------
+    # 4. Check that merged result is what we expect (upgrade_expect)
+    #----------------------------------------------------------------------
+    aa_log "locale=$locale ----------4. Check merge result of first upgrade----------"
+    lang::test::check_import_result \
+        -package_key $package_key \
+        -locale $locale \
+        -upgrade_array upgrade_expect \
+        -base_array base_messages \
+        -db_array db_messages \
+        -file_array file_messages
+
+    #----------------------------------------------------------------------
+    # 5. First upgrade (second import)
+    #----------------------------------------------------------------------
+    aa_log "locale=$locale ----------5. Second upgrade ----------"
+    lang::catalog::import -package_key $package_key -locales [list $locale]
+
+    #----------------------------------------------------------------------
+    # 6. Check that we still have the same result (verify idempotent)
+    #----------------------------------------------------------------------
+    aa_log "locale=$locale ----------6. Check merge results of second upgrade (verify idempotent)----------"
+    lang::test::check_import_result \
+        -package_key $package_key \
+        -locale $locale \
+        -upgrade_array upgrade_expect \
+        -base_array base_messages \
+        -db_array db_messages \
+        -file_array file_messages
+
+    #----------------------------------------------------------------------
+    # 7. Resolve some conflicts, but not all
+    #----------------------------------------------------------------------
+    aa_log "locale=$locale ----------7. Resolve some conflicts, but not all----------"
+    array set conflict_resolutions {
+        key06 "key06 resolution message"
+        key08 "accept"
+    }
+    foreach message_key [array names conflict_resolutions] {
+        if { [string equal $conflict_resolutions($message_key) "accept"] } {
+            # Resolution is an accept - just toggle conflict_p flag
+            lang::message::edit $package_key $message_key $locale [list conflict_p f]
+
+            # Set the message to be what's in the database (the accepted message)
+            set conflict_resolutions($message_key) [lang::message::get_element \
+                                                        -package_key $package_key \
+                                                        -message_key $message_key \
+                                                        -locale $locale \
+                                                        -element message]
+        } else {
+            # Resolution is an edit
+            lang::message::register \
+                $locale \
+                $package_key \
+                $message_key \
+                $conflict_resolutions($message_key)
+        }
+    }
+
+    # TODO: test resolution being to retain the message (just toggle conflict_p)
+    # TODO: test resolution being to delete a resurrected message
+    # TODO: test other resolution possibilities
+
+    #----------------------------------------------------------------------
+    # 8. Third upgrade
+    #----------------------------------------------------------------------
+    aa_log "locale=$locale ----------8. Do third upgrade----------"
+    lang::catalog::import -package_key $package_key -locales [list $locale]
+
+    #----------------------------------------------------------------------
+    # 9. Check that we have what's expected then (resolutions are sticky)
+    #----------------------------------------------------------------------
+    aa_log "locale=$locale ----------9. Check results of third upgrade (that resolutions are sticky)----------"
+    foreach message_key [array names conflict_resolutions] {
+    
+        array unset message_array
+        lang::message::get \
+            -package_key $package_key \
+            -message_key $message_key \
+            -locale $locale \
+            -array message_array
+
+        aa_equals "$message_key - conflict message that has been resolved in UI has conflict_p=f" \
+            $message_array(conflict_p) "f"
+        aa_equals "$message_key - the resolved conflict is not clobbered by an additional import" \
+            $message_array(message) $conflict_resolutions($message_key)
+    }
+}
+
 aa_register_case util__replace_temporary_tags_with_lookups {
     Primarily tests lang::util::replace_temporary_tags_with_lookups,
     Also tests the procs lang::catalog::export_messages_to_file, lang::catalog::parse,
@@ -499,3 +932,38 @@
         error $saved_error $saved_errorInfo
     }
 }
+
+aa_register_case upgrade {
+    Test that a package can be upgraded with new
+    catalog files and that the resulting keys and messages
+    in the database can then be exported properly.
+
+    What we are testing is a scenario similar to what we have on the OpenACS
+    Translation server (http://translate.openacs.org).
+
+    @author Peter Marklund
+} {
+    # Create the test package in the file system
+    lang::test::setup_test_package
+
+    # Can't run this test case with the usual rollback switch since if everthing
+    # is wrapped in one transaction then the creation_date of the messages will be the
+    # same and the query in lang::catalog::last_sync_messages will return duplicates.
+    aa_run_with_teardown \
+        -test_code {
+
+        lang::test::execute_upgrade -locale en_US
+
+        lang::system::locale_set_enabled \
+            -locale de_DE \
+            -enabled_p t
+
+        lang::test::execute_upgrade -locale de_DE
+
+    } -teardown_code {                 
+        foreach message_key [array names upgrade_expect] {
+            lang::message::unregister $package_key $message_key
+        }    
+        lang::test::teardown_test_package
+    }
+}
Index: openacs-4/packages/acs-lang/www/admin/export-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/export-messages.adp	11 Dec 2003 21:39:53 -0000	1.2
@@ -0,0 +1,31 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+
+Export results for
+<if @package_key@ nil>
+  <b>all packages</b>
+</if>
+<else>
+package <b>@package_key@</b>
+</else>
+and
+<if @locale@ nil>
+  <b>all locales</b>
+</if>
+<else>
+locale <b>@locale@</b>
+</else>.
+
+<p>
+  Export complete.
+</p>
+
+<if @package_key@ not nil>
+  <p>
+    Catalog files are stored in the directory <b>@catalog_dir@</b>.
+  </p>
+</if>
+
+<p>
+  <b>&raquo;</b> <a href="@return_url@">Return</a>
+</p>
Index: openacs-4/packages/acs-lang/www/admin/export-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/export-messages.tcl	11 Dec 2003 21:39:53 -0000	1.2
@@ -0,0 +1,22 @@
+ad_page_contract {
+    Export messages from the database to catalog files.
+
+    @author Peter Marklund
+} {
+    {locale:multiple ""}
+    {package_key ""}
+    {return_url "/acs-lang/admin"}
+}
+
+set page_title "Export messages"
+
+if { ![acs_user::site_wide_admin_p] } {
+    ad_return_warning "Permission denied" "Sorry, only site-wide administrators are allowed to export messages from the database to catalog files."
+    ad_script_abort
+}
+
+lang::catalog::export \
+    -package_key $package_key \
+    -locales $locale
+
+set catalog_dir [lang::catalog::package_catalog_dir $package_key]
Index: openacs-4/packages/acs-lang/www/admin/import-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/import-messages.adp	11 Dec 2003 21:39:53 -0000	1.2
@@ -0,0 +1,37 @@
+<master>
+ <property name="title">@page_title;noquote@</property>
+
+Import results for
+<if @package_key@ nil>
+  <b>all packages</b>
+</if>
+<else>
+package <b>@package_key@</b>
+</else>
+and
+<if @locale@ nil>
+  <b>all locales</b>
+</if>
+<else>
+locale <b>@locale@</b>
+</else>.
+
+<p>
+  Import finished. Number of messages processed: @message_count.processed@, added: @message_count.added@, updated: @message_count.updated@, 
+  deleted: @message_count.deleted@.
+</p>
+
+<if @conflict_count@ gt 0>
+  <font color="red">There are @conflict_count@ message conflicts in the database.</font> 
+
+<p>
+  <b>&raquo;</b> <a href="@conflict_url@">Proceed to resolve conflicts</a>
+</p>
+</if>
+<else>
+  There are currently no conflicts in the database.
+</else>
+
+<p>
+  <b>&raquo;</b> <a href="@return_url@">Return</a>
+</p>
Index: openacs-4/packages/acs-lang/www/admin/import-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/import-messages.tcl	11 Dec 2003 21:39:53 -0000	1.2
@@ -0,0 +1,27 @@
+ad_page_contract {
+    Import messages from catalog files to the database.
+
+    @author Peter Marklund
+} {
+    {locale ""}
+    {package_key ""}
+    {return_url "/acs-lang/admin"}
+}
+
+set page_title "Import messages"
+
+if { ![acs_user::site_wide_admin_p] } {
+    ad_return_warning "Permission denied" "Sorry, only site-wide administrators are allowed to import message catalog files to the database."
+    ad_script_abort
+}
+
+set locales [list $locale]
+array set message_count [lang::catalog::import \
+                             -package_key $package_key \
+                             -locales $locales]
+
+set conflict_count [lang::message::conflict_count \
+                        -package_key $package_key \
+                        -locale $locale]
+
+set conflict_url [export_vars -base message-conflicts { package_key locale }]
Index: openacs-4/packages/acs-lang/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/acs-lang/www/admin/index.adp	30 Sep 2003 10:08:45 -0000	1.14
+++ openacs-4/packages/acs-lang/www/admin/index.adp	11 Dec 2003 21:39:53 -0000	1.15
@@ -2,6 +2,8 @@
   <property name="title">@page_title@</property>
   <property name="context">@context@</property>
 
+<include src="/packages/acs-lang/lib/conflict-link" />
+
 <p>
   <b>&raquo;</b>
   Toggle translator mode: 
@@ -23,6 +25,15 @@
   <b>&raquo;</b> <a href="lookup">Look up message</a>
 </p>
 
+<if @site_wide_admin_p@>
+  <p>
+    <b>&raquo;</b> <a href="@import_url@" title="Imports messages system-wide from catalog files" onclick="return confirm('Are you sure you want to import all I18N messages from catalog files?');">Import all messages</a>
+  </p>
+  <p>
+    <b>&raquo;</b> <a href="@export_url@" title="Export messages system-wide to catalog files" onclick="return confirm('Are you sure you want to export all I18N messages to catalog files?');">Export all messages</a>
+  </p>
+</if>
+
 <h2>Installed Locales</h2>
 
 <table cellpadding="0" cellspacing="0" border="0">
@@ -36,7 +47,7 @@
      <th>Translated</th>
      <th>Untranslated</th>
      <th>Enabled</th>
-     <th>Default Locale For Langauge</th>
+     <th>Default Locale For Language</th>
      <th></th>
     </tr>
     <multiple name="locales">
Index: openacs-4/packages/acs-lang/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-lang/www/admin/index.tcl	17 Sep 2003 18:39:00 -0000	1.6
+++ openacs-4/packages/acs-lang/www/admin/index.tcl	11 Dec 2003 21:39:53 -0000	1.7
@@ -14,18 +14,20 @@
 set system_locale [lang::system::locale -site_wide]
 set system_locale_label [ad_locale_get_label $system_locale]
 
-set page_title "Adminsitration of Localization"
+set page_title "Administration of Localization"
 set context [list]
 
+set site_wide_admin_p [acs_user::site_wide_admin_p]
 
 set timezone_p [lang::system::timezone_support_p]
 
 set timezone [lang::system::timezone]
 
 set translator_mode_p [lang::util::translator_mode_p]
 
+set import_url [export_vars -base import-messages]
+set export_url [export_vars -base export-messages]
 
-
 set parameter_url [export_vars -base "/shared/parameters" { {package_id {[ad_conn package_id]} } { return_url {[ad_return_url]} } }]
 
 
Index: openacs-4/packages/acs-lang/www/admin/locale-set-enabled-p.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-set-enabled-p.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-lang/www/admin/locale-set-enabled-p.tcl	21 Oct 2003 13:55:05 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/locale-set-enabled-p.tcl	11 Dec 2003 21:39:53 -0000	1.6
@@ -14,5 +14,9 @@
         -locale $locale \
         -enabled_p $enabled_p
 
+if {$enabled_p} {
+    lang::catalog::import -locales [list $locale]
+}
+
 ad_returnredirect . 
 ad_script_abort
Index: openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	11 Dec 2003 21:39:53 -0000	1.2
@@ -0,0 +1,15 @@
+ad_page_contract {
+    Mark conflict of an I18N message as resolved, i.e.
+    set the conflict_p flag to false.
+
+    @author Peter Marklund
+} {
+    package_key
+    message_key
+    locale
+    {return_url {[export_vars -base "message-conflicts" { package_key locale }]}}
+}
+
+lang::message::edit $package_key $message_key $locale [list conflict_p f]
+
+ad_returnredirect $return_url
Index: openacs-4/packages/acs-lang/www/admin/message-conflicts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflicts.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.adp	11 Dec 2003 21:39:53 -0000	1.2
@@ -0,0 +1,28 @@
+<master>
+  <property name="title">@page_title@</property>
+
+<p>
+  This page lists conflicts resulting from message catalog imports that need manual resolution by a translator
+  or administrator.
+</p>
+
+<table cellpadding="3" cellspacing="3">
+
+  <tr>
+
+    <td class="list-filter-pane" valign="top" width="200">
+
+      <listfilters name="messages"></listfilters>
+
+    </td>
+
+    <td class="list-list-pane" valign="top">
+
+      <listtemplate name="messages"></listtemplate>
+
+    </td>
+
+  </tr>
+
+</table>
+
Index: openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	11 Dec 2003 21:39:53 -0000	1.2
@@ -0,0 +1,78 @@
+ad_page_contract {
+    Show message conflicts resulting from message catalog
+    imports. Optionally filter by package and locale.
+
+    @author Peter Marklund
+} {
+    locale:optional
+    package_key:optional
+}
+
+set page_title "I18N Message Conflicts"
+
+list::create \
+    -name messages \
+    -multirow messages \
+    -no_data "There are no conflicts" \
+    -elements {
+        package_key {
+            label "Package"
+        }
+        message_key {
+            label "Key"
+        }
+        locale {
+            label "Locale"
+        }
+        message {
+            label "Message"
+            link_url_col edit_url
+            display_eval {[string_truncate -len 50 -- $message]}
+        }
+        upgrade_status {
+            label "Status"
+        }
+        accept {
+            label ""
+            display_template {
+                Mark resolved
+            }
+            link_url_col accept_url
+            link_html {title "Click to accept current state of message and consider conflict resolved."}
+        }
+    } -filters {
+        locale {
+            label "Locale"
+            where_clause "locale = :locale"
+            values {[db_list_of_lists locales {select distinct locale, locale from lang_messages where conflict_p = 't'}]}
+        }
+        package_key {
+            label "Package"
+            where_clause "package_key = :package_key"
+            values {[db_list_of_lists packages {
+                select pt.pretty_name, 
+                       pt.package_key 
+                from   apm_package_types pt 
+                where  pt.package_key in (select m.package_key
+                               from   lang_messages m
+                               where    m.conflict_p = 't')
+                order  by pretty_name
+            }]}
+        }
+
+    }
+
+db_multirow -unclobber -extend { edit_url accept_url } messages select_messages "
+    select package_key,
+           locale,
+           message_key,
+           message,
+           deleted_p,
+           upgrade_status
+    from lang_messages
+    where conflict_p = 't'
+    [template::list::filter_where_clauses -and -name messages]
+" {
+    set edit_url [export_vars -base "edit-localized-message" { package_key locale message_key }]
+    set accept_url [export_vars -base "message-conflict-resolve" { package_key locale message_key {return_url [ad_return_url]}}]
+}
Index: openacs-4/packages/acs-lang/www/admin/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-delete.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/message-delete.adp	15 Aug 2003 07:50:44 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/message-delete.adp	11 Dec 2003 21:39:53 -0000	1.2
@@ -5,13 +5,10 @@
 <p />
 
 <p>
-  Deleting message <strong>@package_key@.@message_key@</strong>
+  Deleting message for key <strong>@package_key@.@message_key@</strong> in locale @locale@.
 </p>
 
 <form action="message-delete">
 @form_export_vars;noquote@
 <input type="submit" value="Confirm delete">
 </form>
-
-
-
Index: openacs-4/packages/acs-lang/www/admin/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-delete.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/message-delete.tcl	15 Aug 2003 07:50:44 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/message-delete.tcl	11 Dec 2003 21:39:53 -0000	1.2
@@ -28,32 +28,15 @@
                  [list "message-list?[export_vars { locale package_key show }]" $package_key] \
                  $page_title]
 
-
-# We check that this request is coming for the system wide default
-# locale. If not, we can't allow the creation of a new localized 
-# message.
-
-if { ![string equal $current_locale $default_locale] } {
-    ad_return_error "Can only create messages in the default locale" "Can only create messages in the default locale"
-    ad_script_abort
-}
-
-
 set form_export_vars [export_vars -form { locale package_key message_key show {confirm_p 1} }]
 
 
 if { [exists_and_not_null confirm_p] && [template::util::is_true $confirm_p] } {
+    lang::message::delete \
+        -package_key $package_key \
+        -message_key $message_key \
+        -locale $locale
 
-    db_transaction {
-
-        db_dml delete_messages { delete from lang_messages where package_key = :package_key and message_key = :message_key }
-
-        db_dml delete_audit { delete from lang_messages_audit where package_key = :package_key and message_key = :message_key  }
-
-        db_dml delete_message_key { delete from lang_message_keys where package_key = :package_key and message_key = :message_key  }
-
-    }
-
     ad_returnredirect "message-list?[export_vars { locale package_key show }]"
     ad_script_abort
 }
Index: openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/message-list-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql	22 Sep 2003 14:33:40 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql	11 Dec 2003 21:39:53 -0000	1.3
@@ -21,6 +21,8 @@
     and    lm2.locale (+) = :locale
     and    lm2.message_key (+) = lmk.message_key
     and    lm2.package_key (+) = lmk.package_key
+    and    (lm2.deleted_p = 'f' or lm2.deleted_p is null)
+    and    lm1.deleted_p = 'f'
     $where_clause
     order  by upper(lm1.message_key), lm1.message_key
 
Index: openacs-4/packages/acs-lang/www/admin/message-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/message-list-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/message-list-postgresql.xql	14 Aug 2003 16:06:20 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/message-list-postgresql.xql	11 Dec 2003 21:39:53 -0000	1.2
@@ -17,6 +17,8 @@
     and    lm1.package_key = :package_key
     and    lm1.message_key = lmk.message_key
     and    lm1.package_key = lmk.package_key
+    and    (lm2.deleted_p = 'f' or lm2.deleted_p is null)
+    and    lm1.deleted_p = 'f'
     $where_clause
     order  by upper(lm1.message_key), lm1.message_key
 
Index: openacs-4/packages/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	22 Oct 2003 11:34:20 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	11 Dec 2003 21:39:53 -0000	1.6
@@ -11,6 +11,8 @@
   </multiple>
 </p>
 
+<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale@" package_key="@package_key@"/>
+
 <if @create_p@ true>
   <p>
     <b>&raquo;</b> <a href="@new_message_url@">Create new message</a>
@@ -64,11 +66,11 @@
                   <else><span style="color: gray; font-style: italic;">Not translated</span></else>
                 </td>
               </if>
-              <if @create_p@ true>
+              <if @messages.translated_message@ not nil>
                 <td>
                   <a href="@messages.delete_url@" title="Delete this messages"><img src="/shared/images/Delete16.gif" border="0" width="16" height="16"></a>
                 </td>
-              </if>
+             </if>
             </tr>
           </multiple>
         </table>
Index: openacs-4/packages/acs-lang/www/admin/message-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	22 Oct 2003 11:34:20 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	11 Dec 2003 21:39:53 -0000	1.6
@@ -30,14 +30,10 @@
 set page_title $package_key
 set context [list [list [export_vars -base package-list { locale }] $locale_label] $page_title]
 
-set site_wide_admin_p [permission::permission_p \
-                           -party_id [ad_conn user_id] \
-                           -object_id [acs_lookup_magic_object security_context_root] \
-                           -privilege "admin"]
+set site_wide_admin_p [acs_user::site_wide_admin_p]
 
-set version_id [apm_version_id_from_package_key $package_key]
-set export_messages_url [export_vars -base "/acs-admin/apm/version-i18n-export" { version_id { return_url {[ad_return_url]} } }]
-set import_messages_url [export_vars -base "/acs-admin/apm/version-i18n-import" { version_id { return_url {[ad_return_url]} } }]
+set export_messages_url [export_vars -base "export-messages" { package_key locale { return_url {[ad_return_url]} } }]
+set import_messages_url [export_vars -base "import-messages" { package_key locale { return_url {[ad_return_url]} } }]
 
 # We let you create new messages keys if you're in the default locale
 set create_p [string equal $current_locale $default_locale]
Index: openacs-4/packages/acs-lang/www/admin/package-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/package-list.adp	22 Oct 2003 11:17:50 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/package-list.adp	11 Dec 2003 21:39:53 -0000	1.5
@@ -6,9 +6,11 @@
 Search <formwidget id="search_locale"> for <formwidget id="q"> <input type="submit" value="Search">
 </formtemplate>
 
-<if @locale_enabled_p@>
+<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale@" />
+
+<if @locale_enabled_p@ and @site_wide_admin_p@>
   <p>
-    <b>&raquo;</b> <a href="@import_all_url@" title="Imports all messages for this locale from the catalog files"  onclick="return confirm('Importing messages for this locale from the filesystem should typically only be done once. If you already have translated messages in this locale those may be overwritten by the import, so be very cautious.');">Import all messages for this locale</a>
+    <b>&raquo;</b> <a href="@import_all_url@" title="Imports all messages for this locale from the catalog files">Import all messages for this locale</a>
   </p>
   <p>
     <b>&raquo;</b> <a href="@export_all_url@" title="Export all messages for this locale to the catalog files">Export all messages for this locale</a>
Index: openacs-4/packages/acs-lang/www/admin/package-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/package-list.tcl	22 Oct 2003 13:30:31 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/package-list.tcl	11 Dec 2003 21:39:53 -0000	1.5
@@ -29,11 +29,11 @@
 set context [list $page_title]
 
 set locale_enabled_p [expr [lsearch [lang::system::get_locales] $current_locale] != -1]
+set site_wide_admin_p [acs_user::site_wide_admin_p]
 
 
 
 
-
 #####
 #
 # Package/message list
@@ -114,6 +114,5 @@
 }
 
 
-set import_all_url [export_vars -base import-locale-from-files { { locale $current_locale } }]
-set export_all_url [export_vars -base export-locale-to-files { { locale $current_locale } }]
-
+set import_all_url [export_vars -base import-messages { { locale $current_locale } {return_url {[ad_return_url]}} }]
+set export_all_url [export_vars -base export-messages { { locale $current_locale } {return_url {[ad_return_url]}} }]
Index: openacs-4/packages/acs-lang/www/doc/index.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/doc/index.html,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/doc/index.html	11 Sep 2002 13:41:05 -0000	1.1
+++ openacs-4/packages/acs-lang/www/doc/index.html	11 Dec 2003 21:39:54 -0000	1.2
@@ -1,20 +1,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!-- saved from url=(0075)http://acs40.arsdigita.com/acs40-project-central/local-sepg/design-template -->
-<HTML><HEAD><TITLE>ACS 4 Globalization</TITLE>
+<HTML><HEAD><TITLE>ACS 4 Localization</TITLE>
 <META content="text/html; charset=iso-8859-1" http-equiv=Content-Type>
 <META content="MSHTML 5.00.2722.2800" name=GENERATOR></HEAD>
 <BODY bgColor=white>
-<H2>ACS 4 Globalization</H2>
-by Henry Minsky
-<HR>
 
+This is now documented within ACS Core Documentation at:
 <ul>
-  <li><a href="i18n-requirements.html">Requirements</a>
-  <li><a href="i18n-design.html">Design</a>
+<li><a href="/doc/i18n-requirements.html">Requirements</a>
+<li><a href="/doc/i18n.html">Design</a>
 </ul>
-
-<HR>
-<A href="mailto:hqm@arsdigita.com">hqm@arsdigita.com</A> <BR>
-
 </BODY></HTML>
 
Index: openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info	17 May 2003 09:49:06 -0000	1.4
+++ openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info	11 Dec 2003 21:39:54 -0000	1.5
@@ -1,19 +1,20 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="acs-ldap-authentication" url="http://www.arsdigita.com/acs-repository/apm/packages/acs-ldap-authentication/" type="apm_service">
+<package key="acs-ldap-authentication" url="http://openacs.org/repository/apm/packages/acs-ldap-authentication/" type="apm_service">
     <package-name>ACS LDAP Authentication</package-name>
     <pretty-plural>ACS LDAP Authentication Services</pretty-plural>
     <singleton-p>t</singleton-p>
 
-    <version name="0.3" url="http://www.arsdigita.com/acs-repository/download/apm/acs-ldap-authentication-0.3.apm">
+    <version name="0.3" url="http://openacs.org/repository/download/apm/acs-ldap-authentication-0.3.apm">
     <database-support>
         <database>oracle</database>
     </database-support>
-        <owner url="mailto:dennis@arsdigita.com">Dennis Gregorovic</owner>
-        <summary>Authentication across multiple servers via LDAP</summary>
+        <owner>Dennis Gregorovic</owner>
+        <summary>Authentication via LDAP (deprecated)</summary>
         <release-date>2001-02-06</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/plain">Deprecated in favor of the auth-ldap package.</description>
 
         <requires url="acs-kernel" version="4.6.2"/>
 
Index: openacs-4/packages/acs-mail/acs-mail.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/acs-mail.info,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/acs-mail/acs-mail.info	10 Nov 2003 14:28:56 -0000	1.14
+++ openacs-4/packages/acs-mail/acs-mail.info	11 Dec 2003 21:39:54 -0000	1.15
@@ -1,23 +1,24 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-mail" url="http://www.openacs.org/acs-repository/apm/packages/acs-mail/" type="apm_service">
+<package key="acs-mail" url="http://openacs.org/repository/apm/packages/acs-mail/" type="apm_service">
     <package-name>Mail</package-name>
     <pretty-plural>Mail Services</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/acs-repository/download/apm/acs-mail-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-mail-5.0.0b4.apm">
         <owner url="mailto:vinod@kurup.com">Vinod Kurup</owner>
         <owner url="mailto:prevost@maya.com">John Prevost</owner>
         <summary>General messaging system, mark II</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
-        <description format="text/html">Provides generic message services, with email sending.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Provides generic message services, with email sending.  The acs-mail-lite package is the prefered 
+        interface for new packages and it's anticipated that this package will ultimately be deprecated.</description>
 
-        <provides url="acs-mail" version="5.0.0a5"/>
-        <requires url="acs-content-repository" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-mail" version="5.0.0b4"/>
+        <requires url="acs-content-repository" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-mail/sql/postgresql/acs-mail-packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/postgresql/acs-mail-packages-create.sql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-mail/sql/postgresql/acs-mail-packages-create.sql	17 May 2003 09:52:12 -0000	1.5
+++ openacs-4/packages/acs-mail/sql/postgresql/acs-mail-packages-create.sql	11 Dec 2003 21:39:54 -0000	1.6
@@ -120,7 +120,7 @@
 end;
 ' language 'plpgsql';
 
-create function acs_mail_body__body_p(integer) 
+create or replace function acs_mail_body__body_p(integer) 
 returns boolean as '
 	p_object_id		alias for $1;
     v_check_body_id integer;
@@ -134,7 +134,7 @@
          return ''f'';
      end if;
 end;
-' language 'plpgsql';
+' language 'plpgsql' stable;
 
 create function acs_mail_body__clone (integer,integer,varchar,timestamptz,integer,varchar,integer) 
 returns integer as '
@@ -245,7 +245,7 @@
 end;
 ' language 'plpgsql';
 
-create function acs_mail_multipart__multipart_p (integer)
+create or replace function acs_mail_multipart__multipart_p (integer)
 returns boolean as '
 declare
 	p_object_id				alias for $1;
@@ -261,7 +261,7 @@
         return ''f'';
     end if;
 end;
-' language 'plpgsql';
+' language 'plpgsql' stable;
 
  -- Add content at a specific index.  If the sequence number is null,
  -- below one, or higher than the highest item already available,
@@ -336,7 +336,7 @@
 end;
 ' language 'plpgsql';
 
-create function acs_mail_link__link_p (integer)
+create or replace function acs_mail_link__link_p (integer)
 returns boolean as '
 declare
 	p_object_id				alias for $1;
@@ -352,7 +352,7 @@
         return ''f'';
     end if;
 end;
-' language 'plpgsql';
+' language 'plpgsql' stable;
 
 --end acs_mail_link;
 
Index: openacs-4/packages/acs-mail-lite/acs-mail-lite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/acs-mail-lite.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-mail-lite/acs-mail-lite.info	10 Nov 2003 16:36:31 -0000	1.5
+++ openacs-4/packages/acs-mail-lite/acs-mail-lite.info	11 Dec 2003 21:39:54 -0000	1.6
@@ -10,9 +10,9 @@
     <version name="0.1d" url="http://openacs.org/repository/download/apm/acs-mail-lite-0.1d.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <vendor url="http://openacs.org">OpenACS</vendor>
-        <summary>Simplified reliable email transmission.</summary>
+        <summary>Simple reliable email transmission.</summary>
         <release-date>2003-11-10</release-date>
-        <description format="text/html">This package provides a simple ns_sendmail-like interface for sending messages, but queues messages in the database to ensure reliable sending and make sending a message 'transactional'.</description>
+        <description format="text/html">This package provides a simple ns_sendmail-like interface for sending messages, but queues messages in the database to ensure reliable sending and make sending a message 'transactional'.  Prefered over acs-messaging or acs-mail.</description>
 
         <provides url="acs-mail-lite" version="0.1d"/>
 
Index: openacs-4/packages/acs-messaging/acs-messaging.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/acs-messaging.info,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-messaging/acs-messaging.info	10 Nov 2003 14:28:56 -0000	1.10
+++ openacs-4/packages/acs-messaging/acs-messaging.info	11 Dec 2003 21:39:54 -0000	1.11
@@ -1,24 +1,25 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-messaging" url="http://www.openacs.org/acs-repository/apm/packages/acs-messaging/" type="apm_service">
+<package key="acs-messaging" url="http://openacs.org/repository/apm/packages/acs-messaging/" type="apm_service">
     <package-name>Messaging</package-name>
     <pretty-plural>Messaging Services</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/repository/download/apm/acs-messaging-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-messaging-5.0.0b4.apm">
         <owner url="mailto:akk+@cs.cmu.edu">Anukul Kapoor</owner>
         <owner url="mailto:prevost@maya.com">John Prevost</owner>
         <owner url="mailto:vinod@kurup.com">Vinod Kurup</owner>
-        <summary>General messaging for bboard, general comments, etc.</summary>
+        <summary>General messaging for bboard and general comments.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
-        <description format="text/html">Provides generic message services, with email sending.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Provides generic message services, with email sending.  acs-mail-lite and notifications are the 
+        prefered packages for delivering this functionality and it is anticipated that this package will ultimately be deprecated.</description>
 
-        <provides url="acs-messaging" version="5.0.0a5"/>
-        <requires url="acs-content-repository" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-messaging" version="5.0.0b4"/>
+        <requires url="acs-content-repository" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-create.sql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-create.sql	17 May 2003 09:54:26 -0000	1.10
+++ openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-create.sql	11 Dec 2003 21:39:54 -0000	1.11
@@ -95,14 +95,14 @@
 
 -- support for tree queries on acs_messages
 
-create function acs_message_get_tree_sortkey(integer) returns varbit as '
+create or replace function acs_message_get_tree_sortkey(integer) returns varbit as '
 declare
   p_message_id    alias for $1;
 begin
   return tree_sortkey from acs_messages where message_id = p_message_id;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
-create function acs_message_insert_tr () returns opaque as '
+create or replace function acs_message_insert_tr () returns opaque as '
 declare
         v_parent_sk     varbit  default null;
         v_max_value     integer;
Index: openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql	28 Aug 2003 09:41:39 -0000	1.13
+++ openacs-4/packages/acs-messaging/sql/postgresql/acs-messaging-packages.sql	11 Dec 2003 21:39:54 -0000	1.14
@@ -191,7 +191,7 @@
     else
         return ''f'';
     end if;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 create or replace function acs_message__send (integer,varchar,integer,timestamptz)
 returns integer as '
@@ -247,7 +247,7 @@
      where tree_sortkey = v_ancestor_sk;
 
     return v_message_id;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
     -- ACHTUNG!  WARNING!  ACHTUNG!  WARNING!  ACHTUNG!  WARNING! --
 
@@ -466,11 +466,9 @@
 declare
     p_image_id  alias for $1;
 begin
-    -- XXX fix after image.delete exists
-    delete from images
-        where image_id = p_image_id;
-    perform content_item__delete(p_image_id);
-    return 1;
+    perform image__delete(p_image_id);
+
+    return 0;
 end;' language 'plpgsql';
 
     -- XXX should just call content_extlink.new
@@ -545,5 +543,5 @@
         from acs_messages_all
         where message_id = p_message_id;
     return v_message_name;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
Index: openacs-4/packages/acs-messaging/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-messaging/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql	11 Dec 2003 21:39:54 -0000	1.2
@@ -0,0 +1,11 @@
+-- call image__delete instead.
+
+create or replace function acs_message__delete_image (integer)
+returns integer as '
+declare
+    p_image_id  alias for $1;
+begin
+    perform image__delete(p_image_id);
+
+    return 1;
+end;' language 'plpgsql';
Index: openacs-4/packages/acs-reference/acs-reference.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/acs-reference.info,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-reference/acs-reference.info	10 Nov 2003 14:28:56 -0000	1.9
+++ openacs-4/packages/acs-reference/acs-reference.info	11 Dec 2003 21:39:54 -0000	1.10
@@ -1,29 +1,26 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-reference" url="http://www.openacs.org/acs-repository/apm/packages/acs-reference" type="apm_service">
+<package key="acs-reference" url="http://openacs.org/repository/apm/packages/acs-reference" type="apm_service">
     <package-name>Reference Data</package-name>
     <pretty-plural>Reference Datas</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/acs-repository/download/apm/acs-reference-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-reference-5.0.0b4.apm">
         <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
-        <summary>This package contains reference data for the OpenACS system.</summary>
+        <summary>Tools and API for managing refrence data.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.mayuli.com">Mayuli Enterprises LLC</vendor>
-        <description format="text/html">acs-reference contains data and functions to allow the following:
-&lt;ul&gt;
-&lt;li&gt;It allows applications to refer to and employ a common set of reference
-data.
-&lt;li&gt;It gives administrators the ability to run standard reports on this data.
-&lt;li&gt;It offers a convenient repository for and the ability to run reports on
-data of this sort.
-&lt;li&gt;It allows us to monitor the usage of reference data.
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <description format="text/html">Reference Data provides an API to support:
+&lt;ul&gt;
+&lt;li&gt; A common set of reference data.
+&lt;li&gt; Running standard reports on this data.
+&lt;li&gt; Monitoring the usage of reference data.
 &lt;/ul&gt;</description>
 
-        <provides url="acs-reference" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-reference" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
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 -N -r1.18 -r1.19
--- openacs-4/packages/acs-service-contract/acs-service-contract.info	10 Nov 2003 14:28:56 -0000	1.18
+++ openacs-4/packages/acs-service-contract/acs-service-contract.info	11 Dec 2003 21:39:54 -0000	1.19
@@ -1,20 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-service-contract" url="http://www.openacs.org/acs-repository/apm/packages/acs-service-contract" type="apm_service">
+<package key="acs-service-contract" url="http://openacs.org/repository/apm/packages/acs-service-contract" type="apm_service">
     <package-name>Service Contracts</package-name>
     <pretty-plural>Service Contract Packages</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/repository/download/apm/acs-service-contract-5.0.0a5.apm">
-        <owner url="http://www.openacs.org">OpenACS</owner>
-        <summary>Allows different packages to communicate via defined contracts</summary>
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-service-contract-5.0.0b4.apm">
+        <owner url="http://openacs.org">OpenACS</owner>
+        <summary>API and UI for service contracts</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Service contracts defines an API for the creation of interfaces and discovery of interface implementations.
+        Examples are the contracts used for search which provide a means to get content on a given object and to translate an object_id to a 
+        url or the contracts used by dotlrn and new-portals to allow packages to provide portalized panes.</description>
 
-        <provides url="acs-service-contract" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-service-contract" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-service-contract/sql/postgresql/acs-sc-msg-types-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/sql/postgresql/acs-sc-msg-types-create.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-service-contract/sql/postgresql/acs-sc-msg-types-create.sql	15 Jan 2002 11:08:02 -0000	1.3
+++ openacs-4/packages/acs-service-contract/sql/postgresql/acs-sc-msg-types-create.sql	11 Dec 2003 21:39:54 -0000	1.4
@@ -40,7 +40,7 @@
 );
 
 
-create function acs_sc_msg_type__new(varchar,varchar)
+create or replace function acs_sc_msg_type__new(varchar,varchar)
 returns integer as '
 declare
     p_msg_type_name             alias for $1;
@@ -72,7 +72,7 @@
 end;' language 'plpgsql';
 
 
-create function acs_sc_msg_type__get_id(varchar)
+create or replace function acs_sc_msg_type__get_id(varchar)
 returns integer as '
 declare
     p_msg_type_name		alias for $1;
@@ -85,10 +85,10 @@
    
     return v_msg_type_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
-create function acs_sc_msg_type__get_name(integer)
+create or replace function acs_sc_msg_type__get_name(integer)
 returns varchar as '
 declare
     p_msg_type_id		alias for $1;
@@ -101,10 +101,10 @@
    
     return v_msg_type_name;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
-create function acs_sc_msg_type__delete(integer)
+create or replace function acs_sc_msg_type__delete(integer)
 returns integer as '
 declare
     p_msg_type_id		alias for $1;
@@ -117,8 +117,9 @@
 
 end;' language 'plpgsql';
 
-
-create function acs_sc_msg_type__delete(varchar)
+-- XXX: this might be a bug that it does not return 0 as the above does.
+-- anyway now it is strict as being called with null is a noop and returns null
+create or replace function acs_sc_msg_type__delete(varchar)
 returns integer as '
 declare
     p_msg_type_name		alias for $1;
@@ -131,14 +132,14 @@
 
     return v_msg_type_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' strict;
 
 
 
 
 
 
-create function acs_sc_msg_type__new_element(varchar,varchar,varchar,boolean,integer)
+create or replace function acs_sc_msg_type__new_element(varchar,varchar,varchar,boolean,integer)
 returns integer as '
 declare
     p_msg_type_name		alias for $1;
@@ -183,7 +184,7 @@
 
 
 
-create function acs_sc_msg_type__parse_spec(varchar,varchar)
+create or replace function acs_sc_msg_type__parse_spec(varchar,varchar)
 returns integer as '
 declare
     p_msg_type_name		alias for $1;
Index: openacs-4/packages/acs-service-contract/sql/postgresql/acs-sc-packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/sql/postgresql/acs-sc-packages-create.sql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-service-contract/sql/postgresql/acs-sc-packages-create.sql	16 Sep 2003 08:29:59 -0000	1.9
+++ openacs-4/packages/acs-service-contract/sql/postgresql/acs-sc-packages-create.sql	11 Dec 2003 21:39:54 -0000	1.10
@@ -1,4 +1,4 @@
-create function acs_sc_contract__new(varchar,text)
+create or replace function acs_sc_contract__new(varchar,text)
 returns integer as '
 declare
     p_contract_name             alias for $1;
@@ -31,7 +31,7 @@
 
 
 
-create function acs_sc_contract__get_id(varchar)
+create or replace function acs_sc_contract__get_id(varchar)
 returns integer as '
 declare
     p_contract_name             alias for $1;
@@ -44,11 +44,11 @@
 
     return v_contract_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 
-create function acs_sc_contract__get_name(integer)
+create or replace function acs_sc_contract__get_name(integer)
 returns varchar as '
 declare
     p_contract_id               alias for $1;
@@ -61,11 +61,11 @@
 
     return v_contract_name;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 
-create function acs_sc_contract__delete(integer)
+create or replace function acs_sc_contract__delete(integer)
 returns integer as '
 declare
     p_contract_id               alias for $1;
@@ -80,7 +80,7 @@
 
 
 
-create function acs_sc_contract__delete(varchar)
+create or replace function acs_sc_contract__delete(varchar)
 returns integer as '
 declare
     p_contract_name             alias for $1;
@@ -97,7 +97,7 @@
 
 
 
-create function acs_sc_operation__new(varchar,varchar,text,boolean,integer,varchar,varchar)
+create or replace function acs_sc_operation__new(varchar,varchar,text,boolean,integer,varchar,varchar)
 returns integer as '
 declare
     p_contract_name             alias for $1;
@@ -156,7 +156,7 @@
 
 
 
-create function acs_sc_operation__get_id(varchar,varchar)
+create or replace function acs_sc_operation__get_id(varchar,varchar)
 returns integer as '
 declare
     p_contract_name             alias for $1;
@@ -171,11 +171,10 @@
 
     return v_operation_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
-
-create function acs_sc_operation__delete(integer)
+create or replace function acs_sc_operation__delete(integer)
 returns integer as '
 declare
     p_operation_id              alias for $1;
@@ -189,8 +188,8 @@
 end;' language 'plpgsql';
 
 
-
-create function acs_sc_operation__delete(varchar,varchar)
+-- XXX: should it exception on null?
+create or replace function acs_sc_operation__delete(varchar,varchar)
 returns integer as '
 declare
     p_contract_name             alias for $1;
@@ -207,9 +206,9 @@
 
     return v_operation_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' strict;
 
-create function acs_sc_impl__new(varchar,varchar,varchar,varchar)
+create or replace function acs_sc_impl__new(varchar,varchar,varchar,varchar)
 returns integer as '
 declare
     p_impl_contract_name        alias for $1;
@@ -267,7 +266,7 @@
 
 end;' language 'plpgsql';
 
-create function acs_sc_impl__get_id(varchar,varchar)
+create or replace function acs_sc_impl__get_id(varchar,varchar)
 returns integer as '
 declare
     p_impl_contract_name        alias for $1;
@@ -282,10 +281,10 @@
 
     return v_impl_id;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
-create function acs_sc_impl__get_name(integer)
+create or replace function acs_sc_impl__get_name(integer)
 returns varchar as '
 declare
     p_impl_id                   alias for $1;
@@ -298,11 +297,11 @@
 
     return v_impl_name;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 
 
-create function acs_sc_impl__delete(varchar,varchar)
+create or replace function acs_sc_impl__delete(varchar,varchar)
 returns integer as '
 declare
     p_impl_contract_name        alias for $1;
@@ -322,7 +321,7 @@
 
 
 
-create function acs_sc_impl_alias__new(varchar,varchar,varchar,varchar,varchar)
+create or replace function acs_sc_impl_alias__new(varchar,varchar,varchar,varchar,varchar)
 returns integer as '
 declare
     p_impl_contract_name        alias for $1;
@@ -358,7 +357,7 @@
 
 
 
-create function acs_sc_impl_alias__delete(varchar,varchar,varchar)
+create or replace function acs_sc_impl_alias__delete(varchar,varchar,varchar)
 returns integer as '
 declare
     p_impl_contract_name        alias for $1;
@@ -380,7 +379,7 @@
 
 
 
-create function acs_sc_binding__new(integer,integer)
+create or replace function acs_sc_binding__new(integer,integer)
 returns integer as '
 declare
     p_contract_id               alias for $1;
@@ -419,7 +418,7 @@
 
 
 
-create function acs_sc_binding__new(varchar,varchar)
+create or replace function acs_sc_binding__new(varchar,varchar)
 returns integer as '
 declare
     p_contract_name             alias for $1;
@@ -444,7 +443,7 @@
 end;' language 'plpgsql';
 
 
-create function acs_sc_binding__delete(integer,integer)
+create or replace function acs_sc_binding__delete(integer,integer)
 returns integer as '
 declare
     p_contract_id               alias for $1;
@@ -459,7 +458,7 @@
 end;' language 'plpgsql';
 
 
-create function acs_sc_binding__delete(varchar,varchar)
+create or replace function acs_sc_binding__delete(varchar,varchar)
 returns integer as '
 declare
     p_contract_name             alias for $1;
@@ -480,7 +479,7 @@
 
 
 
-create function acs_sc_binding__exists_p(varchar,varchar)
+create or replace function acs_sc_binding__exists_p(varchar,varchar)
 returns integer as '
 declare
     p_contract_name             alias for $1;
@@ -501,7 +500,7 @@
 
     return v_exists_p;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 
Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-init-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/Attic/acs-service-contract-init-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-init-postgresql.xql	11 Dec 2003 21:39:54 -0000	1.2
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+
+<fullquery name="binding_exists_p">
+<querytext>
+select acs_sc_binding__exists_p(:impl_contract_name,:impl_name)
+</querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/acs-service-contract-init.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-service-contract/tcl/acs-service-contract-init.tcl	16 Oct 2002 15:10:04 -0000	1.4
+++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-init.tcl	11 Dec 2003 21:39:54 -0000	1.5
@@ -9,7 +9,7 @@
 
     acs_sc_log SCDebug "ACS_SC_PROC: checking binding exists for contract $impl_contract_name impl $impl_name"
 
-    set binding_exists_p [db_string binding_exists_p {select acs_sc_binding__exists_p(:impl_contract_name,:impl_name)}]
+    set binding_exists_p [db_string binding_exists_p {*SQL*}]
 
     if $binding_exists_p {
 	acs_sc_proc $impl_contract_name $impl_operation_name $impl_name
Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/Attic/acs-service-contract-procs-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs-oracle.xql	9 Oct 2001 04:57:37 -0000	1.1
+++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs-oracle.xql	11 Dec 2003 21:39:55 -0000	1.2
@@ -10,6 +10,32 @@
 </querytext>
 </fullquery>
 
+<fullquery name="acs_sc_get_alias.get_alias">
+<querytext>
+   select impl_alias, impl_pl 	 
+         from   acs_sc_impl_aliases 	 
+         where  impl_contract_name = :contract 	 
+         and    impl_operation_name = :operation 	 
+         and    impl_name = :impl
+</querytext>
+</fullquery>
+
+
+<fullquery name="acs_sc_proc.get_operation_definition">
+<querytext>
+	select 
+	    operation_desc,
+	    operation_iscachable_p,
+	    operation_nargs,
+	    operation_inputtype_id,
+	    operation_outputtype_id
+	from acs_sc_operations
+	where contract_name = :contract
+	and operation_name = :operation
+</querytext>
+</fullquery>
+
+
 <fullquery name="acs_sc_proc.operation_inputtype_element">
 <querytext>
 	select 
Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/Attic/acs-service-contract-procs-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs-postgresql.xql	11 Dec 2003 21:39:55 -0000	1.2
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+
+<fullquery name="acs_sc_binding_exists_p.binding_exists_p">
+<querytext>
+select acs_sc_binding__exists_p(:contract,:impl)
+</querytext>
+</fullquery>
+
+<fullquery name="acs_sc_get_alias.get_alias">
+<querytext>
+   select impl_alias, impl_pl 	 
+         from   acs_sc_impl_aliases 	 
+         where  impl_contract_name = :contract 	 
+         and    impl_operation_name = :operation 	 
+         and    impl_name = :impl
+</querytext>
+</fullquery>
+
+<fullquery name="acs_sc_proc.get_operation_definition">
+<querytext>
+	select 
+	    operation_desc,
+	    operation_iscachable_p,
+	    operation_nargs,
+	    operation_inputtype_id,
+	    operation_outputtype_id
+	from acs_sc_operations
+	where contract_name = :contract
+	and operation_name = :operation
+</querytext>
+</fullquery>
+
+
+<fullquery name="acs_sc_proc.operation_inputtype_element">
+<querytext>
+	select 
+	    element_name, 
+	    acs_sc_msg_type__get_name(element_msg_type_id) as element_msg_type_name,
+	    element_msg_type_isset_p,
+	    element_pos
+	from acs_sc_msg_type_elements
+	where msg_type_id = :operation_inputtype_id
+	order by element_pos asc
+</querytext>
+</fullquery>
+
+<fullquery name="acs_sc_proc.operation_outputtype_element">
+<querytext>
+	select 
+	    element_name, 
+	    acs_sc_msg_type__get_name(element_msg_type_id) as element_msg_type_name,
+	    element_msg_type_isset_p,
+	    element_pos
+	from acs_sc_msg_type_elements
+	where msg_type_id = :operation_outputtype_id
+	order by element_pos asc
+</querytext>
+</fullquery>
+
+
+</queryset>
Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl	10 Sep 2003 14:52:01 -0000	1.19
+++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl	11 Dec 2003 21:39:55 -0000	1.20
@@ -77,7 +77,7 @@
     @author Neophytos Demetriou
 } {
 
-    return [db_string binding_exists_p {select acs_sc_binding__exists_p(:contract,:impl)}]
+    return [db_string binding_exists_p {*SQL*}]
 
 }
 
@@ -107,18 +107,12 @@
 } {
     # LARS
     set exists_p [acs_sc_binding_exists_p $contract $impl]
-    
+
     #set exists_p [util_memoize "acs_sc_binding_exists_p $contract $impl"]
-    
+
     if ![set exists_p] {return ""}
     
-    db_0or1row get_alias {
-	select impl_alias, impl_pl
-	from   acs_sc_impl_aliases
-	where  impl_contract_name = :contract
-	and    impl_operation_name = :operation
-	and    impl_name = :impl
-    }
+    db_0or1row get_alias {*SQL*}
 
     return [list $impl_alias $impl_pl]
 
@@ -151,50 +145,22 @@
 	error "ACS-SC: Cannot find alias for $proc_name"
     }
 
-    if {![db_0or1row get_operation_definition {
-	select 
-	    operation_desc,
-	    operation_iscachable_p,
-	    operation_nargs,
-	    operation_inputtype_id,
-	    operation_outputtype_id
-	from acs_sc_operations
-	where contract_name = :contract
-	and operation_name = :operation
-    }]} { 
+    if {![db_0or1row get_operation_definition {*SQL*}]} { 
         ns_log warning "ACS-SC: operation definition not found for contract $contract operation $operation"
         return 0
     }
 
     append docblock "\n<b>acs-service-contract operation.  Call via acs_sc_call.</b>\n\n$operation_desc\n\n"
 
-    db_foreach operation_inputtype_element {
-	select 
-	    element_name, 
-	    acs_sc_msg_type__get_name(element_msg_type_id) as element_msg_type_name,
-	    element_msg_type_isset_p,
-	    element_pos
-	from acs_sc_msg_type_elements
-	where msg_type_id = :operation_inputtype_id
-	order by element_pos asc
-    } {
+    db_foreach operation_inputtype_element {*SQL*} {
 	lappend arguments "$element_name"
 	append docblock "\n@param $element_name $element_msg_type_name"
 	if { $element_msg_type_isset_p } {
 	    append docblock " \[\]"
 	}
     }
 
-    db_foreach operation_outputtype_element {
-	select 
-	    element_name, 
-	    acs_sc_msg_type__get_name(element_msg_type_id) as element_msg_type_name,
-	    element_msg_type_isset_p,
-	    element_pos
-	from acs_sc_msg_type_elements
-	where msg_type_id = :operation_outputtype_id
-	order by element_pos asc
-    } {
+    db_foreach operation_outputtype_element {*SQL*} {
 	append docblock "\n@return <b>$element_name</b> - $element_msg_type_name"
 	if { $element_msg_type_isset_p } {
 	    append docblock " \[\]"
@@ -270,6 +236,8 @@
     {arguments ""}
     {impl ""}
 } {
+    Additional documentation and commentary at http://openacs.org/forums/message-view?message_id=108614.
+
     @param contract the contract name 
     @param operation the method to invoke
     @param arguments list of arguments to pass to the method
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 -N -r1.59 -r1.60
--- openacs-4/packages/acs-subsite/acs-subsite.info	12 Nov 2003 18:20:34 -0000	1.59
+++ openacs-4/packages/acs-subsite/acs-subsite.info	11 Dec 2003 21:39:55 -0000	1.60
@@ -1,24 +1,25 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-subsite" url="http://www.openacs.org/acs-repository/apm/packages/acs-subsite/" type="apm_service">
+<package key="acs-subsite" url="http://openacs.org/repository/apm/packages/acs-subsite/" type="apm_service">
     <package-name>Subsite</package-name>
     <pretty-plural>Subsite Services</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
-    
-    <version name="5.0.0a5" url="http://www.openacs.org/repository/download/apm/acs-subsite-5.0.0a5.apm">
+
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-subsite-5.0.0b4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <summary>Provides the ability to create subsite within the OpenACS Community System.</summary>
+        <summary>Subsite</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
-        <description format="text/html">Aware of parties, groups, users, portraits, ...</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Provides for creating subsites within the OpenACS Community System.  Aware of parties, groups, users, portraits.  Can be themed via a per subsite master template.</description>
 
-        <provides url="acs-subsite" version="5.0.0a5"/>
-        <requires url="acs-content-repository" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
-        <requires url="acs-tcl" version="5.0.0a5"/>
 
+        <provides url="acs-subsite" version="5.0.0b4"/>
+        <requires url="acs-content-repository" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
+        <requires url="acs-tcl" version="5.0.0b4"/>
+
         <callbacks>
             <callback type="before-upgrade"  proc="subsite::before_upgrade"/>
             <callback type="after-mount"  proc="subsite::after_mount"/>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v
diff -u -N -r1.44 -r1.45
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	3 Nov 2003 09:53:16 -0000	1.44
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	11 Dec 2003 21:39:55 -0000	1.45
@@ -28,6 +28,9 @@
   <msg key="Action">Action</msg>
   <msg key="Add_new_app">Add new application</msg>
   <msg key="Admin">Admin</msg>
+  <msg key="Subsites">Subsites</msg>
+  <msg key="subsites">subsites</msg>
+  <msg key="subsite">subsite</msg>
   <msg key="Administer_subsite">Administer %subsite_name%</msg>
   <msg key="Administrative_options">Administrative options for this user</msg>
   <msg key="Alert_Type">Alert Type</msg>
@@ -62,13 +65,10 @@
   </msg>
   <msg key="Close_your_account">Close your account</msg>
   <msg key="Comment">Comment</msg>
-  <msg key="Communities">Communities</msg>
-  <msg key="communities">communities</msg>
-  <msg key="community">community</msg>
   <msg key="Confirm">Confirm</msg>
   <msg key="Continue">Continue</msg>
   <msg key="Country_Name">Country Name</msg>
-  <msg key="Create_new_community">Create new %pretty_name%</msg>
+  <msg key="Create_new_subsite">Create new subsite</msg>
   <msg key="Current_Password">Current Password</msg>
   <msg key="Currently_invisible_msg">&lt;p&gt; Your online status is currently not visible to other users. &lt;/p&gt;</msg>
   <msg key="Currently_visible_msg">&lt;p&gt; Your online status is currently visible to other users. &lt;/p&gt;</msg>
@@ -135,14 +135,14 @@
   <msg key="ISO_Code_List">ISO Code List</msg>
   <msg key="ISO_Codes_Not_Loaded">ISO Codes Not Loaded</msg>
   <msg key="ISO_Codes_not_loaded">ISO Codes not loaded</msg>
-  <msg key="Join_community">Join community</msg>
+  <msg key="Join_subsite">Join subsite</msg>
   <msg key="Join_group_name">Join %group_name%</msg>
-  <msg key="Join_this_community">Join this community</msg>
+  <msg key="Join_this_subsite">Join this subsite</msg>
   <msg key="Keyword">Keyword</msg>
   <msg key="Last_name">Last name</msg>
   <msg key="later">later.</msg>
-  <msg key="Leave_community">Leave community</msg>
-  <msg key="Leave_this_community">Leave this community</msg>
+  <msg key="Leave_this_subsite">Leave this subsite</msg>
+  <msg key="Leave_subsite">Leave subsite</msg>
   <msg key="lGo_back_without_adding">Go back without adding any users</msg>
   <msg key="Log_In">Log In</msg>
   <msg key="log_in">log in</msg>
@@ -297,7 +297,7 @@
   <msg key="Reject">Reject</msg>
   <msg key="Remember_my_login">Remember my login on this computer</msg>
   <msg key="Remove">Remove</msg>
-  <msg key="Req_membership_comm">Request membership of this community</msg>
+  <msg key="Req_membership_subs">Request membership of this subsite</msg>
   <msg key="Request_membership">Request membership</msg>
   <msg key="return_to_application">return to application</msg>
   <msg key="Revoke_Checked">Revoke Checked</msg>
@@ -314,9 +314,6 @@
   <msg key="Status">Status</msg>
   <msg key="Story_Behind_Photo">Story Behind Photo</msg>
   <msg key="Story_behind_photo">Story Behind Photo</msg>
-  <msg key="Subcommunities">Subcommunities</msg>
-  <msg key="subcommunities">subcommunities</msg>
-  <msg key="subcommunity">subcommunity</msg>
   <msg key="Thank_you">Thank you.</msg>
   <msg key="The_ISO_codes_were_not">The ISO codes were not loaded on this server.</msg>
   <msg key="this_subsite">this subsite</msg>
Index: openacs-4/packages/acs-subsite/lib/applications.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/applications.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/lib/applications.adp	12 Oct 2003 19:50:30 -0000	1.2
+++ openacs-4/packages/acs-subsite/lib/applications.adp	11 Dec 2003 21:39:55 -0000	1.3
@@ -1,4 +1,4 @@
-<p><listtemplate name="applications"></listtemplate></p>
+<listtemplate name="applications"></listtemplate>
 
 <if @add_url@ not nil>
   <p> <b>&raquo;</b> <a href="@add_url@">#acs-subsite.Add_new_app#</a> </p>
Index: openacs-4/packages/acs-subsite/lib/applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/applications.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/lib/applications.tcl	28 Oct 2003 13:33:47 -0000	1.3
+++ openacs-4/packages/acs-subsite/lib/applications.tcl	11 Dec 2003 21:39:55 -0000	1.4
@@ -14,34 +14,27 @@
         }
     }
 
+set subsite_node_id [subsite::get_element -element node_id]
 
+set user_id [ad_conn user_id]
 
-set applications [list]
-
-foreach url [site_node::get_children -package_type apm_application -node_id [subsite::get_element -element node_id]] {
-    array unset node 
-    array set node [site_node::get_from_url -url $url -exact]
-
-    if { [permission::permission_p -object_id $node(object_id) -privilege read] } {
-        lappend applications [list \
-                                  $node(instance_name) \
-                                  $node(node_id) \
-                                  $node(name) \
-                                  $node(object_id)]
-    }
+db_multirow applications select_applications {
+    select p.package_id,
+           p.instance_name,
+           n.node_id, 
+           n.name
+    from   site_nodes n,
+           apm_packages p,
+           apm_package_types t
+    where  n.parent_id = :subsite_node_id
+    and    p.package_id = n.object_id
+    and    t.package_key = p.package_key
+    and    t.package_type = 'apm_application'
+    and    exists (select 1 
+                   from   all_object_party_privilege_map perm 
+                   where  perm.object_id = p.package_id
+                   and    perm.privilege = 'read'
+                   and    perm.party_id = :user_id)
+    order  by upper(instance_name)
 }
 
-# Sort them by instance_name
-set applications [lsort -index 0 $applications]
-
-multirow create applications instance_name node_id name package_id read_p
-
-foreach elm $applications {
-    multirow append applications \
-        [lindex $elm 0] \
-        [lindex $elm 1] \
-        [lindex $elm 2] \
-        [lindex $elm 3] \
-        [lindex $elm 4]
-}
-
Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/acs-subsite/lib/login.tcl	10 Nov 2003 16:51:01 -0000	1.19
+++ openacs-4/packages/acs-subsite/lib/login.tcl	11 Dec 2003 21:39:55 -0000	1.20
@@ -171,8 +171,8 @@
     array set auth_info [auth::authenticate \
                              -return_url $return_url \
                              -authority_id $authority_id \
-                             -email $email \
-                             -username $username \
+                             -email [string trim $email] \
+                             -username [string trim $username] \
                              -password $password \
                              -persistent=[expr $allow_persistent_login_p && [template::util::is_true $persistent_p]]]
     
Index: openacs-4/packages/acs-subsite/lib/services.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/Attic/services.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/lib/services.adp	8 Oct 2003 07:32:42 -0000	1.1
+++ openacs-4/packages/acs-subsite/lib/services.adp	11 Dec 2003 21:39:55 -0000	1.2
@@ -1 +1 @@
-<p><listtemplate name="services"></listtemplate></p>
+<listtemplate name="services"></listtemplate>
Index: openacs-4/packages/acs-subsite/lib/subsites.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/lib/subsites.adp	12 Oct 2003 19:50:30 -0000	1.3
+++ openacs-4/packages/acs-subsite/lib/subsites.adp	11 Dec 2003 21:39:55 -0000	1.4
@@ -1,5 +1,5 @@
-<p><listtemplate name="subsites"></listtemplate></p>
+<listtemplate name="subsites"></listtemplate>
 
 <if @add_url@ not nil>
-  <p> <b>&raquo;</b> <a href="@add_url@">#acs-subsite.Create_new_community#</a> </p>
+  <p> <b>&raquo;</b> <a href="@add_url@">#acs-subsite.Create_new_subsite#</a> </p>
 </if>
Index: openacs-4/packages/acs-subsite/sql/postgresql/application-groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/postgresql/application-groups-create.sql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/sql/postgresql/application-groups-create.sql	28 Aug 2003 09:41:39 -0000	1.8
+++ openacs-4/packages/acs-subsite/sql/postgresql/application-groups-create.sql	11 Dec 2003 21:39:55 -0000	1.9
@@ -111,7 +111,7 @@
     return v_group_id;
   end if;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 insert into group_type_rels
 (group_rel_type_id, group_type, rel_type)
Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/tcl/group-procs.tcl	10 Nov 2003 12:35:39 -0000	1.16
+++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl	11 Dec 2003 21:39:55 -0000	1.17
@@ -426,7 +426,6 @@
 } {
     Adds a user to a group, checking that the rel_type is permissible given the user's privileges, 
     Can default both the rel_type and the member_state to their relevant values.
-    Deletes any existing relation of the same rel_type between the same group and the same user.
 } {       
     set admin_p [permission::permission_p -object_id $group_id -privilege "admin"]
     
@@ -449,11 +448,6 @@
                               -join_policy $group(join_policy) \
                               -create_p $create_p]
     }
-
-    set existing_rel_id [relation::get_id -object_id_one $group_id -object_id_two $user_id -rel_type $rel_type]
-    if { ![empty_string_p $existing_rel_id] } {
-        relation_remove $existing_rel_id
-    }
     
     relation_add -member_state $member_state $rel_type $group_id $user_id
 }
Index: openacs-4/packages/acs-subsite/tcl/relation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/relation-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/tcl/relation-procs.tcl	30 Sep 2003 12:10:03 -0000	1.8
+++ openacs-4/packages/acs-subsite/tcl/relation-procs.tcl	11 Dec 2003 21:39:55 -0000	1.9
@@ -93,13 +93,17 @@
 
 	# Check to see if constraints are violated because of this new
 	# relation
-	set violated_err_msg [db_string select_rel_violation {
-	    select rel_constraint.violation(:rel_id) from dual
-	} -default ""]
 
-	if { ![empty_string_p $violated_err_msg] } {
-	    error $violated_err_msg
-	}
+	# JCD: this is enforced by trigger so no longer check explicitly
+	# see membership_rels_in_tr
+	# 
+	# set violated_err_msg [db_string select_rel_violation {
+	#    select rel_constraint.violation(:rel_id) from dual
+	# } -default ""]
+	#
+	# if { ![empty_string_p $violated_err_msg] } {
+	#     error $violated_err_msg
+	# }
     } on_error {
 	return -code error $errmsg
     }
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	27 Oct 2003 11:11:39 -0000	1.17
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	11 Dec 2003 21:39:55 -0000	1.18
@@ -53,10 +53,12 @@
             set segment_name "$truncated_subsite_name Members"
             set segment_id [rel_segments_new $subsite_group_id membership_rel $segment_name]
 
-            # Create a constraint that says "to be a member of this subsite you must be a member
-            # of the parent subsite.
+            # Create a constraint that says "to be a member of this
+            # subsite you must be a member of the parent subsite".
+	    set subsite_id [site_node_closest_ancestor_package acs-subsite]
 
             db_1row parent_subsite_query {}
+
             set constraint_name "Members of [string range $subsite_name 0 30] must be members of [string range $supersite_name 0 30]"
             set user_id [ad_conn user_id]
             set creation_ip [ad_conn peeraddr]
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/Attic/subsite-procs.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.xql	17 May 2003 09:58:37 -0000	1.4
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.xql	11 Dec 2003 21:39:55 -0000	1.5
@@ -32,7 +32,7 @@
          where s1.node_id = :node_id
            and s2.node_id = s1.parent_id
            and p.package_id = s2.object_id
-	   and m.package_id = s2.object_id 
+	   and m.package_id = :subsite_id
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl	2 Nov 2003 15:57:47 -0000	1.1
+++ openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl	11 Dec 2003 21:39:55 -0000	1.2
@@ -6,6 +6,50 @@
     @cvs-id $Id$
 }
 
+aa_register_case acs_subsite_expose_bug_1144 {
+    Exposes Bug 1144.
+
+    @author Peter Marklund
+} {
+
+    aa_run_with_teardown \
+        -rollback \
+        -test_code {
+
+            array set main_node [site_node::get_from_url -url "/"]
+            set main_group_id [application_group::group_id_from_package_id \
+                              -package_id $main_node(package_id)]
+            
+            set email "__test@test.test"
+            array set creation_info [auth::create_user \
+                                     -username "__test" \
+                                     -email $email \
+                                     -first_names "__Test first" \
+                                     -last_name "__Test last" \
+                                     -password 1 \
+                                     -password_confirm 1]
+     
+            group::add_member \
+                -group_id $main_group_id \
+                -user_id $creation_info(user_id) \
+                -rel_type admin_rel
+
+            set cc_users_count [db_string count_cc_users {
+                select count(*)
+                from cc_users
+                where email = :email
+            }]
+            aa_equals "New user occurs only once in cc_users" $cc_users_count 1
+
+            set registered_users_count [db_string count_registered_users {
+                select count(*)
+                from registered_users
+                where email = :email
+            }]
+            aa_equals "New user occurs only once in registered_users" $registered_users_count 1
+        }
+}
+
 aa_register_case acs_subsite_trivial_smoke_test {
     Minimal smoke test.
 } {    
Index: openacs-4/packages/acs-subsite/www/group-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/group-master.tcl	10 Oct 2003 09:02:18 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/group-master.tcl	11 Dec 2003 21:39:55 -0000	1.7
@@ -28,8 +28,13 @@
 # Context bar
 if { [template::util::is_nil no_context_p] } {
     if { ![template::util::is_nil context] } {
-        set context_bar [eval ad_context_bar -from_node $subsite_node_id $context]
+        set cmd [list ad_context_bar -from_node $subsite_node_id --]
+        foreach elem $context {
+            lappend cmd $elem
+        }
+        set context_bar [eval $cmd]
     }
+
     if [template::util::is_nil context_bar] { 
         set context_bar [ad_context_bar -from_node $subsite_node_id]
     }
Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/index.adp	12 Oct 2003 19:50:30 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/index.adp	11 Dec 2003 21:39:55 -0000	1.17
@@ -6,17 +6,17 @@
     <if @main_site_p@ false>  
       <if @group_member_p@ true>
         <span class="button"><a href="group-leave" class="button"
-          title="#acs-subsite.Leave_this_community#">#acs-subsite.Leave_community#</a></span>
+          title="#acs-subsite.Leave_this_subsite#">#acs-subsite.Leave_subsite#</a></span>
       </if>
       <else>
         <if @can_join_p@ true>
           <if @group_join_policy@ eq "open">
             <a href="register/user-join" class="button"
-              title="#acs-subsite.Join_this_community">#acs-subsite.Join_community#</a>
+              title="#acs-subsite.Join_this_subsite">#acs-subsite.Join_subsite#</a>
           </if>
           <else>
             <a href="register/user-join" class="button"
-              title="#acs-subsite.Req_membership_comm#">#acs-subsite.Request_membership#</a>
+              title="#acs-subsite.Req_membership_subs#">#acs-subsite.Request_membership#</a>
           </else>
         </if>
       </else>
@@ -34,7 +34,7 @@
       <include src="/packages/acs-subsite/lib/applications">
     </td>
     <td valign="top">
-      <h2>@communities_label@</h2>
+      <h2>#acs-subsite.Subsites#</h2>
       <include src="/packages/acs-subsite/lib/subsites">
     </td>
   </tr>
Index: openacs-4/packages/acs-subsite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/index.tcl	16 Oct 2003 20:45:43 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/index.tcl	11 Dec 2003 21:39:55 -0000	1.17
@@ -55,5 +55,3 @@
 
 set can_join_p [expr !$group_admin_p && $group_member_p == 0 && $user_id != 0 && ![string equal $group_join_policy "closed"]]
 
-set communities_label [ad_decode $main_site_p 1 "[_ acs-subsite.Communities]" \
-	"[_ acs-subsite.Subcommunities]"]
Index: openacs-4/packages/acs-subsite/www/admin/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/configure.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/configure.tcl	16 Oct 2003 20:24:57 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/configure.tcl	11 Dec 2003 21:39:55 -0000	1.8
@@ -11,16 +11,14 @@
 set context [list "Configuration"]
 
 
-# TODO: Add join policy
-
 ad_form -name name -cancel_url [ad_conn url] -mode display -form {
     {instance_name:text
         {label "Subsite name"}
         {html {size 50}}
     }
     {master_template:text(select)
         {label "Template"}
-        {help_text "Choose the layout and navigation you want for your community."}
+        {help_text "Choose the layout and navigation you want for your subsite."}
         {options [subsite::get_template_options]}
     }
     {visibility:text(select)
Index: openacs-4/packages/acs-subsite/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/acs-subsite/www/admin/index.adp	10 Nov 2003 13:58:22 -0000	1.19
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	11 Dec 2003 21:39:55 -0000	1.20
@@ -7,7 +7,7 @@
   <li><a href="permissions">Permissions</a>
   <li><a href="../members/">Members</a>
   <li><a href="../shared/parameters">Parameters</a>
-  <li><a href="subsite-add">Create new @subsite_label@</a>
+  <li><a href="subsite-add">Create new subsite</a>
 </ul>
 
 <h2>Advanced Features</h2>
Index: openacs-4/packages/acs-subsite/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/www/admin/index.tcl	2 Oct 2003 22:15:49 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl	11 Dec 2003 21:39:55 -0000	1.12
@@ -29,9 +29,4 @@
 
 set acs_lang_admin_url "[apm_package_url_from_key "acs-lang"]admin/"
 
-if { [string equal [ad_conn package_url] "/"] } {
-    set subsite_label "community"
-} else {
-    set subsite_label "subcommunity"
-}
 
Index: openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl	10 Oct 2003 11:34:51 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/subsite-add.tcl	11 Dec 2003 21:39:55 -0000	1.8
@@ -1,5 +1,5 @@
 ad_page_contract {
-    Create and mount a new Subsite/Community.
+    Create and mount a new Subsite
 
     @author Steffen Tiedemann Christensen (steffen@christensen.name)
     @creation-date 2003-09-26
@@ -9,31 +9,27 @@
 
 auth::require_login
 
-if { [string equal [ad_conn package_url] "/"] } {
-    set page_title "New community"
-    set subsite_pretty_name "Community name"
-} else {
-    set page_title "New subcommunity"
-    set subsite_pretty_name "Subcommunity name"
-}
+set page_title "New subsite"
+set subsite_pretty_name "Subsite name"
+
 set context [list $page_title]
 
 
 ad_form -name subsite -cancel_url . -form {
     {node_id:key}
     {instance_name:text
         {label $subsite_pretty_name}
-        {help_text "The name of the new community you're setting up."}
+        {help_text "The name of the new subsite you're setting up."}
         {html {size 30}}
     }
-    {folder:text,optional
+    {folder:url_element(text),optional
         {label "URL folder name"}
         {help_text "This should be a short string, all lowercase, with hyphens instead of spaces, whicn will be used in the URL of the new application. If you leave this blank, we will generate one for you from name of the application."}
         {html {size 30}}
     }
     {master_template:text(select)
         {label "Template"}
-        {help_text "Choose the layout and navigation you want for your community."}
+        {help_text "Choose the layout and navigation you want for your subsite."}
         {options [subsite::get_template_options]}
     }
     {visibility:text(select)
@@ -81,7 +77,7 @@
         }
         
     } on_error {
-        ad_return_error "Problem Creating Application" "We had a problem creating the community."
+        ad_return_error "Problem Creating Application" "We had a problem creating the subsite."
     }
 } -after_submit {
     ad_returnredirect ../$folder
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	22 May 2003 14:08:33 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	11 Dec 2003 21:39:55 -0000	1.4
@@ -4,7 +4,7 @@
 
 <include src="elements-display-list" group_id="@group_id;noquote@" rel_type="@rel_type;noquote@" member_state="@member_state;noquote@">
 
-<if @member_state;noquote@ eq approved or @member_state;noquote@ eq "">
+<if @member_state@ eq approved or @member_state@ eq "">
     <if @create_p@ eq 1>
       <ul>
         <li> <a href=../relations/add?group_id=@group_id@&rel_type=@rel_type_enc@&return_url=@return_url_enc@>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/Attic/elements-display-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display-oracle.xql	11 Aug 2001 21:31:03 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display-oracle.xql	11 Dec 2003 21:39:55 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-
+<!-- used in elements-display.adp ... ugh -->
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/Attic/elements-display-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display-postgresql.xql	11 Aug 2001 21:31:03 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display-postgresql.xql	11 Dec 2003 21:39:55 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-
+<!-- used in elements-display.adp ... ugh -->
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql	1 May 2003 20:42:51 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql	11 Dec 2003 21:39:56 -0000	1.8
@@ -52,7 +52,11 @@
                          parent_id
                   from site_nodes n
                   where (object_id is null
-                  or acs_permission.permission_p(object_id, :user_id, 'read') = 't')
+                         or exists (
+                            select 1 from acs_object_party_privilege_map ppm 
+                             where ppm.object_id = n.object_id 
+                               and ppm.party_id = :user_id 
+                               and ppm.privilege = 'read'))
             start with node_id = nvl(:root_id, site_node.node_id('/'))
             connect by prior node_id = parent_id and parent_id in ([join $expand ", "])) site_map
             where site_map.object_id = p.package_id (+)
@@ -64,16 +68,15 @@
         <querytext>
             select package_id,
                    ap.package_key,
-                   acs_object.name(package_id) as instance_name,
+                   ap.instance_name,
                    apm_package_type.num_parameters(ap.package_key) as parameter_count
             from apm_packages ap,
                  apm_package_types
             where ap.package_key = apm_package_types.package_key
             and package_type = 'apm_service'
-            and (
-                    acs_permission.permission_p(package_id, :user_id, 'read') = 't'
-                 or acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't'
-                )
+            and not exists (select 1 from site_nodes sn where sn.object_id = package_id)
+            and exists (select 1 from acs_object_party_privilege_map ppm 
+                        where ppm.object_id = package_id and ppm.party_id = :user_id and ppm.privilege = 'admin')
             order by instance_name
         </querytext>
     </fullquery>
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql	1 May 2003 20:42:51 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql	11 Dec 2003 21:39:56 -0000	1.10
@@ -25,27 +25,28 @@
                    pretty_name as package_pretty_name,
                    apm_package_type__num_parameters(package_key) as parameter_count,
                    node_id, url, parent_url, name, root_p, mylevel, object_id,
-                   object_name, directory_p, parent_id, n_children,
-                   (select case when acs_permission__permission_p(object_id, :user_id, 'admin') = 't' then 1 else 0 end) as object_admin_p
+                   directory_p, parent_id, n_children,
+                   p.instance_name as object_name,
+                   acs_permission__permission_p(object_id, :user_id, 'admin') as object_admin_p
             from apm_packages p join apm_package_types using (package_key) right outer join
                  (select n.node_id,
                          site_node__url(n.node_id) as url,
                          site_node__url(n.parent_id) as parent_url,
                          n.name,
-                         (select count(*)
-                          from site_nodes
-                          where parent_id = n.node_id) as n_children,
-                         case when n.node_id = site_node__node_id('/', null) then 1 else 0 end as root_p,
-                         (select tree_level(n.tree_sortkey) - tree_level(n2.tree_sortkey)
-                          from site_nodes n2
-                          where n2.node_id = coalesce(:root_id, site_node__node_id('/', null))) as mylevel,
+                         case when exists (select 1 from site_nodes where parent_id = n.node_id) then 1 else 0 end as n_children,
+                         case when n.node_id = (select site_node__node_id('/', null)) then 1 else 0 end as root_p,
+                         (tree_level(n.tree_sortkey) - (select tree_level(n2.tree_sortkey) from site_nodes n2 where n2.node_id = (select coalesce(:root_id, site_node__node_id('/', null))))) as mylevel,
                          n.object_id,
-                         acs_object__name(n.object_id) as object_name,
                          n.directory_p,
                          n.parent_id
                   from site_nodes n, site_nodes n2
-                  where (n.object_id is null or acs_permission__permission_p(n.object_id, :user_id, 'read'))
-                  and n2.node_id = coalesce(:root_id, site_node__node_id('/', null))
+                  where (n.object_id is null
+                         or exists (
+                            select 1 from acs_object_party_privilege_map ppm 
+                             where ppm.object_id = n.object_id 
+                               and ppm.party_id = :user_id 
+                               and ppm.privilege = 'read'))
+                  and n2.node_id = (select coalesce(:root_id, site_node__node_id('/', null)))
                   and n.tree_sortkey between n2.tree_sortkey and tree_right(n2.tree_sortkey)
                   and (n.parent_id is null or n.parent_id in ([join $expand ", "]))) site_map
             on site_map.object_id = p.package_id
@@ -57,16 +58,15 @@
         <querytext>
             select package_id,
                    ap.package_key,
-                   acs_object__name(package_id) as instance_name,
+                   ap.instance_name,
                    apm_package_type__num_parameters(ap.package_key) as parameter_count
             from apm_packages ap,
                  apm_package_types
             where ap.package_key = apm_package_types.package_key
             and package_type = 'apm_service'
-            and (
-                    acs_permission__permission_p(package_id, :user_id, 'read') = 't'
-                 or acs_permission__permission_p(package_id, acs__magic_object_id('the_public'), 'read') = 't'
-                )
+            and not exists (select 1 from site_nodes sn where sn.object_id = package_id)
+            and exists (select 1 from acs_object_party_privilege_map ppm 
+                        where ppm.object_id = package_id and ppm.party_id = :user_id and ppm.privilege = 'admin')
             order by instance_name
         </querytext>
     </fullquery>
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	3 Oct 2003 18:33:05 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	11 Dec 2003 21:39:56 -0000	1.19
@@ -291,16 +291,14 @@
 <a href=\"unmounted\">Manage unmounted applications</a>
 </p>
 
-<h2>Set Parameters</h2>
+<h2>Services</h2>
        <ul>
 "
 
 
 db_foreach services_select {} {
     if {$parameter_count > 0} {
-        if {[ad_permission_p $package_id admin]} {		
-	    doc_body_append "  <li><a href=\"[export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]\">$instance_name</a>"
-	}
+        doc_body_append "  <li><a href=\"[export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]\">$instance_name</a>"
     }
     doc_body_append "\n"
 } if_no_rows {
Index: openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	11 Nov 2003 13:14:51 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	11 Dec 2003 21:39:56 -0000	1.10
@@ -13,7 +13,7 @@
     {new_package_id:integer ""}
     node_id:integer,notnull
     {new_node_p f}
-    {node_name ""}
+    {node_name:trim ""}
     {instance_name ""}
     package_key:notnull
     {expand:integer,multiple ""}
@@ -62,7 +62,7 @@
 
 } on_error {
     if {![db_string package_new_doubleclick_ck {} -default 0]} {
-	ad_return_complaint "Error Creating Package" "The following error was generated
+	ad_return_complaint 1 "Error Creating Package: The following error was generated
 		when attempting to create the package
 	<blockquote><pre>
 		[ad_quotehtml $errmsg]
Index: openacs-4/packages/acs-subsite/www/members/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-new.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/members/user-new.tcl	10 Nov 2003 12:36:20 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/members/user-new.tcl	11 Dec 2003 21:39:56 -0000	1.6
@@ -5,7 +5,7 @@
     @creation-date 2003-06-02
     @cvs-id $Id$
 } {
-    email
+    email:trim
 }
 
 auth::require_login
Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl	29 Sep 2003 11:52:55 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl	11 Dec 2003 21:39:56 -0000	1.5
@@ -2,6 +2,7 @@
 } {
     object_id:integer,notnull
     return_url
+    page:integer,optional
 }
 
 # check they have read permission on this file
@@ -17,15 +18,12 @@
 
 set perm_url "[site_node_closest_ancestor_package_url]permissions/"
 
-db_multirow -extend { add_url } users users_who_dont_have_any_permissions {} {
-    set add_url [export_vars -base "${perm_url}perm-user-add-2" { return_url object_id user_id }]
-}
-
-
 list::create \
     -name users \
     -multirow users \
     -key user_id \
+    -page_size 20 \
+    -page_query_name users_who_dont_have_any_permissions_paginator \
     -no_data "There are no users who don't already have access to this object" \
     -bulk_action_export_vars { return_url object_id } \
     -bulk_actions [list \
@@ -45,9 +43,17 @@
             link_html { title "Add this user" }
             display_template "Add"
         }
+    } -filters {
+	object_id {}
+	return_url {}
     }
 
+set page_where_clause [list::page_where_clause -name users -and]
+
+db_multirow -extend { add_url } users users_who_dont_have_any_permissions {} {
+    set add_url [export_vars -base "${perm_url}perm-user-add-2" { return_url object_id user_id }]
+}
+
 set img_path "[ad_conn package_url]images"
 
 set form_export_vars [export_vars -form {object_id return_url }]
-
Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.xql	11 Dec 2003 21:39:56 -0000	1.2
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+<fullquery name="users_who_dont_have_any_permissions">
+      <querytext>
+
+    select u.user_id,
+           u.first_names || ' ' || u.last_name as name,
+           u.email
+    from   cc_users u
+    where  u.user_id not in (select grantee_id from acs_permissions_all where object_id = :object_id)
+           $page_where_clause
+    order  by upper(first_names), upper(last_name)
+
+      </querytext>
+</fullquery>
+
+<fullquery name="users_who_dont_have_any_permissions_paginator">
+      <querytext>
+
+    select u.user_id
+    from   cc_users u
+    where  u.user_id not in (select grantee_id from acs_permissions_all where object_id = :object_id)
+    order  by upper(first_names), upper(last_name)
+
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/www/shared/community-member.tcl	24 Sep 2003 15:19:24 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl	11 Dec 2003 21:39:56 -0000	1.12
@@ -21,7 +21,6 @@
     url:onevalue
     bio:onevalue
     verified_user_id:onevalue
-    user_contributions:multirow
     subsite_url:onevalue
 }
 
Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -N -r1.30 -r1.31
--- openacs-4/packages/acs-tcl/acs-tcl.info	10 Nov 2003 14:28:56 -0000	1.30
+++ openacs-4/packages/acs-tcl/acs-tcl.info	11 Dec 2003 21:39:56 -0000	1.31
@@ -1,21 +1,22 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-tcl" url="http://www.arsdgita.com/acs-repository/apm/packages/acs-tcl" type="apm_service">
+<package key="acs-tcl" url="http://openacs.org/repository/apm/packages/acs-tcl" type="apm_service">
     <package-name>Tcl Library</package-name>
     <pretty-plural>Tcl Libraries</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/repository/download/apm/acs-tcl-5.0.0a5.apm">
-        <owner url="http://www.openacs.org">OpenACS</owner>
-        <summary>The Tcl library procedures that comprise the ACS Kernel.</summary>
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-tcl-5.0.0b4.apm">
+        <owner url="http://openacs.org">OpenACS</owner>
+        <summary>The Kernel Tcl API library.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Contains all the core Tcl API, including the request processor, security and session management, permissions, site-nodes, package management infrastructure, etc.</description>
 
-        <provides url="acs-tcl" version="5.0.0a5"/>
-        <requires url="acs-bootstrap-installer" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-tcl" version="5.0.0b4"/>
+        <requires url="acs-bootstrap-installer" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/00-database-procs.tcl,v
diff -u -N -r1.44 -r1.45
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	10 Nov 2003 13:35:02 -0000	1.44
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	11 Dec 2003 21:39:56 -0000	1.45
@@ -783,12 +783,11 @@
                       ' language 'plpgsql'"
 
         set ret_val [ns_db 0or1row $db "select $function_name ()"]
+        
         # drop the anonymous function (OpenACS - Dan)
+        # JCD: ignore return code -- maybe we should be smarter about this though.
+        catch {ns_db dml $db "drop function $function_name ()"} 
 
-	# bartt: Wait a second to workaround a problem in PostgreSQL 7.3.
-	# The problem only occured here. Couldn't reproduce it elsewhere.
-        after 1000 {ns_db dml $db "drop function $function_name ()"}
-
         return $ret_val
 
     } error]
@@ -2584,13 +2583,13 @@
 
         postgresql {
             set sql_table_names_with_pattern {
-                select relname
+                select relname as table_name
                 from pg_class
                 where relname like lower(:pattern) and
                 relname !~ '^pg_' and relkind = 'r'
             }
             set sql_table_names_without_pattern {
-                select relname
+                select relname as table_name
                 from pg_class
                 where relname !~ '^pg_' and relkind = 'r'
             }
Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	3 Oct 2003 09:21:39 -0000	1.13
+++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	11 Dec 2003 21:39:56 -0000	1.14
@@ -268,12 +268,12 @@
 		}
 		
 		"last_name_starts_with" {
-		    lappend where_clauses "upper(users.last_name) like upper([ns_dbquotevalue "${last_name_starts_with}%"])"
+		    lappend where_clauses "lower(users.last_name) like lower([ns_dbquotevalue "${last_name_starts_with}%"])"
 		    # note the added percent sign  here
 		    
 		}
 		"email_starts_with" {
-		    lappend where_clauses "upper(users.email) like upper([ns_dbquotevalue "${email_starts_with}%"])"
+		    lappend where_clauses "lower(users.email) like lower([ns_dbquotevalue "${email_starts_with}%"])"
 		    # note the added percent sign  here
 		    
 		}
Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v
diff -u -N -r1.29 -r1.30
--- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl	21 Oct 2003 13:54:07 -0000	1.29
+++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl	11 Dec 2003 21:39:56 -0000	1.30
@@ -516,34 +516,41 @@
     @return If successful, a path to the .info file of the package uncompressed 
             into the apm-workspace directory
 
-} {
-    apm_callback_and_log $callback "<li>Downloading $url..."
-    if { [catch {
-	# Open a destination file.
-	set file_path [ns_tmpnam].apm
-	set fileChan [open $file_path w+ 0600]
-	# Open the channel to the server.
-	set httpChan [lindex [ns_httpopen GET $url] 0]
-	ns_log Debug "APM: Copying data from $url"
-	# Copy the data
-	fcopy $httpChan $fileChan
-	# Clean up.
-	ns_log Debug "APM: Done copying data."
-	close $httpChan
-	close $fileChan
-    } errmsg] } {
-	apm_callback_and_log $callback "Unable to download. Please check your URL.</ul>.
-	The following error was returned: <blockquote><pre>[ad_quotehtml $errmsg]
-	</pre></blockquote>[ad_footer]"
-	return
-    }	
+} {    
+    # First download the apm file if a URL is provided
+    if { ![empty_string_p $url] } {
+        apm_callback_and_log $callback "<li>Downloading $url..."
+        if { [catch {
+            # Open a destination file.
+            set file_path [ns_tmpnam].apm
+            set fileChan [open $file_path w 0640]
+            # Open the channel to the server.
+            set httpChan [lindex [ns_httpopen GET $url] 0]
+            ns_log Debug "APM: Copying data from $url"
+            fconfigure $httpChan -encoding binary
+            fconfigure $fileChan -encoding binary
+            # Copy the data
+            fcopy $httpChan $fileChan
+            # Clean up.
+            ns_log Debug "APM: Done copying data."
+            close $httpChan
+            close $fileChan
+        } errmsg] } {
+            apm_callback_and_log $callback "Unable to download. Please check your URL.</ul>.
+            The following error was returned: <blockquote><pre>[ad_quotehtml $errmsg]
+            </pre></blockquote>[ad_footer]"
+            return
+        }	
 
-    if {![file exists $file_path]} {
-	apm_callback_and_log $callback  "
-	The file cannot be found.  Your URL or your file name is incorrect.  Please verify that the file name
-	is correct and try again."
-	return
+        if {![file exists $file_path]} {
+            apm_callback_and_log $callback  "
+            The file cannot be found.  Your URL or your file name is incorrect.  Please verify that the file name
+            is correct and try again."
+            ns_log Error "Error loading APM file form url $url: The file cannot be found."
+            return
+        }
     }
+
     if { [catch {
 	set files [split [string trim \
 		[exec [apm_gunzip_cmd] -q -c $file_path | [apm_tar_cmd] tf - 2>/dev/null] "\n"]]
@@ -552,11 +559,14 @@
 	apm_callback_and_log $callback "The follow error occured during the uncompression process:
 	<blockquote><pre>[ad_quotehtml $errmsg]</pre></blockquote><br>
 	"
+        global errorInfo
+        ns_log Error "Error loading APM file form url $url: $errmsg\n$errorInfo"
 	return
     }
 	
     if { [llength $files] == 0 } {
 	apm_callback_and_log $callback  "The archive does not contain any files.\n"
+        ns_log Error "Error loading APM file form url $url: The archive does not contain any files."
 	return
     }
 
@@ -569,22 +579,25 @@
 	    apm_callback_and_log $callback  "All files in the archive must be contained in the same directory 
 	    (corresponding to the package's key). This is not the case, so the archive is not 
 	    a valid APM file.\n"
+            ns_log Error "Error loading APM file form url $url: Invalid APM file. All files in the archive must be contained in the same directory corresponding to the package's key."
 	    return
 	}
     
 	if { [llength $components] == 2 && ![string compare [file extension $file] ".info"] } {
 	    if { [info exists info_file] } {
 		apm_callback_and_log $callback  "The archive contains more than one <tt>package/*/*.info</tt> file, so it is not a valid APM file.</ul>\n"
+                ns_log Error "Error loading APM file form url $url: Invalid APM file. More than one package .info file."
 		return
 	    } else {
 	    set info_file $file
 	    }
 	}
     }
-	if { ![info exists info_file] || [regexp {[^a-zA-Z0-9\-\./_]} $info_file] } {
-	apm_callback_and_log $callback  "The archive does not contain a <tt>*/*.info</tt> file, so it is not 
-	a valid APM file.</ul>\n"
-	return
+    if { ![info exists info_file] || [regexp {[^a-zA-Z0-9\-\./_]} $info_file] } {
+        apm_callback_and_log $callback  "The archive does not contain a <tt>*/*.info</tt> file, so it is not 
+        a valid APM file.</ul>\n"
+        ns_log Error "Error loading APM file form url $url: Invalid APM file. No package .info file."
+        return
     }
 
     apm_callback_and_log $callback  "Extracting the .info file (<tt>$info_file</tt>)..."
@@ -602,6 +615,8 @@
 	<p>
 	The package cannot be installed.
 	</ul>\n"
+        global errorInfo
+        ns_log Error "Error loading APM file form url $url: Bad package .info file. $errmsg\n$errorInfo"
 	return
     }
     file delete -force $tmpdir
@@ -611,8 +626,8 @@
     ns_log Debug "APM: Preparing to load $pretty_name $version_name"
     # Determine if this package version is already installed.
     if {[apm_package_version_installed_p $package_key $version_name]} {	
-	apm_callback_and_log $callback  "<li>$pretty_name $version_name is already installed in your system.
-	"
+	apm_callback_and_log $callback  "<li>$pretty_name $version_name is already installed in your system."
+        ns_log Error "Error loading APM file form url $url: Package $pretty_name $version_name is already installed"
     } else {
 	
 	set install_path "[apm_workspace_install_dir]"
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -N -r1.70 -r1.71
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	24 Nov 2003 10:48:33 -0000	1.70
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	11 Dec 2003 21:39:56 -0000	1.71
@@ -623,12 +623,7 @@
         return
     }
 
-    if { $upgrade_p } {
-        # Reset the upgrade status of message catalog keys before we load the catalog files
-        lang::catalog::reset_upgrade_status_message_keys $package_key
-    }
-
-    # Load and cache I18N messages
+    # Load and cache I18N messages for all enabled locales
     lang::catalog::import -cache -package_key $package_key
 }
 
@@ -918,16 +913,66 @@
 }
 
 ad_proc -private apm_package_delete {
+    {-sql_drop_scripts ""}
     { 
 	-callback apm_dummy_callback
     }
     {-remove_files:boolean}
     package_key
 } {
     
-    Deinstalls and deletes a package from the ACS and the filesystem.
+    Deinstall a package from the system. Will unmount and uninstantiate
+    package instances, invoke any before-unstall callback, source any
+    provided sql drop scripts, remove message keys, and delete
+    the package from the APM tables.
 
 } {
+    set version_id [apm_version_id_from_package_key $package_key]
+
+    # Unmount all instances of this package with the Tcl API that 
+    # invokes before-unmount callbacks
+    db_foreach all_package_instances {
+        select site_nodes.node_id
+        from apm_packages, site_nodes
+        where apm_packages.package_id = site_nodes.object_id
+        and   apm_packages.package_key = :package_key
+    } {
+        set url [site_node::get_url -node_id $node_id]
+        apm_callback_and_log $callback "Unmounting package instance at url $url <br />"
+        site_node::unmount -node_id $node_id
+    }    
+
+    # Delete the package instances with Tcl API that invokes 
+    # before-uninstantiate callbacks
+    db_foreach all_package_instances {
+        select package_id
+        from apm_packages
+        where package_key = :package_key
+    } {
+        apm_callback_and_log $callback "Deleting package instance $package_id <br />"
+        apm_package_instance_delete $package_id
+    }
+
+    # Invoke the before-uninstall Tcl callback before the sql drop scripts
+    apm_invoke_callback_proc -version_id $version_id -type before-uninstall
+
+    # Source SQL drop scripts
+    if {![empty_string_p $sql_drop_scripts]} {
+        
+        apm_callback_and_log $callback "Now executing drop scripts.
+    <ul>
+    "
+        foreach path $sql_drop_scripts {
+    	apm_callback_and_log $callback "<li><pre>"
+    	db_source_sql_file -callback $callback "[acs_package_root_dir $package_key]/$path"
+    	apm_callback_and_log $callback "</pre>"
+        }
+    }    
+
+    # Unregister I18N messages
+    lang::catalog::package_delete -package_key $package_key
+
+    # Remove package from APM tables
     apm_callback_and_log $callback "<li>Deleting $package_key..."
     db_exec_plsql apm_package_delete {
 	begin
@@ -937,7 +982,8 @@
             );
 	end;
     }
-    # Remove the files from the filesystem
+
+    # Optionally remove the files from the filesystem
     if {$remove_files_p==1} {
 	if { [catch { 
 	    file delete -force [acs_package_root_dir $package_key] 
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -N -r1.63 -r1.64
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	1 Nov 2003 08:45:37 -0000	1.63
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	11 Dec 2003 21:39:56 -0000	1.64
@@ -126,7 +126,7 @@
     doc_body_append $string
 }
 
-ad_proc apm_callback_and_log { { -severity Debug } callback message } {
+ad_proc apm_callback_and_log { { -severity Notice } callback message } {
 
     Executes the $callback callback routine with $message as an argument,
     and calls ns_log with the given $severity.
Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql	1 Nov 2003 10:46:32 -0000	1.15
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs-oracle.xql	11 Dec 2003 21:39:56 -0000	1.16
@@ -50,10 +50,10 @@
   <querytext>
       select distinct u.first_names || ' ' || u.last_name || ' (' || u.email || ')' as name, u.user_id
       from   cc_users u
-      where  upper(nvl(u.first_names || ' ', '')  ||
+      where  lower(nvl(u.first_names || ' ', '')  ||
              nvl(u.last_name || ' ', '') ||
              u.email || ' ' ||
-             nvl(u.screen_name, '')) like upper('%'||:value||'%')
+             nvl(u.screen_name, '')) like lower('%'||:value||'%')
       order  by name
   </querytext>
 </fullquery>
@@ -126,7 +126,7 @@
                  creation_ip
           from   cc_users 
           where  authority_id = :authority_id
-          and    upper(username) = upper(:username)
+          and    lower(username) = lower(:username)
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql	1 Nov 2003 10:46:32 -0000	1.17
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs-postgresql.xql	11 Dec 2003 21:39:56 -0000	1.18
@@ -46,10 +46,10 @@
   <querytext>
       select distinct u.first_names || ' ' || u.last_name || ' (' || u.email || ')' as name, u.user_id
       from   cc_users u
-      where  upper(coalesce(u.first_names || ' ', '')  ||
+      where  lower(coalesce(u.first_names || ' ', '')  ||
              coalesce(u.last_name || ' ', '') ||
              u.email || ' ' ||
-             coalesce(u.screen_name, '')) like upper('%'||:value||'%')
+             coalesce(u.screen_name, '')) like lower('%'||:value||'%')
       order  by name
   </querytext>
 </fullquery>
@@ -122,7 +122,7 @@
                  creation_ip
           from   cc_users 
           where  authority_id = :authority_id
-          and    upper(username) = upper(:username)
+          and    lower(username) = lower(:username)
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl,v
diff -u -N -r1.39 -r1.40
--- openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	1 Nov 2003 10:46:32 -0000	1.39
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	11 Dec 2003 21:39:56 -0000	1.40
@@ -13,9 +13,7 @@
 namespace eval acs_user {}
 
 ad_proc -private cc_lookup_screen_name_user { screen_name } {
-    return [db_string user_select {
-        select user_id from cc_users where upper(screen_name) = upper(:screen_name)
-    } -default ""]
+    return [db_string user_select {*SQL*} -default {}]
 }
 
 ad_proc cc_screen_name_user { screen_name } {
@@ -30,17 +28,13 @@
 ad_proc -private cc_lookup_email_user { email } {
     Return the user_id of a user given the email. Returns the empty string if no such user exists.
 } {
-    return [db_string user_select {
-        select user_id from cc_users where email = lower(:email)
-    } -default ""]
+    return [db_string user_select {*SQL*} -default {}]
 }
 
 ad_proc -public cc_email_from_party { party_id } {
     @return The email address of the indicated party.
 } {
-    return [db_string email_from_party {
-        select email from parties where party_id = :party_id
-    } -default ""]
+    return [db_string email_from_party {*SQL*} -default {}]
 }
 
 ad_proc cc_email_user { email } {
@@ -53,9 +47,7 @@
 }
 
 ad_proc -private cc_lookup_name_group { name } {
-    return [db_string group_select {
-        select group_id from groups where group_name = :name
-    } -default ""]
+    return [db_string group_select {*SQL*} -default {}]
 }
 
 ad_proc cc_name_to_group { name } {
@@ -123,12 +115,7 @@
         set user_id [db_exec_plsql user_insert {}]
 
         # set password_question, password_answer
-        db_dml update_question_answer {
-            update users
-            set    password_question = :password_question,
-                   password_answer = :password_answer
-            where  user_id = :user_id
-        }
+        db_dml update_question_answer {*SQL*} 
 
         if {[catch {
             # Call the extension
@@ -318,11 +305,7 @@
 } {
     Change the membership state of a user.
 } {
-    set rel_id [db_string select_rel_id {
-        select rel_id
-        from cc_users
-        where user_id = :user_id
-    } -default ""]
+    set rel_id [db_string select_rel_id {*SQL*} -default {}]
 
     if {[empty_string_p $rel_id]} {
         return
@@ -479,7 +462,7 @@
 
     @author Peter Marklund
 } {
-    db_1row select_user_info {} -column_array row
+    db_1row select_user_info {*SQL*} -column_array row
     
     return [array get row]
 }
@@ -490,7 +473,7 @@
 
     @author Peter Marklund
 } {
-    db_1row select_user_info {} -column_array row
+    db_1row select_user_info {*SQL*} -column_array row
 
     return [array get row]
 }
@@ -584,9 +567,7 @@
     Returns the user_id from a screen_name, or empty string if no user found.
     Searches all users, including banned, deleted, unapproved, etc.
 } {
-    return [db_string select_user_id_by_screen_name { 
-        select user_id from users where screen_name = :screen_name 
-    } -default {}]
+    return [db_string select_user_id_by_screen_name {*SQL*} -default {}]
 }
 
 
@@ -606,8 +587,8 @@
     }
 
     return [permission::permission_p -party_id $user_id \
-                                     -object_id [acs_lookup_magic_object security_context_root] \
-                                     -privilege "admin"]
+		-object_id [acs_lookup_magic_object security_context_root] \
+		-privilege "admin"]
 }
 
 
@@ -657,6 +638,6 @@
 
     @return party_id
 } {
-    return [db_string select_party_id {} -default {}]
+    return [db_string select_party_id {*SQL*} -default {}]
 }
 
Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.xql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-tcl/tcl/community-core-procs.xql	3 Oct 2003 13:12:43 -0000	1.11
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs.xql	11 Dec 2003 21:39:56 -0000	1.12
@@ -4,17 +4,25 @@
 <fullquery name="cc_lookup_screen_name_user.user_select">      
       <querytext>
       
-	select user_id from cc_users where upper(screen_name) = upper(:screen_name)
+	select user_id from cc_users where lower(screen_name) = lower(:screen_name)
     
       </querytext>
 </fullquery>
 
+<fullquery name="cc_lookup_email_user.user_select">      
+      <querytext>
+      
+	select user_id from cc_users where lower(email) = lower(:email)
+    
+      </querytext>
+</fullquery>
+
  
 <fullquery name="cc_email_from_party.email_from_party">      
       <querytext>
-      
+
 	select email from parties where party_id = :party_id
-    
+
       </querytext>
 </fullquery>
 
@@ -112,7 +120,7 @@
 
             select user_id
             from   users
-            where  upper(username) = upper(:username)
+            where  lower(username) = lower(:username)
             and    authority_id =:authority_id
 
       </querytext>
@@ -138,4 +146,44 @@
       </querytext>
 </fullquery>
 
+
+<fullquery name="party::get_by_email.select_party_id">
+      <querytext>
+      
+        select party_id 
+        from   parties 
+        where  lower(email) = lower(:email)
+
+      </querytext>
+</fullquery>
+
+<fullquery name="acs_user::get_user_id_by_screen_name.select_user_id_by_screen_name">
+      <querytext>
+
+	select user_id from users where lower(screen_name) = lower(:screen_name)
+
+      </querytext>
+</fullquery>
+
+<fullquery name="acs_user::change_state.select_rel_id">
+      <querytext>
+
+	select rel_id
+        from cc_users
+        where user_id = :user_id
+
+      </querytext>
+</fullquery>
+
+<fullquery name="ad_user_new.update_question_answer">
+      <querytext>
+
+            update users
+            set    password_question = :password_question,
+                   password_answer = :password_answer
+            where  user_id = :user_id
+
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -N -r1.39 -r1.40
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	29 Oct 2003 20:53:30 -0000	1.39
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	11 Dec 2003 21:39:56 -0000	1.40
@@ -16,6 +16,7 @@
     data is to be added, or existing data modified.   You can declare form validation blocks that
     are similar in spirit to those found in ad_page_contract.
 
+    <p><a href="/doc/form-builder.html">Developer's Guide fo ad_form</a>
     <p>
 
     We use the standard OpenACS Templating System (ATS) form builder's form and element create 
@@ -425,7 +426,7 @@
     </blockquote>
 
     <blockquote><pre>
-    start_date:date,to_sql(sql_date),to_html(sql_date),optional
+    start_date:date,to_sql(linear_date),to_html(sql_date),optional
     </pre><p>
 
     Define the optional element "start_date" of type "date", get the sql_date property before executing
@@ -934,9 +935,9 @@
             if { [info exists values($element_name)] } {
                 if { [info exists af_flag_list(${form_name}__$element_name)] && \
                      [lsearch $af_flag_list(${form_name}__$element_name) multiple] >= 0 } {
-                    template::element set_properties $form_name $element_name -values $values($element_name)
+                    template::element set_values $form_name $element_name $values($element_name)
                 } else {
-                    template::element set_properties $form_name $element_name -value $values($element_name)
+                    template::element set_value $form_name $element_name $values($element_name)
                 }
             }
         }
Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -N -r1.30 -r1.31
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	24 Nov 2003 13:35:10 -0000	1.30
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	11 Dec 2003 21:39:56 -0000	1.31
@@ -1227,20 +1227,53 @@
     {-maxlen 70}
     text
 } {
-    Converts a chunk of text from text/html to text/html.
-    Text to text does nothing, but html to html closes any unclosed html tags (see util_close_html_tags).
-    Text to html does ad_text_to_html, and html to text does a ad_html_to_text.
-    See those procs for details.
+    Converts a chunk of text from a variety of formats to either 
+    text/html or text/plain.
 
-    DRB: Modified this to accept mime types (text/plain or text/html).  Simplies things when 
-    providing confirmation pages for input destined for the content repository ...
+    <p>
 
-    @param from specify with html or text what type of text you're providing.
-    @param to specify what format you want this translated into
+    Html to html closes any unclosed html tags 
+    (see util_close_html_tags).
     
+    <p>
+
+    Text to html does ad_text_to_html, and html to text does a 
+    ad_html_to_text. See those procs for details.
+
+    <p>
+
+    When text is empty, then an empty string will be returned 
+    regardless of any format. This is especially useful when
+    displaying content that was created with the richtext widget
+    and might contain empty values for content and format.
+
+    @param from specify what type of text you're providing. Allowed values:
+    <ul>
+    <li>text/plain</li>
+    <li>text/enhanced</li>
+    <li>text/fixed-width</li>
+    <li>text/html</li>
+    </ul>
+
+    @param to specify what format you want this translated into. Allowed values: 
+    <ul>
+    <li>text/plain</li>
+    <li>text/html</li>
+    </ul>
+
+    @param maxlen the maximum line width when generating text/plain
+    
     @author Lars Pind (lars@pinds.com)
     @creation-date 19 July 2000
-} {
+} { 
+    # DRB: Modified this to accept mime types (text/plain or
+    # text/html).  Simplies things when providing confirmation pages
+    # for input destined for the content repository ...
+
+    if { [empty_string_p $text] } {
+        return ""
+    }
+
     set valid_froms { text/enhanced text/plain text/fixed-width text/html }
     set valid_tos { text/plain text/html }
     
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.59 -r1.60
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	27 Nov 2003 15:25:18 -0000	1.59
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	11 Dec 2003 21:39:56 -0000	1.60
@@ -1637,6 +1637,9 @@
 ad_proc -public exists_and_not_null { varname } {
     Returns 1 if the variable name exists in the caller's environment and 
     is not the empty string.
+
+    Note you should enter the variable name, and not the variable value 
+    (varname not $varname which will pass variable varnames value into this function).
 } {
     upvar 1 $varname var 
     return [expr { [info exists var] && ![empty_string_p $var] }] 
@@ -4649,3 +4652,20 @@
     regsub -all {\]} $string {\]} string
     return $string
 }
+
+ad_proc -public util::interval_pretty {
+    {-seconds 0}
+} { 
+    Takes a number of seconds and returns a pretty interval of the form "3h 49m 13s"
+} {
+    set result {}
+    if { $seconds > 0 } {
+        set hrs [expr $seconds / (60*60)]
+        set mins [expr ($seconds / 60) % 60]
+        set secs [expr $seconds % 60]
+        if { $hrs > 0 } { append result "${hrs}h " }
+        if { $hrs > 0 || $mins > 0 } { append result "${mins}m " }
+        append result "${secs}s"
+    }
+    return $result
+}
Index: openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl	11 Dec 2003 21:39:56 -0000	1.2
@@ -0,0 +1,51 @@
+ad_library {
+    
+    Tests that deal with the html parsing procs of openacs.
+
+    @creation-date 15 November 2003
+}
+
+
+aa_register_case ad_html_to_text_bold {
+
+    Test if it converts b tags correctly.
+
+} {
+
+    set html "Some <b>bold</b> test"
+
+    set result [ad_html_to_text $html]
+
+    aa_true "contains asterisks?" [regexp {\*bold\*} $result]
+
+}
+
+
+aa_register_case ad_html_to_text_clipped_link {
+
+    Test if it converts clipped links.
+
+    http://openacs.org/bugtracker/openacs/bug?bug_number=386
+} {
+
+    # try with missing leading and trailing quote
+
+    foreach html {{
+Some <a href="abc>linktext</a> bla
+<p>
+following text
+} {
+Some <a href=abc">linktext</a> bla
+<p>
+following text
+    }} {
+	set result [ad_html_to_text $html]
+
+	# make sure the desired text is in there and _before_ the
+	# footnotes
+
+	aa_true "contains link" [regexp {linktext.*\[1\]} $result]
+	aa_true "contains following text" [regexp {following text.*\[1\]} $result]
+    }
+}
+
Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/acs-templating/acs-templating.info	10 Nov 2003 14:28:56 -0000	1.21
+++ openacs-4/packages/acs-templating/acs-templating.info	11 Dec 2003 21:39:56 -0000	1.22
@@ -1,23 +1,31 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-templating" url="http://www.openacs.org/repository/apm/packages/acs-templating/" type="apm_service">
+<package key="acs-templating" url="http://openacs.org/repository/apm/packages/acs-templating/" type="apm_service">
     <package-name>Templating</package-name>
     <pretty-plural>Templating Services</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/repository/download/apm/acs-templating-5.0.0a5.apm">
-        <owner url="http://www.openacs.org">OpenACS</owner>
-        <summary>Separate page layout and implementation.</summary>
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-templating-5.0.0b4.apm">
+        <owner url="http://openacs.org">OpenACS</owner>
+        <summary>Templating library.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org">OpenACS</vendor>
-        <description format="text/html">The template system provides mechanisms that allow developers and graphic designers to work independently. Templates specify the layout of the page seperately from the contents of the page. Graphic designers work primarily on the layout part of the template (the template), while programmers work primarily a script that generates the the content part of the template (the code). In addition, the
-template system provides a way to use a single layout
-specification for many physical pages, so the overall layout of a site can be more easily administered.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">
+The templating system provides the tag library and support routines
+that allow developers and graphic designers to work
+independently. Templates specify the layout of the page seperately
+from the contents of the page. Graphic designers work primarily on the
+layout part of the template (the template), while programmers work
+primarily a script that generates the the content part of the template
+(the code). In addition, the template system provides a way to use a
+single layout specification for many physical pages, so the overall
+layout of a site can be more easily administered.
+</description>
 
-        <provides url="acs-templating" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="acs-templating" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
             <callback type="before-upgrade"  proc="template::apm::before_upgrade"/>
Index: openacs-4/packages/acs-templating/resources/forms/grid.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/grid.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-templating/resources/forms/grid.adp	22 Sep 2003 17:42:56 -0000	1.5
+++ openacs-4/packages/acs-templating/resources/forms/grid.adp	11 Dec 2003 21:39:57 -0000	1.6
@@ -35,22 +35,26 @@
         <if @elements.widget@ in radio checkbox>
           <table cellpadding=4 cellspacing=0 border=0>
             <tr>
-            ~formgroup id=@elements.id@>
-              <td>+formgroup.widget+</td><td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">+formgroup.label+</label></td>
-            </formgroup>
+              <noparse>
+                <formgroup id=@elements.id@>
+                  <td>\@formgroup.widget\@</td><td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option\@">\@formgroup.label\@</label></td>
+                </formgroup>
+              </noparse>
             </tr>
           </table>
-          ~formerror id=@elements.id@><br><font color="red"><b>+formerror.@elements.id@+<b></font>~/formerror>
+          <noparse><formerror id=@elements.id@><br><font color="red"><b>\@formerror.@elements.id@\@<b></font></formerror></noparse>
         </if>
           
         <else>         
           <if @elements.widget@ eq inform>
-            ~formwidget id=@elements.id@>
+            <noparse><formwidget id=@elements.id@></noparse>
           </if>
           <else>
-            ~formwidget id=@elements.id@>
-            ~formerror id=@elements.id@><br><font color="red"><b>
-                +formerror.@elements.id@+<b></font>~/formerror>
+            <noparse>
+              <formwidget id=@elements.id@>
+              <formerror id=@elements.id@><br><font color="red"><b>
+                \@formerror.@elements.id@\@<b></font></formerror>
+            </noparse>
           </else>
         </else>
 
@@ -83,11 +87,6 @@
 
 <multiple name=elements>
   <if @elements.widget@ eq "hidden">
-     ~formwidget id=@elements.id@>
+     <noparse><formwidget id=@elements.id@></noparse>
   </if>
 </multiple> 
-
-
-
-
-
Index: openacs-4/packages/acs-templating/tcl/data-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/data-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-templating/tcl/data-procs.tcl	15 Oct 2003 12:35:51 -0000	1.11
+++ openacs-4/packages/acs-templating/tcl/data-procs.tcl	11 Dec 2003 21:39:57 -0000	1.12
@@ -173,6 +173,31 @@
   return $result 
 }
 
+ad_proc -public template::data::validate::url_element { value_ref message_ref } {
+
+    Beautiful URL elements that may only contain lower case 
+    characters, numbers and hyphens.
+
+    <p>
+
+
+    @see util_text_to_url if you want to offer auto-generation of URLs based on a pretty name
+
+    @author Tilmann Singer
+
+} {
+    upvar 2 $message_ref message $value_ref value
+
+    set expr {^[a-z0-9-]+$}
+    set result [regexp $expr $value]
+
+    if { ! $result } {
+	set message "Invalid url \"$value\". Please use only lowercase characters, numbers and hyphens, e.g. \"foo-bar\"."
+    }
+   
+    return $result 
+}
+
 ad_proc -public template::data::validate::date { value_ref message_ref } {
 
   upvar 2 $message_ref message $value_ref value
Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/acs-templating/tcl/date-procs.tcl	15 Oct 2003 12:35:51 -0000	1.23
+++ openacs-4/packages/acs-templating/tcl/date-procs.tcl	11 Dec 2003 21:39:57 -0000	1.24
@@ -309,7 +309,7 @@
            ![string equal $minutes {}] } {
 	  append value " [string range $pad [string length $hours] end]${hours}:[string range $pad [string length $minutes] end]$minutes"
 	  if { ![string equal $seconds {}] } {
-	      append value ":[string range $pad [string length $seconds] end]$second"
+	      append value ":[string range $pad [string length $seconds] end]$seconds"
 	  }
       }
       return $value
Index: openacs-4/packages/acs-templating/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/element-procs.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/acs-templating/tcl/element-procs.tcl	1 Nov 2003 08:45:37 -0000	1.21
+++ openacs-4/packages/acs-templating/tcl/element-procs.tcl	11 Dec 2003 21:39:57 -0000	1.22
@@ -269,6 +269,19 @@
   set element(values) [list $value]
 }
 
+ad_proc -public template::element::set_values { form_id element_id values } {
+    Sets the list of values of an element
+
+    @param form_id     The identifier of the form containing the element.
+    @param element_id  The unique identifier of the element.
+    @param values      The list of values to apply
+} {
+
+  get_reference
+
+  set element(values) [list $values]
+}
+
 ad_proc -public template::element::get_value { form_id element_id } {
     Retrieves the current value of an element.  Typically used following
     a valid form submission to retrieve the submitted value.
Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	1 Nov 2003 08:45:37 -0000	1.25
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	11 Dec 2003 21:39:57 -0000	1.26
@@ -343,9 +343,6 @@
 
   template::code::adp::$file_stub
 
-  # unprotect registered tags and variable references
-  set __adp_output [string map { ~ < + @ } $__adp_output]
-
   return $__adp_output
 }
 
@@ -745,9 +742,7 @@
   
   foreach name [array names values] {
     
-    template::element set_properties $id $name -value $values($name) 
-    # Resolve single value  / multiple value issues ?
-    template::element set_properties $id $name -values [list $values($name)]
+    template::element set_value $id $name $values($name) 
   }
 }
 
Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	10 Nov 2003 10:20:47 -0000	1.12
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	11 Dec 2003 21:39:57 -0000	1.13
@@ -65,6 +65,7 @@
         -actions [list "Add item" [export_vars -base item-add {order_id}] "Add item to this order"] \ 
         -bulk_actions {
             "Remove" "item-remove" "Remove checked items"
+            "Copy" "item-copy" "Copy checked items to clipboard"
         } \ 
         -bulk_action_export_vars {
             order_id
@@ -449,8 +450,18 @@
     # Split the current ordering info into name and direction
     # name is the string before the comma, order (asc/desc) is what's after
     if { [info exists list_properties(filter,$list_properties(orderby_name))] } {
-        foreach { orderby_name orderby_direction } [lrange [split $list_properties(filter,$list_properties(orderby_name)) ","] 0 1] {}
+        foreach { orderby_name orderby_direction } \
+            [lrange [split $list_properties(filter,$list_properties(orderby_name)) ","] 0 1] {}
+
         set list_properties(orderby_selected_name) $orderby_name
+
+        if { [empty_string_p $orderby_direction] } {
+            template::list::orderby::get_reference \
+                -list_name $name \
+                -orderby_name $orderby_name
+    
+            set orderby_direction $orderby_properties(default_direction)
+        }
         set list_properties(orderby_selected_direction) $orderby_direction
     }
 
@@ -2222,6 +2233,15 @@
         <b>orderby_desc</b>: The reverse ordering from 'orderby_asc'.
       </li>
       <li>
+        <b>orderby_name</b>: The name of a named query, same functionality as orderby property.
+      </li>
+      <li>
+        <b>orderby_asc_name</b>: The name of a named query, same functionality as orderby_asc property.
+      </li>
+      <li>
+        <b>orderby_desc_name</b>: The name of a named query, same functionality as orderby_desc property.
+      </li>
+      <li>
         <b>default_direction</b>: The default order direction, 'asc' or 'desc'. Defaults to 'asc'.
       </li>
     </ul>
@@ -2361,6 +2381,22 @@
             set orderby_properties(orderby_asc) "$value asc"
             set orderby_properties(orderby_desc) "$value desc"
         }
+        orderby_asc_name {
+            set orderby_properties($property) $value
+            set value [uplevel $ulevel [list db_map $value]]
+            set orderby_properties(orderby_asc) $value
+        }
+        orderby_desc_name {
+            set orderby_properties($property) $value
+            set value [uplevel $ulevel [list db_map $value]]
+            set orderby_properties(orderby_desc) $value
+        }
+        orderby_name {
+            set orderby_properties($property) $value
+            set value [uplevel $ulevel [list db_map $value]]
+            set orderby_properties(orderby_asc) "$value asc"
+            set orderby_properties(orderby_desc) "$value desc"
+        }
         default {
             # We require all properties to be initialized to the empty string in the array, otherwise they're illegal.
             if { ![info exists orderby_properties($property)] } {
Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-templating/tcl/query-procs.tcl	1 Nov 2003 08:45:37 -0000	1.17
+++ openacs-4/packages/acs-templating/tcl/query-procs.tcl	11 Dec 2003 21:39:57 -0000	1.18
@@ -631,14 +631,14 @@
     <dt> <b>template::multirow append datasourcename value [value ...]</b></dt>
     <dd> appends the row to an existing multirow.</dd>
     <dt> <b>template::multirow pop datasourcename </b></dt>
-    <dd> pops a row off an existing multirow, returning a list of the rows keys and values</dd>
+    <dd> pops a row off an existing multirow, returning a list of the rows keys gand values</dd>
     <dt> <b>template::multirow size datasourcename</b></dt>
     <dd> returns the rowcount</dd>
     <dt> <b>template::multirow columns datasourcename</b></dt>
     <dd> returns the columns in the datasource</dd>
     <dt> <b>template::multirow get datasourcename rownum [column]</b></dt>
     <dd> returns the row of of data (or the particular row/column if column is provided)</dd>
-    <dt> <b>template::multirow get datasourcename rownum column value</b></dt>
+    <dt> <b>template::multirow set datasourcename rownum column value</b></dt>
     <dd> set an element value</dd>
     <dt> <b>template::multirow foreach datasource code </b></dt>
     <dd> evaluate code block for each row (like db_foreach)</dd>
Index: openacs-4/packages/acs-templating/tcl/util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/util-procs.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-templating/tcl/util-procs.tcl	15 Oct 2003 12:35:51 -0000	1.16
+++ openacs-4/packages/acs-templating/tcl/util-procs.tcl	11 Dec 2003 21:39:57 -0000	1.17
@@ -266,12 +266,11 @@
 
     @param arrayname   The name of an array in the calling frame.
 } {
+    upvar $arrayname arr
 
-  upvar $arrayname arr
-
-  foreach { key value } [array get arr] {
-    uplevel "set \{${key}\} \{$value\}"
-  }
+    foreach { key value } [array get arr] {
+        uplevel [list set $key $value]
+    }
 }
 
 ad_proc -public template::util::vars_to_array { arrayname args } {
@@ -412,15 +411,19 @@
     @param level How many levels up the stack to place the new datasource,
                  defaults to 1 level up.
 } {
-    upvar $level $var_name:rowcount rowcount
+    upvar $level $var_name:rowcount rowcount $var_name:columns columns
     set rowcount [llength $rows]
 
     set i 1
     foreach row_set $rows {
+
         ns_set put $row_set rownum $i
 
         upvar $level $var_name:$i row
         array set row [util_ns_set_to_list -set $row_set]
+	if {$i == 1} {
+	    set columns [array names row]
+	} 
         incr i
     }
 }
Index: openacs-4/packages/acs-templating/tcl/widget-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/Attic/widget-procs-oracle.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-templating/tcl/widget-procs-oracle.xql	12 Oct 2003 18:03:22 -0000	1.3
+++ openacs-4/packages/acs-templating/tcl/widget-procs-oracle.xql	11 Dec 2003 21:39:57 -0000	1.4
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <queryset>
 
+<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
 <fullquery name="template::data::transform::party_search.search_persons">      
       <querytext>
         select (first_names || ' ' || last_name) as name, pe.person_id from persons pe, parties pa 
Index: openacs-4/packages/acs-templating/tcl/widget-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/Attic/widget-procs-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-templating/tcl/widget-procs-postgresql.xql	10 Oct 2003 08:23:23 -0000	1.2
+++ openacs-4/packages/acs-templating/tcl/widget-procs-postgresql.xql	11 Dec 2003 21:39:57 -0000	1.3
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
 <fullquery name="template::data::transform::party_search.search_persons">      
       <querytext>
Index: openacs-4/packages/acs-templating/tcl/test/multirow-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/test/multirow-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-templating/tcl/test/multirow-procs.tcl	11 Dec 2003 21:39:57 -0000	1.2
@@ -0,0 +1,30 @@
+ad_library {
+
+    procs for testing the multiple and group tags
+    
+}
+
+
+aa_register_case group_tag {
+    Testing more than one group tag inside multiple.
+
+    <p>
+
+    This test uses to auxiliary files: multirow-test.tcl and 
+    multirow-test.adp - I put them in the same directory 
+    acs-templating/tcl/test for now, but it would be cool
+    to have a way to test adp output without additional 
+    files.
+
+    @see http://openacs.org/bugtracker/openacs/bug?bug_number=428
+} {
+
+    set out [ad_parse_template -params [list [list second_level_stays_p 0]] "/packages/acs-templating/tcl/test/multirow-test"]
+
+    aa_true "contains first heading twice when second level changes" [regexp {f1:.*f1:} $out]
+
+
+    set out [ad_parse_template -params [list [list second_level_stays_p 1]] "/packages/acs-templating/tcl/test/multirow-test"]
+
+    aa_true "contains first heading twice when second level stays the same" [regexp {f1:.*f1:} $out]
+}
Index: openacs-4/packages/acs-templating/tcl/test/multirow-test.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/test/multirow-test.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-templating/tcl/test/multirow-test.adp	11 Dec 2003 21:39:57 -0000	1.2
@@ -0,0 +1,12 @@
+<!-- Used in multirow-procs.tcl -->
+
+<multiple name="test">
+<h1>f1: @test.f1@ </h1>
+<group column="f1">
+<h2>f2: @test.f2@</h2>
+<group column="f2">
+f3: @test.f3@
+<br>
+</group>
+</group>
+</multiple>
Index: openacs-4/packages/acs-templating/tcl/test/multirow-test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/test/multirow-test.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-templating/tcl/test/multirow-test.tcl	11 Dec 2003 21:39:57 -0000	1.2
@@ -0,0 +1,22 @@
+# used in multirow-procs.tcl
+
+template::multirow create test f1 f2 f3
+template::multirow append test I 1 a
+template::multirow append test I 1 b
+template::multirow append test I 1 c
+
+if { $second_level_stays_p } {
+    # the mode that fails - change in level f1 and f3
+    multirow append test I 2 a
+    multirow append test I 1 a
+
+} else {
+    # a mode that works, for testing the test case
+    template::multirow append test I 3 a
+    template::multirow append test I 2 b
+}
+
+template::multirow append test II 1 a
+template::multirow append test II 1 b
+template::multirow append test II 2 a
+template::multirow append test II 2 b
Index: openacs-4/packages/adserver/adserver.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/adserver.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/adserver/adserver.info	17 May 2003 10:10:43 -0000	1.5
+++ openacs-4/packages/adserver/adserver.info	11 Dec 2003 21:39:57 -0000	1.6
@@ -1,103 +1,32 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="adserver" url="http://www.arsdgita.com/acs-repository/apm/packages/adserver" type="apm_application">
+<package key="adserver" url="http://openacs.org/repository/apm/packages/adserver" type="apm_application">
     <package-name>Ad Server</package-name>
     <pretty-plural>adservers</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.2" url="http://www.arsdigita.com/acs-repository/download/apm/adserver-4.2.apm">
+    <version name="4.2" url="http://openacs.org/repository/download/apm/adserver-4.2.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jerry@hollyjerry.org">Jerry Asher</owner>
         <owner url="mailto:janine@furfly.net">Janine Sisk</owner>
-        <summary>Serve ads to users and monitor clickthroughs</summary>
+        <summary>Serve banner ads to users and monitor clickthroughs</summary>
         <release-date>2001-07-09</release-date>
-        <vendor url="www.furfly.net">furfly.net, LLC</vendor>
+        <vendor url="http://www.furfly.net">furfly.net, LLC</vendor>
+        <description format="text/html">Create ad groups and ads and server banners in random rotation with display and clickthrough statistics recorded</description>
 
         <provides url="adserver" version="4.2"/>
         <requires url="acs-kernel" version="4.6.2"/>
 
-        <files>
-            <file type="package_spec" path="adserver.info"/>
-            <file path="sql/CHANGES"/>
-            <file type="data_model_create" db_type="oracle" path="sql/oracle/adserver-create.sql"/>
-            <file type="data_model_drop" db_type="oracle" path="sql/oracle/adserver-drop.sql"/>
-            <file type="data_model_create" db_type="postgresql" path="sql/postgresql/adserver-create.sql"/>
-            <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/adserver-drop.sql"/>
-            <file path="tcl/CHANGES"/>
-            <file type="tcl_procs" path="tcl/adserver-ad-monitor-procs.tcl"/>
-            <file type="query_file" db_type="oracle" path="tcl/adserver-procs-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="tcl/adserver-procs-postgresql.xql"/>
-            <file type="tcl_procs" path="tcl/adserver-procs.tcl"/>
-            <file type="query_file" path="tcl/adserver-procs.xql"/>
-            <file type="content_page" path="www/CHANGES"/>
-            <file type="query_file" db_type="oracle" path="www/adhref-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/adhref-postgresql.xql"/>
-            <file type="content_page" path="www/adhref.tcl"/>
-            <file type="query_file" path="www/adhref.xql"/>
-            <file type="query_file" db_type="oracle" path="www/adimg-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/adimg-postgresql.xql"/>
-            <file type="content_page" path="www/adimg.tcl"/>
-            <file type="query_file" path="www/adimg.xql"/>
-            <file type="content_page" path="www/admin/CHANGES"/>
-            <file type="query_file" db_type="oracle" path="www/admin/add-adv-2-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/add-adv-2-postgresql.xql"/>
-            <file type="content_page" path="www/admin/add-adv-2.tcl"/>
-            <file type="query_file" path="www/admin/add-adv-2.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/add-adv-group-2-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/add-adv-group-2-postgresql.xql"/>
-            <file type="content_page" path="www/admin/add-adv-group-2.tcl"/>
-            <file type="query_file" path="www/admin/add-adv-group-2.xql"/>
-            <file type="content_page" path="www/admin/add-adv-group.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/admin/add-adv-to-group-2-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/add-adv-to-group-2-postgresql.xql"/>
-            <file type="content_page" path="www/admin/add-adv-to-group-2.tcl"/>
-            <file type="content_page" path="www/admin/add-adv-to-group.tcl"/>
-            <file type="query_file" path="www/admin/add-adv-to-group.xql"/>
-            <file type="content_page" path="www/admin/add-adv.tcl"/>
-            <file type="content_page" path="www/admin/all-adv-groups.tcl"/>
-            <file type="content_page" path="www/admin/all-advs.tcl"/>
-            <file type="content_page" path="www/admin/default.adp"/>
-            <file type="content_page" path="www/admin/delete-adv-2.tcl"/>
-            <file type="query_file" path="www/admin/delete-adv-2.xql"/>
-            <file type="content_page" path="www/admin/delete-adv.tcl"/>
-            <file type="query_file" path="www/admin/delete-adv.xql"/>
-            <file type="content_page" path="www/admin/index.tcl"/>
-            <file type="query_file" path="www/admin/index.xql"/>
-            <file type="content_page" path="www/admin/one-adv-detailed-stats.tcl"/>
-            <file type="query_file" path="www/admin/one-adv-detailed-stats.xql"/>
-            <file type="content_page" path="www/admin/one-adv-group.tcl"/>
-            <file type="query_file" path="www/admin/one-adv-group.xql"/>
-            <file type="content_page" path="www/admin/one-adv.tcl"/>
-            <file type="query_file" path="www/admin/one-adv.xql"/>
-            <file type="content_page" path="www/admin/remove-adv-from-group-2.tcl"/>
-            <file type="query_file" path="www/admin/remove-adv-from-group-2.xql"/>
-            <file type="content_page" path="www/admin/remove-adv-from-group.tcl"/>
-            <file type="query_file" path="www/admin/remove-adv-from-group.xql"/>
-            <file type="content_page" path="www/admin/update-adv-group.tcl"/>
-            <file type="query_file" path="www/admin/update-adv-group.xql"/>
-            <file type="content_page" path="www/admin/update-adv.tcl"/>
-            <file type="query_file" path="www/admin/update-adv.xql"/>
-            <file type="content_page" path="www/ads/arsdigita.gif"/>
-            <file type="content_page" path="www/adtest.tcl"/>
-            <file type="content_page" path="www/default.adp"/>
-            <file type="documentation" path="www/doc/index.adp"/>
-            <file type="content_page" path="www/index.tcl"/>
-            <file type="content_page" path="www/default.tcl"/>
-            <file type="content_page" path="www/admin/default.tcl"/>
-            <file type="query_file" path="www/index.xql"/>
-            <file type="content_page" path="www/view-group.tcl"/>
-            <file type="query_file" path="www/view-group.xql"/>
-        </files>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="CacheRefresh"  default="600" description="Time (in seconds) to memoize parameters and other elements.  Memoized itself, it takes five minutes before this parameter becomes updated."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DefaultAdLocalP"  default="1" description="Is the default Ad local to your server?  (1 for yes, 0 for no)"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DetailedPerUserLoggingP"  default="0" description="If 1, then detailed per ad, per hit details are kept for each user"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultAdTargetURL"  default="http://www.arsdigita.com" description="The default Target URL to associate with the DefaultAdImage."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultAdTargetURL"  default="http://openacs.org" description="The default Target URL to associate with the DefaultAdImage."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultAdImage"  default="arsdigita.gif" description="The default ad image to return if no other ads can be found, or if an error occurs."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="BaseImagePath"  default="ads" description="Base pathname to ad images.  The pathname follows Tcl filename conventions.  If the path starts with a '/', a backslash, or it's second character is a ':', then it is considered to be an absolute pathname in your file system.  Otherwise, it is relative to the pageroot of the webserver. E.g., a BaseImagePath of '/home/ads' implies that ad images are found in '/home/ads/', while an BaseImagePath of 'ads' implies that images should be placed in the directory '[ns_info pageroot]/ads/' directory."/>
         </parameters>
Index: openacs-4/packages/attachments/attachments.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/attachments.info,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/attachments/attachments.info	10 Nov 2003 16:36:31 -0000	1.12
+++ openacs-4/packages/attachments/attachments.info	11 Dec 2003 21:39:57 -0000	1.13
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="attachments" url="http:/openacs.org/repository/apm/packages/attachments" type="apm_service">
+<package key="attachments" url="http://openacs.org/repository/apm/packages/attachments" type="apm_service">
     <package-name>Attachments</package-name>
     <pretty-plural>Attachments</pretty-plural>
     <initial-install-p>f</initial-install-p>
@@ -10,10 +10,10 @@
 
     <version name="0.5" url="http://openacs.org/repository/download/apm/attachments-0.5.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <summary>Attachments</summary>
+        <summary>Attachment support</summary>
         <release-date>2003-11-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
-        <description format="text/plain">Attachments</description>
+        <description format="text/plain">Provide widgets and datamodel to support attachments on arbitrary objects.  Used by forums.</description>
 
         <provides url="attachments" version="0.5"/>
         <requires url="file-storage" version="4.6.2"/>
Index: openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.13
+++ openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	11 Dec 2003 21:39:57 -0000	1.14
@@ -41,7 +41,7 @@
   <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, 
     then click &quot;Open&quot;.</msg>
   <msg key="lt_You_are_attaching_a_d">You are attaching a document to %pretty_object_name%.</msg>
-  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the &lt;a href=&quot;%folder_url%&quot;&gt;folder&lt;/a&gt; you want, or you can use the Back button to return and re-enter the version file.</msg>
+  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the &lt;a href=&quot;%folder_url%&quot;&gt;folder&lt;/a&gt; you want, or you can use the Back button to return and re-enter the version file. Here is the error message: &lt;pre&gt;%errmsg%&lt;pre&gt;</msg>
   <msg key="lt_Your_file_is_larger_t">Your file is larger than the maximum file size allowed on this system (%max_number_of_bytes% bytes)</msg>
   <msg key="Name">Name</msg>
   <msg key="No_such_type">No such type</msg>
Index: openacs-4/packages/attachments/www/attach-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/attachments/www/attach-2.tcl	10 Sep 2002 22:22:22 -0000	1.3
+++ openacs-4/packages/attachments/www/attach-2.tcl	11 Dec 2003 21:39:57 -0000	1.4
@@ -24,4 +24,3 @@
 }
 
 ad_returnredirect $return_url
-
Index: openacs-4/packages/attachments/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/attachments/www/attach.tcl	7 Nov 2002 15:11:50 -0000	1.6
+++ openacs-4/packages/attachments/www/attach.tcl	11 Dec 2003 21:39:57 -0000	1.7
@@ -42,10 +42,12 @@
 set n_contents [fs::get_folder_contents_count -folder_id $folder_id -user_id $user_id]
 
 # Folder name
-set folder_name [fs::get_object_name -object_id $folder_id]
+set folder_name [lang::util::localize [fs::get_object_name -object_id $folder_id]]
 
 # Folder contents
-db_multirow contents select_folder_contents {}
+db_multirow -unclobber contents select_folder_contents {} {
+    set name [lang::util::localize $name]
+}
 
 set passthrough_vars "object_id=$object_id&return_url=[ns_urlencode $return_url]&pretty_object_name=[ns_urlencode $pretty_object_name]"
 
Index: openacs-4/packages/auth-ldap/auth-ldap.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/auth-ldap/auth-ldap.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/auth-ldap/auth-ldap.info	2 Oct 2003 14:22:34 -0000	1.2
+++ openacs-4/packages/auth-ldap/auth-ldap.info	11 Dec 2003 21:39:57 -0000	1.3
@@ -9,9 +9,9 @@
     
     <version name="1.0d2" url="http://openacs.org/repository/download/apm/auth-ldap-1.0d2.apm">
         <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
-        <summary>Provides authentication and related drivers for LDAP.</summary>
+        <summary>LDAP authentication drivers for acs-authentication.</summary>
         <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
-        <description format="text/html">Provides authentication, password management, and other drivers for LDAP.</description>
+        <description format="text/html">Implements the LDAP authentication, password management, and other drivers for use with the acs-authentication service contracts.</description>
 
         <provides url="auth-ldap" version="1.0d2"/>
         <requires url="acs-authentication" version="5.0d3"/>
Index: openacs-4/packages/auth-pam/auth-pam.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/auth-pam/auth-pam.info,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/auth-pam/auth-pam.info	14 Oct 2003 13:54:53 -0000	1.3
+++ openacs-4/packages/auth-pam/auth-pam.info	11 Dec 2003 21:39:57 -0000	1.4
@@ -9,9 +9,10 @@
     
     <version name="1.0d1" url="http://openacs.org/repository/download/apm/auth-pam-1.0d1.apm">
         <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
+        <summary>PAM authentication drivers for acs-authentication.</summary>
         <summary>Authentication and password management drivers for PAM.</summary>
         <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
-        <description format="text/plain">Provides authentication and password management drivers for authenticating through PAM on the host operating system. Requires the nspam module for AOLserver.</description>
+        <description format="text/html">Implements the PAM authentication, password management, and other drivers for use with the acs-authentication service contracts.</description>
 
         <requires url="acs-authentication" version="5.0d3"/>
 
Index: openacs-4/packages/auth-server/auth-server.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/auth-server/auth-server.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/auth-server/auth-server.info	8 Oct 2003 11:30:22 -0000	1.1
+++ openacs-4/packages/auth-server/auth-server.info	11 Dec 2003 21:39:57 -0000	1.2
@@ -11,7 +11,7 @@
     <version name="1.0d1" url="http://openacs.org/repository/download/apm/auth-server-1.0d1.apm">
         <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
         <owner url="mailto:aegrumet@mit.edu">Andrew Grumet</owner>
-        <summary>Allows OpenACS to act as an authentication server in a single-sign-on environment.</summary>
+        <summary>Allows OpenACS to act as an authentication server for a single-sign-on environment.</summary>
 
         <!-- No dependency information -->
 
Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/bookmarks/bookmarks.info	8 Oct 2003 16:05:24 -0000	1.24
+++ openacs-4/packages/bookmarks/bookmarks.info	11 Dec 2003 21:39:58 -0000	1.25
@@ -1,45 +1,34 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="bookmarks" url="http://www.openacs.org/repository/apm/packages/bookmarks" type="apm_application">
+<package key="bookmarks" url="http://openacs.org/repository/apm/packages/bookmarks" type="apm_application">
     <package-name>Bookmarks</package-name>
     <pretty-plural>Bookmarks Modules</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="5.0d1" url="http://www.openacs.org/repository/download/apm/bookmarks-5.0d1.apm">
+    <version name="5.0d1" url="http://openacs.org/repository/download/apm/bookmarks-5.0d1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:pmarklun@arsdigita.com">Peter Marklund</owner>
-        <summary>This module lets you manage your bookmarks on the web and enables sharing of bookmarks between people in a community (one ACS installation).</summary>
+        <owner url="http://petermarklund.com">Peter Marklund</owner>
+        <summary>Web based user bookmark application.</summary>
         <release-date>2002-10-27</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/plain">This version contains a number of bugfixes and minor improvements over the 4.X alpha versions and has been rigorously tested. 
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">User bookmark management package with the following functionality:
+&lt;ul&gt;
+&lt;li&gt;Adding bookmarks when browsing with the help of a Bookmarklet (a Bookmark in the browser that contains Javascript instead of a url).&lt;/li&gt;
+&lt;li&gt;Sorting by name and access date&lt;/li&gt;
+&lt;li&gt;Enhanced access permissions including toggling between private and public.&lt;/li&gt;
+&lt;li&gt;Display of keywords and descriptions of urls (fetched with ns_httpget)
+&lt;li&gt;Bookmarks are viewed in a tree structure with open/collapse functionality of folders. Alternatively the bookmarks can be viewed in a Javascript version.&lt;/li&gt;
+&lt;li&gt;Importing/exporting bookmarks from/to Netscape and IE browsers&lt;/li&gt;
+&lt;li&gt;Checking for broken or changed URLs&lt;/li&gt;
+&lt;li&gt;Display of the most popular hosts and urls in the community&lt;/li&gt;
+&lt;/ul&gt;
+</description>
 
-New features in the ACS4 (not in the ACS4 version) include:
-
-- Adding bookmarks when browsing with the help of a Bookmarklet (a Bookmark in the browser that contains Javascript instead of a url).
-
-- Sorting by name and access date
-
-- Enhanced access permissions. The alpha version will only include toggling between private and public. Future versions could use the ACS permission API to grant read, write, delete and admin rights to any party on a bookmark level.  It is not yet clear how big the need for this granular access permissions is.
-
-- Display of keywords and descriptions of urls (fetched with ns_httpget)
-
-Important features from the ACS3 version are:
-
-- Bookmarks are viewed in a tree structure with open/collapse functionality of folders. Alternatively the bookmarks can be viewed in a Javascript version.
-
-- Importing/exporting bookmarks from/to Netscape and IE browsers
-
-- Checking if URLs are alive
-
-- Display of the most popular hosts and urls in the community
-
-Areas that need improvement: The query on the index page is a bit slow - closing and opening folders becomes impractible with for example 200 bookmarks. Users who have this many bookmarks can preferably use the Javascript version. </description>
-
         <requires url="acs-kernel" version="5.0d13"/>
 
         <files>
Index: openacs-4/packages/bookmarks/www/bookmarks-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmarks-check.tcl	10 Sep 2002 22:22:26 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmarks-check.tcl	11 Dec 2003 21:39:58 -0000	1.5
@@ -55,12 +55,18 @@
 
 # We want to give the user something to look at before we start contacting
 # the foreign hosts
+set cmd [list ad_context_bar --]
+foreach elem [bm_context_bar_args "\"$page_title\"" $viewed_user_id] {
+    lappend cmd $elem
+}
+set context_bar [eval $cmd]
+
 ReturnHeaders
 ns_write "[ad_header $page_title]
-
+$context_bar
 <h2>$page_title</h2>
 
-[eval ad_context_bar [bm_context_bar_args "\"$page_title\"" $viewed_user_id]]
+
 <hr>
 "
 
Index: openacs-4/packages/bookshelf/bookshelf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/bookshelf.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bookshelf/bookshelf.info	30 Sep 2002 18:10:53 -0000	1.1
+++ openacs-4/packages/bookshelf/bookshelf.info	11 Dec 2003 21:39:58 -0000	1.2
@@ -13,8 +13,10 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:lars@pinds.com">Lars Pind</owner>
-        <summary>Allows you to share your bookshelf with others.</summary>
+        <summary>Share your bookshelf with others.</summary>
+        <description format="text/html">Store commentary on books with an interface to amazon to retrieve thumbnails and other book data</description>
 
+        
         <!-- No dependency information -->
 
         <files>
Index: openacs-4/packages/bookshelf/lib/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/lib/master.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/bookshelf/lib/master.adp	22 May 2003 14:22:56 -0000	1.2
+++ openacs-4/packages/bookshelf/lib/master.adp	11 Dec 2003 21:39:58 -0000	1.3
@@ -10,9 +10,9 @@
   .bookshelf_summary_bold { font-size: 70%; font-family: verdana,arial,helvetica; font-weight: bold; }
   </style>
 </property>
-<if @signatory;noquote@ not nil><property name="signatory">@signatory</property></if>
-<if @focus;noquote@ not nil><property name="focus">@focus;noquote@</property></if>
-<if @context_bar;noquote@ not nil><property name="context_bar">@context_bar;noquote@</property></if>
+<if @signatory@ not nil><property name="signatory">@signatory</property></if>
+<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
+<if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if>
 
 <include src="nav-bar">
 
Index: openacs-4/packages/bug-tracker/bug-tracker.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/bug-tracker.info,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/bug-tracker/bug-tracker.info	8 Oct 2003 16:05:24 -0000	1.15
+++ openacs-4/packages/bug-tracker/bug-tracker.info	11 Dec 2003 21:39:58 -0000	1.16
@@ -13,10 +13,11 @@
         <database>oracle</database>
     </database-support>
         <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
-        <summary>Tracks bugs and features, versions and maintainers, in software projects. Contains the best of SDM, Bugzilla, FogBUGZ, and bughost.com.</summary>
+        <summary>Tracks bugs and features, versions and maintainers, in software projects.</summary>
         <release-date>2003-02-28</release-date>
         <vendor url="http://www.museatech.net">Musea Technologies</vendor>
-
+        <description format="text/html">Bug tracking application with notifications, configurable state management, and patch upload.
+        Contains the best of SDM, Bugzilla, FogBUGZ, and bughost.com.</description>
         <provides url="bug-tracker" version="1.3d2"/>
         <requires url="acs-content-repository" version="5.0d1"/>
         <requires url="acs-kernel" version="5.0d13"/>
Index: openacs-4/packages/bug-tracker/www/bug-submission-instructions.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug-submission-instructions.html,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/bug-submission-instructions.html	16 Jan 2003 13:43:58 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/bug-submission-instructions.html	11 Dec 2003 21:39:58 -0000	1.3
@@ -53,12 +53,34 @@
   input to a form.
 
       <h3> Provide sensible priorities and deadlines </h3>
-    
+
+    <p>    
     We make an effort to meet deadlines and fix things in priority
     order but if all tickets are critical with a short deadline
     we will not necessarily fix them in the order you would really
-    like.  
-    
+    like. Here is an explanation of what the priority and severety
+    codes mean:
+    </p>
+
+    <p>
+    Severity
+      <ol>
+        <li> Critical. System crash, security violation, or data loss.</li>
+        <li> No Workaround. Because of this bug, a function cannot be made to work.</li>
+        <li> Workaround. The bug interferes with functionality but an alternative</li>
+        <li> Cosmetic. The bug does not interfere with functionality.</li>
+      </ol>
+    </p>
+
+    <p>
+    Priority
+      <ol>
+        <li>Must be fixed by next release</li>
+        <li>Should be fixed by next release</li>
+        <li>Might be fixed</li>
+      </ol>
+    </p>
+
     <hr>
     <address><a href="mailto:davis@xarg.net">Jeff
 Davis</a></address>
Index: openacs-4/packages/bulk-mail/bulk-mail.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/bulk-mail.info,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/bulk-mail/bulk-mail.info	10 Nov 2003 16:36:31 -0000	1.7
+++ openacs-4/packages/bulk-mail/bulk-mail.info	11 Dec 2003 21:39:58 -0000	1.8
@@ -11,9 +11,10 @@
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2003-11-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
-
+        <summary>Mailing form letters to groups of users.</summary>
         <provides url="bulk-mail" version="0.5"/>
         <requires url="acs-mail-lite" version="0.1d"/>
+        <description format="text/html">Provides an API for sending messages to a collection of users (which can be chosen via arbitrary sql).  Mails can be personalized and can be scheduled for a later date.</description>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/bulk-mail/tcl/bulk-mail-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/tcl/bulk-mail-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/bulk-mail/tcl/bulk-mail-procs.tcl	8 Sep 2003 09:50:51 -0000	1.7
+++ openacs-4/packages/bulk-mail/tcl/bulk-mail-procs.tcl	11 Dec 2003 21:39:58 -0000	1.8
@@ -185,7 +185,9 @@
             foreach bulk_mail [db_list_of_ns_sets select_bulk_mails_to_send {}] {
 		#Although the message may change for each recipiant, it usually doesn't.  We check by looking to see if message_old = the current messag.  This is inicialized here for each bulk_mail.
 		set message_old ""
-		
+
+		# NOTE: JCD: the query issued here is actually stored in the database in column bulk_mail_messages.query
+		# I am horrified by this.
                 foreach recipient [db_list_of_ns_sets select_bulk_mail_recipients [ns_set get $bulk_mail query]] {
 
                     # create a list of key, value pairs that will be used to
Index: openacs-4/packages/calendar/calendar.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/calendar/calendar.info	10 Nov 2003 16:36:31 -0000	1.20
+++ openacs-4/packages/calendar/calendar.info	11 Dec 2003 21:39:58 -0000	1.21
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="calendar" url="http://openacs.org/acs-repository/apm/packages/calendar" type="apm_application">
+<package key="calendar" url="http://openacs.org/repository/apm/packages/calendar" type="apm_application">
     <package-name>Calendar</package-name>
     <pretty-plural>Calendars</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.0d1" url="http://openacs.org/acs-repository/download/apm/calendar-2.0d1.apm">
+    <version name="2.0b2" url="http://openacs.org/repository/download/apm/calendar-2.0b2.apm">
         <owner url="mailto:tong@ebt.ee.usyd.edu.au">Lilian Tong</owner>
         <owner>Charles Mok</owner>
-        <summary>straight port</summary>
-        <vendor>University of Sydney</vendor>
-        <description format="text/html">straight port of calendar</description>
+        <summary>Personal and shared event calendars.</summary>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Manage group and shared calendars with download.</description>
 
-        <provides url="calendar" version="2.0d1"/>
+        <provides url="calendar" version="2.0b2"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-events" version="0.1d"/>
-        <requires url="acs-lang" version="5.0.0a5"/>
-        <requires url="ref-timezones" version="5.0.0a5"/>
+        <requires url="acs-lang" version="5.0.0b4"/>
+        <requires url="ref-timezones" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	24 Oct 2003 11:37:50 -0000	1.15
+++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	11 Dec 2003 21:39:58 -0000	1.16
@@ -11,6 +11,7 @@
   <msg key="All_Day_Event">All Day Event</msg>
   <msg key="all_events">all events</msg>
   <msg key="and_Time">and Time</msg>
+  <msg key="Apply_to_all">Apply to all events</msg>
   <msg key="Attachments">Attachments:</msg>
   <msg key="Audiences_for_item">Audiences for item %cal_item_name%</msg>
   <description key="Audiences_for_item">Used as a header where the audiences of a calendar item are shown.</description>
@@ -109,6 +110,7 @@
   <msg key="same">same</msg>
   <msg key="Saturday">Saturday</msg>
   <msg key="Select_Calendars">Select Calendars</msg>
+  <msg key="Sharing">Sharing</msg>
   <msg key="Start_Time">Start Time</msg>
   <msg key="Submit_query">Submit query</msg>
   <msg key="Sunday">Sunday</msg>
Index: openacs-4/packages/calendar/sql/oracle/calendar-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/oracle/calendar-create.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar/sql/oracle/calendar-create.sql	30 Sep 2003 12:10:04 -0000	1.4
+++ openacs-4/packages/calendar/sql/oracle/calendar-create.sql	11 Dec 2003 21:39:58 -0000	1.5
@@ -191,7 +191,7 @@
           -- public calendar. 
         private_p               varchar2(1)
                                 default 'f'
-                                constraint calendars_prviate_p_ck 
+                                constraint calendars_private_p_ck 
                                 check (private_p in ( 
                                         't',
                                         'f'
Index: openacs-4/packages/calendar/sql/oracle/upgrade/upgrade-2.0d1-2.0b2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/oracle/upgrade/upgrade-2.0d1-2.0b2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/sql/oracle/upgrade/upgrade-2.0d1-2.0b2.sql	11 Dec 2003 21:39:59 -0000	1.2
@@ -0,0 +1,11 @@
+--
+-- Set the context ID of existing calendars to the package_id
+--
+-- @cvs-id $Id: upgrade-2.0d1-2.0b2.sql,v 1.2 2003/12/11 21:39:59 jeffd Exp $
+--
+
+
+update acs_objects
+set    context_id = package_id
+from   calendars
+where  calendar_id = object_id;
Index: openacs-4/packages/calendar/sql/postgresql/calendar-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/postgresql/calendar-create.sql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/calendar/sql/postgresql/calendar-create.sql	17 May 2003 10:20:23 -0000	1.11
+++ openacs-4/packages/calendar/sql/postgresql/calendar-create.sql	11 Dec 2003 21:39:59 -0000	1.12
@@ -21,8 +21,7 @@
 
 
   select acs_privilege__create_privilege('cal_item_create', 'Add an new item', null); 
-  select acs_privilege__create_privilege('cal_item_read',   'view an 
-cal_item', null);
+  select acs_privilege__create_privilege('cal_item_read',   'view an cal_item', null);
   select acs_privilege__create_privilege('cal_item_write',  'Edit an exsiting cal_item', null);
   select acs_privilege__create_privilege('cal_item_delete', 'Delete cal_item', null );
   select acs_privilege__create_privilege('cal_item_invite', 'Allow others to view cal_item', null); 
@@ -33,19 +32,15 @@
 
   select acs_privilege__add_child('delete', 'cal_item_delete'); 
         
-  select acs_privilege__create_privilege('calendar_on', 'Implies that a
-calendar is selected', null); 
+  select acs_privilege__create_privilege('calendar_on', 'Implies that a calendar is selected', null); 
   select acs_privilege__create_privilege('calendar_show', 'Show a calendar', null);
 
   select acs_privilege__add_child('read', 'calendar_on'); 
   select acs_privilege__add_child('read', 'calendar_show');         
 	
-  select acs_privilege__create_privilege('calendar_create', 'Create a new
-calendar', null);
-  select acs_privilege__create_privilege('calendar_read', 'View items on
-an exsiting calendar', null);	
-  select acs_privilege__create_privilege('calendar_write', 'Edit items of
-an exsiting calendar', null);
+  select acs_privilege__create_privilege('calendar_create', 'Create a new calendar', null);
+  select acs_privilege__create_privilege('calendar_read', 'View items on an exsiting calendar', null);	
+  select acs_privilege__create_privilege('calendar_write', 'Edit items of an exsiting calendar', null);
   select acs_privilege__create_privilege('calendar_delete','Delete an calendar', null);
 
   select acs_privilege__add_child('create', 'calendar_create');
@@ -216,7 +211,7 @@
           -- public calendar. 
         private_p               boolean
                                 default 'f'
-                                constraint calendars_prviate_p_ck 
+                                constraint calendars_private_p_ck 
                                 check (private_p in ( 
                                         't',
                                         'f'
Index: openacs-4/packages/calendar/sql/postgresql/upgrade/upgrade-2.0d1-2.0b2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/postgresql/upgrade/upgrade-2.0d1-2.0b2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/sql/postgresql/upgrade/upgrade-2.0d1-2.0b2.sql	11 Dec 2003 21:39:59 -0000	1.2
@@ -0,0 +1,11 @@
+--
+-- Set the context ID of existing calendars to the package_id
+--
+-- @cvs-id $Id: upgrade-2.0d1-2.0b2.sql,v 1.2 2003/12/11 21:39:59 jeffd Exp $
+--
+
+
+update acs_objects
+set    context_id = package_id
+from   calendars
+where  calendar_id = object_id;
Index: openacs-4/packages/calendar/tcl/cal-item-2-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs-oracle.xql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/calendar/tcl/cal-item-2-procs-oracle.xql	11 Aug 2003 12:14:15 -0000	1.9
+++ openacs-4/packages/calendar/tcl/cal-item-2-procs-oracle.xql	11 Dec 2003 21:39:59 -0000	1.10
@@ -18,58 +18,68 @@
 <fullquery name="calendar::item::get.select_item_data">      
 <querytext>
             
-            select   
-            cal_items.cal_item_id,
-            0 as n_attachments,
-            to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
-            to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
-            nvl(e.name, a.name) as name,
-            nvl(e.description, a.description) as description,
-            recurrence_id,
-            cal_items.item_type_id,
-            cal_item_types.type as item_type,
-            on_which_calendar as calendar_id
-            from     acs_activities a,
-            acs_events e,
-            timespans s,
-            time_intervals t,
-            cal_items,
-            cal_item_types
-            where    e.timespan_id = s.timespan_id
-            and      s.interval_id = t.interval_id
-            and      e.activity_id = a.activity_id
-            and      e.event_id = :cal_item_id
-            and      cal_items.cal_item_id= :cal_item_id
-            and      cal_item_types.item_type_id(+)= cal_items.item_type_id
+            select cal_items.cal_item_id,
+                   0 as n_attachments,
+                   to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
+                   to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
+                   nvl(e.name, a.name) as name,
+                   nvl(e.description, a.description) as description,
+                   recurrence_id,
+                   cal_items.item_type_id,
+                   cal_item_types.type as item_type,
+                   on_which_calendar as calendar_id,
+                   c.calendar_name,
+                   o.creation_user
+            from   acs_activities a,
+                   acs_events e,
+                   timespans s,
+                   time_intervals t,
+                   cal_items,
+                   cal_item_types,
+                   calendars c,
+                   acs_objects o
+            where  e.timespan_id = s.timespan_id
+            and    s.interval_id = t.interval_id
+            and    e.activity_id = a.activity_id
+            and    e.event_id = :cal_item_id
+            and    cal_items.cal_item_id= :cal_item_id
+            and    cal_item_types.item_type_id(+)= cal_items.item_type_id
+            and    c.calendar_id = on_which_calendar
+            and    o.object_id = cal_items.cal_item_id
 </querytext>
 </fullquery>
 
 <fullquery name="calendar::item::get.select_item_data_with_attachment">      
 <querytext>
             
-            select   
-            cal_items.cal_item_id,
-            (select count(*) from attachments where object_id = cal_item_id) as n_attachments,
-            to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
-            to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
-            nvl(e.name, a.name) as name,
-            nvl(e.description, a.description) as description,
-            recurrence_id,
-            cal_items.item_type_id,
-            cal_item_types.type as item_type,
-            on_which_calendar as calendar_id
-            from     acs_activities a,
-            acs_events e,
-            timespans s,
-            time_intervals t,
-            cal_items,
-            cal_item_types
-            where    e.timespan_id = s.timespan_id
-            and      s.interval_id = t.interval_id
-            and      e.activity_id = a.activity_id
-            and      e.event_id = :cal_item_id
-            and      cal_items.cal_item_id= :cal_item_id
-            and      cal_item_types.item_type_id(+)= cal_items.item_type_id
+            select cal_items.cal_item_id,
+                   (select count(*) from attachments where object_id = cal_item_id) as n_attachments,
+                   to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
+                   to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
+                   nvl(e.name, a.name) as name,
+                   nvl(e.description, a.description) as description,
+                   recurrence_id,
+                   cal_items.item_type_id,
+                   cal_item_types.type as item_type,
+                   on_which_calendar as calendar_id,
+                   c.calendar_name,
+                   o.creation_user
+            from   acs_activities a,
+                   acs_events e,
+                   timespans s,
+                   time_intervals t,
+                   cal_items,
+                   cal_item_types,
+                   calendars c,
+                   acs_objects o
+            where  e.timespan_id = s.timespan_id
+            and    s.interval_id = t.interval_id
+            and    e.activity_id = a.activity_id
+            and    e.event_id = :cal_item_id
+            and    cal_items.cal_item_id= :cal_item_id
+            and    cal_item_types.item_type_id(+)= cal_items.item_type_id
+            and    c.calendar_id = on_which_calendar
+            and    o.object_id = cal_items.cal_item_id
 </querytext>
 </fullquery>
 
Index: openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs-postgresql.xql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql	13 Aug 2003 16:08:33 -0000	1.11
+++ openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql	11 Dec 2003 21:39:59 -0000	1.12
@@ -19,12 +19,14 @@
          0 as n_attachments,
          to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi,
          to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
-         coalesce(a.name, e.name) as name,
+         coalesce(e.name, a.name) as name,
          coalesce(e.description, a.description) as description,
          recurrence_id,
          i.item_type_id,
          it.type as item_type,
-         on_which_calendar as calendar_id
+         on_which_calendar as calendar_id,
+         c.calendar_name,
+         o.creation_user
        from
          acs_events e join timespans s
            on (e.timespan_id = s.timespan_id)
@@ -36,6 +38,10 @@
            on (e.event_id = i.cal_item_id)
          left join cal_item_types it
            on (it.item_type_id = i.item_type_id)
+         left join calendars c
+           on (c.calendar_id = i.on_which_calendar)
+         left join acs_objects o
+           on (o.object_id = i.cal_item_id)
        where
          e.event_id = :cal_item_id
       </querytext>
@@ -53,7 +59,9 @@
          recurrence_id,
          i.item_type_id,
          it.type as item_type,
-         on_which_calendar as calendar_id
+         on_which_calendar as calendar_id,
+         c.calendar_name,
+         o.creation_user
        from
          acs_events e join timespans s
            on (e.timespan_id = s.timespan_id)
@@ -65,6 +73,10 @@
            on (e.event_id = i.cal_item_id)
          left join cal_item_types it
            on (it.item_type_id = i.item_type_id)
+         left join calendars c
+           on (c.calendar_id = i.on_which_calendar)
+         left join acs_objects o
+           on (o.object_id = i.cal_item_id)
        where
          e.event_id = :cal_item_id
      </querytext>
Index: openacs-4/packages/calendar/tcl/cal-item-2-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/calendar/tcl/cal-item-2-procs.tcl	25 Sep 2003 23:11:11 -0000	1.13
+++ openacs-4/packages/calendar/tcl/cal-item-2-procs.tcl	11 Dec 2003 21:39:59 -0000	1.14
@@ -41,7 +41,7 @@
             return [cal_item_create $start_date $end_date $name $description $calendar_id [ad_conn peeraddr] [ad_conn user_id] $item_type_id]
         } else {
             # FIXME: do this better
-            ad_return_complaint 1 "Start Time must be before End Time"
+            ad_return_complaint 1 [_ calendar.start_time_before_end_time]
             ad_script_abort
         }
 
@@ -123,13 +123,14 @@
         {-description:required}
         {-item_type_id ""}
         {-edit_all_p 0}
+        {-calendar_id ""}
     } {
         Edit the item
 
     } {
         if {[dates_valid_p -start_date $start_date -end_date $end_date]} {
             # For now we call the old nasty version
-	    return [cal_item_update $cal_item_id $start_date $end_date $name $description $item_type_id $edit_all_p]
+	    return [cal_item_update $cal_item_id $start_date $end_date $name $description $item_type_id $edit_all_p $calendar_id]
         } else {
             # FIXME: do this better
             ad_return_complaint 1 "Start Time must be before End Time"
Index: openacs-4/packages/calendar/tcl/cal-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/calendar/tcl/cal-item-procs.tcl	25 Sep 2003 23:11:11 -0000	1.15
+++ openacs-4/packages/calendar/tcl/cal-item-procs.tcl	11 Dec 2003 21:39:59 -0000	1.16
@@ -134,31 +134,32 @@
 
 #------------------------------------------------
 # update an existing calendar item
-ad_proc cal_item_update { cal_item_id
-                          start_date
-                          end_date
-                          name
-                          description
-{item_type_id ""}
-{edit_all_p 0}
+ad_proc cal_item_update { 
+    cal_item_id
+    start_date
+    end_date
+    name
+    description
+    {item_type_id ""}
+    {edit_all_p 0}
+    {calendar_id ""}
 } {
-
-    updating  a new cal_item
-    for this version, i am omitting recurrence
-
+    Updating a cal_item
 } {
     
     if {$edit_all_p} {
         set recurrence_id [db_string select_recurrence_id {}]
 
         # If the recurrence id is NULL, then we stop here and just do the normal update
         if {![empty_string_p $recurrence_id]} {
-            cal_item_edit_recurrence -event_id $cal_item_id \
-                    -start_date $start_date \
-                    -end_date $end_date \
-                    -name $name \
-                    -description $description \
-                    -item_type_id $item_type_id
+            cal_item_edit_recurrence \
+                -event_id $cal_item_id \
+                -start_date $start_date \
+                -end_date $end_date \
+                -name $name \
+                -description $description \
+                -item_type_id $item_type_id \
+                -calendar_id $calendar_id
 
             return
         }
@@ -190,11 +191,25 @@
 	end;
         "
     
-        # Update the item_type_id
-        db_dml update_item_type_id "update cal_items
-        set item_type_id= :item_type_id
-        where cal_item_id= :cal_item_id"
-    }
+        # Update the item_type_id and calendar_id
+        set colspecs [list]
+        lappend colspecs "item_type_id = :item_type_id"
+        if { ![empty_string_p $calendar_id] } {
+            lappend colspecs "on_which_calendar = :calendar_id"
+
+            db_dml update_context_id {
+                update acs_objects
+                set    context_id = :calendar_id
+                where  object_id = :cal_item_id
+            }
+        }
+        
+        db_dml update_item_type_id "
+            update cal_items
+            set    [join $colspecs ", "]
+            where  cal_item_id= :cal_item_id
+        "
+   }
 }
 
 
@@ -240,6 +255,7 @@
     {-name:required}
     {-description:required}
     {-item_type_id ""}
+    {-calendar_id ""}
 } {
     edit a recurrence
 } {
@@ -256,7 +272,18 @@
         # Update the events table
         db_dml recurrence_events_update {}
         
-        # Update the cal_items table
+        set colspecs [list]
+        lappend colspecs {item_type_id = :item_type_id}
+        if { ![empty_string_p $calendar_id] } {
+            lappend colspecs {on_which_calendar = :calendar_id}
+
+            db_dml update_context_id {
+                update acs_objects
+                set    context_id = :calendar_id
+                where  object_id in (select event_id from acs_events where recurrence_id = :recurrence_id)
+            }
+        }
+
         db_dml recurrence_items_update {}
     }
 }
Index: openacs-4/packages/calendar/tcl/cal-item-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/calendar/tcl/cal-item-procs.xql	3 Jun 2002 04:08:17 -0000	1.5
+++ openacs-4/packages/calendar/tcl/cal-item-procs.xql	11 Dec 2003 21:39:59 -0000	1.6
@@ -85,10 +85,10 @@
 
 <fullquery name="cal_item_edit_recurrence.recurrence_items_update">
     <querytext>
-    update cal_items set
-    item_type_id= :item_type_id
-    where cal_item_id in (select event_id from acs_events where recurrence_id= :recurrence_id)
+            update cal_items
+            set    [join $colspecs ", "]
+            where  cal_item_id in (select event_id from acs_events where recurrence_id = :recurrence_id)
     </querytext>
 </fullquery>
- 
+  
 </queryset>
Index: openacs-4/packages/calendar/tcl/calendar-2-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-2-procs-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/calendar/tcl/calendar-2-procs-oracle.xql	27 Oct 2003 12:16:22 -0000	1.2
+++ openacs-4/packages/calendar/tcl/calendar-2-procs-oracle.xql	11 Dec 2003 21:39:59 -0000	1.3
@@ -9,9 +9,24 @@
                calendar_id, 
                acs_permission.permission_p(calendar_id, :user_id, 'calendar_admin') as calendar_admin_p
         from   calendars
-        where  package_id= :package_id
-        and    (private_p='f' or (private_p='t' and owner_id= :user_id))
+        where  (private_p = 'f' and package_id = :package_id $permissions_clause) or
+               (private_p = 't' and owner_id = :user_id)
+        order  by private_p asc, upper(calendar_name)
     </querytext>
     </fullquery>
 
+    <partialquery name="calendar::calendar_list.permissions_clause">
+    <querytext>
+            and acs_permission.permission_p(calendar_id, :user_id, :privilege) = 't'
+    </querytext>
+    </partialquery>
+
+    <fullquery name="calendar::delete.delete_calendar">
+    <querytext>
+            begin
+                calendar.del(:calendar_id);
+            end;
+    </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/calendar/tcl/calendar-2-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-2-procs-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/calendar/tcl/calendar-2-procs-postgresql.xql	27 Oct 2003 12:16:22 -0000	1.2
+++ openacs-4/packages/calendar/tcl/calendar-2-procs-postgresql.xql	11 Dec 2003 21:39:59 -0000	1.3
@@ -7,11 +7,24 @@
     <querytext>
         select calendar_name, 
                calendar_id, 
-               acs_permission__permission_p(calendar_id, :user_id, 'calendar_admin') as calendar_admin_p 
+               acs_permission__permission_p(calendar_id, :user_id, 'calendar_admin') as calendar_admin_p
         from   calendars
-        where  package_id= :package_id
-        and    (private_p='f' or (private_p='t' and owner_id= :user_id))
+        where  (private_p = 'f' and package_id = :package_id $permissions_clause) or 
+               (private_p = 't' and owner_id = :user_id)
+        order  by private_p asc, upper(calendar_name)
     </querytext>
     </fullquery>
 
+    <partialquery name="calendar::calendar_list.permissions_clause">
+    <querytext>
+            and acs_permission__permission_p(calendar_id, :user_id, :privilege) = 't'
+    </querytext>
+    </partialquery>
+
+    <fullquery name="calendar::delete.delete_calendar">
+    <querytext>
+            select calendar__delete(:calendar_id)
+    </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/calendar/tcl/calendar-2-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-2-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/calendar/tcl/calendar-2-procs.tcl	25 Sep 2003 23:11:11 -0000	1.13
+++ openacs-4/packages/calendar/tcl/calendar-2-procs.tcl	11 Dec 2003 21:39:59 -0000	1.14
@@ -7,226 +7,289 @@
     @creation-date 2002-03-16
 }
 
-namespace eval calendar {
+namespace eval calendar {}
 
-    ad_proc -public get_month_multirow_information {
-        {-current_day:required}
-        {-today_julian_date:required}
-        {-first_julian_date_of_month:required}
-    } {
-        @author Dirk Gomez (openacs@dirkgomez.de)
-        @creation-date 20-July-2003
-    } {
-        set first_day_of_week [lc_get firstdayofweek]
-        set last_day_of_week [expr [expr $first_day_of_week + 6] % 7]
+ad_proc -public calendar::get_month_multirow_information {
+    {-current_day:required}
+    {-today_julian_date:required}
+    {-first_julian_date_of_month:required}
+} {
+    @author Dirk Gomez (openacs@dirkgomez.de)
+    @creation-date 20-July-2003
+} {
+    set first_day_of_week [lc_get firstdayofweek]
+    set last_day_of_week [expr [expr $first_day_of_week + 6] % 7]
 
-        if {$current_day == $today_julian_date} {
-            set today_p t 
-        } else {
-            set today_p f
-        }
-        set day_number [expr $current_day - $first_julian_date_of_month +1]
-        set weekday [expr [expr $current_day % 7] +1]
+    if {$current_day == $today_julian_date} {
+        set today_p t 
+    } else {
+        set today_p f
+    }
+    set day_number [expr $current_day - $first_julian_date_of_month +1]
+    set weekday [expr [expr $current_day % 7] +1]
 
-        set beginning_of_week_p f
-        set end_of_week_p f
-        if {$weekday == $last_day_of_week} {
-            set end_of_week_p t
-        } elseif {$weekday == $first_day_of_week} {
-            set beginning_of_week_p t
-        }
-        return [list day_number $day_number \
-                    today_p $today_p \
-                    beginning_of_week_p $beginning_of_week_p \
-                    end_of_week_p $end_of_week_p]
+    set beginning_of_week_p f
+    set end_of_week_p f
+    if {$weekday == $last_day_of_week} {
+        set end_of_week_p t
+    } elseif {$weekday == $first_day_of_week} {
+        set beginning_of_week_p t
     }
+    return [list day_number $day_number \
+                today_p $today_p \
+                beginning_of_week_p $beginning_of_week_p \
+                end_of_week_p $end_of_week_p]
+}
 
-    ad_proc -public from_sql_datetime {
-        {-sql_date:required}
-        {-format:required}
-    } {
-        
-    } {
-        # for now, we recognize only "YYYY-MM-DD" "HH12:MIam" and "HH24:MI". 
-        set date [template::util::date::create]
+ad_proc -public calendar::from_sql_datetime {
+    {-sql_date:required}
+    {-format:required}
+} {
+    
+} {
+    # for now, we recognize only "YYYY-MM-DD" "HH12:MIam" and "HH24:MI". 
+    set date [template::util::date::create]
 
-        switch -exact -- $format {
-            {YYYY-MM-DD} {
-                regexp {([0-9]*)-([0-9]*)-([0-9]*)} $sql_date all year month day
+    switch -exact -- $format {
+        {YYYY-MM-DD} {
+            regexp {([0-9]*)-([0-9]*)-([0-9]*)} $sql_date all year month day
 
-                set date [template::util::date::set_property format $date {DD MONTH YYYY}]
-                set date [template::util::date::set_property year $date $year]
-                set date [template::util::date::set_property month $date $month]
-                set date [template::util::date::set_property day $date $day]
-            }
+            set date [template::util::date::set_property format $date {DD MONTH YYYY}]
+            set date [template::util::date::set_property year $date $year]
+            set date [template::util::date::set_property month $date $month]
+            set date [template::util::date::set_property day $date $day]
+        }
 
-            {HH12:MIam} {
-                regexp {([0-9]*):([0-9]*) *([aApP][mM])} $sql_date all hours minutes ampm
-                
-                set date [template::util::date::set_property format $date {HH12:MI am}]
-                set date [template::util::date::set_property hours $date $hours]
-                set date [template::util::date::set_property minutes $date $minutes]                
-                set date [template::util::date::set_property ampm $date [string tolower $ampm]]
-            }
+        {HH12:MIam} {
+            regexp {([0-9]*):([0-9]*) *([aApP][mM])} $sql_date all hours minutes ampm
+            
+            set date [template::util::date::set_property format $date {HH12:MI am}]
+            set date [template::util::date::set_property hours $date $hours]
+            set date [template::util::date::set_property minutes $date $minutes]                
+            set date [template::util::date::set_property ampm $date [string tolower $ampm]]
+        }
 
-            {HH24:MI} {
-                regexp {([0-9]*):([0-9]*)} $sql_date all hours minutes
+        {HH24:MI} {
+            regexp {([0-9]*):([0-9]*)} $sql_date all hours minutes
 
-                set date [template::util::date::set_property format $date {HH24:MI}]
-                set date [template::util::date::set_property hours $date $hours]
-                set date [template::util::date::set_property minutes $date $minutes]
-            }
+            set date [template::util::date::set_property format $date {HH24:MI}]
+            set date [template::util::date::set_property hours $date $hours]
+            set date [template::util::date::set_property minutes $date $minutes]
+        }
 
-            {HH24} {
-                set date [template::util::date::set_property format $date {HH24:MI}]
-                set date [template::util::date::set_property hours $date $sql_date]
-                set date [template::util::date::set_property minutes $date 0]
-            }
-            default {
-                set date [template::util::date::set_property ansi $date $sql_date]
-            }
+        {HH24} {
+            set date [template::util::date::set_property format $date {HH24:MI}]
+            set date [template::util::date::set_property hours $date $sql_date]
+            set date [template::util::date::set_property minutes $date 0]
         }
+        default {
+            set date [template::util::date::set_property ansi $date $sql_date]
+        }
+    }
 
-        return $date
+    return $date
+}
+
+ad_proc -public calendar::to_sql_datetime {
+    {-date:required}
+    {-time:required}
+    {-time_p 1}
+} {
+    This takes two date chunks, one for date one for time,
+    and combines them correctly.
+
+    The issue here is the incoming format.
+    date: ANSI SQL YYYY-MM-DD
+    time: we return HH24.
+} {
+    # Set the time to 0 if necessary
+    if {!$time_p} {
+        set hours 0
+        set minutes 0
+    } else {
+        set hours [template::util::date::get_property hours $time]
+        set minutes [template::util::date::get_property minutes $time]
     }
 
-    ad_proc -public to_sql_datetime {
-        {-date:required}
-        {-time:required}
-        {-time_p 1}
-    } {
-        This takes two date chunks, one for date one for time,
-        and combines them correctly.
+    set year [template::util::date::get_property year $date]
+    set month [template::util::date::get_property month $date]
+    set day [template::util::date::get_property day $date]
 
-        The issue here is the incoming format.
-        date: ANSI SQL YYYY-MM-DD
-        time: we return HH24.
-    } {
-        # Set the time to 0 if necessary
-        if {!$time_p} {
-            set hours 0
-            set minutes 0
-        } else {
-            set hours [template::util::date::get_property hours $time]
-            set minutes [template::util::date::get_property minutes $time]
-        }
+    # put together the timestamp
+    return "$year-$month-$day $hours:$minutes"
+}
 
-        set year [template::util::date::get_property year $date]
-        set month [template::util::date::get_property month $date]
-        set day [template::util::date::get_property day $date]
+ad_proc -public calendar::calendar_list {
+    {-package_id ""}
+    {-user_id ""}
+    {-privilege ""}
+} {
+    # If no user_id
+    if {[empty_string_p $user_id]} {
+        set user_id [ad_conn user_id]
+    }
 
-        # put together the timestamp
-        return "$year-$month-$day $hours:$minutes"
+    if {[empty_string_p $package_id]} {
+        set package_id [ad_conn package_id]
     }
+    
+    set permissions_clause {}
+    if { ![empty_string_p $privilege] } {
+        set permissions_clause [db_map permissions_clause]
+    }
 
-    ad_proc -public calendar_list {
-        {-package_id ""}
-        {-user_id ""}
-    } {
-        # If no user_id
-        if {[empty_string_p $user_id]} {
-            set user_id [ad_conn user_id]
-        }
+    set new_list [db_list_of_lists select_calendar_list {}]
+}
 
-        if {[empty_string_p $package_id]} {
-            set package_id [ad_conn package_id]
+ad_proc -public calendar::adjust_date {
+    {-date ""}
+    {-julian_date ""}
+} {
+    if {[empty_string_p $date]} {
+        if {![empty_string_p $julian_date]} {
+            set date [dt_julian_to_ansi $julian_date]
+        } else {
+            set date [dt_sysdate]
         }
-        set new_list [db_list_of_lists select_calendar_list {}]
     }
 
-    ad_proc -public adjust_date {
-        {-date ""}
-        {-julian_date ""}
-    } {
-        if {[empty_string_p $date]} {
-            if {![empty_string_p $julian_date]} {
-                set date [dt_julian_to_ansi $julian_date]
-            } else {
-                set date [dt_sysdate]
-            }
-        }
+    return $date
+}
 
-        return $date
+ad_proc -public calendar::new {
+    {-owner_id:required}
+    {-private_p "f"}
+    {-calendar_name:required}
+    {-package_id ""}
+} {
+    if { [empty_string_p $package_id] } {
+        set package_id [ad_conn package_id]
     }
+    set extra_vars [ns_set create]
+    set context_id $package_id
+    oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {owner_id private_p calendar_name package_id context_id}
 
-    ad_proc -public new {
-        {-owner_id:required}
-        {-private_p "f"}
-        {-calendar_name:required}
-        {-package_id:required}
-    } {
-        set extra_vars [ns_set create]
-        oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {owner_id private_p calendar_name package_id}
+    set calendar_id [package_instantiate_object -extra_vars $extra_vars calendar]
 
-        set calendar_id [package_instantiate_object -extra_vars $extra_vars calendar]
+    return $calendar_id
+}
 
-        return $calendar_id
+ad_proc -public calendar::personal_p { 
+    {-calendar_id:required}
+    {-user_id ""}
+} {
+    Returns true (1) if this is the user's personal calendar, false (0) otherwise.
+    
+    @param user_id The user whose calendar you want to check
+} {
+    if { [empty_string_p $user_id] } {
+        set user_id [ad_conn user_id]
     }
+    calendar::get -calendar_id $calendar_id -array calendar
+    if { [template::util::is_true $calendar(private_p)] && $calendar(owner_id) == $user_id } {
+        return 1
+    } else {
+        return 0
+    } 
+}
 
-    ad_proc -public get_item_types {
-        {-calendar_id:required}
-    } {
-        return the item types
-    } {
-        return [concat [list [list {--} {}]] \
-                [db_list_of_lists select_item_types {}]]
+ad_proc -public calendar::update { 
+    {-calendar_id:required}
+    {-calendar_name:required}
+} {
+    Edit calendar
+} {
+    
+    # Update the calendar table
+    db_dml update_calendar {
+	update   calendars
+	set      calendar_name = :calendar_name
+	where    calendar_id = :calendar_id	
     }
+}
 
-    ad_proc -public item_type_new {
-        {-calendar_id:required}
-        {-item_type_id ""}
-        {-type:required}
-    } {
-        creates a new item type
-    } {
-        if {[empty_string_p $item_type_id]} {
-            set item_type_id [db_nextval cal_item_type_seq]
-        }
+ad_proc -public calendar::get {
+    {-calendar_id:required}
+    {-array:required}
+} {
+    Get calendar info
+} {
+    upvar 1 $array row
+    db_1row select_calendar {} -column_array row
+}
+    
 
-        db_dml insert_item_type {}
+ad_proc -public calendar::delete {
+    {-calendar_id:required}
+} {
+    Delete a calendar
+} {
+    db_exec_plsql delete_calendar {}
+}
 
-        return $item_type_id
-    }
+ad_proc -public calendar::get_item_types {
+    {-calendar_id:required}
+} {
+    return the item types
+} {
+    return [concat [list [list {--} {}]] \
+            [db_list_of_lists select_item_types {}]]
+}
 
-    ad_proc -public item_type_delete {
-        {-calendar_id:required}
-        {-item_type_id:required}
-    } {
-        db_transaction {
-            # Remove the mappings for all events
-            db_dml reset_item_types {}
-            
-            # Remove the item type
-            db_dml delete_item_type {}
-        }
+ad_proc -public calendar::item_type_new {
+    {-calendar_id:required}
+    {-item_type_id ""}
+    {-type:required}
+} {
+    creates a new item type
+} {
+    if {[empty_string_p $item_type_id]} {
+        set item_type_id [db_nextval cal_item_type_seq]
     }
 
-    ad_proc -public attachments_enabled_p {} {
-        set package_id [site_node_apm_integration::child_package_exists_p \
-            -package_key attachments
-        ]
-    }
+    db_dml insert_item_type {}
 
-    ad_proc -public rename {
-        {-calendar_id:required}
-        {-name:required}
-    } {
-        rename a calendar
-    } {
-        db_dml rename_calendar {}
-    }
+    return $item_type_id
+}
 
-    ad_proc -private compare_day_items_by_current_hour {a b} {
-        Compare a day item by the current hour (field 0)
-    } {
-        set a_criterium [lindex $a 0]
-        set b_criterium [lindex $b 0]
-        if {$a_criterium > $b_criterium} {
-            return 1
-        } elseif {$a_criterium < $b_criterium} {
-            return -1
-        } 
-        return 0
+ad_proc -public calendar::item_type_delete {
+    {-calendar_id:required}
+    {-item_type_id:required}
+} {
+    db_transaction {
+        # Remove the mappings for all events
+        db_dml reset_item_types {}
+        
+        # Remove the item type
+        db_dml delete_item_type {}
     }
+}
 
+ad_proc -public calendar::attachments_enabled_p {} {
+    set package_id [site_node_apm_integration::child_package_exists_p \
+        -package_key attachments
+    ]
 }
+
+ad_proc -public calendar::rename {
+    {-calendar_id:required}
+    {-name:required}
+} {
+    rename a calendar
+} {
+    db_dml rename_calendar {}
+}
+
+ad_proc -private calendar::compare_day_items_by_current_hour {a b} {
+    Compare a day item by the current hour (field 0)
+} {
+    set a_criterium [lindex $a 0]
+    set b_criterium [lindex $b 0]
+    if {$a_criterium > $b_criterium} {
+        return 1
+    } elseif {$a_criterium < $b_criterium} {
+        return -1
+    } 
+    return 0
+}
+
Index: openacs-4/packages/calendar/tcl/calendar-2-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-2-procs.xql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/calendar/tcl/calendar-2-procs.xql	11 Aug 2003 12:14:15 -0000	1.6
+++ openacs-4/packages/calendar/tcl/calendar-2-procs.xql	11 Dec 2003 21:39:59 -0000	1.7
@@ -41,4 +41,16 @@
         </querytext>
     </fullquery>
 
+<fullquery name="calendar::get.select_calendar">      
+      <querytext>
+	       select  calendar_id,
+                       calendar_name,
+                       private_p,
+                       owner_id,
+                       package_id
+	       from    calendars
+               where   calendar_id = :calendar_id
+      </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/calendar/www/cal-item-create-recurrence-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-create-recurrence-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar/www/cal-item-create-recurrence-2.tcl	22 Jul 2002 21:46:19 -0000	1.4
+++ openacs-4/packages/calendar/www/cal-item-create-recurrence-2.tcl	11 Dec 2003 21:39:59 -0000	1.5
@@ -15,11 +15,23 @@
     recur_until:array
     days_of_week:multiple
     {return_url "./"}
-} 
+}
 
+
 # Verify permission
 ad_require_permission $cal_item_id cal_item_write
 
+# Get basic information about the event. We need the start date
+calendar::item::get -cal_item_id $cal_item_id -array cal_item
+
+set end_date [calendar_make_datetime [array get recur_until]]
+set start_date $cal_item(start_date)
+
+if {![calendar::item::dates_valid_p -start_date $$cal_item(start_date) -end_date $end_date]} {
+    ad_return_complaint 1 [_ calendar.start_date_before_end_date]
+    ad_script_abort
+}
+
 # Set up the recurrence
 calendar::item::add_recurrence -cal_item_id $cal_item_id -interval_type $interval_type -every_n $every_n -days_of_week $days_of_week -recur_until [calendar_make_datetime [array get recur_until]]
 
Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/calendar/www/cal-item-new.adp	22 Oct 2003 14:49:19 -0000	1.13
+++ openacs-4/packages/calendar/www/cal-item-new.adp	11 Dec 2003 21:39:59 -0000	1.14
@@ -16,28 +16,23 @@
 
 
 <script language="JavaScript">
-    function TimePChanged() {
+    function TimePChanged(elm) {
       var form_name = "cal_item";
-      var element_name = "time_p";
 
+      if (elm == null) return;
       if (document.forms == null) return;
       if (document.forms[form_name] == null) return;
-      if (document.forms[form_name].elements[element_name] == null) return;
 
-      if (document.forms[form_name].elements[element_name][0].checked) {
-          document.forms[form_name].elements["start_time.short_hours"].disabled = true;
-          document.forms[form_name].elements["start_time.minutes"].disabled = true;
-          document.forms[form_name].elements["start_time.ampm"].disabled = true;
-          document.forms[form_name].elements["end_time.short_hours"].disabled = true;
-          document.forms[form_name].elements["end_time.minutes"].disabled = true;
-          document.forms[form_name].elements["end_time.ampm"].disabled = true;
+      if (elm.value == 0) {
+          <multiple name="time_format_elms">
+            document.forms[form_name].elements["start_time.@time_format_elms.name@"].disabled = true;
+            document.forms[form_name].elements["end_time.@time_format_elms.name@"].disabled = true;
+          </multiple>
       } else {
-          document.forms[form_name].elements["start_time.short_hours"].disabled = false;
-          document.forms[form_name].elements["start_time.minutes"].disabled = false;
-          document.forms[form_name].elements["start_time.ampm"].disabled = false;
-          document.forms[form_name].elements["end_time.short_hours"].disabled = false;
-          document.forms[form_name].elements["end_time.minutes"].disabled = false;
-          document.forms[form_name].elements["end_time.ampm"].disabled = false;
+          <multiple name="time_format_elms">
+            document.forms[form_name].elements["start_time.@time_format_elms.name@"].disabled = false;
+            document.forms[form_name].elements["end_time.@time_format_elms.name@"].disabled = false;
+          </multiple>
       }
   }
 </script>
@@ -49,7 +44,7 @@
       <p>
       <include src="mini-calendar" base_url="view" view="day" date="@ansi_date@">
       <p>
-	<include src="cal-options" calendar_list="@calendar_list@">	
+	<include src="cal-options" calendar_list="@calendar_list;noquote@">	
     </td>	
 
     <td valign=top> 
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/calendar/www/cal-item-new.tcl	27 Oct 2003 13:04:42 -0000	1.20
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	11 Dec 2003 21:39:59 -0000	1.21
@@ -20,40 +20,26 @@
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 
-if { [string equal $calendar_id "-1"] || [empty_string_p $calendar_id]} {
-    # Seamlessly create a private calendar if the user doesn't have one
-
-    if { ![calendar_have_private_p $user_id] } {
-	calendar::new -owner_id $user_id -private_p "t" -calendar_name "Personal" -package_id $package_id
-    } 
-} else {
-    ad_require_permission $calendar_id cal_item_create
-}
-
 if {![info exists item_type_id]} {
     set item_type_id ""
 }
 
 set date [calendar::adjust_date -date $date -julian_date $julian_date]
 set ansi_date $date
 set calendar_list [calendar::calendar_list]
+set calendar_options [calendar::calendar_list -privilege create]
 
-if { ![info exists cal_item_id] } {
-    if { [llength $calendar_list] > 1 && [empty_string_p $calendar_id] } {
-        set return_url [export_vars -base cal-item-new { date start_time end_time }]
-        ad_returnredirect [export_vars -base calendar-choose { return_url }]
-        ad_script_abort
-    } elseif { [empty_string_p $calendar_id] } {
-	set calendar_id [lindex [lindex $calendar_list 0] 1]
-    }
-} else {
-    set calendar_id [db_string get_calendar_id {select 
-         on_which_calendar as calendar_id
-         from cal_items 
-        where cal_item_id = :cal_item_id} -default ""]
 
+# TODO: Move into ad_form
+if { ![ad_form_new_p -key cal_item_id] } {
+    set calendar_id [db_string get_calendar_id {
+        select on_which_calendar as calendar_id
+         from  cal_items 
+        where  cal_item_id = :cal_item_id
+    } -default ""]
 }
 
+# TODO: Move into ad_form
 if { [exists_and_not_null cal_item_id] } {
     set page_title "One calendar item"
     set ad_form_mode display
@@ -63,7 +49,7 @@
 }
 
 ad_form -name cal_item  -form {
-    cal_item_id:key
+    {cal_item_id:key}
 
     {title:text(text)
         {label "[_ calendar.Title_1]"}
@@ -76,7 +62,7 @@
 
     {time_p:text(radio)     
         {label "&nbsp;"}
-        {html {onchange "javascript:TimePChanged();"}} 
+        {html {onClick "javascript:TimePChanged(this);"}} 
         {options {{"[_ calendar.All_Day_Event]" 0}
                   {"[_ calendar.Use_Hours_Below]" 1} }}
     }
@@ -95,16 +81,60 @@
         {label "[_ calendar.Description]"}
         {html {cols 60 rows 3 wrap soft} maxlength 255}
     }
+    {calendar_id:integer(radio)
+        {label "[_ calendar.Sharing]"}
+        {options $calendar_options}
+    }
+}
 
-    {repeat_p:text(radio)     
-        {label "[_ calendar.Repeat_1]"}
-        {options {{"[_ calendar.Yes]" 1}
-                  {"[_ calendar.No]" 0} }}
+if { [ad_form_new_p -key cal_item_id] } {
+    ad_form -extend -name cal_item -form {
+        {repeat_p:text(radio)     
+            {label "[_ calendar.Repeat_1]"}
+            {options {{"[_ calendar.Yes]" 1}
+                {"[_ calendar.No]" 0} }}
+        }
     }
+} else {
+    ad_form -extend -name cal_item -form {
+        {edit_all_p:text(radio)     
+            {label "[_ calendar.Apply_to_all]"}
+            {options {{"[_ calendar.Yes]" 1}
+                {"[_ calendar.No]" 0} }}
+        }
+    }
+}
 
-    {calendar_id:text(hidden) {value $calendar_id}}
+
+#----------------------------------------------------------------------
+# LARS: Hack to make enable/disable time widgets work with i18n
+#----------------------------------------------------------------------
+
+set format_string [lc_get formbuilder_time_format]
+
+multirow create time_format_elms name
+
+while { ![empty_string_p $format_string] } {
+    # Snip off the next token
+    regexp {([^/\-.: ]*)([/\-.: ]*)(.*)} \
+          $format_string match word sep format_string
+    # Extract the trailing "t", if any
+    regexp -nocase $template::util::date::token_exp $word \
+          match token type
+
+    # Output the widget
+    set fragment_def $template::util::date::fragment_widgets([string toupper $token])
+
+    multirow append time_format_elms [lindex $fragment_def 1]
 }
 
+
+
+
+#----------------------------------------------------------------------
+# Finishing definition of form
+#----------------------------------------------------------------------
+
 set cal_item_types [calendar::get_item_types -calendar_id $calendar_id]
 
 if {[llength $cal_item_types] > 1} {
@@ -119,9 +149,14 @@
 
 ad_form -extend -name cal_item -validate { 
     {title {[string length $title] <= 4000}
-        " TITLE MUST BE 4"
+        "Title is too long"
     }
 } -new_request {
+    # Seamlessly create a private calendar if the user doesn't have one
+    if { ![calendar_have_private_p $user_id] } {
+	calendar::new -owner_id $user_id -private_p "t" -calendar_name "Personal" -package_id $package_id
+    } 
+    
     set date [template::util::date::from_ansi $date]
     set repeat_p 0
     if {[info exists start_time] && ![empty_string_p $start_time] && $start_time != 0} {
@@ -136,8 +171,12 @@
 	set start_time "{} {} {} 0 0 {} {HH24:MI}"
 	set end_time "{} {} {} 0 0 {} {HH24:MI}"
     }
+    set calendar_id [lindex [lindex $calendar_options 0] 1]
 } -edit_request {
     calendar::item::get -cal_item_id $cal_item_id -array cal_item
+
+    permission::require_write_permission -object_id $cal_item_id -creation_user $cal_item(creation_user)
+
     set cal_item_id $cal_item(cal_item_id)
     set n_attachments $cal_item(n_attachments)
     set ansi_start_date $cal_item(start_date_ansi)
@@ -152,45 +191,65 @@
     set calendar_id $cal_item(calendar_id)
     set time_p $cal_item(time_p)
 
-    if {[empty_string_p $repeat_p]} {
+    if { [empty_string_p $repeat_p] } {
         set repeat_p 0
     } else {
         set repeat_p 1
     }
+    set edit_all_p $repeat_p
+    if { !$repeat_p } {
+        element set_properties cal_item edit_all_p -widget hidden
+    }
     set date [template::util::date::from_ansi $ansi_start_date]
     set start_time [template::util::date::from_ansi $ansi_start_date [lc_get formbuilder_time_format]]
     set end_time [template::util::date::from_ansi $ansi_end_date [lc_get formbuilder_time_format]]
 } -new_data {
     set start_date [calendar::to_sql_datetime -date $date -time $start_time -time_p $time_p]
     set end_date [calendar::to_sql_datetime -date $date -time $end_time -time_p $time_p]
 
-    set cal_item_id [calendar::item::new -start_date $start_date \
-            -end_date $end_date \
-            -name $title \
-            -description $description \
-            -calendar_id $calendar_id \
-            -item_type_id $item_type_id]
+    if { ![calendar::personal_p -calendar_id $calendar_id] } {
+        permission::require_permission -object_id $calendar_id -privilege create
+    }
+    
+    set cal_item_id [calendar::item::new \
+                         -start_date $start_date \
+                         -end_date $end_date \
+                         -name $title \
+                         -description $description \
+                         -calendar_id $calendar_id \
+                         -item_type_id $item_type_id]
+
+    if {$repeat_p} {
+        ad_returnredirect [export_vars -base cal-item-create-recurrence { cal_item_id }]
+    } else {
+        ad_returnredirect [export_vars -base cal-item-view { cal_item_id }]
+    }
+    ad_script_abort
+
 } -edit_data {
+    # Require write permission on the item and create on the calendar into which we're putting it
+    permission::require_write_permission -object_id $cal_item_id
+    if { ![calendar::personal_p -calendar_id $calendar_id] } {
+        permission::require_permission -object_id $calendar_id -privilege create
+    }
+
     # set up the datetimes
     set start_date [calendar::to_sql_datetime -date $date -time $start_time -time_p $time_p]
     set end_date [calendar::to_sql_datetime -date $date -time $end_time -time_p $time_p]
 
     # Do the edit
-    calendar::item::edit -cal_item_id $cal_item_id \
-            -start_date $start_date \
-            -end_date $end_date \
-            -name $title \
-            -description $description \
-            -item_type_id $item_type_id \
-            -edit_all_p $repeat_p
-} -after_submit {
-    if {$repeat_p} {
-        ad_returnredirect "cal-item-create-recurrence?cal_item_id=$cal_item_id"
-    } else {
-        ad_returnredirect "cal-item-view?cal_item_id=$cal_item_id"
-    }
+    calendar::item::edit \
+        -cal_item_id $cal_item_id \
+        -start_date $start_date \
+        -end_date $end_date \
+        -name $title \
+        -description $description \
+        -item_type_id $item_type_id \
+        -edit_all_p $edit_all_p \
+        -calendar_id $calendar_id
+    
+    ad_returnredirect [export_vars -base cal-item-view { cal_item_id }]
     ad_script_abort
 }
 
 
-ad_return_template
Index: openacs-4/packages/calendar/www/cal-item-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/calendar/www/cal-item-view.adp	27 Oct 2003 12:42:23 -0000	1.22
+++ openacs-4/packages/calendar/www/cal-item-view.adp	11 Dec 2003 21:39:59 -0000	1.23
@@ -29,10 +29,16 @@
     <tr>
     <td class="cal-table-data-title">#calendar.Description#:
     </td>
-    <td>@cal_item.description@
+    <td>@cal_item.description;noquote@
     </tr>
 
     <tr>
+    <td class="cal-table-data-title">#calendar.Sharing#:
+    </td>
+    <td>@cal_item.calendar_name@
+    </tr>
+
+    <tr>
     <td class="cal-table-data-title">#calendar.Date_1#
     <if @cal_item.no_time_p@ eq 0> 
     #calendar.and_Time#
@@ -79,10 +85,8 @@
   </tr>
   <tr>
     <td colspan="2">
-      <if @edit_p@ eq 1>
+      <if @write_p@ true>
         <a href="cal-item-new?cal_item_id=@cal_item_id@&return_url=@return_url@" class="button">#calendar.edit#</a>
-      </if>
-      <if @delete_p@ eq 1>
         <a href="./cal-item-delete?cal_item_id=@cal_item_id@&return_url=@return_url@" class="button">#calendar.delete#</a>
       </if>
       <p><a href="ics/@cal_item_id@.ics" class="button">#calendar.sync_with_Outlook#</a> 
@@ -91,8 +95,8 @@
 
   <if @cal_item.recurrence_id@ not nil>
     <tr>
-    <td class="cal-table-data-action">
-    <a  href="ics/@cal_item_id@.ics?all_occurences_p=1">#calendar.all_events#</a>
+    <td>
+    <a  href="ics/@cal_item_id@.ics?all_occurences_p=1" class="button">#calendar.all_events#</a>
     </td>
     <td>Sync all events with Outlook</td>
     </tr>
Index: openacs-4/packages/calendar/www/cal-item-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/calendar/www/cal-item-view.tcl	25 Sep 2003 23:11:12 -0000	1.12
+++ openacs-4/packages/calendar/www/cal-item-view.tcl	11 Dec 2003 21:39:59 -0000	1.13
@@ -12,14 +12,13 @@
 set user_id [ad_verify_and_get_user_id]
 set package_id [ad_conn package_id]
 
-#ad_require_permission $cal_item_id read
+permission::require_permission -object_id $cal_item_id -privilege read
 
-set edit_p [ad_permission_p $cal_item_id cal_item_write]
-set delete_p [ad_permission_p $cal_item_id cal_item_delete] 
-set admin_p [ad_permission_p $cal_item_id calendar_admin]
-
 calendar::item::get -cal_item_id $cal_item_id -array cal_item
 
+set write_p [permission::write_permission_p -object_id $cal_item_id -creation_user $cal_item(creation_user)]
+
+
 # Attachments?
 if {$cal_item(n_attachments) > 0} {
     set item_attachments [attachments::get_attachments -object_id $cal_item(cal_item_id)]
Index: openacs-4/packages/calendar/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/index.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/calendar/www/index.tcl	25 Sep 2003 09:06:16 -0000	1.13
+++ openacs-4/packages/calendar/www/index.tcl	11 Dec 2003 21:39:59 -0000	1.14
@@ -10,14 +10,8 @@
 }
 
 set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
+set user_id [auth::require_login]
 
-if {!$user_id} {
-    # user isn't logged in 
-    ad_redirect_for_registration
-    ad_script_abort
-}
-
 if { ![calendar_have_private_p $user_id] } {
     calendar::new -owner_id $user_id -private_p "t" -calendar_name "Personal" -package_id $package_id
 } 
Index: openacs-4/packages/calendar/www/mini-calendar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/calendar/www/mini-calendar.adp	27 Oct 2003 13:04:19 -0000	1.7
+++ openacs-4/packages/calendar/www/mini-calendar.adp	11 Dec 2003 21:39:59 -0000	1.8
@@ -4,12 +4,12 @@
   <multiple name=views>
     <if @views.active_p@ eq t>
       <td class="cal-navbar-selected">
-      @views.name@
+        <a href="@base_url@?view=@views.text@&date=@date@@page_num@" style="color: #004080; text-decoration: none;">@views.name@</a>
       </td>
     </if>
     <else>
       <td class="cal-navbar">
-      <a href="@base_url@?view=@views.text@&date=@date@@page_num@">@views.name@</a>
+        <a href="@base_url@?view=@views.text@&date=@date@@page_num@">@views.name@</a>
       </td>
     </else>
   </multiple>
@@ -78,7 +78,7 @@
     </tr>
     <tr>
       <td class="cal-spacer" colspan="7">
-        <img border="0" src="spacer.gif">
+        <img border="0" src="/resources/acs-subsite/spacer.gif">
       </td>
     </tr>
 
Index: openacs-4/packages/calendar/www/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/calendar/www/view-month-display.adp	1 Oct 2003 15:05:39 -0000	1.8
+++ openacs-4/packages/calendar/www/view-month-display.adp	11 Dec 2003 21:39:59 -0000	1.9
@@ -48,7 +48,7 @@
 
                   <a
                   href="@base_url@cal-item-new?date=@days_of_a_month.ansi_start_date@&start_time=&end_time=">
-                  <img border="0" align="right" height="8" width="8" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_Item#"></a>
+                  <img border="0" align="right" height="7" width="7" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_Item#"></a>
                   <a href="?view=day&date=@days_of_a_month.ansi_start_date@@page_num@">@days_of_a_month.day_number@</a>
 
                   <group column="ansi_start_date">
@@ -74,3 +74,7 @@
     </td>
   </tr>
 </table>
+
+
+
+
Index: openacs-4/packages/calendar/www/view-one-day-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/calendar/www/view-one-day-display.adp	17 Oct 2003 09:46:38 -0000	1.13
+++ openacs-4/packages/calendar/www/view-one-day-display.adp	11 Dec 2003 21:39:59 -0000	1.14
@@ -13,7 +13,7 @@
     </table>
   </td>
   </tr>
-  <table>
+  <table width="100%">
   <tr>
   <td>
     <tr>
@@ -60,7 +60,7 @@
                   </if>
                   <else>
                     <if @max_items_per_hour@ eq 0>
-                      <td class="cal-day-event">&nbsp;</td>
+                      <td width="80%" class="cal-day-event">&nbsp;</td>
                     </if>
                   </else>
                 </else>
Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/calendar/www/view-one-day-display.tcl	5 Nov 2003 18:02:49 -0000	1.22
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl	11 Dec 2003 21:39:59 -0000	1.23
@@ -38,11 +38,7 @@
     set base_url ""
 }
 
-set current_date $date
-if { [info exists start_display_hour]} {
-    set current_date_system "$current_date $start_display_hour:00:00"
-} else {
-    set current_date_system "$current_date 00:00:00"
+if { ![info exists start_display_hour]} {
     set start_display_hour 0
 }
 
@@ -53,12 +49,17 @@
 if {[exists_and_not_null calendar_id_list]} {
     set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))"
 } else {
-    set calendars_clause "and ((cals.package_id= :package_id and cals.private_p='f') or (cals.private_p='t' and cals.owner_id= :user_id))"
+    set calendars_clause {
+        and ((cals.package_id = :package_id and cals.private_p = 'f') 
+             or (cals.private_p = 't' and cals.owner_id = :user_id))
+    }
 }
 
 # The database needs this for proper formatting.
 set ansi_date_format "YYYY-MM-DD HH24:MI:SS"
 
+set current_date $date
+set current_date_system "$date 00:00:00"
 if {[empty_string_p $date]} {
     # Default to todays date in the users (the connection) timezone
     set server_now_time [dt_systime]
@@ -119,13 +120,20 @@
     set start_time [lc_time_fmt $ansi_start_date "%X"]
     set end_time [lc_time_fmt $ansi_end_date "%X"]
 
+    regexp {([1-9][0-9]*)} $start_hour match start_hour_no
+    regexp {([1-9][0-9]*)} $end_hour match end_hour_no
+
     for { set item_current_hour $start_hour } { $item_current_hour < $end_hour } { incr item_current_hour } {
         set item_current_hour [expr [string trimleft $item_current_hour 0]+0]
-        if {$start_hour == $item_current_hour && $start_hour >= $start_display_hour } {
-            lappend day_items_per_hour [list $item_current_hour $name $item_id $calendar_name $status_summary $start_hour $end_hour $start_time $end_time]
-        } elseif { $end_hour <= $end_display_hour } {
-            lappend day_items_per_hour [list $item_current_hour "" $item_id $calendar_name $status_summary $start_hour $end_hour $start_time $end_time]
-            }
+
+        if { $start_hour_no == $item_current_hour } {
+
+            lappend day_items_per_hour \
+                [list $item_current_hour $name $item_id $calendar_name $status_summary $start_hour $end_hour $start_time $end_time]
+        } else {
+            lappend day_items_per_hour \
+                [list $item_current_hour {} $item_id $calendar_name $status_summary $start_hour $end_hour $start_time $end_time]
+        }
         incr items_per_hour($item_current_hour)
     }
 }
@@ -145,14 +153,17 @@
     set item_start_hour [expr [string trimleft [lindex $this_item 5] 0]+0]
     set item_end_hour [expr [string trimleft [lindex $this_item 6] 0]+0]
     set rowspan [expr $item_end_hour - $item_start_hour]
-    if {$item_start_hour > $day_current_hour} {
+
+    if {$item_start_hour > $day_current_hour && \
+                 $item_start_hour >= $start_display_hour && $item_end_hour <= $end_display_hour} {
         # need to add dummy entries to show all hours
         for {  } { $day_current_hour < $item_start_hour } { incr day_current_hour } {
 	    set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%X"]
-            multirow append day_items_with_time  "[subst $hour_template]" $day_current_hour $localized_day_current_hour "" "" "" "" "" "" "" "" 0 0 ""
+            multirow append day_items_with_time [subst $hour_template] $day_current_hour $localized_day_current_hour "" "" "" "" "" "" "" "" 0 0 ""
         }
     }
 
+    set day_current_hour [lindex $this_item 0]
     set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%X"]
 
     # reset url stub
@@ -171,11 +182,17 @@
     set end_time [lindex $this_item 8]
 
     set item [lindex $this_item 1]
+    set item_id [lindex $this_item 2]
     set full_item [subst $item_template]
 
-    set current_hour_link "[subst $hour_template]"
+    set current_hour_link [subst $hour_template]
 
-    multirow append day_items_with_time $current_hour_link $day_current_hour $localized_day_current_hour [lindex $this_item 1] [lindex $this_item 2] [lindex $this_item 3] [lindex $this_item 4] [lindex $this_item 5] [lindex $this_item 6] [lindex $this_item 7] [lindex $this_item 8] 0 $rowspan $full_item
+    multirow append day_items_with_time \
+        $current_hour_link $day_current_hour $localized_day_current_hour \
+        [lindex $this_item 1] [lindex $this_item 2] [lindex $this_item 3] \
+        [lindex $this_item 4] [lindex $this_item 5] [lindex $this_item 6] \
+        [lindex $this_item 7] [lindex $this_item 8] 0 $rowspan $full_item
+
     set day_current_hour [expr [lindex $this_item 0] +1 ]
 }
 
Index: openacs-4/packages/calendar/www/view-week-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/calendar/www/view-week-display.adp	1 Oct 2003 15:05:39 -0000	1.6
+++ openacs-4/packages/calendar/www/view-week-display.adp	11 Dec 2003 21:39:59 -0000	1.7
@@ -1,4 +1,4 @@
-<table CELLPADDING=0 CELLSPACING=0 BORDER=0 width="100%">
+ <table CELLPADDING=0 CELLSPACING=0 BORDER=0 width="100%">
 
   <tr><td>
   <table cellpadding=3 cellspacing=0 border=0 width="100%" class="cal-table-display">
@@ -25,9 +25,8 @@
       </td>
 
       <td width="95%" class="cal-week">
-      <a
-      href="@base_url@cal-item-new?date=@week_items.ansi_start_date@&start_time=&end_time=">
-      <img border="0" align="right" height="16" width="16" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_Item#"></a><a
+      <a href="@base_url@cal-item-new?date=@week_items.ansi_start_date@&start_time=&end_time=">
+      <img border="0" align="right" height="7" width="7" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_Item#"></a><a
       href="?view=day&date=@week_items.ansi_start_date@@page_num@">@week_items.start_date@</a>
       </td>
       </tr>
@@ -69,3 +68,8 @@
   </td>
   </tr>
 </table>
+
+
+
+
+
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/calendar/www/view.adp	1 Oct 2003 15:05:39 -0000	1.21
+++ openacs-4/packages/calendar/www/view.adp	11 Dec 2003 21:39:59 -0000	1.22
@@ -13,10 +13,10 @@
 <p>
     <a href="cal-item-new?date=@date@" title="#calendar.Add_Item#"><img border=0 align="left" valign="top" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_Item#">#calendar.Add_Item#</a>
 <p>
-<if @admin_p@ eq 1>
-    <a href="admin/">#calendar.lt_Calendar_Administrati#</a>
+<if @admin_p@ true>
+  <a href="admin/">#calendar.lt_Calendar_Administrati#</a>
 </if>
-<include src="cal-options" calendar_list="@calendar_list@">	
+<include src="cal-options" calendar_list="@calendar_list;noquote@">	
 
     </td>	
 
Index: openacs-4/packages/calendar/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/calendar/www/view.tcl	13 Aug 2003 16:08:33 -0000	1.16
+++ openacs-4/packages/calendar/www/view.tcl	11 Dec 2003 21:39:59 -0000	1.17
@@ -25,7 +25,7 @@
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 
-set admin_p [ad_permission_p $package_id calendar_admin]
+set admin_p [permission::permission_p -object_id $package_id -privilege calendar_admin]
 
 set calendar_list [calendar::calendar_list]
 set date [calendar::adjust_date -date $date]
Index: openacs-4/packages/calendar/www/admin/calendar-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-delete.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/www/admin/calendar-delete.tcl	11 Dec 2003 21:39:59 -0000	1.2
@@ -0,0 +1,12 @@
+ad_page_contract {
+    Delete calendar
+} {
+    calendar_id:integer
+}
+
+# We know we have admin privs here
+
+calendar::delete -calendar_id $calendar_id
+
+ad_returnredirect .
+
Index: openacs-4/packages/calendar/www/admin/calendar-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-edit.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/calendar/www/admin/calendar-edit.adp	30 Nov 2002 17:28:30 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/calendar-edit.adp	11 Dec 2003 21:39:59 -0000	1.4
@@ -1,23 +1,7 @@
-<!--	
-	Template for calendar edit
-	
-	@author Gary Jin (gjin@arsidigta.com)
-     	@creation-date Jan 09, 2000
-     	@cvs-id $Id$
--->
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="focus">calendar.calendar_name</property>
 
+<formtemplate id="calendar"></formtemplate>
 
-<if @action@ eq delete>
-
-  <form action="calendar-edit" method=post>
-    <input type=hidden name=calendar_id value=@calendar_id@>
-    <input type=hidden name=confirm value=yes>
-    <p>	
-      #calendar.lt_Are_you_sure_you_want# 
-    </p>	
-
-    <input type=submit value="#calendar.Yes_I_am_sure#">	
-
-  </form>
-</if>
-
Index: openacs-4/packages/calendar/www/admin/calendar-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-edit.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/calendar/www/admin/calendar-edit.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/calendar/www/admin/calendar-edit.tcl	11 Dec 2003 21:39:59 -0000	1.3
@@ -1,31 +1,35 @@
-# /packages/calendar/www/admin/calendar-edit.tcl
-
 ad_page_contract {
     
-    edit the basic info
-    of an existing calendar
+    Add/Edit calendar
 
-    @author Gary Jin (gjin@arsdigita.com)
-    
-    @party_id  key to owner id
-    @calendar_name  the name of the calendar
-    @calendar_permission the permissions of the calendar
-
     @creation-date Dec 14, 2000
     @cvs-id $Id$
 } {
-    {action edit}
-    {party_id:integer,notnull}
-    {calendar_id:integer,notnull}
-    {calendar_name:notnull}
-    {calendar_permission "private"}
+    {calendar_id:integer,optional}
 }
 
-if { [string equal $action "edit"] } {
-    calendar_update $calendar_id $party_id $calendar_name $calendar_permission
+set page_title "Add/Edit Calendar"
+set context [list $page_title]
+
+ad_form -name calendar -form {
+    {calendar_id:key}
+    {calendar_name:text
+        {label "[_ calendar.Calendar_Name]"}
+        {html {size 50}}
+    }
+} -edit_request {
+    set calendar_name [calendar_get_name $calendar_id]
+} -new_data {
+    calendar::new \
+        -owner_id [ad_conn user_id] \
+        -calendar_name $calendar_name 
+} -edit_data {
+    calendar::update \
+        -calendar_id $calendar_id \
+        -calendar_name $calendar_name 
+} -after_submit {
+    ad_returnredirect .
+    ad_script_abort
 }
 
-ad_returnredirect "."
 
-
-
Index: openacs-4/packages/calendar/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/index.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/calendar/www/admin/index.adp	23 Sep 2003 21:35:24 -0000	1.9
+++ openacs-4/packages/calendar/www/admin/index.adp	11 Dec 2003 21:39:59 -0000	1.10
@@ -1,54 +1,10 @@
-<!--	
-	Displays the basic UI for the calendar
-	
-	@author Gary Jin (gjin@arsidigta.com)
-     	@creation-date Dec 14, 2000
-     	@cvs-id $Id$
--->
-
-
 <master>
-<property name="title">#calendar.lt_Calendar_Administrati_1# # @user_id;noquote@</property>
-<property name="context">@context;noquote@</property>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
 
 
-<if @calendars:rowcount@ eq 0>
-  <p>
-    <i>#calendar.lt_You_have_no_party_wid#</i>
-  </p>
-</if>
+<listtemplate name="calendars"></listtemplate>
 
-<else>
-  <p>
-  #calendar.lt_You_can_manage_the_fo#
-  <table>
-   <multiple name=calendars>
-     <tr>
-	<td valign=top>
-	  <li>[<a href="one?calendar_id=@calendars.calendar_id@&action=edit"> 
-             @calendars.calendar_name@ 
-           </a>]          	
-	</td>
-     </tr>	
-   </multiple>
-  </table>
-  </p>
-</else>
-
 <p>
-<a href="one?party_id=@user_id@&action=add">
-#calendar.lt_Create_a_new_calendar#
-</a>
+  <b>&raquo;</b> <a href="@permissions_url@">Package permissions</a>
 </p>
-
-
-<p>
-<a href="calendar-preferences">
-#calendar.lt_Edit_your_Calendar_Pr#
-</a>
-</p>
-
-
-
-
-
Index: openacs-4/packages/calendar/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/index.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar/www/admin/index.tcl	23 Sep 2003 21:35:24 -0000	1.4
+++ openacs-4/packages/calendar/www/admin/index.tcl	11 Dec 2003 21:39:59 -0000	1.5
@@ -1,81 +1,72 @@
 # /packages/calendar/www/admin/index.tcl
 
 ad_page_contract {
-    
     Main Calendar Admin Page. 
-    ## HACKED BY BEN FOR SLOAN ##
-    ## FEATURES TEMPORARILY TAKEN OUT ##
-    
-    This pages checks to see if the user has any group calendar 
-    that he or she is the admin of. 
-    
 
     @author Gary Jin (gjin@arsdigita.com)
     @creation-date Dec 14, 2000
     @cvs-id $Id$
-} {
- 
-} -properties {
-    context_bar:onevalue
 }
 
-
 # find out the user_id 
 set user_id [ad_verify_and_get_user_id]
 
 set package_id [ad_conn package_id]
+set page_title [_ calendar.lt_Calendar_Administrati]
 set context [list]
 
-
-db_multirow calendars calendar_list {
-    select     calendar_id, 
-               calendar_name
-    from       calendars
-    where      owner_id = :user_id
-    and        acs_permission.permission_p(
-                  calendar_id, 
-                  :user_id,
-                  'calendar_admin'
-               ) = 't'
-    order by   calendar_name
+db_multirow calendars select_calendars {
+    select c.calendar_name, 
+           c.calendar_id, 
+           c.private_p,
+           (select count(*) from cal_items i where i.on_which_calendar = c.calendar_id) as num_items
+    from   calendars c
+    where  (c.private_p = 'f' and c.package_id = :package_id) or (c.private_p = 't' and c.owner_id = :user_id)
+    order  by c.private_p asc, upper(c.calendar_name)
 }
-          
 
-ad_return_template 
+template::list::create \
+    -name "calendars" \
+    -multirow "calendars" \
+    -actions [list [_ calendar.lt_Create_a_new_calendar] "calendar-edit"] \
+    -elements {
+        edit {
+            label ""
+            display_template {
+                <img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit" border="0">
+            }
+            link_url_eval {[export_vars -base calendar-edit { calendar_id }]}
+            sub_class narrow
+        }
+        calendar_name {
+            label {[_ calendar.Calendar_Name]}
+            link_url_eval {[export_vars -base calendar-edit { calendar_id }]}
+        }
+        type {
+            label {Type}
+            display_eval {[ad_decode $private_p "t" "Personal" "Shared"]}
+        }
+        num_items {
+            label "Items"
+            display_eval {[lc_numeric $num_items]}
+            html { align right }
+        }
+        permissions {
+            label {Permissions}
+            display_template {Permissions}
+            link_url_eval {[export_vars -base permissions { { object_id $calendar_id } }]}
+            html { align center }
+        }
+        delete {
+            label ""
+            display_template {
+                <if @calendars.num_items@ eq 0>
+                  <img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete" border="0">
+                </if>
+            }
+            link_url_eval {[export_vars -base calendar-delete { calendar_id }]}
+            sub_class narrow
+        }        
+    }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+set permissions_url [export_vars -base permissions { { object_id {[ad_conn package_id]} } }]
Index: openacs-4/packages/calendar/www/admin/permissions-user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/permissions-user-add.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/www/admin/permissions-user-add.adp	11 Dec 2003 21:39:59 -0000	1.2
@@ -0,0 +1,5 @@
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
+
+<include src="/packages/acs-subsite/www/permissions/perm-user-add-include">
Index: openacs-4/packages/calendar/www/admin/permissions-user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/permissions-user-add.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/www/admin/permissions-user-add.tcl	11 Dec 2003 21:39:59 -0000	1.2
@@ -0,0 +1,14 @@
+ad_page_contract {
+    Redirect page for adding users to the permissions list.
+    
+    @author Lars Pind (lars@collaboraid.biz)
+    @creation-date 2003-06-13
+    @cvs-id $Id: permissions-user-add.tcl,v 1.2 2003/12/11 21:39:59 jeffd Exp $
+} {
+    object_id:integer
+}
+
+set page_title "Add User"
+
+set context [list [list [export_vars -base permissions { object_id }] "$Permissions"] $page_title]
+
Index: openacs-4/packages/calendar/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/permissions.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/www/admin/permissions.adp	11 Dec 2003 21:39:59 -0000	1.2
@@ -0,0 +1,5 @@
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
+
+<include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" user_add_url="permissions-user-add">
Index: openacs-4/packages/calendar/www/admin/permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/permissions.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/www/admin/permissions.tcl	11 Dec 2003 21:39:59 -0000	1.2
@@ -0,0 +1,14 @@
+ad_page_contract {
+    Permissions for the subsite itself.
+    
+    @author Lars Pind (lars@collaboraid.biz)
+    @creation-date 2003-06-13
+    @cvs-id $Id: permissions.tcl,v 1.2 2003/12/11 21:39:59 jeffd Exp $
+} {
+    object_id:integer
+}
+
+set page_title "Permissions"
+
+set context [list $page_title]
+
Index: openacs-4/packages/categories/categories.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/categories.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/categories.info	23 Apr 2003 12:29:26 -0000	1.1
+++ openacs-4/packages/categories/categories.info	11 Dec 2003 21:40:00 -0000	1.2
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="categories" url="http://www.arsdgita.com/acs-repository/apm/packages/categories" type="apm_service">
+<package key="categories" url="http://openacs.org/repository/apm/packages/categories" type="apm_service">
     <package-name>Categories</package-name>
     <pretty-plural>Categories</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     <auto-mount>categories</auto-mount>
 
-    <version name="0.1d" url="http://www.arsdgita.com/acs-repository/apm/packages/categories">
+    <version name="0.1d" url="http://openacs.org/repository/apm/packages/categories">
         <owner>thentschel@sussdorff-roy.com</owner>
         <summary>Manage categories in category trees and let users map objects to categories.</summary>
         <release-date>2003-04-16</release-date>
-
+        <description format="text/html">Datamodel for category trees with supporting API and management pages.  Provides a widget for 
+        general categorization of arbitrary objects and tracks which package instances use which category trees.  Also supports localization.</description>
         <provides url="categories" version="0.1d"/>
 
         <callbacks>
Index: openacs-4/packages/categories/www/cadmin/category-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	11 Dec 2003 21:40:00 -0000	1.2
@@ -17,7 +17,7 @@
     category::delete $category_id
     category_tree::flush_cache $tree_id
 } on_error {
-    ad_return_complaint "Error Deleting Node" "<p> This node contains leaf (child) nodes. If you really want to delete those leaf nodes, plesae delete them first. Thank you."
+    ad_return_complaint 1 "Error Deleting Node<p>This node contains leaf (child) nodes. If you really want to delete those leaf nodes, plesae delete them first. Thank you."
     return
 }
 
Index: openacs-4/packages/categories/www/cadmin/tree-update-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/tree-update-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-update-2.tcl	19 May 2003 13:10:51 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-update-2.tcl	11 Dec 2003 21:40:00 -0000	1.4
@@ -33,8 +33,8 @@
 }
 db_dml delete_tmp_category_trees ""
     
-if { [llength $list_of_errors] >0 } {
-    ad_return_complaint "Error Deleting Nodes" $list_of_errors
+if { [llength $list_of_errors] > 0 } {
+    ad_return_complaint [llength $list_of_errors] "Error Deleting Nodes: $list_of_errors"
     return
 }
 
Index: openacs-4/packages/chat/chat.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/chat.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/chat/chat.info	8 Oct 2003 16:05:25 -0000	1.5
+++ openacs-4/packages/chat/chat.info	11 Dec 2003 21:40:00 -0000	1.6
@@ -1,21 +1,22 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="chat" url="http://www.arsdgita.com/acs-repository/apm/packages/chat" type="apm_application">
+<package key="chat" url="http://openacs.org/repository/apm/packages/chat" type="apm_application">
     <package-name>Chat</package-name>
     <pretty-plural>Chats</pretty-plural>
     <singleton-p>f</singleton-p>
 
-    <version name="5.0d1" url="http://www.arsdigita.com/acs-repository/download/apm/chat-5.0d1.apm">
+    <version name="5.0d1" url="http://openacs.org/repository/download/apm/chat-5.0d1.apm">
     <database-support>
         <database>oracle</database>
     </database-support>
-        <owner url="mailto:ddao@arsdigita.com">David Dao</owner>
-        <summary>This is a chat application	</summary>
+        <owner>David Dao</owner>
+        <summary>Server based chat with an html and java client.</summary>
         <release-date>2001-01-18</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/html">ACS Chat is now support both HTML client and Java applet client. </description>
 
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">This package has not really been used.  Probably better to look at the jabber package in contrib.</description>
+
         <requires url="acs-kernel" version="5.0d13"/>
 
         <files>
Index: openacs-4/packages/chat/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/tcl/chat-procs.tcl	1 Nov 2003 08:45:37 -0000	1.3
+++ openacs-4/packages/chat/tcl/chat-procs.tcl	11 Dec 2003 21:40:00 -0000	1.4
@@ -506,7 +506,7 @@
             returning contents into :1
 	} -clobs [list $contents]
     } on_error {
-	ad_return_complaint "Insert fail" $errmsg
+	ad_return_complaint 1 "Insert fail: $errmsg"
     }
 
     return $transcript_id
Index: openacs-4/packages/chat/www/chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/chat.tcl	18 Sep 2002 13:03:47 -0000	1.3
+++ openacs-4/packages/chat/www/chat.tcl	11 Dec 2003 21:40:00 -0000	1.4
@@ -26,7 +26,7 @@
 }
 
 if { [catch {set room_name [chat_room_name $room_id]} errmsg] } {
-    ad_return_complaint "Room not found" "Invalid room id"
+    ad_return_complaint 1 "Room not found, Invalid room id"
 }
 
 set context_bar [list $room_name]
Index: openacs-4/packages/chat/www/message-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/chat/www/message-delete-2.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/chat/www/message-delete-2.tcl	11 Dec 2003 21:40:00 -0000	1.2
@@ -12,7 +12,7 @@
 ad_require_permission $room_id chat_room_delete
 
 if { [catch {chat_room_message_delete $room_id} errmsg] } {
-    ad_return_complaint "Delete messages failed." $errmsg
+    ad_return_complaint 1 "Delete messages failed: $errmsg"
 }
 
 ad_returnredirect .
\ No newline at end of file
Index: openacs-4/packages/chat/www/room-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/chat/www/room-delete-2.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/chat/www/room-delete-2.tcl	11 Dec 2003 21:40:00 -0000	1.2
@@ -12,7 +12,7 @@
 ad_require_permission $room_id chat_room_delete
 
 if { [catch {chat_room_delete $room_id} errmsg] } {
-    ad_return_complaint "Delete room failed." $errmsg
+    ad_return_complaint 1 "Delete room failed: $errmsg"
 }
 
 ad_returnredirect . 
Index: openacs-4/packages/chat/www/room-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/room-edit-2.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/chat/www/room-edit-2.tcl	10 Sep 2002 22:22:32 -0000	1.2
+++ openacs-4/packages/chat/www/room-edit-2.tcl	11 Dec 2003 21:40:00 -0000	1.3
@@ -18,7 +18,7 @@
 
 if {[catch {chat_room_edit $room_id $pretty_name $description $moderated_p $active_p $archive_p} errmsg]} {
 
-    ad_return_complaint "Could not update room" $errmsg
+    ad_return_complaint 1 "Could not update room: $errmsg"
 }
 
 
Index: openacs-4/packages/chat/www/room-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/chat/www/room-edit.tcl	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/room-edit.tcl	11 Dec 2003 21:40:00 -0000	1.3
@@ -27,7 +27,7 @@
     from chat_rooms
     where room_id = :room_id}} errmsg]} {
 
-    ad_return_complaint "Room not found" "Room not found."
+    ad_return_complaint 1 "Room not found."
 }
 
 set context_bar [list "Edit room '$pretty_name'"]
Index: openacs-4/packages/chat/www/room-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/room-new-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/chat/www/room-new-2.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/chat/www/room-new-2.tcl	11 Dec 2003 21:40:00 -0000	1.2
@@ -26,7 +26,7 @@
                           -context_id $package_id \
                           -creation_user $user_id \
 		          -creation_ip $creation_ip $pretty_name]} errmsg]} {
-    ad_return_complaint "Create new room failed." $errmsg
+    ad_return_complaint 1 "Create new room failed: $errmsg"
 }
 
 ad_returnredirect "room?room_id=$room_id"
Index: openacs-4/packages/chat/www/transcript-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/chat/www/transcript-delete-2.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/chat/www/transcript-delete-2.tcl	11 Dec 2003 21:40:00 -0000	1.2
@@ -10,7 +10,7 @@
 ad_require_permission $transcript_id chat_transcript_delete
 
 if { [catch {chat_transcript_delete $transcript_id} errmsg] } {
-    ad_return_complaint "Delete transcript failed." $errmsg
+    ad_return_complaint 1 "Delete transcript failed: $errmsg"
 }
 
 ad_returnredirect "room?room_id=$room_id"
Index: openacs-4/packages/chat/www/transcript-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/transcript-edit-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/chat/www/transcript-edit-2.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/chat/www/transcript-edit-2.tcl	11 Dec 2003 21:40:00 -0000	1.2
@@ -16,7 +16,7 @@
 ad_require_permission $transcript_id chat_transcript_edit
 
 if { [catch {chat_transcript_edit $transcript_id $transcript_name $description $contents} errmsg] } {
-    ad_return_complaint "Could not update transcript" $errmsg
+    ad_return_complaint 1 "Could not update transcript: $errmsg"
 }
 
 ad_returnredirect "transcript-view?transcript_id=$transcript_id&room_id=$room_id"
\ No newline at end of file
Index: openacs-4/packages/clickthrough/clickthrough.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/clickthrough.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/clickthrough/clickthrough.info	17 May 2003 10:22:04 -0000	1.6
+++ openacs-4/packages/clickthrough/clickthrough.info	11 Dec 2003 21:40:00 -0000	1.7
@@ -1,27 +1,34 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="clickthrough" url="http://www.arsdigita.com/acs-repository/apm/packages/clickthrough" type="apm_service">
+<package key="clickthrough" url="http://openacs.org/repository/apm/packages/clickthrough" type="apm_service">
     <package-name>Clickthrough</package-name>
     <pretty-plural>Clickthrough</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="0.1d" url="http://www.arsdigita.com/acs-repository/download/apm/clickthrough-0.1d.apm">
+    <version name="0.1d" url="http://openacs.org/repository/download/apm/clickthrough-0.1d.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:nuno@arsdigita.com">Nuno Santos</owner>
-        <summary>The Clickthrough package provides a service that allows a site or subsite to monitor how its users exit the site, by recording which links are followed to external sites.</summary>
+        <owner>Nuno Santos</owner>
+        <summary>Track which links are actually followed by a user.</summary>
         <release-date>2000-12-14</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/plain">Clickthrough collects information about each pair of local (origin) and foreign (destination) addresses, including a daily count of clickthroughs between each such pair of addresses.
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/plain">
+Clickthrough collects information about each pair of local (origin)
+and foreign (destination) addresses, including summary statistics of
+clickthroughs between each such pairs of addresses.  The clickthrough
+log can be used to provide external sites with a measure of how much
+traffic originated from the local site, which can be useful for
+auditing or confirming revenue generating clickthroughs (e.g.,
+referrals).  Any link can be clickthrough-enabled by embedding special
+information in its destination address. This is achieved by wrapping
+the href attribute with a call to `clickthrough_href' (e.g.,
+[clickthrough_href http://openacs.org]).
+</description>
 
-This clickthrough log can be used to provide external sites with a measure of how much traffic originated from the local site, which can be useful for auditing or confirming revenue generating clickthroughs (e.g., referrals).
-
-Any link can be clickthrough-enabled by embedding special information in its destination address. This is achieved by wrapping the href attribute with a call to `clickthrough_href' (e.g., [clickthrough_href http://www.arsdigita.com]).</description>
-
         <requires url="acs-kernel" version="4.6.2"/>
 
         <files>
Index: openacs-4/packages/cms/cms.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/cms.info,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/cms/cms.info	17 May 2003 10:22:20 -0000	1.9
+++ openacs-4/packages/cms/cms.info	11 Dec 2003 21:40:00 -0000	1.10
@@ -1,22 +1,28 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="cms" url="http://www.arsdigita.com/acs-repository/apm/packages/cms" type="apm_application">
+<package key="cms" url="http://openacs.org/repository/apm/packages/cms" type="apm_application">
     <package-name>Content Management System</package-name>
     <pretty-plural>Content Management Systems</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.1.1" url="http://www.arsdigita.com/acs-repository/download/apm/cms-4.1.1.apm">
+    <version name="4.1.1" url="http://openacs.org/repository/download/apm/cms-4.1.1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:karlg@arsdigita.com">Karl Goldstein</owner>
-        <owner url="mailto:lutter@arsdigita.com">David Lutterkort</owner>
+        <owner>Karl Goldstein</owner>
+        <owner>David Lutterkort</owner>
+        <summary>A CMS implemented on top of the Content Repository.</summary>
         <release-date>2001-01-26</release-date>
-        <vendor url="http://cms.arsdigita.com/">ArsDigita Corporation</vendor>
-
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">CMS is a full featured content management system implemented on top of
+        the content repository which supports workflow, composite objects, dynamicly created attributes, publishing to 
+        the filesystem and categorization.  The user interface needs a great deal of work and the package relies on 
+        acs-workflow which has been deprecated.  Alternatives include etp and bcms (which is a work in progress), CMS 
+        remains the best place to look to find examples of how the content repository should be used.
+        </description>
         <provides url="cms" version="4.1"/>
         <requires url="acs-content-repository" version="4.1"/>
         <requires url="acs-kernel" version="4.6.2"/>
Index: openacs-4/packages/cms/www/item/create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/item/create.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/item/create.tcl	16 Aug 2002 00:18:41 -0000	1.4
+++ openacs-4/packages/cms/www/item/create.tcl	11 Dec 2003 21:40:00 -0000	1.5
@@ -1,6 +1,6 @@
 # Create a new item and an initial revision for a content item (generic)
 
-form create create_item {
+form create create_item
 
 element create create_item item_id -datatype integer -widget hidden
 element create create_item revision_id -datatype integer -widget hidden
Index: openacs-4/packages/cms/www/modules/types/widget-register-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-2.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/widget-register-2.adp	22 May 2003 14:32:35 -0000	1.2
+++ openacs-4/packages/cms/www/modules/types/widget-register-2.adp	11 Dec 2003 21:40:00 -0000	1.3
@@ -1,7 +1,7 @@
 <master src="../../master">
 <property name="title">Set Attribute Widget Params</property>
 
-<if @notification_chunk;noquote@ nil>
+<if @notification_chunk@ nil>
   <h3>You must select a widget for this attribute!</h3>
   <a href="widget-register?attribute_id=@attribute_id@">
     Select a widget</a>
@@ -11,4 +11,4 @@
   <h3>Set Attribute Widget Params</h3>
   <formtemplate id="widget_register" style="wizard"></formtemplate>
 
-</else>
\ No newline at end of file
+</else>
Index: openacs-4/packages/cms/www/modules/types/widget-register-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-3.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/widget-register-3.adp	22 May 2003 14:32:35 -0000	1.2
+++ openacs-4/packages/cms/www/modules/types/widget-register-3.adp	11 Dec 2003 21:40:00 -0000	1.3
@@ -1,7 +1,7 @@
 <master src="../../master">
 <property name="title">Preview Attribute Widget</property>
 
-<if @notification_chunk;noquote@ nil>
+<if @notification_chunk@ nil>
   <h3>You must select a widget for this attribute!</h3>
   <a href="widget-register?attribute_id=@attribute_id@">
     Select a widget</a>
@@ -21,4 +21,4 @@
 
   </else>
 
-</else>
\ No newline at end of file
+</else>
Index: openacs-4/packages/cms-news-demo/cms-news-demo.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms-news-demo/cms-news-demo.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms-news-demo/cms-news-demo.info	17 May 2003 10:25:59 -0000	1.4
+++ openacs-4/packages/cms-news-demo/cms-news-demo.info	11 Dec 2003 21:40:01 -0000	1.5
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="cms-news-demo" url="http://www.arsdigita.com/acs-repository/apm/packages/cms-news-demo" type="apm_application">
+<package key="cms-news-demo" url="http://openacs.org/repository/apm/packages/cms-news-demo" type="apm_application">
     <package-name>CMS News Site Demo</package-name>
     <pretty-plural>CMS News Site Demos</pretty-plural>
     <singleton-p>t</singleton-p>
 
-    <version name="1.4" url="http://www.arsdigita.com/acs-repository/download/apm/cms-news-demo-1.4.apm">
+    <version name="1.4" url="http://openacs.org/repository/download/apm/cms-news-demo-1.4.apm">
     <database-support>
         <database>oracle</database>
     </database-support>
-        <owner url="mailto:pihman@arsdigita.com">Michael Pih</owner>
-        <summary>A demo news site built using CMS.</summary>
+        <owner>Michael Pih</owner>
+        <summary>News site demo built using CMS.</summary>
         <release-date>2001-02-14</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">A demo news site built using CMS.</description>
 
         <requires url="acs-content-repository" version="4.1"/>
Index: openacs-4/packages/cronjob/cronjob.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/cronjob.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/cronjob/cronjob.info	8 Oct 2003 16:05:25 -0000	1.6
+++ openacs-4/packages/cronjob/cronjob.info	11 Dec 2003 21:40:01 -0000	1.7
@@ -13,8 +13,9 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:tom@rmadilo.com">Tom Jackson</owner>
-        <summary>Runs sql and tcl code on schedule similar to unix cron.</summary>
-        <description format="text/plain">Runs sql and tcl code on schedule similar to unix cron.</description>
+        <summary>Run sql and tcl code on schedule, similar to unix cron.</summary>
+        <description format="text/plain">Runs sql and tcl code on schedule similar to unix cron.  Some issues exist with 
+        guaranteed execution and blocking.</description>
 
         <!-- No dependency information -->
 
Index: openacs-4/packages/curriculum/curriculum.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/curriculum.info,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/curriculum/curriculum.info	17 Oct 2003 13:43:29 -0000	1.8
+++ openacs-4/packages/curriculum/curriculum.info	11 Dec 2003 21:40:01 -0000	1.9
@@ -10,10 +10,13 @@
     <version name="0.5d1" url="http://openacs.org/repository/download/apm/curriculum-0.5d1.apm">
         <owner url="mailto:ola@polyxena.net">Ola Hansson</owner>
         <vendor url="http://www.polyxena.net">Polyxena</vendor>
+        <summary>Create and track user page sequence "curriculum"</summary>
+        <description format="text/html">Provides a UI for creating a sequence of links as a "curriculum" which can 
+be presented as a linkbar in the page footer (or elsewhere) and is tracked per user.</description>
 
         <provides url="curriculum" version="0.5d1"/>
         <requires url="workflow" version="0.2d2"/>
-
+        
         <callbacks>
             <callback type="before-uninstall"  proc="curriculum::apm::before_uninstall"/>
             <callback type="after-install"  proc="curriculum::apm::after_install"/>
Index: openacs-4/packages/curriculum/lib/curriculum-ave.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/curriculum-ave.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/curriculum/lib/curriculum-ave.tcl	4 Oct 2003 13:10:51 -0000	1.10
+++ openacs-4/packages/curriculum/lib/curriculum-ave.tcl	11 Dec 2003 21:40:01 -0000	1.11
@@ -27,10 +27,11 @@
     # New curriculum.
     ####
 
+    set form_mode edit
+
     permission::require_permission -object_id $package_id -privilege write
     set write_p 1
 
-    set form_mode edit
     set title "[_ curriculum.Create_Curriculum]"
 
     lappend owners_list [list [person::name -person_id $user_id] "$user_id"]
@@ -41,6 +42,8 @@
     # Edit/display curriculum.
     ####
 
+    set form_mode display
+
     curriculum::get -curriculum_id $curriculum_id -array curriculum_array
 
     set write_p [permission::permission_p -object_id $curriculum_id -privilege write]
@@ -82,6 +85,7 @@
 	    # We can't just change the mode of the entire form to display mode because
 	    # then the form will lose its OK and Cancel buttons when an action button is pressed.
 	    
+	    set form_mode edit
 	    set element_mode display
 
 	    workflow::action::get -action_id $action_id -array action
@@ -90,8 +94,10 @@
 	    set action_pretty_past_tense [lang::util::localize $action(pretty_past_tense)]
 	    
 	} else {
+
 	    set action_pretty_name {}
 	    set action_pretty_past_tense {}
+
 	}
 	
 	set title "[ad_decode $action_pretty_name "" "[_ curriculum.View]" $action_pretty_name] [_ curriculum.Curriculum] $curriculum_array(name)"
@@ -106,13 +112,11 @@
 
     }
     
-    set form_mode display
-
     lappend owners_list [list [person::name -person_id $curriculum_array(owner_id)] $curriculum_array(owner_id)]
 
 }
 
-set context {$title}
+set context [list $title]
 
 # Curriculum "owner" select box. 
 lappend owners_list [list "[_ curriculum.Search]" ":search:"]
@@ -216,14 +220,6 @@
 #
 ####
 
-# Set editable fields. Must do this after the "-form" block!
-if { !$new_p && $wf_action_exists_p } {
-
-    foreach field [workflow::action::get_element -action_id $action_id -element edit_fields] { 
-	element set_properties curriculum $field -mode edit 
-    }
-}    
-
 ad_form -extend -name curriculum -edit_request {
 
     curriculum::get -curriculum_id $curriculum_id -array curriculum_array
@@ -238,12 +234,10 @@
     }
     
 } -validate {
-
     {name
 	{[string length $name] <= [set length 200]}
 	"[_ curriculum.lt_Name_may_not_be_more_]"
     }
-
 } -new_data {
 
     curriculum::new \
@@ -279,4 +273,13 @@
 }
 
 
+# Set editable fields. Must do this after the "-form" block!
+if { !$new_p && $wf_action_exists_p && ![form is_submission curriculum] } {
+
+    foreach field [workflow::action::get_element -action_id $action_id -element edit_fields] { 
+	element set_properties curriculum $field -mode edit 
+    }
+}    
+
+
 ad_return_template
Index: openacs-4/packages/curriculum/lib/element-ave.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/element-ave.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/curriculum/lib/element-ave.tcl	5 Oct 2003 17:41:38 -0000	1.8
+++ openacs-4/packages/curriculum/lib/element-ave.tcl	11 Dec 2003 21:40:01 -0000	1.9
@@ -52,7 +52,7 @@
     set title "[_ curriculum.lt_element_name_part_of_]"
 }
 
-set context {$title}
+set context [list $title]
 
 ad_form -name element \
     -export {curriculum_id} \
@@ -141,4 +141,10 @@
     element set_properties element url -display_value $link
 }
 
+# If there is a spelling error you want to display the form in edit mode.
+if { [form is_submission element] } {
+    form set_properties element -mode edit
+}
+
+
 ad_return_template
Index: openacs-4/packages/curriculum/lib/summary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/summary.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum/lib/summary.adp	11 Dec 2003 21:40:01 -0000	1.2
@@ -0,0 +1,28 @@
+<if @elements:rowcount@ not nil>
+
+@community_name@:
+
+<multiple name="elements">
+
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td width="75%">
+      @indent;noquote@<a href="@url@curriculum-ave?curriculum_id=@elements.curriculum_id@" title="@elements.curriculum_desc;noquote@<if @elements.curr_desc_trunc_p@> ...</if>">@elements.curriculum_name;noquote@</a>
+    </td>
+    <td width="25%">
+      <if @elements.completed_p@>#curriculum.Completed#</if><else>#curriculum.Ongoing#</else>
+    </td>
+  </tr>
+</table>
+
+</multiple>
+
+</if>
+<else>
+
+<li>
+  #curriculum.lt_No_published_curricul#
+</li>
+
+</else>
+
Index: openacs-4/packages/curriculum/lib/user-curriculums.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/user-curriculums.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/curriculum/lib/user-curriculums.adp	5 Sep 2003 09:32:15 -0000	1.12
+++ openacs-4/packages/curriculum/lib/user-curriculums.adp	11 Dec 2003 21:40:01 -0000	1.13
@@ -7,7 +7,7 @@
   <a href="@url@remove-from-bar?@return_url_export@" title="#curriculum.lt_Stop_displaying_the_c#">#curriculum.lt_Remove_all_curriculum#</a>
 </if>
   |
-  <a href="doc/user.html#STUDENT" title="#curriculum.lt_Read_the_user_manual_#">#curriculum.Help#</a>
+  <a href="@url@doc/user.html#STUDENT" title="#curriculum.lt_Read_the_user_manual_#">#curriculum.Help#</a>
   ]
 </p>
 <table border="0" width="100%">
@@ -118,7 +118,7 @@
 </if>
 <else>
 <li>
-  <i>#curriculum.lt_No_published_curricul#</i>
+  #curriculum.lt_No_published_curricul#
 </li>
 </else>
 
Index: openacs-4/packages/curriculum/lib/user-curriculums.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/user-curriculums.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/curriculum/lib/user-curriculums.tcl	14 Jun 2003 16:29:24 -0000	1.4
+++ openacs-4/packages/curriculum/lib/user-curriculums.tcl	11 Dec 2003 21:40:01 -0000	1.5
@@ -11,8 +11,21 @@
     logged_in_p:onevalue
 }
 
-set package_id [curriculum::conn package_id]
+# "package_id" may or may not be provided as an attribute with the <include> tag.
+if { ![info exists package_id] } {
+    set package_id [curriculum::conn package_id]
+}
 
+# "template" may or may not be provided as an attribute with the <include> tag.
+if { ![info exists template] } {
+    # Use the ordinary template (user-curriculums.adp).
+    set template ""
+} else {
+    # Assume "template" came from the portlet <include> and calculate the community name, etc.
+    set community_name [site_nodes::get_parent_name -package_id $package_id]
+    set indent [string repeat "&nbsp;" 4]
+}
+
 set logged_in_p [ad_conn user_id]
 
 # Upvar the "elements" multirow datasource for the curriculum bar.
@@ -28,4 +41,4 @@
 set return_url [ad_return_url]
 set return_url_export [export_vars -url return_url]
 
-ad_return_template
+ad_return_template $template
Index: openacs-4/packages/curriculum/www/doc/admin.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/doc/admin.html,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/curriculum/www/doc/admin.html	6 Jul 2003 17:36:48 -0000	1.2
+++ openacs-4/packages/curriculum/www/doc/admin.html	11 Dec 2003 21:40:01 -0000	1.3
@@ -76,7 +76,7 @@
 ><P
 >As a site wide admin (SWA) there are a few things that you should be aware of when setting up an instance of the Curriculum module. The package essentially offers services to students and teachers of online courses. The students are offered a curriculum bar, a navigation and tracking interface, that is to be displayed on all master-templated pages of the site, or at least the subsite, where the Curriculum instance is mounted. You must facilitate this. The teachers that design courses use a publishing workflow. Unless you want to take on the responsibility for administrating the work, you must grant admin rights on the instance to a head teacher.</P
 ><P
->Hence, after installing and mounting the Curriculum package (you can mount one instance of Curriculum per subsite) there are a few things left for you to do. First, make sure to facilitate the proper display of the curriculum bar widget. There are two versions of the curriculum bar to choose from: a horizontal and a vertical course menu. But the curriculum bar widget won't be displayed at all until you have included it manually in the master template. You will need to add the following curriculum bar include code at the desired place in the default-master or other template of preference, and perhaps write some markup code around it.</P
+>Hence, after installing and mounting the Curriculum package (you can mount one instance of Curriculum per subsite) - and restarting the server - there are a few things left for you to do. First, make sure to facilitate the proper display of the curriculum bar widget. There are two versions of the curriculum bar to choose from: a horizontal and a vertical course menu. But the curriculum bar widget won't be displayed at all unless it is included in the master template. If it isn't, you will need to add the following curriculum bar include code at the desired place in the site-master or other template of preference, and perhaps write some markup code around it.</P
 ><P
 >Add this to the template's TCL file:</P
 ><P
@@ -88,7 +88,7 @@
 ><PRE
 CLASS="SCREEN"
 ># Curriculum bar
-set curriculum_bar_p [apm_package_installed_p curriculum]</PRE
+set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $subsite_node_id]]</PRE
 ></BLOCKQUOTE
 ></P
 ><P
Index: openacs-4/packages/curriculum/www/doc/dev.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/doc/dev.html,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/curriculum/www/doc/dev.html	3 Jul 2003 10:56:01 -0000	1.1
+++ openacs-4/packages/curriculum/www/doc/dev.html	11 Dec 2003 21:40:01 -0000	1.2
@@ -82,89 +82,17 @@
 > and the <SAMP
 CLASS="COMPUTEROUTPUT"
 >cu_elements</SAMP
-> tables. Elements, not curriculums, are actually the most fundamental objects that the Curriculum package works with. Presenting the elements as belonging to a certain curriculum, in turn belonging to a certain instance, is more or less a matter of display finesses. The curriculum and element definition tables are cached per instance, and the cache gets flushed whenever a curriculum or element is modified.</P
+> tables. Elements, not curriculums, are actually the most fundamental objects that the Curriculum package works with. Presenting the elements as belonging to a certain curriculum, in turn belonging to a certain instance, is more or less a matter of display finesses. The curriculum and element definition tables are cached per instance, and the cache gets flushed via a callback whenever a curriculum or element is modified by an editor or publisher.</P
 ><P
 >The tracking of users' learning progress is handled with a registered filter that notes whenever a user visits a URL that has been defined as a learning element in a curriculum. If the URL is external to the subsite that hosts the Curriculum instance, it will be modified in the bar so as to lead to a "clickthrough" script where the tracking takes place as the web page is delivered. In order to display the curriculum bar on external pages too, these are presented with frames. A user's individual curriculum progress is set and updated in a cookie. Logged-in users get their learning progress recorded in the <SAMP
 CLASS="COMPUTEROUTPUT"
->cu_user_element_map.</SAMP
-></P
-><P
->In order for logged-in users to have more control over which curriculums to follow and which not to, the <SAMP
+>cu_user_element_map</SAMP
+>. In order for logged-in users to have more control over which curriculums to follow and which not to, the <SAMP
 CLASS="COMPUTEROUTPUT"
 >cu_user_curriculum_map</SAMP
-> keeps track of which curriculums a user wants displayed. This table is cached per user. The cache is only flushed for all users at the specific request of a curriculum administrator who is done modifying the curriculums and elements in an instance. The administrator will want do this from time to time in order to update the curriculum bar of all users of the Curriculum service so as to reflect altered curriculum or element definitions.</P
+> keeps track of which curriculums a user wants displayed. This table is cached per user.</P
 ><P
->Curriculum uses the Workflow package for managing the process of publishing curriculums. A default workflow is automatically created when installing the Curriculum package. Every instance will use an individual copy of this default workflow. If you are dissatisfied with the default workflow template and wish to create another one of your own liking, please refer to the Workflow Developer's Guide. The default workflow of Curriculum goes as follows:</P
-><P
-><A
-NAME="AEN55"
-></A
-><BLOCKQUOTE
-CLASS="BLOCKQUOTE"
-><PRE
-CLASS="SCREEN"
->* Roles:
-
-{Author}
-{Editor}
-{Publisher}
-
-* Actions:
-
-[Create]
-[Edit]
-[Reject]
-[Publish]
-[Archive]
-[Comment]
-
-* States:
-
-(Created)
-(Edited)
-(Rejected)
-(Published)
-(Archived)
-
-* Cases:
-
-In-flow:
-
-The {Editor} and {Publisher} are required to act on some states, and will be notified when this is so.
-
-When the object is in the states (Created) or (Rejected) the {Editor} is required to [Edit].
-
-(Created) -&#62; [Edit] -&#62; (Edited)
-(Rejected) -&#62; [Edit] -&#62; (Edited)
-
-When the object is in the state (Edited) the {Publisher} is required to [Reject] or [Publish].
-
-(Edited) -&#62; [Reject] -&#62; (Rejected)
-(Edited) -&#62; [Publish] -&#62; (Published)
-
-Out-of-flow: 
-
-The {Author}, {Editor}, and {Publisher} are free to act in different ways on different states.
-
-The {Author} can always [Create] objects, and then the {Editor} is required to [Edit].
-
-[Create] -&#62; (Created)
-
-The {Editor} can always [Edit] objects, and then the {Publisher} is required to either [Reject] or [Publish].
-
-(Edited) -&#62; [Edit] -&#62; (Edited)
-(Published) -&#62; [Edit] -&#62; (Edited)
-(Archived) -&#62; [Edit] -&#62; (Edited)
-
-The {Publisher} can always [Archive] objects that are (Published), and [Publish] objects that are (Archived).
-
-(Published) -&#62; [Archive] -&#62; (Archived)
-(Archived) -&#62; [Publish] -&#62; (Published) 
-
-All roles can [Comment] the workflow process without this having any effect on the states.
-      </PRE
-></BLOCKQUOTE
-></P
+>Curriculum uses the Workflow package for managing the process of publishing curriculums. A default workflow - distinguishing between the roles of Creator, Editor, and Publisher - is automatically created when installing the Curriculum package. Every instance will use an individual copy of this default workflow. If you are dissatisfied with the default workflow template and wish to create another one to your own liking, please refer to the Workflow Developer's Guide.</P
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
Index: openacs-4/packages/curriculum/www/doc/user.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/doc/user.html,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/curriculum/www/doc/user.html	3 Jul 2003 10:56:01 -0000	1.1
+++ openacs-4/packages/curriculum/www/doc/user.html	11 Dec 2003 21:40:01 -0000	1.2
@@ -105,11 +105,11 @@
 ><P
 >The Curriculum module provides online teachers with a handy educational tool. It allows you to set up curriculums made up of learning elements that are URLs found anywhere online. In order to manage this course design process, a publishing workflow aids the administration of curriculums in the making. While the teachers focus on designing courses, the web publisher is ultimately responsible for determining when a course is ready for public viewing, and when it is time to archive it. Hence Curriculum is administered via a content management system.</P
 ><P
->The Curriculum admin page presents an overview of all set-up curriculums from a workflow perspective. Here you will get information about which publishing state each curriculum and its learning elements are in. If you click on a curriculum's name, you will (apart from the data about the curriculum) also be presented with those administrative actions you are allowed to take, depending on your assigned role in the workflow. On the admin page you use the tabs at the top to filter out a view of only those curriculums that are in a particular publishing state of your interest. The workflow states that are implemented in a default setup of Curriculum are: Created, Edited, Rejected, Published, and Archived.</P
+>The Curriculum admin page presents an overview of all set-up curriculums from a workflow perspective. Here you will get information about which publishing state each curriculum and its learning elements are in. If you click on a curriculum's name, you will (apart from the data about the curriculum) also be presented with those administrative actions you are allowed to take, depending on your assigned role in the workflow. On the admin page you use the tabs at the top to filter out a view of only those curriculums that are in a particular publishing state of your interest. The workflow states that are implemented in a default setup of Curriculum are: Pending, Edited, Rejected, Published, and Archived.</P
 ><P
->The first thing to do is to create a new curriculum. Simply follow the "Add a curriculum" link, fill in the form, and submit it. Now, a curriculum is merely the container of the actual learning resources: the URL elements. The "Add an element" link found in the created curriculum will take you to a form where you fill in the data about a learning resource. Repeat this operation for every element in your curriculum. If you wish to change the internal order of the elements in the curriculum, just click on the arrows in the "Move" column in the curriculum table. If you have created several curriculums, the order of these can also be altered in the same way. In order for you to get notifications of administrative actions taken on a curriculum, just click on the "Watch" link in the "Actions" column of the curriculums you are interested in.</P
+>The first thing to do is to create a new curriculum. Simply follow the "Add a curriculum" link, fill in the form, and submit it. Now, a curriculum is merely the container of the actual learning resources: the URL elements. The "Add an element" link found in the created curriculum will take you to a form where you fill in the data about a learning resource. If you don't state a URL, the element will consist solely of its metadata. Then the element URL in the curriculum bar will lead to the element info page, just like the info link. Repeat this operation for every element in your curriculum. If you wish to change the internal order of the elements in the curriculum, just click on the arrows in the "Move" column in the curriculum table. If you have created several curriculums, the order of these can also be altered in the same way.</P
 ><P
->The publisher will get notified about the created curriculum. If you are a publisher, you will be presented with the option of publishing the created (or edited) curriculum when you look at it in a detailed view. A published curriculum will go live; all users will be presented with it. But the users' individual curriculum bars are not updated with the new curriculum until you click on the "I'm done now, update the bar for everyone!" link to the top right of the admin page. The reason why you have to manually make sure that this happens is because you only want your very final edition to show. Also, updating users' individual bars is a rather heavy computer operation; if this were done automatically every time a curriculum or element was edited or moved, a lot of unnecessary computer processing would take place.</P
+>In order for you to get notifications of administrative actions taken on a curriculum, just click on the "Watch" link in the "Actions" column of the curriculums you are interested in. Then you will get an email report whenever someone has performed an action in the publishing workflow of the curriculum. The publisher will get notified about the created curriculum. If you are a publisher, you will be presented with the option of publishing the created (or edited) curriculum when you look at it in a detailed view. A published curriculum will go live; all users will be presented with it.</P
 ></DIV
 ></DIV
 ><DIV
Index: openacs-4/packages/curriculum/www/doc/docbook/curriculum.sgml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/www/doc/docbook/curriculum.sgml,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/curriculum/www/doc/docbook/curriculum.sgml	6 Jul 2003 17:36:48 -0000	1.2
+++ openacs-4/packages/curriculum/www/doc/docbook/curriculum.sgml	11 Dec 2003 21:40:01 -0000	1.3
@@ -29,18 +29,18 @@
     <sect2 id="teacher">
       <title>Teacher's Guide</title>
       <para>The Curriculum module provides online teachers with a handy educational tool. It allows you to set up curriculums made up of learning elements that are URLs found anywhere online. In order to manage this course design process, a publishing workflow aids the administration of curriculums in the making. While the teachers focus on designing courses, the web publisher is ultimately responsible for determining when a course is ready for public viewing, and when it is time to archive it. Hence Curriculum is administered via a content management system.</para>
-      <para>The Curriculum admin page presents an overview of all set-up curriculums from a workflow perspective. Here you will get information about which publishing state each curriculum and its learning elements are in. If you click on a curriculum's name, you will (apart from the data about the curriculum) also be presented with those administrative actions you are allowed to take, depending on your assigned role in the workflow. On the admin page you use the tabs at the top to filter out a view of only those curriculums that are in a particular publishing state of your interest. The workflow states that are implemented in a default setup of Curriculum are: Created, Edited, Rejected, Published, and Archived.</para>
-      <para>The first thing to do is to create a new curriculum. Simply follow the "Add a curriculum" link, fill in the form, and submit it. Now, a curriculum is merely the container of the actual learning resources: the URL elements. The "Add an element" link found in the created curriculum will take you to a form where you fill in the data about a learning resource. Repeat this operation for every element in your curriculum. If you wish to change the internal order of the elements in the curriculum, just click on the arrows in the "Move" column in the curriculum table. If you have created several curriculums, the order of these can also be altered in the same way. In order for you to get notifications of administrative actions taken on a curriculum, just click on the "Watch" link in the "Actions" column of the curriculums you are interested in.</para>
-      <para>The publisher will get notified about the created curriculum. If you are a publisher, you will be presented with the option of publishing the created (or edited) curriculum when you look at it in a detailed view. A published curriculum will go live; all users will be presented with it. But the users' individual curriculum bars are not updated with the new curriculum until you click on the "I'm done now, update the bar for everyone!" link to the top right of the admin page. The reason why you have to manually make sure that this happens is because you only want your very final edition to show. Also, updating users' individual bars is a rather heavy computer operation; if this were done automatically every time a curriculum or element was edited or moved, a lot of unnecessary computer processing would take place.</para>
+      <para>The Curriculum admin page presents an overview of all set-up curriculums from a workflow perspective. Here you will get information about which publishing state each curriculum and its learning elements are in. If you click on a curriculum's name, you will (apart from the data about the curriculum) also be presented with those administrative actions you are allowed to take, depending on your assigned role in the workflow. On the admin page you use the tabs at the top to filter out a view of only those curriculums that are in a particular publishing state of your interest. The workflow states that are implemented in a default setup of Curriculum are: Pending, Edited, Rejected, Published, and Archived.</para>
+      <para>The first thing to do is to create a new curriculum. Simply follow the "Add a curriculum" link, fill in the form, and submit it. Now, a curriculum is merely the container of the actual learning resources: the URL elements. The "Add an element" link found in the created curriculum will take you to a form where you fill in the data about a learning resource. If you don't state a URL, the element will consist solely of its metadata. Then the element URL in the curriculum bar will lead to the element info page, just like the info link. Repeat this operation for every element in your curriculum. If you wish to change the internal order of the elements in the curriculum, just click on the arrows in the "Move" column in the curriculum table. If you have created several curriculums, the order of these can also be altered in the same way.</para>
+      <para>In order for you to get notifications of administrative actions taken on a curriculum, just click on the "Watch" link in the "Actions" column of the curriculums you are interested in. Then you will get an email report whenever someone has performed an action in the publishing workflow of the curriculum. The publisher will get notified about the created curriculum. If you are a publisher, you will be presented with the option of publishing the created (or edited) curriculum when you look at it in a detailed view. A published curriculum will go live; all users will be presented with it.</para>
     </sect2>
   </sect1>
   <sect1 id="admin">
     <title>Administrator's Guide</title>
     <para>As a site wide admin (SWA) there are a few things that you should be aware of when setting up an instance of the Curriculum module. The package essentially offers services to students and teachers of online courses. The students are offered a curriculum bar, a navigation and tracking interface, that is to be displayed on all master-templated pages of the site, or at least the subsite, where the Curriculum instance is mounted. You must facilitate this. The teachers that design courses use a publishing workflow. Unless you want to take on the responsibility for administrating the work, you must grant admin rights on the instance to a head teacher.</para>
-    <para>Hence, after installing and mounting the Curriculum package (you can mount one instance of Curriculum per subsite) there are a few things left for you to do. First, make sure to facilitate the proper display of the curriculum bar widget. There are two versions of the curriculum bar to choose from: a horizontal and a vertical course menu. But the curriculum bar widget won't be displayed at all until you have included it manually in the master template. You will need to add the following curriculum bar include code at the desired place in the default-master or other template of preference, and perhaps write some markup code around it.</para>
+    <para>Hence, after installing and mounting the Curriculum package (you can mount one instance of Curriculum per subsite) - and restarting the server - there are a few things left for you to do. First, make sure to facilitate the proper display of the curriculum bar widget. There are two versions of the curriculum bar to choose from: a horizontal and a vertical course menu. But the curriculum bar widget won't be displayed at all unless it is included in the master template. If it isn't, you will need to add the following curriculum bar include code at the desired place in the site-master or other template of preference, and perhaps write some markup code around it.</para>
     <para>Add this to the template's TCL file:</para>
     <para><blockquote><screen><![CDATA[# Curriculum bar
-set curriculum_bar_p [apm_package_installed_p curriculum]]]></screen></blockquote></para>
+set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $subsite_node_id]]]]></screen></blockquote></para>
     <para>Add this to the template's ADP file:</para>
     <para><blockquote><screen><![CDATA[<!-- Start curriculum bar -->
 <if @curriculum_bar_p@><include src="/packages/curriculum/lib/bar" /></if>
@@ -50,71 +50,9 @@
   <sect1 id="dev">
     <title>Developer's Guide</title>
     <para>The usage of Curriculum has been extended quite a bit from the OpenACS 3 version, which wasn't subsite aware and didn't allow for several curriculums to be presented at once. The new expanded Curriculum module has also been adapted into a .LRN applet and portlet. One nice feature that has been kept from the original module is the ability to serve curriculums to both logged-in users and casual surfers. Non-registered users will get a cookie that keeps track of the curriculum progress. Logged-in users get their progress updated in the database, and are thus able to continue where they were last even if they are not using their own computer.</para>
-    <para>The definition of the curriculums and their elements (and respective metadata) is entered via ad_forms into the <computeroutput>cu_curriculums</computeroutput> and the <computeroutput>cu_elements</computeroutput> tables. Elements, not curriculums, are actually the most fundamental objects that the Curriculum package works with. Presenting the elements as belonging to a certain curriculum, in turn belonging to a certain instance, is more or less a matter of display finesses. The curriculum and element definition tables are cached per instance, and the cache gets flushed whenever a curriculum or element is modified.</para>
-    <para>The tracking of users' learning progress is handled with a registered filter that notes whenever a user visits a URL that has been defined as a learning element in a curriculum. If the URL is external to the subsite that hosts the Curriculum instance, it will be modified in the bar so as to lead to a "clickthrough" script where the tracking takes place as the web page is delivered. In order to display the curriculum bar on external pages too, these are presented with frames. A user's individual curriculum progress is set and updated in a cookie. Logged-in users get their learning progress recorded in the <computeroutput>cu_user_element_map.</computeroutput></para>
-    <para>In order for logged-in users to have more control over which curriculums to follow and which not to, the <computeroutput>cu_user_curriculum_map</computeroutput> keeps track of which curriculums a user wants displayed. This table is cached per user. The cache is only flushed for all users at the specific request of a curriculum administrator who is done modifying the curriculums and elements in an instance. The administrator will want do this from time to time in order to update the curriculum bar of all users of the Curriculum service so as to reflect altered curriculum or element definitions.</para>
-    <para>Curriculum uses the Workflow package for managing the process of publishing curriculums. A default workflow is automatically created when installing the Curriculum package. Every instance will use an individual copy of this default workflow. If you are dissatisfied with the default workflow template and wish to create another one of your own liking, please refer to the Workflow Developer's Guide. The default workflow of Curriculum goes as follows:</para>
-    <para><blockquote><screen>
-* Roles:
-
-{Author}
-{Editor}
-{Publisher}
-
-* Actions:
-
-[Create]
-[Edit]
-[Reject]
-[Publish]
-[Archive]
-[Comment]
-
-* States:
-
-(Created)
-(Edited)
-(Rejected)
-(Published)
-(Archived)
-
-* Cases:
-
-In-flow:
-
-The {Editor} and {Publisher} are required to act on some states, and will be notified when this is so.
-
-When the object is in the states (Created) or (Rejected) the {Editor} is required to [Edit].
-
-(Created) -> [Edit] -> (Edited)
-(Rejected) -> [Edit] -> (Edited)
-
-When the object is in the state (Edited) the {Publisher} is required to [Reject] or [Publish].
-
-(Edited) -> [Reject] -> (Rejected)
-(Edited) -> [Publish] -> (Published)
-
-Out-of-flow: 
-
-The {Author}, {Editor}, and {Publisher} are free to act in different ways on different states.
-
-The {Author} can always [Create] objects, and then the {Editor} is required to [Edit].
-
-[Create] -> (Created)
-
-The {Editor} can always [Edit] objects, and then the {Publisher} is required to either [Reject] or [Publish].
-
-(Edited) -> [Edit] -> (Edited)
-(Published) -> [Edit] -> (Edited)
-(Archived) -> [Edit] -> (Edited)
-
-The {Publisher} can always [Archive] objects that are (Published), and [Publish] objects that are (Archived).
-
-(Published) -> [Archive] -> (Archived)
-(Archived) -> [Publish] -> (Published) 
-
-All roles can [Comment] the workflow process without this having any effect on the states.
-      </screen></blockquote></para>
+    <para>The definition of the curriculums and their elements (and respective metadata) is entered via ad_forms into the <computeroutput>cu_curriculums</computeroutput> and the <computeroutput>cu_elements</computeroutput> tables. Elements, not curriculums, are actually the most fundamental objects that the Curriculum package works with. Presenting the elements as belonging to a certain curriculum, in turn belonging to a certain instance, is more or less a matter of display finesses. The curriculum and element definition tables are cached per instance, and the cache gets flushed via a callback whenever a curriculum or element is modified by an editor or publisher.</para>
+    <para>The tracking of users' learning progress is handled with a registered filter that notes whenever a user visits a URL that has been defined as a learning element in a curriculum. If the URL is external to the subsite that hosts the Curriculum instance, it will be modified in the bar so as to lead to a "clickthrough" script where the tracking takes place as the web page is delivered. In order to display the curriculum bar on external pages too, these are presented with frames. A user's individual curriculum progress is set and updated in a cookie. Logged-in users get their learning progress recorded in the <computeroutput>cu_user_element_map</computeroutput>. In order for logged-in users to have more control over which curriculums to follow and which not to, the <computeroutput>cu_user_curriculum_map</computeroutput> keeps track of which curriculums a user wants displayed. This table is cached per user.</para>
+    <para>Curriculum uses the Workflow package for managing the process of publishing curriculums. A default workflow - distinguishing between the roles of Creator, Editor, and Publisher - is automatically created when installing the Curriculum package. Every instance will use an individual copy of this default workflow. If you are dissatisfied with the default workflow template and wish to create another one to your own liking, please refer to the Workflow Developer's Guide.</para>
   </sect1>
   <sect1 id="future">
     <title>Future Developments</title>
Index: openacs-4/packages/directory/directory.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/directory/directory.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/directory/directory.info	17 May 2003 10:28:04 -0000	1.4
+++ openacs-4/packages/directory/directory.info	11 Dec 2003 21:40:02 -0000	1.5
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="directory" url="http://www.arsdigita.com/acs-repository/apm/packages/directory" type="apm_application">
+<package key="directory" url="http://openacs.org/repository/apm/packages/directory" type="apm_application">
     <package-name>Directory</package-name>
     <pretty-plural>Directories</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="4.2a" url="http://www.arsdigita.com/acs-repository/download/apm/directory-4.2a.apm">
+    <version name="4.2a" url="http://openacs.org/repository/download/apm/directory-4.2a.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:mikeb@arsdigita.com">Mike Bonnet</owner>
-        <owner url="mailto:aegrumet@arsdigita.com">Andrew Grumet</owner>
+        <owner>Mike Bonnet</owner>
+        <owner url="http://www.grumet.net/">Andrew Grumet</owner>
         <summary>User Directory</summary>
         <release-date>2001-04-17</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/plain">This package lets you browse or search for users of an ACS site.  It is subsite-aware, and allows you to view the members of the current subsite, or all users of the site.  See doc/ for more information.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/plain">This package lets you browse or search for users of an OpenACS site.  It is subsite-aware, and allows you to view the members of the current subsite, or all users of the site.  </description>
 
         <requires url="acs-kernel" version="4.6.2"/>
         <requires url="acs-subsite" version="4.2"/>
Index: openacs-4/packages/download/download.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/download.info,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/download/download.info	8 Oct 2003 16:05:25 -0000	1.9
+++ openacs-4/packages/download/download.info	11 Dec 2003 21:40:02 -0000	1.10
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="download" url="http://www.arsdgita.com/acs-repository/apm/packages/downolad" type="apm_application">
+<package key="download" url="http://openacs.org/repository/apm/packages/downolad" type="apm_application">
     <package-name>Download</package-name>
     <pretty-plural>Download</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="5.0d1" url="http://www.arsdigita.com/acs-repository/download/apm/download-5.0d1.apm">
+    <version name="5.0d1" url="http://openacs.org/repository/download/apm/download-5.0d1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner>Joseph Bank</owner>
         <owner url="mailto:vinod@kurup.com">Vinod Kurup</owner>
-        <summary>OpenACS 4.x version of download module.  Supports the functionality required by the current acs-repository.</summary>
+        <summary>Manage downloadable resources, versioned and with download tracking.</summary>
         <release-date>2003-01-03</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
-        <description format="text/plain">Create an instance of the download module. Each instance has a repository_id which allows the download module to differentiate between different instances of the package.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/plain">Intended to support downloads of versioned software and packages.  UI needs work.</description>
 
         <provides url="download" version="5.0d1"/>
         <requires url="acs-kernel" version="5.0d13"/>
Index: openacs-4/packages/download/www/all-metadata.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/all-metadata.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/download/www/all-metadata.tcl	10 Sep 2002 22:22:34 -0000	1.2
+++ openacs-4/packages/download/www/all-metadata.tcl	11 Dec 2003 21:40:02 -0000	1.3
@@ -16,7 +16,7 @@
     where dam.linked_p = 't' and
           dam.metadata_id = :metadata_id
 }] } {
-    ad_return_complaint "Not found" "Metadata id not found"
+    ad_return_complaint 1 "Metadata id not found"
 }
 set answer_column [download_metadata_column $data_type]
 set metadata_select "metadata$metadata_id"
Index: openacs-4/packages/download/www/one-metadata.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-metadata.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/download/www/one-metadata.tcl	10 Sep 2002 22:22:34 -0000	1.3
+++ openacs-4/packages/download/www/one-metadata.tcl	11 Dec 2003 21:40:02 -0000	1.4
@@ -16,7 +16,7 @@
     where dam.linked_p = 't' and
           dam.metadata_id = :metadata_id
 }] } {
-    ad_return_complaint "Not found" "Metadata id not found"
+    ad_return_complaint 1 "Metadata id not found"
 }
 set answer_column [download_metadata_column $data_type]
 
Index: openacs-4/packages/ecommerce/ecommerce.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/ecommerce.info,v
diff -u -N -r1.32 -r1.33
--- openacs-4/packages/ecommerce/ecommerce.info	17 May 2003 10:29:50 -0000	1.32
+++ openacs-4/packages/ecommerce/ecommerce.info	11 Dec 2003 21:40:02 -0000	1.33
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="ecommerce" url="http://www.arsdgita.com/acs-repository/apm/packages/ecommerce" type="apm_application">
+<package key="ecommerce" url="http://openacs.org/repository/apm/packages/ecommerce" type="apm_application">
     <package-name>E-Commerce</package-name>
     <pretty-plural>E-Commerce-ii</pretty-plural>
     <initial-install-p>f</initial-install-p>
 
     <singleton-p>t</singleton-p>
 
-    <version name="4.6.1" url="http://www.arsdigita.com/acs-repository/download/apm/ecommerce-4.6.1.apm">
+    <version name="4.6.1" url="http://openacs.org/repository/download/apm/ecommerce-4.6.1.apm">
         <owner url="mailto:janine@furfly.net">Janine Sisk</owner>
         <owner url="mailto:bart.teeuwisse@7-sisters.com">Bart Teeuwisse</owner>
-        <summary>ACS 3.x based e-commerce solution.See the documentation for more information.	</summary>
+        <summary>The ACS 3.x based e-commerce solution ported to OpenACS.</summary>
         <release-date>2003-03-23</release-date>
         <vendor url="http://www.furfly.net">furfly.net, LLC</vendor>
-        <description format="text/plain">This module implements all that IT needs for a standard business-to-consumer Web service.  You can find a feature summary in the documentaion.</description>
+        <description format="text/plain">This module implements all that IT needs for a standard business-to-consumer Web service. You can find a feature summary in the documentaion.</description>
 
         <provides url="ecommerce" version="4.6.1"/>
         <requires url="acs-kernel" version="4.1"/>
Index: openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl	10 Sep 2002 22:22:36 -0000	1.14
+++ openacs-4/packages/ecommerce/tcl/ecommerce-widgets-procs.tcl	11 Dec 2003 21:40:02 -0000	1.15
@@ -1014,7 +1014,7 @@
 
 } {
     if { ![regexp -nocase {([0-9]+):([0-9]+):([0-9]+)} $timestamp match hours mins secs]} {
-	ad_return_complaint "1" "<li>The time part of the timestamp is not in the correct format.  It must be HH12:MI:SS" 
+	ad_return_complaint 1 "<li>The time part of the timestamp is not in the correct format.  It must be HH12:MI:SS" 
 	return -code return
     } else {
 
Index: openacs-4/packages/ecommerce/www/contextbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/contextbar.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/contextbar.tcl	10 Dec 2002 20:06:18 -0000	1.3
+++ openacs-4/packages/ecommerce/www/contextbar.tcl	11 Dec 2003 21:40:02 -0000	1.4
@@ -18,7 +18,11 @@
 if {[empty_string_p $context_addition]} {
     set context_bar [ad_context_bar]
 } else {
-    set context_bar [eval ad_context_bar $context_addition]
+    set cmd [list ad_context_bar --]
+    foreach elem $context_addition {
+        lappend cmd $elem
+    }
+    set context_bar [eval $cmd]
 }
 
 # Check for admin rights to this (the ecommerce) package.
Index: openacs-4/packages/ecommerce/www/gift-certificate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/gift-certificate.tcl	10 Dec 2002 20:06:18 -0000	1.5
+++ openacs-4/packages/ecommerce/www/gift-certificate.tcl	11 Dec 2003 21:40:02 -0000	1.6
@@ -73,7 +73,7 @@
     }
 }
 
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Gift Certificate"]]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Gift Certificate"]]]
 set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/index.adp	22 May 2003 14:48:11 -0000	1.3
+++ openacs-4/packages/ecommerce/www/index.adp	11 Dec 2003 21:40:02 -0000	1.4
@@ -14,7 +14,7 @@
 
       <include src="browse-categories">
 
-      <if @recommendations_if_there_are_any;noquote@>
+      <if @recommendations_if_there_are_any@>
 	<h4>We recommend:</h4>
 	@recommendations_if_there_are_any@
       </if>
Index: openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql	30 Nov 2002 17:31:38 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/orders/one-postgresql.xql	11 Dec 2003 21:40:02 -0000	1.3
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
   <fullquery name="order_select">
     <querytext>
Index: openacs-4/packages/ecommerce/www/doc/contextbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/contextbar.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/contextbar.tcl	10 Dec 2002 20:05:21 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/contextbar.tcl	11 Dec 2003 21:40:02 -0000	1.3
@@ -18,7 +18,11 @@
 if {[empty_string_p $context_addition]} {
     set context_bar [ad_context_bar]
 } else {
-    set context_bar [eval ad_context_bar $context_addition]
+    set cmd [list ad_context_bar --]
+    foreach elem $context_addition {
+        lappend cmd $elem
+    }
+    set context_bar [eval $cmd]
 }
 
 # Check for admin rights to this (the ecommerce) package.
Index: openacs-4/packages/edit-this-page/edit-this-page.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/edit-this-page.info,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/edit-this-page/edit-this-page.info	22 Oct 2003 15:54:50 -0000	1.9
+++ openacs-4/packages/edit-this-page/edit-this-page.info	11 Dec 2003 21:40:03 -0000	1.10
@@ -15,7 +15,7 @@
 	<owner url="mailto:luke@museatech.net">Luke Pond</owner>
         <owner url="mailto:jon@mayuli.com">Jon Griffin</owner>
         <summary>An easy-to-use content management system.</summary>
-        <description format="text/html">Easy to use publishing system</description>
+        <description format="text/html">An Easy to use publishing system with versioning and permissions.</description>
 
         <provides url="edit-this-page" version="1.4"/>
         <requires url="acs-kernel" version="4.6.2"/>
Index: openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql	21 Oct 2003 18:28:30 -0000	1.11
+++ openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql	11 Dec 2003 21:40:03 -0000	1.12
@@ -35,7 +35,8 @@
     function create_new_revision (
       package_id in apm_packages.package_id%TYPE,
       name in varchar,
-      user_id    in users.user_id%TYPE
+      user_id    in users.user_id%TYPE,
+      revision_id in cr_revisions.revision_id%TYPE
     ) return integer;
 
     function get_folder_id (
@@ -190,7 +191,8 @@
     function create_new_revision (
       package_id in apm_packages.package_id%TYPE,
       name in varchar,
-      user_id    in users.user_id%TYPE
+      user_id    in users.user_id%TYPE,
+      revision_id in cr_revisions.revision_id%TYPE
     ) return integer
     is
       v_revision_id cr_revisions.revision_id%TYPE;
@@ -212,9 +214,13 @@
 
      -- cannot use acs_object__new because it creates attributes with their
     -- default values, which is not what we want.
+      if create_new_revision.revision_id is NULL then
 
-      select acs_object_id_seq.nextval
-      into v_new_revision_id from dual;
+	      select acs_object_id_seq.nextval
+	      into v_new_revision_id from dual;
+      else
+	      v_new_revison_id := create_new_revision.revision_id;
+      end if;
 
       insert into acs_objects 
         ( object_id, object_type, creation_date, creation_user)
Index: openacs-4/packages/email-handler/email-handler.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/email-handler/email-handler.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/email-handler/email-handler.info	17 May 2003 10:32:22 -0000	1.4
+++ openacs-4/packages/email-handler/email-handler.info	11 Dec 2003 21:40:03 -0000	1.5
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="email-handler" url="http://www.arsdgita.com/acs-repository/apm/packages/email-handler" type="apm_service">
+<package key="email-handler" url="http://openacs.org/repository/apm/packages/email-handler" type="apm_service">
     <package-name>Email Handler</package-name>
     <pretty-plural>Email Handlers</pretty-plural>
     <singleton-p>t</singleton-p>
 
-    <version name="4.0.1" url="http://www.arsdigita.com/acs-repository/download/apm/email-handler-4.0.1.apm">
+    <version name="4.0.1" url="http://openacs.org/repository/download/apm/email-handler-4.0.1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:hqm@ai.mit.edu">Henry Minsky</owner>
-        <summary>Service to autmatically dispatch and process incoming email messages </summary>
+        <summary>Service to automatically dispatch and process incoming email messages.</summary>
         <release-date>2000-12-08</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/plain">A service to autmatically dispatch and process incoming email messages.Email messages are tagged and inserted into a database table by an external script, and the email handler dispatches emails by tag to Tcl procedures to handle them. </description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/plain">A service to autmatically dispatch and process incoming email messages.  Email messages are tagged and inserted into a database table by an external script, and the email handler dispatches emails by tag to Tcl procedures to handle them.  See notifications for an alternative maildir based handler for inbound mail.</description>
 
         <provides url="email-handler" version="4.0.1"/>
         <requires url="acs-kernel" version="4.6.2"/>
Index: openacs-4/packages/faq/faq.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/faq.info,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/faq/faq.info	10 Nov 2003 16:36:31 -0000	1.9
+++ openacs-4/packages/faq/faq.info	11 Dec 2003 21:40:03 -0000	1.10
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="faq" url="http://openacs.org/acs-repository/apm/packages/faq" type="apm_application">
+<package key="faq" url="http://openacs.org/repository/apm/packages/faq" type="apm_application">
     <package-name>FAQ</package-name>
     <pretty-plural>FAQs</pretty-plural>
     <initial-install-p>f</initial-install-p>
@@ -10,12 +10,12 @@
     <version name="4.6" url="http://openacs.org/repository/download/apm/faq-4.6.apm">
         <owner url="mailto:jennie@ybos.net">Jennie Kim Housman</owner>
         <owner url="mailto:wirth@ybos.net">Elizabeth Wirth</owner>
-        <summary>Port of FAQ module from 3.4 with a few enhancements.</summary>
+        <summary>Manage simple Question and Answer style FAQs</summary>
         <release-date>2003-11-10</release-date>
         <vendor url="http://ybos.net">Ybos Corporation</vendor>
-
+        <description format="text/html">Handles frequently asked questions Q&amp;A presentation.  Can be one Q&amp;A per page or all presented flat.  Straightforward application with room for improvement.</description>
         <provides url="faq" version="4.6"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/file-manager/file-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/file-manager.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/file-manager/file-manager.info	17 May 2003 10:35:55 -0000	1.2
+++ openacs-4/packages/file-manager/file-manager.info	11 Dec 2003 21:40:03 -0000	1.3
@@ -1,20 +1,22 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="file-manager" url="http://www.arsdgita.com/acs-repository/apm/packages/file-manager" type="apm_application">
+<package key="file-manager" url="http://openacs.org/repository/apm/packages/file-manager" type="apm_application">
     <package-name>File Manager</package-name>
     <pretty-plural>File Manager</pretty-plural>
     <singleton-p>f</singleton-p>
 
-    <version name="4.0a" url="http://www.arsdigita.com/acs-repository/download/apm/file-manager-4.0a.apm">
+    <version name="4.0a" url="http://openacs.org/repository/download/apm/file-manager-4.0a.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:ron@arsdigita.com">Ron Henderson</owner>
-        <summary>A lightweight content-management application</summary>
+        <owner>Ron Henderson</owner>
+        <summary>lightweight file-system based content-management application</summary>
         <release-date>2001-01-26</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Provides a simple interface to upload and modify documents directly in the filesystem.  An alternative to ftp 
+which uses the built in authentication of OpenACS.</description>
 
         <requires url="acs-kernel" version="4.6.2"/>
         <requires url="version-control" version="4.0d"/>
Index: openacs-4/packages/file-manager/tcl/file-manager-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/tcl/file-manager-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/file-manager/tcl/file-manager-procs.tcl	10 Oct 2003 15:44:32 -0000	1.3
+++ openacs-4/packages/file-manager/tcl/file-manager-procs.tcl	11 Dec 2003 21:40:03 -0000	1.4
@@ -33,10 +33,17 @@
     }
 }
 
+ad_proc -private fm_check_permission {} { 
+    Require that the user have sitewide admin
+} { 
+    permission::require_permission -object_id [site_node::get_element -url / -element package_id] -privilege admin
+}
+
+
 ad_proc fm_admin_context_bar {} {
     Returns a context bar that will break out of the frames
 } {
-    regsub -all "href" [ad_admin_context_bar "File Manager"] "target=_top href" context_bar
+    regsub -all "href" [ad_context_bar {File Manager}] "target=_top href" context_bar
     return $context_bar
 }
 
Index: openacs-4/packages/file-manager/www/file-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-edit.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/file-manager/www/file-edit.tcl	18 Sep 2002 12:12:43 -0000	1.3
+++ openacs-4/packages/file-manager/www/file-edit.tcl	11 Dec 2003 21:40:03 -0000	1.4
@@ -8,6 +8,8 @@
     {path}
 }
 
+fm_check_permission
+
 # check for image files and redirect to the upload page
 
 if [string match "image/*" [ns_guesstype [file tail $path]]] {
Index: openacs-4/packages/file-manager/www/file-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-list.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/file-manager/www/file-list.tcl	10 Sep 2002 22:22:54 -0000	1.2
+++ openacs-4/packages/file-manager/www/file-list.tcl	11 Dec 2003 21:40:03 -0000	1.3
@@ -9,6 +9,8 @@
     {path ""}
 }
 
+fm_check_permission
+
 set output "
 [ad_admin_header "File Manager"]
 
Index: openacs-4/packages/file-manager/www/file-mkdir-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-mkdir-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/file-manager/www/file-mkdir-2.tcl	18 Sep 2002 12:12:43 -0000	1.3
+++ openacs-4/packages/file-manager/www/file-mkdir-2.tcl	11 Dec 2003 21:40:03 -0000	1.4
@@ -12,6 +12,8 @@
     {subdir:trim,notnull}
 }
 
+fm_check_permission
+
 set errcnt 0
 set errmsg ""
 
Index: openacs-4/packages/file-manager/www/file-mkdir.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-mkdir.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/file-manager/www/file-mkdir.tcl	10 Sep 2002 22:22:54 -0000	1.2
+++ openacs-4/packages/file-manager/www/file-mkdir.tcl	11 Dec 2003 21:40:03 -0000	1.3
@@ -11,6 +11,8 @@
     {path:trim}
 }
 
+fm_check_permission
+
 doc_return  200 text/html "
 [ad_admin_header "File Manager"]
 
Index: openacs-4/packages/file-manager/www/file-tree.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-tree.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/file-manager/www/file-tree.tcl	10 Sep 2002 22:22:54 -0000	1.2
+++ openacs-4/packages/file-manager/www/file-tree.tcl	11 Dec 2003 21:40:03 -0000	1.3
@@ -10,6 +10,8 @@
     @cvs-id  $Id$
 }
 
+fm_check_permission
+
 proc get_dirs { path } {
 
   set files [list]
Index: openacs-4/packages/file-manager/www/file-upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-upload-2.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/file-manager/www/file-upload-2.tcl	10 Oct 2003 16:03:45 -0000	1.7
+++ openacs-4/packages/file-manager/www/file-upload-2.tcl	11 Dec 2003 21:40:03 -0000	1.8
@@ -13,17 +13,19 @@
     {title:trim,notnull}
 }
 
+fm_check_permission
+
 set the_file [ns_queryget the_file.tmpfile]
 
 # Make sure the incoming filename is valid
 
 if ![fm_valid_filename_p $title] {
-    ad_return_complaint "Error" "<li>Invalid file name (no spaces, & or /'s)"
+    ad_return_complaint 1 "<li>Invalid file name (no spaces, & or /'s)"
     ad_script_abort
 }
 
 if {![empty_string_p $title] && [empty_string_p [file ext $title]]} {
-    ad_return_complaint "Error" "
+    ad_return_complaint 1 "
     <li>The title you supply must have one of the following extensions:<br>
     [ad_parameter Extensions file-manager]"
     ad_script_abort
Index: openacs-4/packages/file-manager/www/file-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-upload.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/file-manager/www/file-upload.tcl	10 Sep 2002 22:22:54 -0000	1.2
+++ openacs-4/packages/file-manager/www/file-upload.tcl	11 Dec 2003 21:40:03 -0000	1.3
@@ -11,6 +11,8 @@
     {path:trim}
 }
 
+fm_check_permission
+
 set page_content "
 [ad_admin_header "File Manager"]
 
Index: openacs-4/packages/file-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/index.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/file-manager/www/index.tcl	10 Sep 2002 22:22:54 -0000	1.2
+++ openacs-4/packages/file-manager/www/index.tcl	11 Dec 2003 21:40:03 -0000	1.3
@@ -10,6 +10,8 @@
 } {
 }
 
+fm_check_permission
+
 doc_return  200 text/html "
 <html>
 <head>
Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/file-storage/file-storage.info	10 Nov 2003 16:36:31 -0000	1.23
+++ openacs-4/packages/file-storage/file-storage.info	11 Dec 2003 21:40:03 -0000	1.24
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="file-storage" url="http://openacs.og/acs-repository/apm/packages/file-storage" type="apm_application">
+<package key="file-storage" url="http://openacs.org/repository/apm/packages/file-storage" type="apm_application">
     <package-name>File Storage</package-name>
     <pretty-plural>File Storage Areas</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="4.7d3" url="http://openacs.org/repository/download/apm/file-storage-4.7d3.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/file-storage-5.0.0b4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <summary>This application allows users to collaboratively maintain documents on the web server	</summary>
+        <summary>Collaborative document storage</summary>
         <release-date>2003-11-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
-        <description format="text/plain">Now allows storage of files on the filesystem or database.</description>
+        <description format="text/plain">Provides a versioned document store with storage in the filesystem or database (depending on configuration).  Documents and folders can be permissioned and folders downloaded.</description>
 
-        <provides url="file-storage" version="4.7d3"/>
-        <requires url="acs-content-repository" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <provides url="file-storage" version="5.0.0b4"/>
+        <requires url="acs-content-repository" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
@@ -27,6 +27,7 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaximumFileSize"  default="2000000" description="The maximum size, in bytes, of files that users are allowed to upload"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowAdministerPermissionsLinkP"  default="1" description="Whether or not to show a link to administer permissions on the file storage object."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="StoreFilesInDatabaseP"  default="1" description="Flag to determine the storage type. A flag of 1 (true) will store the files in the database. If 0 (false) files are stored in the filesystem. ***This parameter should only be changed at package instance creation.***"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="UnzipBinary"  default="unzip" description="The path and name of the unzip binary to unpack zip files containing multiple files."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.13
+++ openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml	11 Dec 2003 21:40:04 -0000	1.14
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="file-storage" package_version="4.7d3" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="file-storage" package_version="5.0.0a2" locale="da_DK" charset="ISO-8859-1">
 
   <msg key="Action">Handling</msg>
   <msg key="Actions">Handlinger:</msg>
@@ -42,6 +42,7 @@
   <msg key="lt_Either_there_is_alrea">Der er enten allerede en mappe med navnet &quot;%folder_name%&quot;, eller du har klikket p� knappen mere end �n gang. Du kan bruge Tilbage-knappen og v�lge et nyt navn, eller du kan &lt;a href=&quot;%directory_url%&quot;&gt;vende tilbage til mappeoversigten&lt;/a&gt; og se, om din mappe er oprettet d�r.</msg>
   <msg key="lt_Folder_folder_name_is">Mappen %folder_name% er tom</msg>
   <msg key="lt_It_appears_that_there">Der er allerede en fil med det navn i denne mappe. M�ske har du klikket to gange.</msg>
+  <msg key="lt_Leave_blank_for_linked_documents">Lad titel v�re blank hvis du uploader flere dokumenter med links imellem.</msg>
   <msg key="lt_Modify_permissions_on">�ndr rettighedder for denne fil</msg>
   <msg key="lt_Modify_permissions_on_1">Rediger rettigheder p� denne mappe</msg>
   <msg key="lt_Please_enter_the_new_">Skriv venligst det nye navn for denne fil:</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	16 Oct 2003 15:19:54 -0000	1.15
+++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	11 Dec 2003 21:40:04 -0000	1.16
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="file-storage" package_version="4.7d3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="file-storage" package_version="5.0.0a2" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Action">Action</msg>
   <msg key="Actions">Actions:</msg>
@@ -54,6 +54,7 @@
   <msg key="lt_Either_there_is_alrea">Either there is already a folder with the name &quot;%folder_name%&quot; or you clicked on the button more than once.  You can use the Back button to return and choose a new name, or &lt;a href=&quot;%directory_url%&quot;&gt;return to the directory listing&lt;/a&gt; to see if your folder is there.</msg>
   <msg key="lt_Folder_folder_name_is">Folder %folder_name% is empty.</msg>
   <msg key="lt_It_appears_that_there">It appears that there is already a file with that name in this folder (although possibly you clicked more than once on the submit button.)</msg>
+  <msg key="lt_Leave_blank_for_linked_documents">Leave title blank when uploading multiple interlinked documents.</msg>
   <msg key="lt_Live_version_of_title">Live version of &quot;%title%&quot;</msg>
   <msg key="lt_Modify_permissions_on">Modify permissions on this file</msg>
   <msg key="lt_Modify_permissions_on_1">Modify permissions on this folder</msg>
@@ -72,6 +73,7 @@
 so you cannot delete the file.</msg>
   <msg key="lt_This_folder_contains_">This folder contains items that you do not have permission to
 delete, therefore you cannot delete it.</msg>
+  <msg key="lt_This_is_a_ZIP">This is a ZIP file containing multiple files</msg>
   <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, 
     then click &quot;Open&quot;.</msg>
   <msg key="lt_version_not_valid">The specified version is not valid.</msg>
@@ -87,6 +89,7 @@
   <msg key="lt_Your_search_on_query__1">Your search on &quot;%query%&quot; returned the following files:</msg>
   <msg key="Modified">Modified</msg>
   <msg key="Move">Move</msg>
+  <msg key="Multiple_files">Multiple files:</msg>
   <msg key="Name">Name</msg>
   <msg key="new">new</msg>
   <msg key="No_such_type">No such type</msg>
Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql	1 Dec 2003 14:36:44 -0000	1.13
+++ openacs-4/packages/file-storage/sql/postgresql/file-storage-package-create.sql	11 Dec 2003 21:40:04 -0000	1.14
@@ -35,7 +35,7 @@
 
         return v_folder_id;
 
-end;' language 'plpgsql' with (iscachable);
+end;' language 'plpgsql' stable;
 
 create function file_storage__get_package_id (
     integer                     -- cr_items.item_id%TYPE
@@ -61,7 +61,7 @@
         return v_package_id;
     end if;
 
-end;' language 'plpgsql' with (iscachable);
+end;' language 'plpgsql' stable;
 
 create function file_storage__new_root_folder (
        --
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.xql,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/file-storage/tcl/file-storage-procs.xql	17 May 2003 10:39:21 -0000	1.12
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.xql	11 Dec 2003 21:40:04 -0000	1.13
@@ -111,10 +111,11 @@
 
     <fullquery name="fs::publish_versioned_object_to_file_system.select_file_name">
         <querytext>
-            select filename
+            select content
             from cr_revisions
             where revision_id = :live_revision
         </querytext>
     </fullquery>
 
+
 </queryset>
Index: openacs-4/packages/file-storage/www/file-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-add-2.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/file-storage/www/file-add-2.tcl	14 Oct 2003 13:53:29 -0000	1.13
+++ openacs-4/packages/file-storage/www/file-add-2.tcl	11 Dec 2003 21:40:04 -0000	1.14
@@ -8,83 +8,117 @@
     folder_id:integer,notnull
     upload_file:notnull,trim
     upload_file.tmpfile:tmpfile
-    title:trim
+    {title:trim ""}
     description
+    {unpack_p:boolean "f"}
 } -validate {
     valid_folder -requires {folder_id:integer} {
-	if ![fs_folder_p $folder_id] {
-	    ad_complain "[_ file-storage.lt_The_specified_parent_]"
-	}
+        if ![fs_folder_p $folder_id] {
+            ad_complain "[_ file-storage.lt_The_specified_parent_]"
+        }
     }
 
     max_size -requires {upload_file} {
-	set n_bytes [file size ${upload_file.tmpfile}]
-	set max_bytes [ad_parameter "MaximumFileSize"]
-	if { $n_bytes > $max_bytes } {
-	    ad_complain [_ file-storage.lt_Your_file_is_larger_t_1] [list max_number_of_bytes [util_commify_number $max_bytes]]]
-	}
+        set n_bytes [file size ${upload_file.tmpfile}]
+        set max_bytes [ad_parameter "MaximumFileSize"]
+        if { $n_bytes > $max_bytes } {
+            ad_complain [_ file-storage.lt_Your_file_is_larger_t_1] [list max_number_of_bytes [util_commify_number $max_bytes]]]
+        }
     }
 } 
 
 # Check for write permission on this folder
 ad_require_permission $folder_id write
 
-# Get the filename part of the upload file
-if { ![regexp {[^//\\]+$} $upload_file filename] } {
-    # no match
-    set filename $upload_file
-}
-
-# Get the title
-if { [empty_string_p $title] } {
-    set title $filename
-}
-
 # Get the user
 set user_id [ad_conn user_id]
 
 # Get the ip
 set creation_ip [ad_conn peeraddr]
 
-set mime_type [cr_filename_to_mime_type -create $upload_file]
-
 # Get the storage type
 set indb_p [ad_parameter "StoreFilesInDatabaseP" -package_id [ad_conn package_id]]
 
+set unpack_p [template::util::is_true $unpack_p]
+set unzip_binary [string trim [parameter::get -parameter UnzipBinary]]
+
+if { $unpack_p && ![empty_string_p $unzip_binary] } {
+    
+    set path [ns_tmpnam]
+    file mkdir $path
+
+    
+    catch { exec $unzip_binary -jd $path ${upload_file.tmpfile} } errmsg
+
+    # More flexible parameter design could be:
+    # zip {unzip -jd {out_path} {in_file}} tar {tar xf {in_file} {out_path}} tgz {tar xzf {in_file} {out_path}} 
+
+    set upload_files [list]
+    set upload_tmpfiles [list]
+    
+    foreach file [glob -nocomplain "$path/*"] {
+        lappend upload_files [file tail $file]
+        lappend upload_tmpfiles $file
+    }
+
+} else {
+    set upload_files [list $upload_file]
+    set upload_tmpfiles [list ${upload_file.tmpfile}]
+}
+
 db_transaction {
 
-    # create the new item
-    if {$indb_p} {
+    foreach upload_file $upload_files tmpfile $upload_tmpfiles {
 
-	set file_id [db_exec_plsql new_lob_file {}]
+        set mime_type [cr_filename_to_mime_type -create $upload_file]
+
+        # Get the filename part of the upload file
+        if { ![regexp {[^//\\]+$} $upload_file filename] } {
+            # no match
+            set filename $upload_file
+        }
         
-	set version_id [db_exec_plsql new_version {}]
+        # Get the title
+        if { [empty_string_p $title] || $unpack_p } {
+            set title $filename
+        }
 
-	db_dml lob_content {} -blob_files [list ${upload_file.tmpfile}]
+        # create the new item
+        if {$indb_p} {
 
-	# Unfortunately, we can only calculate the file size after the lob is uploaded 
-	db_dml lob_size {}
+            set file_id [db_exec_plsql new_lob_file {}]
+            
+            set version_id [db_exec_plsql new_version {}]
 
-    } else {
+            db_dml lob_content {} -blob_files [list $tmpfile]
 
-	set file_id [db_exec_plsql new_fs_file {}]
+            # Unfortunately, we can only calculate the file size after the lob is uploaded 
+            db_dml lob_size {}
 
+        } else {
 
-	set version_id [db_exec_plsql new_version {}]
+            set file_id [db_exec_plsql new_fs_file {}]
 
-	set tmp_filename [cr_create_content_file $file_id $version_id ${upload_file.tmpfile}]
-	set tmp_size [cr_file_size $tmp_filename]
 
-	db_dml fs_content_size {}
+            set version_id [db_exec_plsql new_version {}]
 
-    }
+            set tmp_filename [cr_create_content_file $file_id $version_id $tmpfile]
+            set tmp_size [cr_file_size $tmp_filename]
 
-    # We know the user has write permission to this folder, but they may not have admin privileges.
-    # They should always be able to admin their own file by default, so they can delete it, control
-    # who can read it, etc.
+            db_dml fs_content_size {}
 
-    if { [string is false [permission::permission_p -party_id $user_id -object_id $folder_id -privilege admin]] } {
-        permission::grant -party_id $user_id -object_id $file_id -privilege admin
+        }
+
+        # We know the user has write permission to this folder, but they may not have admin privileges.
+        # They should always be able to admin their own file by default, so they can delete it, control
+        # who can read it, etc.
+
+        if { [string is false [permission::permission_p -party_id $user_id -object_id $folder_id -privilege admin]] } {
+            permission::grant -party_id $user_id -object_id $file_id -privilege admin
+        }
+        
+        # So we'll set the title from the filename in the next iteration
+        set title {}
     }
 
 } on_error {
@@ -96,11 +130,11 @@
 #    from   cr_items
 #    where  name = :filename
 #    and    parent_id = :folder_id"] {
-#	ad_return_complaint 1 "Either there is already a file with the name \"$tmp_filename\" or you clicked on the button more than once.  You can use the Back button to return and choose a new name, or <a href=\"?folder_id=$folder_id\">return to the directory listing</a> to see if your file is there."
+#       ad_return_complaint 1 "Either there is already a file with the name \"$tmp_filename\" or you clicked on the button more than once.  You can use the Back button to return and choose a new name, or <a href=\"?folder_id=$folder_id\">return to the directory listing</a> to see if your file is there."
 #    } else {
-#	ad_return_complaint 1 "We got an error that we couldn't readily identify.  Please let the system owner know about this.
+#       ad_return_complaint 1 "We got an error that we couldn't readily identify.  Please let the system owner know about this.
 #
-#	<pre>$errmsg</pre>"
+#       <pre>$errmsg</pre>"
 #    }
  
        set folder_name "[_ file-storage.folder]"
Index: openacs-4/packages/file-storage/www/file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/file-storage/www/file-add.adp	22 May 2003 14:55:53 -0000	1.8
+++ openacs-4/packages/file-storage/www/file-add.adp	11 Dec 2003 21:40:04 -0000	1.9
@@ -2,30 +2,62 @@
 <property name="title">#file-storage.Upload_New_File#</property>
 <property name="context">@context;noquote@</property>
 
-<form enctype=multipart/form-data method=POST action="file-add-2">
+<form enctype="multipart/form-data" method="POST" action="file-add-2" name="upload">
 <input type=hidden name="folder_id" value="@folder_id@">
 
 <table border=0>
 
 <tr>
-<td align=right>#file-storage.Version_filename_# </td>
-<td><input type=file name=upload_file size=20></tr>
+  <td align=right>#file-storage.Version_filename_# </td>
+  <td><input type=file name=upload_file size=20></tr>
 </tr>
 
 <tr>
-<td>&nbsp;</td>
-<td><font size=-1>#file-storage.lt_Use_the_Browse_button# </font></td>
+  <td>&nbsp;</td>
+  <td>
+    <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" border="0">
+    <font size=-1>#file-storage.lt_Use_the_Browse_button# </font>
+  </td>
 </tr>
 
 <tr>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
+  <td>&nbsp;</td>
+  <td>&nbsp;</td>
 </tr>
 
+<if @unpack_available_p@ true>
+  <script language="JavaScript">
+      function UnpackChanged(elm) {
+        var form_name = "upload";
+
+        if (elm == null) return;
+        if (document.forms == null) return;
+        if (document.forms[form_name] == null) return;
+
+        if (elm.checked == true) {
+            document.forms[form_name].elements["title"].disabled = true;
+            document.forms[form_name].elements["title"].value = "";
+        } else {
+            document.forms[form_name].elements["title"].disabled = false;
+        }
+    }
+  </script>
+
+  <tr>
+    <td align=right>#file-storage.Multiple_files#</td>
+    <td>
+      <input type="checkbox" name="unpack_p" value="t" id="unpack" onclick="javascript:UnpackChanged(this);">
+      <label for="unpack">#file-storage.lt_This_is_a_ZIP#</label>
+    </td>
+  </tr>
+</if>
+
 <tr>
-<td align=right> #file-storage.Title# </td>
+  <td align=right> #file-storage.Title# </td>
   <if @lock_title_p@ eq 0>
-    <td><input size=30 name=title value=@title@></td>
+    <td>
+      <input size=30 name=title value=@title@>
+    </td>
   </if>
   <else>
       <input type=hidden name=title value=@title@>
@@ -34,11 +66,19 @@
 </tr>
 
 <tr>
-<td valign=top align=right> #file-storage.Description# </td>
-<td colspan=2><textarea rows=5 cols=50 name=description wrap=physical></textarea></td>
+  <td>&nbsp;</td>
+  <td>
+    <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" border="0">
+    <font color="red">#file-storage.lt_Leave_blank_for_linked_documents#</font>
+  </td>
 </tr>
 
 <tr>
+  <td valign=top align=right> #file-storage.Description# </td>
+  <td colspan=2><textarea rows=5 cols=50 name=description wrap=physical></textarea></td>
+</tr>
+
+<tr>
 <td></td>
 <td><input type=submit value="#file-storage.Upload#">
 </td>
Index: openacs-4/packages/file-storage/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/file-storage/www/file-add.tcl	5 Nov 2002 17:19:59 -0000	1.4
+++ openacs-4/packages/file-storage/www/file-add.tcl	11 Dec 2003 21:40:04 -0000	1.5
@@ -36,3 +36,5 @@
 if {[empty_string_p $title]} {
     set lock_title_p 0
 }
+
+set unpack_available_p [expr ![empty_string_p [string trim [parameter::get -parameter UnzipBinary]]]]
Index: openacs-4/packages/file-storage/www/file-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-edit-2.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/file-storage/www/file-edit-2.tcl	5 Nov 2002 17:19:59 -0000	1.4
+++ openacs-4/packages/file-storage/www/file-edit-2.tcl	11 Dec 2003 21:40:04 -0000	1.5
@@ -19,19 +19,11 @@
 
 ad_require_permission $file_id write
 
-if [catch {db_exec_plsql rename_file "
-begin
-    content_item.rename (
-        item_id => :file_id,
-        name => :title
-    );
-end;"} errmsg] {
+if [catch {
+    db_exec_plsql rename_file {}
+} errmsg] {
 
-    if [db_string duplicate_check "
-    select count(*)
-    from   cr_items
-    where  name = :name
-    and    parent_id = content_item.get_parent_folder(:file_id)"] {
+    if { [db_string duplicate_check {}] } {
 	ad_return_complaint 1 "[_ file-storage.lt_It_appears_that_there]"
     } else {
 	ad_return_complaint 1 "[_ file-storage.lt_We_got_an_error_that_]
Index: openacs-4/packages/file-storage/www/file-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-oracle.xql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/file-storage/www/file-oracle.xql	25 Sep 2003 13:55:04 -0000	1.9
+++ openacs-4/packages/file-storage/www/file-oracle.xql	11 Dec 2003 21:40:04 -0000	1.10
@@ -18,7 +18,8 @@
        		r.title as name,
        		acs_permission.permission_p(:file_id,:user_id,'write') as write_p,
        		acs_permission.permission_p(:file_id,:user_id,'delete') as delete_p,
-       		acs_permission.permission_p(:file_id,:user_id,'admin') as admin_p
+       		acs_permission.permission_p(:file_id,:user_id,'admin') as admin_p,
+                content_item.get_path(o.object_id, :root_folder_id) as file_url
 	from   acs_objects o, cr_revisions r, cr_items i
 	where  o.object_id = :file_id
 	and    i.item_id   = o.object_id
Index: openacs-4/packages/file-storage/www/file-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-postgresql.xql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/file-storage/www/file-postgresql.xql	25 Sep 2003 13:55:04 -0000	1.9
+++ openacs-4/packages/file-storage/www/file-postgresql.xql	11 Dec 2003 21:40:04 -0000	1.10
@@ -17,7 +17,8 @@
        		r.title as name,
        		acs_permission__permission_p(:file_id,:user_id,'write') as write_p,
        		acs_permission__permission_p(:file_id,:user_id,'delete') as delete_p,
-       		acs_permission__permission_p(:file_id,:user_id,'admin') as admin_p
+       		acs_permission__permission_p(:file_id,:user_id,'admin') as admin_p,
+                content_item__get_path(o.object_id, :root_folder_id) as file_url
 	from   acs_objects o, cr_revisions r, cr_items i
 	where  o.object_id = :file_id
 	and    i.item_id   = o.object_id
Index: openacs-4/packages/file-storage/www/file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.adp,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/file-storage/www/file.adp	13 Oct 2003 17:16:08 -0000	1.16
+++ openacs-4/packages/file-storage/www/file.adp	11 Dec 2003 21:40:04 -0000	1.17
@@ -59,8 +59,14 @@
 
 <multiple name=version>
   <tr>
-    <td><img src="graphics/file.gif">
-      <a href="download/@version.title@?version_id=@version.version_id@">@version.title@</a>
+    <td>
+      <a href="download/@version.title@?version_id=@version.version_id@"><img src="/resources/file-storage/file.gif" border="0"></a>
+      <if @version.rownum@ eq 1>
+        <a href="view/@file_url@">@version.title@</a>
+      </if>
+      <else>
+        <a href="download/@version.title@?version_id=@version.version_id@">@version.title@</a>
+      </else>
     </td>
     <td>@version.author@</td>
     <td align=right>@version.content_size_pretty@</td>
Index: openacs-4/packages/file-storage/www/file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/file-storage/www/file.tcl	16 Oct 2003 17:44:55 -0000	1.15
+++ openacs-4/packages/file-storage/www/file.tcl	11 Dec 2003 21:40:04 -0000	1.16
@@ -34,18 +34,10 @@
 
 set show_administer_permissions_link_p [ad_parameter "ShowAdministerPermissionsLinkP"]
 
-db_1row file_info "
-select person.name(o.creation_user) as owner,
-       i.name,
-       r.title,
-       acs_permission.permission_p(:file_id,:user_id,'write') as write_p,
-       acs_permission.permission_p(:file_id,:user_id,'delete') as delete_p,
-       acs_permission.permission_p(:file_id,:user_id,'admin') as admin_p
-from   acs_objects o, cr_revisions r, cr_items i
-where  o.object_id = :file_id
-and    i.item_id   = o.object_id
-and    r.revision_id = i.live_revision"
+set root_folder_id [fs::get_root_folder]
 
+db_1row file_info {}
+
 # We use the new db_map here
 if {[string equal $show_all_versions_p "t"]} {
 #    append sql "
Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/forums/forums.info	10 Nov 2003 16:36:31 -0000	1.24
+++ openacs-4/packages/forums/forums.info	11 Dec 2003 21:40:04 -0000	1.25
@@ -9,14 +9,14 @@
     
     <version name="1.0d4" url="http://openacs.org/repository/download/apm/forums-1.0d4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <summary>Online discussion boards with many configuration options.</summary>
+        <summary>Online discussion forums.</summary>
         <release-date>2003-11-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
-        <description format="text/plain">This online discussion board software is the successor of the original bboard package. The biggest improvement is the new scalable datamodel. This package supports threaded and flat view, moderation, a stand alone search function as well as integration with the OpenACS search package and integration with the notifications package for email alerts. It also supports automatic posting of incoming email.</description>
+        <description format="text/plain">This online discussion board software is the successor of the original bboard package. The biggest improvement is a scalable datamodel. Forums supports threaded and flat view, moderation, a stand alone search function as well as integration with the OpenACS search package and integration with the notifications package for email alerts. It also supports reply via email.</description>
 
         <provides url="forums" version="1.0d4"/>
         <requires url="acs-mail-lite" version="0.1d"/>
-        <requires url="notifications" version="5.0.0a5"/>
+        <requires url="notifications" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql	17 May 2003 10:42:08 -0000	1.12
+++ openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql	11 Dec 2003 21:40:04 -0000	1.13
@@ -4,6 +4,7 @@
 --
 -- @author gwong@orchardlabs.com,ben@openforce.biz
 -- @creation-date 2002-05-16
+-- @cvs-id $Id$
 --
 -- The Package for Messages
 --
@@ -105,7 +106,7 @@
 
     return v_message_id;
 end;
-' language 'plpgsql' with(isstrict,iscachable);
+' language 'plpgsql' stable strict;
 
 select define_function_args ('forums_message__thread_open', 'message_id');
 
Index: openacs-4/packages/forums/tcl/forums-security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-security-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/forums/tcl/forums-security-procs.tcl	21 Sep 2003 19:58:58 -0000	1.7
+++ openacs-4/packages/forums/tcl/forums-security-procs.tcl	11 Dec 2003 21:40:04 -0000	1.8
@@ -41,7 +41,12 @@
         {-user_id ""}
         {-message_id:required}
     } {
-        return [permission::permission_p -party_id $user_id -object_id $message_id -privilege read]
+        # if the user is a guest, they can't see any forum messages at all
+        if { ![acs_privacy::user_can_read_private_data_p -user_id $user_id -object_id [ad_conn package_id]] } {
+            return 0
+        } else {
+            return [permission::permission_p -party_id $user_id -object_id $message_id -privilege read]
+        }
     }
 
     ad_proc -public require_read_message {
Index: openacs-4/packages/forums/www/forum-view-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/forum-view-oracle.xql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/forums/www/forum-view-oracle.xql	3 Oct 2003 18:26:31 -0000	1.9
+++ openacs-4/packages/forums/www/forum-view-oracle.xql	11 Dec 2003 21:40:05 -0000	1.10
@@ -44,4 +44,15 @@
         </querytext>
     </fullquery>
 
+    <partialquery name="orderby_user_name_desc">
+        <querytext>
+	user_name desc
+        </querytext>
+    </partialquery>
+    <partialquery name="orderby_user_name_asc">
+        <querytext>
+	user_name asc
+        </querytext>
+    </partialquery>
+
 </queryset>
Index: openacs-4/packages/forums/www/forum-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/forum-view-postgresql.xql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/forums/www/forum-view-postgresql.xql	3 Oct 2003 18:26:31 -0000	1.11
+++ openacs-4/packages/forums/www/forum-view-postgresql.xql	11 Dec 2003 21:40:05 -0000	1.12
@@ -43,5 +43,15 @@
             [template::list::orderby_clause -orderby -name "messages"]
         </querytext>
     </fullquery>
+    <partialquery name="orderby_user_name_desc">
+        <querytext>
+	lower(person__name(fm.user_id)) desc
+        </querytext>
+    </partialquery>
+    <partialquery name="orderby_user_name_asc">
+        <querytext>
+	lower(person__name(fm.user_id)) asc
+        </querytext>
+    </partialquery>
 
 </queryset>
Index: openacs-4/packages/forums/www/forum-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/forums/www/forum-view.tcl	7 Nov 2003 17:24:01 -0000	1.20
+++ openacs-4/packages/forums/www/forum-view.tcl	11 Dec 2003 21:40:05 -0000	1.21
@@ -121,8 +121,8 @@
         }
         user_name {
             label "#forums.Author#"
-            orderby_asc {upper(user_name) asc, posting_date desc}
-            orderby_desc {upper(user_name) desc, posting_date desc}
+            orderby_asc_name "orderby_user_name_asc"
+            orderby_desc_name "orderby_user_name_desc"
         }
         n_messages {
             label "#forums.Replies#"
Index: openacs-4/packages/forums/www/message-post-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post-confirm.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/forums/www/message-post-confirm.adp	10 Oct 2003 17:09:44 -0000	1.11
+++ openacs-4/packages/forums/www/message-post-confirm.adp	11 Dec 2003 21:40:05 -0000	1.12
@@ -30,13 +30,6 @@
     <br>
   </if>
 
-  <if @attachments_enabled_p@ eq 1>
-  #forums.lt_Would_you_like_to_att#
-    <input type="radio" name="attach_p" value="0" checked>#forums.No#</input>
-    <input type="radio" name="attach_p" value="1">#forums.Yes#</input>
-<br>  
-  </if>
-
   <input type="submit" name="formbutton:post" value="#forums.Post#">
   <input type="submit" name="formbutton:edit" value="#forums.Edit_again#">
 </form>
Index: openacs-4/packages/forums/www/message-post.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.tcl,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/forums/www/message-post.tcl	7 Nov 2003 17:24:01 -0000	1.28
+++ openacs-4/packages/forums/www/message-post.tcl	11 Dec 2003 21:40:05 -0000	1.29
@@ -112,14 +112,17 @@
     element create message attach_p \
             -label [_ forums.Attach] \
             -datatype text \
-            -widget hidden \
-            -optional
+            -widget radio \
+            -value 0 \
+            -options [list [list [_ forums.No] 0] [list [_ forums.Yes] 1]]
 }
 
 if {[form is_valid message]} {
     form get_values message \
-        message_id forum_id parent_id subject content html_p confirm_p subscribe_p anonymous_p
-    
+        message_id forum_id parent_id subject content html_p confirm_p subscribe_p anonymous_p 
+    if {$attachments_enabled_p} {
+	form get_values message attach_p    
+    }
     if { !$anonymous_allowed_p } {
         set anonymous_p 0
     }
@@ -131,7 +134,8 @@
 	set subject.spellcheck ":nospell:"
 	set content.spellcheck ":nospell:"
         set content [string trimright $content]
-        set exported_vars [export_form_vars message_id forum_id parent_id subject content html_p confirm_p subject.spellcheck content.spellcheck anonymous_p]
+
+        set exported_vars [export_form_vars message_id forum_id parent_id subject content html_p confirm_p subject.spellcheck content.spellcheck anonymous_p attach_p]
         
         set message(html_p) $html_p
         set message(subject) $subject
@@ -261,4 +265,3 @@
 } else {
     lappend context [_ forums.Post_a_Message]
 }
-
Index: openacs-4/packages/gatekeeper/gatekeeper.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/gatekeeper/gatekeeper.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/gatekeeper/gatekeeper.info	17 May 2003 10:44:02 -0000	1.2
+++ openacs-4/packages/gatekeeper/gatekeeper.info	11 Dec 2003 21:40:05 -0000	1.3
@@ -1,20 +1,21 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="gatekeeper" url="http://www.arsdgita.com/acs-repository/apm/packages/gatekeeper" type="apm_application">
+<package key="gatekeeper" url="http://openacs.org/repository/apm/packages/gatekeeper" type="apm_application">
     <package-name>GateKeeper</package-name>
     <pretty-plural>GateKeepers</pretty-plural>
     <singleton-p>f</singleton-p>
 
-    <version name="4.0b" url="http://www.arsdigita.com/acs-repository/download/apm/gatekeeper-4.0b.apm">
+    <version name="4.0b" url="http://openacs.org/repository/download/apm/gatekeeper-4.0b.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:jbank@arsdigita.com">Joseph Bank</owner>
-        <summary>Provides ability to retrieve remote URL's in a controlled way.</summary>
+        <owner>Joseph Bank</owner>
+        <summary>Provides ability to retrieve remote URLs in a controlled way.</summary>
         <release-date>2001-01-19</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Gatekeeper can act as a proxy for requests, passing a request on to another server via an http GET or POST and returning the resulting document via the existing connection</description>
 
         <requires url="acs-kernel" version="4.6.2"/>
 
Index: openacs-4/packages/general-comments/general-comments.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/general-comments.info,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/general-comments/general-comments.info	10 Nov 2003 16:36:31 -0000	1.10
+++ openacs-4/packages/general-comments/general-comments.info	11 Dec 2003 21:40:05 -0000	1.11
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="general-comments" url="http://openacs.org/acs-repository/apm/packages/general-comments" type="apm_application">
+<package key="general-comments" url="http://openacs.org/repository/apm/packages/general-comments" type="apm_application">
     <package-name>General Comments</package-name>
     <pretty-plural>General Comments</pretty-plural>
     <initial-install-p>f</initial-install-p>
@@ -10,14 +10,15 @@
 
     <version name="4.1" url="http://openacs.org/repository/download/apm/general-comments-4.1.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
-        <summary>Provides commenting facility on objects.</summary>
+        <summary>Service to provide comment entry and display on objects.</summary>
         <release-date>2003-01-30</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">General comments provides the widgets and UI to support commentability on any object.  There is also an admin interface to edit/hide/delete comments.</description>
 
         <provides url="general-comments" version="4.1"/>
-        <requires url="acs-content-repository" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
-        <requires url="acs-messaging" version="5.0.0a5"/>
+        <requires url="acs-content-repository" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
+        <requires url="acs-messaging" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/glossary/glossary.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/glossary.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/glossary/glossary.info	17 May 2003 10:45:36 -0000	1.6
+++ openacs-4/packages/glossary/glossary.info	11 Dec 2003 21:40:05 -0000	1.7
@@ -1,28 +1,30 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="glossary" url="http://www.arsdgita.com/acs-repository/apm/packages/glossary" type="apm_application">
+<package key="glossary" url="http://openacs.org/repository/apm/packages/glossary" type="apm_application">
     <package-name>Glossary</package-name>
     <pretty-plural>Glossaries</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="4.0a2" url="http://www.arsdigita.com/acs-repository/download/apm/glossary-4.0a2.apm">
+    <version name="4.0a2" url="http://openacs.org/repository/download/apm/glossary-4.0a2.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:dennis@arsdigita.com">Dennis Gregorovic</owner>
-        <summary>Users can create glossaries which contain terms and their definitions.</summary>
+        <owner>Dennis Gregorovic</owner>
+        <summary>User maintained glossary.</summary>
         <release-date>2001-02-06</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/plain">The Glossary Package is based on the ACS 3.x glossary module which was simply a repository for a site's terms and their definitions. 
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/plain">
+        The glossary package supports glossaries for multiple
+        contexts. A site, subsite, group, user, or even a document
+        may have one or more glossaries associated with it. Terms may have
+        illustrations (acs-content-repository). Each glossary can have its
+        security set (acs-permissions), a workflow, and optionally except user
+        comments. A glossary's content is stored in the content repository.  Relies on the deprecated acs-workflow module.
+        </description>
 
-In the process of migrating the glossary to an ACS 4.0 package, we will expand it's feature set to support multiple contexts. A site, subsite, group, user, or
-even document (a this point the document must exist in the database as an ACS object) may have one or more glossaries associated with it. Terms may
-have illustrations (acs-content-repository). Each glossary can have its security set (acs-permissions), a workflow, and optionally except user comments. A
-glossary's content will be stored in the content repository and its presentation will use the ArsDigita Templating System (ATS). </description>
-
         <requires url="acs-content-repository" version="4.0"/>
         <requires url="acs-kernel" version="4.6.2"/>
         <requires url="acs-workflow" version="4.0"/>
Index: openacs-4/packages/lars-blogger/lars-blogger.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lars-blogger.info,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/lars-blogger/lars-blogger.info	8 Dec 2003 05:19:50 -0000	1.27
+++ openacs-4/packages/lars-blogger/lars-blogger.info	11 Dec 2003 21:40:05 -0000	1.28
@@ -7,18 +7,18 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.0a1" url="http://openacs.org/repository/download/apm/lars-blogger-1.0a1.apm">
+    <version name="1.0a3" url="http://openacs.org/repository/download/apm/lars-blogger-1.0a3.apm">
         <owner url="mailto:lars@pinds.com">Lars Pind</owner>
         <owner url="mailto:simon@bcuni.net">Simon Carstensen</owner>
-        <summary>Write your own web log</summary>
+        <summary>Individual or collaborative web logs.</summary>
         <release-date>2003-11-10</release-date>
         <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
-        <description format="text/html">Manages multiple weblogs for your wbsite.</description>
+        <description format="text/html">Weblog creation and management with notifications, RSS, archives, draft and published entries, includable templates for presenting on other pages, and permissioning for multiple users.</description>
 
-        <provides url="lars-blogger" version="1.0a1"/>
+        <provides url="lars-blogger" version="1.0a3"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="general-comments" version="4.0"/>
-        <requires url="notifications" version="5.0.0a5"/>
+        <requires url="notifications" version="5.0.0b4"/>
         <requires url="rss-support" version="0.3d1"/>
         <requires url="trackback" version="0.1d"/>
         <requires url="xml-rpc" version="0.1"/>
@@ -29,7 +29,7 @@
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DisplayUsersP"  default="0" description="Should we display a list of bloggers on the index page."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EnableAutoDiscoveyAndPing"  default="1" description="Enable auto-discovery and sedning of trackback pings" section_name="Trackback"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EnableAutoDiscoveryAndPing"  default="1" description="Enable auto-discovery and sending of trackback pings" section_name="Trackback"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EnableCategoriesP"  default="1" description="Should entries be categorized?"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EnableIncomingTrackback"  default="1" description="Enable incoming trackback" section_name="Trackback"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="HeaderBackgroundColor"  default="#dcdcdc" description="Background color for the header bars, those with the entry date, calendar, etc."/>
Index: openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-categories-pb.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-categories-pb.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-categories-pb.sql	8 Dec 2003 05:10:23 -0000	1.1
+++ openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-categories-pb.sql	11 Dec 2003 21:40:05 -0000	1.2
@@ -12,7 +12,7 @@
     p_category_id     alias for $1;
     v_name            varchar;
 begin
-    select title into v_name
+    select name into v_name
         from pinds_blog_categories
         where category_id = p_category_id;
     return v_name;
Index: openacs-4/packages/lars-blogger/sql/postgresql/upgrade/upgrade-1.0a2-1.0a3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/upgrade/upgrade-1.0a2-1.0a3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/sql/postgresql/upgrade/upgrade-1.0a2-1.0a3.sql	11 Dec 2003 21:40:05 -0000	1.2
@@ -0,0 +1,14 @@
+-- this had select title into v_name but title did not exist 
+-- 
+create or replace function pinds_blog_category__name (integer)
+returns varchar as '
+declare
+    p_category_id     alias for $1;
+    v_name            varchar;
+begin
+    select name into v_name
+        from pinds_blog_categories
+        where category_id = p_category_id;
+    return v_name;
+end;
+' language 'plpgsql';
Index: openacs-4/packages/lars-blogger/tcl/category-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/category-procs-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/tcl/category-procs-oracle.xql	11 Dec 2003 21:40:05 -0000	1.2
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="lars_blogger::category::new.insert_category">
+        <querytext>
+	    begin   
+                :1 := pinds_blog_category.new (
+            		category_id => :category_id,
+  	          	package_id => :package_id,
+        	    	name => :name,
+                	short_name => :short_name,
+        	    	creation_user => :creation_user,
+            		creation_ip => :creation_ip
+        	);
+            end;
+        </querytext>
+    </fullquery>
+
+
+</queryset>
Index: openacs-4/packages/lars-blogger/tcl/category-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/category-procs-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/tcl/category-procs-postgresql.xql	11 Dec 2003 21:40:05 -0000	1.2
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="lars_blogger::category::new.insert_category">
+        <querytext>
+	        select pinds_blog_category__new (
+            		:category_id,
+  	          	:package_id,
+        	    	:name,
+                	:short_name,
+        	    	:creation_user,
+            		:creation_ip
+        	)
+        </querytext>
+    </fullquery>
+
+
+</queryset>
Index: openacs-4/packages/lars-blogger/tcl/category-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/category-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/tcl/category-procs.tcl	11 Dec 2003 21:40:05 -0000	1.2
@@ -0,0 +1,48 @@
+ad_library {
+    Category Tcl APi
+}
+
+namespace eval lars_blogger {}
+namespace eval lars_blogger::category {}
+
+ad_proc lars_blogger::category::new {
+    {-package_id ""}
+    {-name:required}
+    {-category_id ""}
+    {-short_name ""}
+} {
+    @return category_id of new category
+} {
+    set creation_user [ad_conn user_id]
+    set creation_ip [ns_conn peeraddr]
+
+    if { [empty_string_p $category_id] } {
+        set category_id [db_nextval acs_object_id_seq]
+    }
+    if { [empty_string_p $package_id] } {
+        set package_id [ad_conn package_id]
+    }
+    if { [empty_string_p $short_name] } {
+        set existing_short_names [lars_blogger::category::get_existing_short_names -package_id $package_id]
+        set short_name [util_text_to_url -existing_urls $existing_short_names -text $name]
+    }
+    
+    return [db_exec_plsql insert_category {}]
+}
+
+ad_proc lars_blogger::category::edit {
+    {-category_id:required}
+    {-name:required}
+    {-short_name ""}
+} {
+    @return category_id of new category
+} {
+    return [db_exec_plsql update_category {}]
+}
+
+ad_proc lars_blogger::category::get_existing_short_names {
+    {-package_id ""}
+} {
+    return [db_list short_names {}]
+}
+
Index: openacs-4/packages/lars-blogger/tcl/category-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/category-procs.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/tcl/category-procs.xql	11 Dec 2003 21:40:05 -0000	1.2
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+    <fullquery name="lars_blogger::category::get_existing_short_names.short_names">
+        <querytext>
+	        select short_name
+                from pinds_blog_categories
+                where package_id = :package_id
+        </querytext>
+    </fullquery>
+
+    <fullquery name="lars_blogger::category::edit.update_category">
+        <querytext>
+            update pinds_blog_categories
+            set    name = :name, 
+                   short_name = :short_name
+            where  category_id = :category_id
+        </querytext>
+    </fullquery>
+
+</queryset>
+
Index: openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql	8 Dec 2003 04:47:53 -0000	1.5
+++ openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql	11 Dec 2003 21:40:05 -0000	1.6
@@ -3,6 +3,25 @@
 <queryset>
     <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
+    <fullquery name="lars_blogger::entry::new.entry_add">
+        <querytext>
+                        begin
+                            :1 := pinds_blog_entry.new (
+                                entry_id => :entry_id,
+                                package_id => :package_id,
+                                title => :title,
+                                title_url => :title_url,
+                                content => :content,
+                                content_format => :content_format,
+                                entry_date => nvl(to_date(:entry_date, 'YYYY-MM-DD'), sysdate),
+                                draft_p => :draft_p,
+                                creation_user => :creation_user,
+                                creation_ip => :creation_ip
+                            );
+                        end;
+        </querytext>
+    </fullquery>
+
     <fullquery name="lars_blogger::entry::get.select_entry">
         <querytext>
 		    select b.entry_id,  
Index: openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql	8 Dec 2003 04:47:53 -0000	1.5
+++ openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql	11 Dec 2003 21:40:05 -0000	1.6
@@ -3,6 +3,24 @@
 <queryset>
     <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
+    <fullquery name="lars_blogger::entry::new.entry_add">
+        <querytext>
+	        select pinds_blog_entry__new (
+            		:entry_id,
+  	          	:package_id,
+        	    	:title,
+                	:title_url,
+                        :category_id,
+	            	:content,
+        	    	:content_format,
+            		coalesce(to_date(:entry_date, 'YYYY-MM-DD'), current_timestamp),
+	            	:draft_p,
+        	    	:creation_user,
+            		:creation_ip
+        	)
+        </querytext>
+    </fullquery>
+
     <fullquery name="lars_blogger::entry::get.select_entry">
         <querytext>
             select b.entry_id,  
Index: openacs-4/packages/lars-blogger/tcl/entry-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/lars-blogger/tcl/entry-procs.tcl	8 Dec 2003 05:19:49 -0000	1.10
+++ openacs-4/packages/lars-blogger/tcl/entry-procs.tcl	11 Dec 2003 21:40:05 -0000	1.11
@@ -2,8 +2,46 @@
     Entry procs for blogger.
 }
 
+namespace eval lars_blogger {}
 namespace eval lars_blogger::entry {}
 
+ad_proc -public lars_blogger::entry::new {
+    {-entry_id ""}
+    {-package_id ""}
+    {-title:required}
+    {-title_url ""}
+    {-category_id ""}
+    {-content ""}
+    {-content_format "text/plain"}
+    {-entry_date ""}
+    {-draft_p "t"}
+} {
+	Add the blog entry and then flush the cache so that the new entry shows up.
+} {
+    set creation_user [ad_conn user_id]
+    set creation_ip [ns_conn peeraddr]
+
+    if { [empty_string_p $package_id] } {
+        set package_id [ad_conn package_id]
+    }
+
+    db_transaction {
+        # Create the entry
+        set entry_id [db_exec_plsql entry_add {}]
+        lars_blog_flush_cache $package_id
+    }
+
+    # If publish directly, fire off notifications and ping weblogs.com
+    if { [string equal $draft_p "f"] } {
+        lars_blogger::entry::publish \
+            -entry_id $entry_id \
+            -package_id $package_id \
+            -no_update
+    }
+
+    return $entry_id
+}
+
 ad_proc -public lars_blogger::entry::get { 
     -entry_id:required
     -array:required
@@ -30,7 +68,7 @@
 } {
     if { !$no_update_p } {
         # Set draft_p = 'f'
-        db_dml update_entry { *SQL* }
+        db_dml update_entry {}
         # Flush cache
         lars_blog_flush_cache
     }
@@ -40,12 +78,9 @@
         ns_conn close
     }
     
-    # Setup instance feed if needed
+    # Setup instance/user feeds if needed
     lars_blog_setup_feed -package_id $package_id
     
-    # Setup user feed if needed
-    lars_blog_setup_feed -user -package_id $package_id
-    
     # Notifications
     lars_blogger::entry::do_notifications -entry_id $entry_id
 
Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql	8 Dec 2003 05:23:42 -0000	1.5
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql	11 Dec 2003 21:40:05 -0000	1.6
@@ -3,31 +3,6 @@
 <queryset>
     <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-    <fullquery name="lars_blog_entry_add.entry_add">
-        <querytext>
-                        begin
-                                :1 := pinds_blog_entry.new (
-                        entry_id => :entry_id,
-                        package_id => :package_id,
-                        title => :title,
-                        title_url => :title_url,
-                        content => :content,
-                        content_format => :content_format,
-                        entry_date => to_date(:entry_date, 'YYYY-MM-DD'),
-                        draft_p => :draft_p,
-                        creation_user => :creation_user,
-                        creation_ip => :creation_ip
-                        );
-                        end;
-        </querytext>
-    </fullquery>
-
-    <partialquery name="lars_blog_entry_edit.now">
-        <querytext>
-			posted_date = sysdate
-        </querytext>
-    </partialquery>
-
    <fullquery name="lars_blog_setup_feed.create_instance_channel">
         <querytext>
                 begin
Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql	8 Dec 2003 05:23:42 -0000	1.6
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql	11 Dec 2003 21:40:05 -0000	1.7
@@ -3,30 +3,6 @@
 <queryset>
     <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-    <fullquery name="lars_blog_entry_add.entry_add">
-        <querytext>
-	        select pinds_blog_entry__new (
-            		:entry_id,
-  	          	:package_id,
-        	    	:title,
-                	:title_url,
-                        :category_id,
-	            	:content,
-        	    	:content_format,
-            		to_date(:entry_date, 'YYYY-MM-DD'),
-	            	:draft_p,
-        	    	:creation_user,
-            		:creation_ip
-        	)
-        </querytext>
-    </fullquery>
-
-    <partialquery name="lars_blog_entry_edit.now">
-        <querytext>
-			posted_date = current_timestamp
-        </querytext>
-    </partialquery>
-
    <fullquery name="lars_blog_setup_feed.create_instance_channel">
         <querytext>
 		select weblogger_channel__new (
Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl	8 Dec 2003 05:23:42 -0000	1.14
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl	11 Dec 2003 21:40:05 -0000	1.15
@@ -5,7 +5,7 @@
      @cvs-id $Id$
 }
 
-ad_proc -public lars_blog_entry_add {
+ad_proc -deprecated -warn lars_blog_entry_add {
     {-entry_id:required}
     {-package_id:required}
     {-title:required}
@@ -16,26 +16,18 @@
     {-entry_date:required}
     {-draft_p:required}
 } {
-	Add the blog entry and then flush the cache so that the new entry shows up.
+    Add the blog entry and then flush the cache so that the new entry shows up.
 } {
-    set creation_user [ad_conn user_id]
-    set creation_ip [ns_conn peeraddr]
-
-    db_transaction {
-        # Create the entry
-        set entry_id [db_exec_plsql entry_add {}]
-        lars_blog_flush_cache $package_id
-    }
-
-    # If publish directly, fire off notifications and ping weblogs.com
-    if { [string equal $draft_p "f"] } {
-        lars_blogger::entry::publish \
-            -entry_id $entry_id \
-            -package_id $package_id \
-            -no_update
-    }
-
-    return $entry_id
+    return [lars_blogger::entry::new \
+                -entry_id $entry_id \
+                -package_id $package_id \
+                -title $title \
+                -title_url $title_url \
+                -category_id $category_id \
+                -content $content \
+                -content_format $content_format \
+                -entry_date $entry_date \
+                -draft_p $draft_p]
 }
 
 ad_proc -public lars_blog_entry_edit {
@@ -105,61 +97,64 @@
     set creation_user [ad_conn user_id]
     set creation_ip [ns_conn peeraddr]
     
-    if { !$user_p } {
-        if { [parameter::get -parameter "package_rss_feed_p" -default 1]} {
+    # Package feed
+    if { [parameter::get -parameter "package_rss_feed_p" -package_id $package_id -default 1] } {
+        
+        # check whether there's been a channel setup for this instance
+        set summary_context_id [db_string select_instance_channel {} -default {}]
             
-            # check whether there's been a channel setup for this instance
-            set summary_context_id [db_string select_instance_channel {} -default {}]
+        if { [empty_string_p $summary_context_id] } {
+            # Setup a channel for this instance
+            set summary_context_id [db_exec_plsql create_instance_channel {}]
+        }
+        
+        # check whether there's been a feed setup for this instance
+        set exists_instance_feed_p [db_string exists_instance_feed_p {}]
+        
+        if { [string equal $exists_instance_feed_p "0"] } {
+            # Setup an RSS feed for this instance
+            set channel_link [lars_blog_public_package_url]
             
-            if { [empty_string_p $summary_context_id] } {
-                # Setup a channel for this instance
-                set summary_context_id [db_exec_plsql create_instance_channel {}]
-            }
+            set subscr_id [db_exec_plsql create_subscr {}]
+            db_dml update_subscr {}
             
-            # check whether there's been a feed setup for this instance
-            set exists_instance_feed_p [db_string exists_instance_feed_p {}]
-            
-            if { [string equal $exists_instance_feed_p "0"] } {
-                # Setup an RSS feed for this instance
-                set channel_link [lars_blog_public_package_url]
-                
-                set subscr_id [db_exec_plsql create_subscr {}]
-                db_dml update_subscr {}
-                
-                # Run it now
-                rss_gen_report $subscr_id
-            }
+            # Run it now
+            rss_gen_report $subscr_id
         }
-    } else {
-        if {[parameter::get -parameter "user_rss_feed_p" -default 0]} {
+    }
 
-            # check whether there's been a channel setup for this instance
-            set summary_context_id [db_string select_user_channel {} -default {}]
+    if { [parameter::get -parameter "user_rss_feed_p" -package_id $package_id -default 0] } {
 
-            if { [empty_string_p $summary_context_id] } {
-                # Setup a channel for this instance
-		set summary_context_id [db_exec_plsql create_user_channel {}]
-            }
+        # check whether there's been a channel setup for this instance
+        set summary_context_id [db_string select_user_channel {} -default {}]
 
-            # check whether there's been a feed setup for this user
-            set exists_user_feed_p [db_string exists_user_feed_p {}]
-            set screen_name [db_string screen_name {}]
+        if { [empty_string_p $summary_context_id] } {
+            # Setup a channel for this instance
+    	set summary_context_id [db_exec_plsql create_user_channel {}]
+        }
 
-            if { [string equal $exists_user_feed_p "0"] && ![empty_string_p $screen_name] } {
-                # Setup an RSS feed for the user
-		set channel_link "[lars_blog_public_package_url]user/$screen_name/"
+        # check whether there's been a feed setup for this user
+        set exists_user_feed_p [db_string exists_user_feed_p {}]
 
-		set subscr_id [db_exec_plsql create_subscr {}]
-		db_dml update_subscr {}
-	
+        if { !$exists_user_feed_p } {
+            set screen_name [acs_user::get_element -user_id $creation_user -element screen_name]
+            
+            if { ![empty_string_p $screen_name] } {
+                # Setup an RSS feed for the user
+                set channel_link "[lars_blog_public_package_url]user/$screen_name/"
+                
+                set subscr_id [db_exec_plsql create_subscr {}]
+                db_dml update_subscr {}
+                
                 # Run it now
                 rss_gen_report $subscr_id
+            } else {
+                ns_log Warning "lars-blogger: User $creation_user has no screen_name, cannot setup an RSS feed for user"
             }
         }
     }
 }
 
-
 ad_proc -private lars_blog_get_as_string_mem { 
     package_id
     admin_p
Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql	8 Dec 2003 05:23:42 -0000	1.3
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql	11 Dec 2003 21:40:05 -0000	1.4
@@ -80,23 +80,4 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="lars_blog_setup_feed.screen_name">
-        <querytext>
-            select screen_name from users where user_id = :creation_user
-        </querytext>
-    </fullquery>
-
-    <fullquery name="lars_blog_list_user_blogs.blog_list">
-        <querytext>
-
-    select p.package_id 
-     from apm_packages p, acs_object_party_privilege_map perm
-    where p.package_key = 'lars-blogger' 
-      and p.package_id = perm.object_id
-      and perm.privilege = 'create'
-      and perm.party_id = :user_id
-
-        </querytext>
-    </fullquery>
-
 </queryset>
Index: openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs-oracle.xql	11 Dec 2003 21:40:05 -0000	1.2
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="pinds_blog_entry__url.get_url_stub">
+	<querytext>
+         select site_node.url(node_id) as url_stub
+         from   site_nodes s, pinds_blog_entries e
+         where  e.entry_id = :object_id
+         and    s.object_id = e.package_id		
+	</querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs-postgresql.xql	11 Dec 2003 21:40:05 -0000	1.2
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="pinds_blog_entry__url.get_url_stub">
+	<querytext>
+         select site_node__url(node_id) as url_stub
+         from   site_nodes s, pinds_blog_entries e
+         where  e.entry_id = :object_id
+         and    s.object_id = e.package_id		
+	</querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs.tcl	28 Aug 2003 09:41:55 -0000	1.3
+++ openacs-4/packages/lars-blogger/tcl/pinds-blog-entry-sc-procs.tcl	11 Dec 2003 21:40:05 -0000	1.4
@@ -34,11 +34,7 @@
     @creation-date 2002-11-18
 } {
 
-    db_1row get_url_stub "
-        select site_node__url(node_id) as url_stub
-        from site_nodes s, pinds_blog_entries e
-        where e.entry_id = :object_id
-		and s.object_id = e.package_id"
+    db_1row get_url_stub {}
 
     set url "${url_stub}one-entry?entry_id=$object_id"
 
Index: openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql	28 Sep 2003 16:24:52 -0000	1.4
+++ openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql	11 Dec 2003 21:40:05 -0000	1.5
@@ -13,51 +13,41 @@
         <querytext>
             select *
             from (select entry_id,
-                         title, 
-                         content,
-                         entry_date,
-                         posted_date,
-                         to_char(posted_date, 'YYYY-MM-DD') as posted_date_string,
-                         to_char(posted_date, 'HH:MI') as posted_time_string,
-                         to_char(posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi,
-                         -6 as tzoffset_hour,
-                         0 as tzoffset_minute,
-                         to_char(entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty,
-                         to_char(entry_date, 'YYYY/MM/') as entry_archive_url
-                  from pinds_blog_entries 
-                  where package_id = :package_id
-                  and draft_p = 'f'
-                  and deleted_p = 'f'
-                  order by entry_date desc, posted_date desc)
+                         e.title, 
+                         e.content,
+                         to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi,
+                         c.name as category
+                  from   pinds_blog_entries e,
+                         pinds_blog_categories c
+                  where  e.package_id = :package_id
+                  and    e.draft_p = 'f'
+                  and    e.deleted_p = 'f'
+                  and    c.category_id = e.category_id (+)
+                  order  by e.entry_date desc, e.posted_date desc)
             where rownum < 11
         </querytext>
     </fullquery>
 
     <fullquery name="lars_blog__rss_datasource.user_blog_rss_items">
         <querytext>
             select *
-            from (select entry_id,
-                         title, 
-                         content,
-                         entry_date,
-                         posted_date,
-                         to_char(posted_date, 'YYYY-MM-DD') as posted_date_string,
-                         to_char(posted_date, 'HH:MI') as posted_time_string,
-                         to_char(posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi,
-                         -6 as tzoffset_hour,
-                         0 as tzoffset_minute,
-                         to_char(entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty,
-                         to_char(entry_date, 'YYYY/MM/') as entry_archive_url
+            from (select e.entry_id,
+                         e.title, 
+                         e.content,
+                         to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi,
+                         c.name as category
                   from   pinds_blog_entries e,
 		         acs_objects o, 
-                         users u
-                  where e.package_id = :package_id
-                  and   o.object_id = e.entry_id
-                  and   o.creation_user = :user_id
-                  and   u.user_id = o.creation_user
-                  and   e.draft_p = 'f'
-                  and   e.deleted_p = 'f'
-                  order by e.entry_date desc, e.posted_date desc)
+                         users u,
+                         pinds_blog_categories c
+                  where  e.package_id = :package_id
+                  and    o.object_id = e.entry_id
+                  and    o.creation_user = :user_id
+                  and    u.user_id = o.creation_user
+                  and    e.draft_p = 'f'
+                  and    e.deleted_p = 'f'
+                  and    c.category_id = e.category_id (+)
+                  order  by e.entry_date desc, e.posted_date desc)
             where rownum < 11
         </querytext>
     </fullquery>
Index: openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql	29 Sep 2003 19:53:30 -0000	1.5
+++ openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql	11 Dec 2003 21:40:05 -0000	1.6
@@ -14,15 +14,7 @@
             select e.entry_id,
                    e.title, 
                    e.content,
-                   e.entry_date,
-                   e.posted_date,
-                   to_char(e.posted_date, 'YYYY-MM-DD') as posted_date_string,
-                   to_char(e.posted_date, 'HH:MI') as posted_time_string,
                    to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi,
-                   extract(timezone_hour from now()) as tzoffset_hour,
-                   extract(timezone_minute from now()) as tzoffset_minute,
-                   to_char(e.entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty,
-                   to_char(e.entry_date, 'YYYY/MM/') as entry_archive_url,
                    c.name as category
             from   pinds_blog_entries e left outer join
                    pinds_blog_categories c using (category_id)
@@ -36,28 +28,21 @@
 
     <fullquery name="lars_blog__rss_datasource.user_blog_rss_items">
         <querytext>
-            select entry_id,
-                   title, 
-                   content,
-                   entry_date,
-                   posted_date,
-                   to_char(posted_date, 'YYYY-MM-DD') as posted_date_string,
-                   to_char(posted_date, 'HH:MI') as posted_time_string,
-                   to_char(posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi,
-                   extract(timezone_hour from now()) as tzoffset_hour,
-                   extract(timezone_minute from now()) as tzoffset_minute,
-                   to_char(entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty,
-                   to_char(entry_date, 'YYYY/MM/') as entry_archive_url
-    
-            from pinds_blog_entries e join 
-		           acs_objects o on (o.object_id = e.entry_id) join 
-		           users u on (u.user_id = o.creation_user)
-            where e.package_id = :package_id
-            and o.creation_user = :user_id
-            and e.draft_p = 'f'
-            and e.deleted_p = 'f'
-            order by e.entry_date desc, e.posted_date desc
-            limit 10
+            select e.entry_id,
+                   e.title, 
+                   e.content,
+                   to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi,
+                   c.name as category
+            from   pinds_blog_entries e join 
+                   acs_objects o on (o.object_id = e.entry_id) join 
+	           users u on (u.user_id = o.creation_user) left outer join
+                   pinds_blog_categories c using (category_id)
+            where  e.package_id = :package_id
+            and    o.creation_user = :user_id
+            and    e.draft_p = 'f'
+            and    e.deleted_p = 'f'
+            order  by e.entry_date desc, e.posted_date desc
+            limit  10
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/lars-blogger/tcl/rss-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/lars-blogger/tcl/rss-procs.tcl	29 Sep 2003 19:53:30 -0000	1.8
+++ openacs-4/packages/lars-blogger/tcl/rss-procs.tcl	11 Dec 2003 21:40:05 -0000	1.9
@@ -5,6 +5,35 @@
      @cvs-id $Id$
 }
 
+namespace eval lars_blogger {}
+namespace eval lars_blogger::rss {}
+
+
+ad_proc -public lars_blogger::rss::get_subscr_id_list {
+    {-package_id ""}
+} {
+    if { [empty_string_p $package_id] } {
+        set package_id [ad_conn package_id]
+    }
+
+    return [db_list select_subscr {
+        select s.subscr_id
+        from   rss_gen_subscrs s
+        where  s.summary_context_id = :package_id 
+        or     s.summary_context_id in (select c.channel_id
+                                        from   weblogger_channels c
+                                        where  c.package_id = :package_id)
+    }]
+}
+
+ad_proc -public lars_blogger::rss::generate {
+    {-package_id ""}
+} {
+    foreach subscr_id [lars_blogger::rss::get_subscr_id_list -package_id $package_id] {
+        rss_gen_report $subscr_id
+    }
+}
+
 ad_proc -private lars_blog__rss_datasource {
     summary_context_id
 } {
@@ -13,7 +42,6 @@
 
     @author Lars Pind (lars@pinds.com)
 } {
-
     db_transaction {
         
         db_1row select_package_id_user_id {}
@@ -25,7 +53,7 @@
         set blog_url "[ad_url]$package_url"
         
     }
-
+    
     set column_array(channel_title) $blog_title
     set column_array(channel_description) $blog_title
 
Index: openacs-4/packages/lars-blogger/tcl/test/entry-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/test/entry-test-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/tcl/test/entry-test-procs.tcl	11 Dec 2003 21:40:06 -0000	1.2
@@ -0,0 +1,68 @@
+ad_library {
+    Test cases for the entry API.
+}
+
+aa_register_case rss_generation { 
+    Test RSS generation
+} {
+    # Test case written to expose bug in RSS datasource generation: 
+    # The queries had not been updated to get category name.
+    
+    aa_run_with_teardown \
+        -rollback \
+        -test_code {
+            
+            # Setup a screen_name
+            set screen_name [ad_generate_random_string]
+            acs_user::update -user_id [ad_conn user_id] -screen_name $screen_name
+
+            # Generate a node name
+            set node_name [site_node::verify_folder_name \
+                               -parent_node_id [site_node::get_node_id -url /] \
+                               -instance_name "Weblogger"]
+            
+            # Create a package
+            set package_id [site_node::instantiate_and_mount \
+                                -package_key "lars-blogger" \
+                                -node_name $node_name]
+            
+            # Create a category
+            set category_name [ad_generate_random_string]
+            set category_id [lars_blogger::category::new \
+                                 -name $category_name]
+
+            # Configure to set up a package and user RSS feed
+            parameter::set_value -parameter "package_rss_feed_p" -package_id $package_id -value 1
+            parameter::set_value -parameter "user_rss_feed_p" -package_id $package_id -value 1
+            
+            # Create an entry
+            set content [ad_generate_random_string]
+            set entry_id [lars_blogger::entry::new \
+                              -package_id $package_id \
+                              -title "Testing" \
+                              -category_id $category_id \
+                              -content $content \
+                              -draft_p "f"]
+
+            lars_blogger::entry::get \
+                -entry_id $entry_id \
+                -array entry
+
+            aa_equals "Entry content is correct" $entry(content) $content
+            aa_equals "Entry category is correct" $entry(category_name) $category_name
+            
+            # Force a rebuild of the RSS feeds
+            lars_blogger::rss::generate -package_id $package_id
+
+            # Check that we have to RSS subscriptions
+            set subscr_ids [lars_blogger::rss::get_subscr_id_list -package_id $package_id]
+            aa_equals "Two RSS subscriptions (one package, one user)" [llength $subscr_ids] 2
+
+            # Find the directory, and verify that it exists
+            foreach subscr_id $subscr_ids {
+                set report_dir [rss_gen_report_dir -subscr_id $subscr_id]
+                set report_file $report_dir/rss.xml
+                aa_true "Report file $report_file exists" [file exists $report_file]
+            }
+        }
+}
Index: openacs-4/packages/lars-blogger/www/category-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/category-edit.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/lars-blogger/www/category-edit.tcl	16 Oct 2003 21:42:22 -0000	1.5
+++ openacs-4/packages/lars-blogger/www/category-edit.tcl	11 Dec 2003 21:40:06 -0000	1.6
@@ -56,10 +56,7 @@
 
 } -on_submit {
     
-    if { [empty_string_p $short_name] } {
-        set existing_short_names [db_list short_names {}]
-        set short_name [util_text_to_url -existing_urls $existing_short_names -text $name]
-    } else {
+    if { ![empty_string_p $short_name] } {
 	db_1row short_name_exists { *SQL* }
 	if { $short_name_exists > 0 } {
 	    form set_error category short_name "This short name is already used by another category"
@@ -69,13 +66,18 @@
 
 } -new_data {
 
-    set creation_user [ad_conn user_id]
-    set creation_ip [ns_conn peeraddr]
+    lars_blogger::category::new \
+        -name $name \
+        -category_id $category_id \
+        -short_name $short_name
 
-    db_exec_plsql insert_category {}
-    
 } -edit_data {
-    db_dml update_category {}
+
+    lars_blogger::category::edit \
+        -category_id $category_id \
+        -name $name \
+        -short_name $short_name
+
 } -after_submit {
     ad_returnredirect $return_url
     ad_script_abort
Index: openacs-4/packages/lars-blogger/www/category-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/category-edit.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/www/category-edit.xql	17 Oct 2003 00:39:22 -0000	1.3
+++ openacs-4/packages/lars-blogger/www/category-edit.xql	11 Dec 2003 21:40:06 -0000	1.4
@@ -48,14 +48,5 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="update_category">
-        <querytext>
-            update pinds_blog_categories
-            set    name = :name, 
-                   short_name = :short_name
-            where  category_id = :category_id
-        </querytext>
-    </fullquery>
-
 </queryset>
 
Index: openacs-4/packages/lars-blogger/www/drafts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/drafts.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/www/drafts.tcl	7 Nov 2003 17:35:42 -0000	1.4
+++ openacs-4/packages/lars-blogger/www/drafts.tcl	11 Dec 2003 21:40:06 -0000	1.5
@@ -20,6 +20,11 @@
     link_url_eval {[export_vars -base entry-edit { entry_id { return_url [ad_return_url] } }]}
     link_html { title "Edit entry" }
 }
+lappend elements title {
+    label "Title"
+    link_url_eval {[export_vars -base one-entry { entry_id }]}
+    link_html { title "Preview entry" }
+}
 lappend elements entry_date {
     label "Date"
     display_col entry_date_pretty
@@ -37,9 +42,7 @@
 }
 
 lappend elements content {
-    label "Entry"
-    link_url_eval {[export_vars -base one-entry { entry_id { return_url [ad_return_url] } }]}
-    link_html { title "Preview entry" }
+    label "Content"
 }
 lappend elements publish {
     label {Publish}
Index: openacs-4/packages/lars-blogger/www/drafts.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/drafts.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/www/drafts.xql	16 Oct 2003 23:10:45 -0000	1.3
+++ openacs-4/packages/lars-blogger/www/drafts.xql	11 Dec 2003 21:40:06 -0000	1.4
@@ -13,7 +13,7 @@
                            u.last_name
 		    from   pinds_blog_entries e,
                            acs_objects o,
-                           all_users u
+                           acs_users_all u
 		    where  e.package_id = :package_id
 		    and    e.draft_p = 't'
 		    and    e.deleted_p = 'f'
@@ -35,7 +35,7 @@
                            u.last_name
 		    from   pinds_blog_entries e,
                            acs_objects o,
-                           all_users u
+                           acs_users_all u
 		    where  e.package_id = :package_id
 		    and    e.draft_p = 't'
 		    and    e.deleted_p = 'f'
Index: openacs-4/packages/lars-blogger/www/entry-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/lars-blogger/www/entry-edit.tcl	8 Dec 2003 05:23:42 -0000	1.9
+++ openacs-4/packages/lars-blogger/www/entry-edit.tcl	11 Dec 2003 21:40:06 -0000	1.10
@@ -106,7 +106,7 @@
     set insert_or_update [element get_value entry insert_or_update]
 
     if { [string equal $insert_or_update "insert"] } {
-        lars_blog_entry_add \
+        lars_blogger::entry::new \
                 -entry_id $entry_id \
                 -package_id $package_id \
                 -title $title \
@@ -119,15 +119,35 @@
     } else {
         permission::require_write_permission -object_id $entry_id
 
-        lars_blog_entry_edit \
-            -entry_id $entry_id \
-            -title $title \
-            -title_url $title_url \
-            -category_id $category_id \
-            -content $content \
-            -content_format $content_format \
-            -entry_date $entry_date \
-            -draft_p $draft_p
+        set set_clauses { 
+            "title = :title" 
+            "title_url = :title_url"
+            "category_id = :category_id"
+            "content = :content"
+            "content_format = :content_format"
+            "entry_date = to_date(:entry_date, 'YYYY-MM-DD')" 
+            "draft_p = :draft_p" 
+        }
+
+        set org_draft_p [db_string org_draft_p { select draft_p from pinds_blog_entries where entry_id = :entry_id } ]
+
+        # Is this a publish?
+        if { [string equal $draft_p "t"] && [string equal $org_draft_p "f"] } {
+            # set the posted_date to now
+            lappend set_clauses [db_map now]
+        }
+    
+        db_dml update_entry {}
+
+        # Is this a publish?
+        if { [string equal $draft_p "t"] && [string equal $org_draft_p "f"] } {
+            # do notifications
+            lars_blogger::entry::do_notifications -entry_id $entry_id
+            # and ping weblogs.com
+            lars_blog_weblogs_com_update_ping
+        }
+    
+        lars_blog_flush_cache $package_id
     }
     
     if { [empty_string_p $return_url] } {
Index: openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl	28 Aug 2003 09:41:56 -0000	1.2
+++ openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl	11 Dec 2003 21:40:06 -0000	1.3
@@ -2,7 +2,7 @@
     Setup an RSS feed for this blogger.
 }
 
-# Setup instance feed if needed
+# Setup instance/user feeds if needed
 lars_blog_setup_feed
 
 ad_returnredirect .
Index: openacs-4/packages/logger/logger.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/logger.info,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/logger/logger.info	8 Oct 2003 16:05:25 -0000	1.8
+++ openacs-4/packages/logger/logger.info	11 Dec 2003 21:40:06 -0000	1.9
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.0b2" url="http://openacs.org/repository/download/apm/logger-1.0b2.apm">
+    <version name="1.0b3" url="http://openacs.org/repository/download/apm/logger-1.0b3.apm">
         <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
         <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
-        <summary>Supports time and expenses reporting. Full specification is here: http://www.collaboraid.biz/developer/logger-spec</summary>
+        <summary>Time and expenses reporting.</summary>
         <release-date>2003-05-08</release-date>
-        <vendor url="http://collaboraid.biz">Collaboraid</vendor>
-
-        <provides url="logger" version="1.0b2"/>
+        <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
+        <description format="text/html">Logger lets you keep track of measurements over time. The primary use case is time and expenses reporting, an area where we are being guided by the HR-XML Time Expense Reporting 2.0 standard. However, the intention is to allow for reporting of arbitrary types of numerical data such as financial results - account balance, revenue etc. You could even use this application to monitor your weight.  The full specification is here: &lt;a href="http://www.collaboraid.biz/developer/logger-spec">http://www.collaboraid.biz/developer/logger-spec&lt;a&gt;</description>
+        <provides url="logger" version="1.0b3"/>
         <requires url="acs-tcl" version="4.6.2"/>
 
         <callbacks>
Index: openacs-4/packages/logger/sql/oracle/logger-packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/oracle/logger-packages-create.sql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/logger/sql/oracle/logger-packages-create.sql	30 Sep 2003 12:10:08 -0000	1.6
+++ openacs-4/packages/logger/sql/oracle/logger-packages-create.sql	11 Dec 2003 21:40:06 -0000	1.7
@@ -131,17 +131,18 @@
           logger_entry.del(rec.entry_id);
         end loop;        
 
-        -- Delete all variables only mapped to this project.
+        -- Delete all variables only mapped to this project that are not preinstalled (time, expenses)
         for rec in (select variable_id
-                   from logger_variables
-                   where exists (select 1
-                                 from logger_project_pkg_map
-                                 where project_id = logger_project.del.project_id
-                                )
-                   and not exists (select 1 
-                                   from logger_project_pkg_map 
-                                   where project_id <> logger_project.del.project_id
+                   from    logger_variables
+                   where   package_id is not null
+                   and     exists (select 1
+                                   from logger_project_pkg_map
+                                   where project_id = logger_project.del.project_id
                                   )
+                   and     not exists (select 1 
+                                       from logger_project_pkg_map 
+                                       where project_id <> logger_project.del.project_id
+                                      )
                    )
         loop
             logger_variable.del(rec.variable_id);
Index: openacs-4/packages/logger/sql/oracle/upgrade/upgrade-1.0b2-1.0b3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/oracle/upgrade/upgrade-1.0b2-1.0b3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/sql/oracle/upgrade/upgrade-1.0b2-1.0b3.sql	11 Dec 2003 21:40:06 -0000	1.2
@@ -0,0 +1,95 @@
+--
+--
+-- Fixed deleting projects also deleting pre-installed variables
+--
+-- @cvs-id $Id: upgrade-1.0b2-1.0b3.sql,v 1.2 2003/12/11 21:40:06 jeffd Exp $
+--
+
+create or replace package body logger_project
+as
+  function new (
+        project_id      in integer default null,
+        name            in logger_projects.name%TYPE,
+        description     in logger_projects.description%TYPE default null,
+        project_lead    in integer,
+        creation_user   in acs_objects.creation_user%TYPE,
+        creation_ip     in acs_objects.creation_ip%TYPE default null,
+        package_id      in apm_packages.package_id%TYPE
+  ) return integer
+  is
+        v_project_id               integer;
+  begin
+        v_project_id := acs_object.new(
+            object_id   => project_id,
+            object_type => 'logger_project',
+            context_id  => package_id,
+            creation_ip => creation_ip,
+            creation_user => creation_user
+        );
+       
+       insert into logger_projects (project_id, name, description, project_lead)
+           values (v_project_id, name, description, project_lead);
+
+       insert into logger_project_pkg_map (project_id, package_id)
+                values (v_project_id, logger_project.new.package_id);
+
+       return v_project_id;  
+  end new;
+
+  procedure del (
+        project_id      in integer
+  )
+  is
+  begin
+        -- Delete all entries in the project
+        for rec in (select entry_id
+                    from logger_entries
+                    where project_id = logger_project.del.project_id
+                   )
+        loop
+          logger_entry.del(rec.entry_id);
+        end loop;        
+
+        -- Delete all variables only mapped to this project that are not preinstalled (time, expenses)
+        for rec in (select variable_id
+                   from    logger_variables
+                   where   package_id is not null
+                   and     exists (select 1
+                                   from logger_project_pkg_map
+                                   where project_id = logger_project.del.project_id
+                                  )
+                   and     not exists (select 1 
+                                       from logger_project_pkg_map 
+                                       where project_id <> logger_project.del.project_id
+                                      )
+                   )
+        loop
+            logger_variable.del(rec.variable_id);
+        end loop;                                 
+
+        -- Delete the project acs object. This will cascade the row in the logger_projects table
+        -- as well as all projections in the project
+        -- acs_object.delete should delete permissions for us but this change is not on cvs head yet
+        delete from acs_permissions where object_id = project_id;
+        acs_object.del(project_id);
+
+  end del;
+
+  function name (
+      project_id        in integer
+  ) return varchar2
+  is
+      v_name          logger_projects.name%TYPE;
+  begin
+      select name
+      into   v_name
+      from   logger_projects
+      where  project_id = name.project_id;
+
+      return v_name;
+  end name;
+
+end logger_project;
+/
+show errors;
+
Index: openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql	9 May 2003 11:04:13 -0000	1.5
+++ openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql	11 Dec 2003 21:40:07 -0000	1.6
@@ -65,17 +65,18 @@
           perform logger_entry__del(v_rec.entry_id);
         end loop;        
 
-        -- Delete all variables only mapped to this project.
+        -- Delete all variables only mapped to this project that are not preinstalled (time, expenses)
         for v_rec in select variable_id
-                      from logger_variables
-                      where exists (select 1
+                      from  logger_variables
+                      where package_id is not null
+                      and   exists (select 1
                                     from logger_project_pkg_map
                                     where project_id = p_project_id
                                    )
-                      and not exists (select 1 
-                                      from logger_project_pkg_map 
-                                      where project_id <> p_project_id
-                                     )
+                      and   not exists (select 1 
+                                        from logger_project_pkg_map 
+                                        where project_id <> p_project_id
+                                       )
         loop
             perform logger_variable__del(v_rec.variable_id);
         end loop;                                 
Index: openacs-4/packages/logger/sql/postgresql/upgrade/upgrade-1.0b2-1.0b3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/postgresql/upgrade/upgrade-1.0b2-1.0b3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/sql/postgresql/upgrade/upgrade-1.0b2-1.0b3.sql	11 Dec 2003 21:40:07 -0000	1.2
@@ -0,0 +1,47 @@
+--
+--
+-- Fixed deleting projects also deleting pre-installed variables
+--
+-- @cvs-id $Id: upgrade-1.0b2-1.0b3.sql,v 1.2 2003/12/11 21:40:07 jeffd Exp $
+--
+
+create or replace function logger_project__del (integer) 
+returns integer as '
+declare
+    p_project_id          alias for $1;
+
+    v_rec                 record;
+begin
+        -- Delete all entries in the project
+        for v_rec in select entry_id
+                      from logger_entries
+                      where project_id = p_project_id                     
+        loop
+          perform logger_entry__del(v_rec.entry_id);
+        end loop;        
+
+        -- Delete all variables only mapped to this project.
+        for v_rec in select variable_id
+                      from  logger_variables
+                      where package_id is not null
+                      and   exists (select 1
+                                    from logger_project_pkg_map
+                                    where project_id = p_project_id
+                                   )
+                      and   not exists (select 1 
+                                        from logger_project_pkg_map 
+                                        where project_id <> p_project_id
+                                       )
+        loop
+            perform logger_variable__del(v_rec.variable_id);
+        end loop;                                 
+
+        -- Delete the project acs object. This will cascade the row in the logger_projects table
+        -- as well as all projections in the project
+        -- acs_object__delete should delete permissions for us but this change is not on cvs head yet
+        delete from acs_permissions where object_id = p_project_id;
+        perform acs_object__delete(p_project_id);
+
+        return 0;
+end; ' language 'plpgsql';
+
Index: openacs-4/packages/logger/tcl/project-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/logger/tcl/project-procs-oracle.xql	1 May 2003 10:00:24 -0000	1.2
+++ openacs-4/packages/logger/tcl/project-procs-oracle.xql	11 Dec 2003 21:40:07 -0000	1.3
@@ -27,4 +27,14 @@
     </querytext>
   </fullquery>
  
+  <fullquery name="logger::project::users_get_options.select_project_leads">
+    <querytext>
+        select acs_object.name(p.project_lead), project_lead
+        from   logger_projects p,
+               logger_project_pkg_map ppm
+        where  ppm.project_id = p.project_id
+        and    ppm.package_id = :package_id
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/logger/tcl/project-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs-postgresql.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/tcl/project-procs-postgresql.xql	8 May 2003 13:54:59 -0000	1.3
+++ openacs-4/packages/logger/tcl/project-procs-postgresql.xql	11 Dec 2003 21:40:07 -0000	1.4
@@ -23,4 +23,14 @@
     </querytext>
   </fullquery>
  
+  <fullquery name="logger::project::users_get_options.select_project_leads">
+    <querytext>
+        select acs_object__name(p.project_lead), project_lead
+        from   logger_projects p,
+               logger_project_pkg_map ppm
+        where  ppm.project_id = p.project_id
+        and    ppm.package_id = :package_id
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/logger/tcl/project-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs.xql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/logger/tcl/project-procs.xql	28 Aug 2003 09:45:30 -0000	1.6
+++ openacs-4/packages/logger/tcl/project-procs.xql	11 Dec 2003 21:40:07 -0000	1.7
@@ -92,14 +92,4 @@
   </fullquery>
 
 
-  <fullquery name="logger::project::users_get_options.select_project_leads">
-    <querytext>
-        select acs_object__name(p.project_lead), project_lead
-        from   logger_projects p,
-               logger_project_pkg_map ppm
-        where  ppm.project_id = p.project_id
-        and    ppm.package_id = :package_id
-    </querytext>
-  </fullquery>
-
 </queryset>
Index: openacs-4/packages/logger/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/Attic/index-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/index-oracle.xql	11 Dec 2003 21:40:07 -0000	1.2
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+  <fullquery name="select_entries">
+    <querytext>
+	    select le.entry_id,
+	           acs_permission.permission_p(le.entry_id, :current_user_id, 'delete') as delete_p,
+	           acs_permission.permission_p(le.entry_id, :current_user_id, 'write') as edit_p,
+	           le.time_stamp,
+	           to_char(le.time_stamp, 'fmDyfm fmMMfm-fmDDfm-YYYY') as time_stamp_pretty,
+	           to_char(le.time_stamp, 'IW-YYYY') as time_stamp_week,
+	           le.value,
+	           le.description,
+                   lp.project_id,               
+	           lp.name as project_name,
+	           submitter.user_id,
+	           submitter.first_names || ' ' || submitter.last_name as user_name
+	    from   logger_entries le,
+	           logger_projects lp,
+	           acs_objects ao,
+	           cc_users submitter
+	    where  le.project_id = lp.project_id
+	    and    ao.object_id = le.entry_id 
+	    and    ao.creation_user = submitter.user_id
+            [list::filter_where_clauses -and -name "entries"]
+	    [list::orderby_clause -orderby -name "entries"]
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/Attic/index-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/logger/www/index-postgresql.xql	11 Dec 2003 21:40:07 -0000	1.2
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <rdbms><type>postgresql</type><version>7.2</version></rdbms>
+
+  <fullquery name="select_entries">
+    <querytext>
+	    select le.entry_id,
+	           acs_permission__permission_p(le.entry_id, :current_user_id, 'delete') as delete_p,
+	           acs_permission__permission_p(le.entry_id, :current_user_id, 'write') as edit_p,
+	           le.time_stamp,
+	           to_char(le.time_stamp, 'fmDyfm fmMMfm-fmDDfm-YYYY') as time_stamp_pretty,
+	           to_char(le.time_stamp, 'IW-YYYY') as time_stamp_week,
+	           le.value,
+	           le.description,
+                   lp.project_id,               
+	           lp.name as project_name,
+	           submitter.user_id,
+	           submitter.first_names || ' ' || submitter.last_name as user_name
+	    from   logger_entries le,
+	           logger_projects lp,
+	           acs_objects ao,
+	           cc_users submitter
+	    where  le.project_id = lp.project_id
+	    and    ao.object_id = le.entry_id 
+	    and    ao.creation_user = submitter.user_id
+            [list::filter_where_clauses -and -name "entries"]
+	    [list::orderby_clause -orderby -name "entries"]
+    </querytext>
+  </fullquery>
+
+</queryset>
Index: openacs-4/packages/logger/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/logger/www/index.tcl	20 Oct 2003 16:10:56 -0000	1.15
+++ openacs-4/packages/logger/www/index.tcl	11 Dec 2003 21:40:07 -0000	1.16
@@ -318,27 +318,6 @@
 # This query will override the ad_page_contract value entry_id
 
 db_multirow -extend { edit_url delete_url delete_onclick } -unclobber entries select_entries "
-	    select le.entry_id,
-	           acs_permission__permission_p(le.entry_id, :current_user_id, 'delete') as delete_p,
-	           acs_permission__permission_p(le.entry_id, :current_user_id, 'write') as edit_p,
-	           le.time_stamp,
-	           to_char(le.time_stamp, 'fmDyfm fmMMfm-fmDDfm-YYYY') as time_stamp_pretty,
-	           to_char(le.time_stamp, 'IW-YYYY') as time_stamp_week,
-	           le.value,
-	           le.description,
-                   lp.project_id,               
-	           lp.name as project_name,
-	           submitter.user_id,
-	           submitter.first_names || ' ' || submitter.last_name as user_name
-	    from   logger_entries le,
-	           logger_projects lp,
-	           acs_objects ao,
-	           cc_users submitter
-	    where  le.project_id = lp.project_id
-	    and    ao.object_id = le.entry_id 
-	    and    ao.creation_user = submitter.user_id
-            [list::filter_where_clauses -and -name "entries"]
-	    [list::orderby_clause -orderby -name "entries"]
 " {
     set selected_p [string equal [ns_queryget entry_id] $entry_id]
     set edit_url "log?[export_vars { entry_id { edit t } }]"
Index: openacs-4/packages/logger/www/admin/entries-table-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/entries-table-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/logger/www/admin/entries-table-oracle.xql	8 May 2003 13:56:04 -0000	1.1
+++ openacs-4/packages/logger/www/admin/entries-table-oracle.xql	11 Dec 2003 21:40:07 -0000	1.2
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
+<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
   <fullquery name="select_entries">
     <querytext>
Index: openacs-4/packages/logger/www/admin/projection.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/projection.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/logger/www/admin/projection.tcl	9 Nov 2003 22:57:23 -0000	1.6
+++ openacs-4/packages/logger/www/admin/projection.tcl	11 Dec 2003 21:40:07 -0000	1.7
@@ -62,7 +62,7 @@
         {options {[logger::ui::variable_options -project_id $project_id]}}
     }
 
-    {value:text
+    {value:float
       {label Value}
       {html {size 50}}
     }
Index: openacs-4/packages/logger/www/admin/variable-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/variable-delete.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/www/admin/variable-delete.tcl	8 May 2003 13:56:04 -0000	1.3
+++ openacs-4/packages/logger/www/admin/variable-delete.tcl	11 Dec 2003 21:40:07 -0000	1.4
@@ -17,7 +17,7 @@
 set n_log_entries [db_string n_log_entries {}]
 
 if { $n_log_entries > 0 } {
-    ad_return_complaint "Variable is in use" "You cannot delete this variable as it is being used by log entries"
+    ad_return_complaint 1 "Variable is in use: you cannot delete this variable as it is being used by log entries"
     ad_script_abort
 }
 
Index: openacs-4/packages/logger/www/lib/entries-table-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table-oracle.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/www/lib/entries-table-oracle.xql	9 Nov 2003 16:40:26 -0000	1.3
+++ openacs-4/packages/logger/www/lib/entries-table-oracle.xql	11 Dec 2003 21:40:07 -0000	1.4
@@ -19,7 +19,7 @@
 	    from logger_entries le,
 	         logger_projects lp,
 	         acs_objects ao,
-	         all_users submitter
+	         acs_users_all submitter
 	    where le.project_id = lp.project_id
 	      and ao.object_id = le.entry_id
 	      and ao.creation_user = submitter.user_id
Index: openacs-4/packages/logger/www/lib/entries-table-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table-postgresql.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/logger/www/lib/entries-table-postgresql.xql	9 Nov 2003 16:40:26 -0000	1.3
+++ openacs-4/packages/logger/www/lib/entries-table-postgresql.xql	11 Dec 2003 21:40:07 -0000	1.4
@@ -19,7 +19,7 @@
 	    from logger_entries le,
 	         logger_projects lp,
 	         acs_objects ao,
-	         all_users submitter
+	         acs_users_all submitter
 	    where le.project_id = lp.project_id
 	      and ao.object_id = le.entry_id
 	      and ao.creation_user = submitter.user_id
Index: openacs-4/packages/logger/www/lib/nav-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/nav-bar.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/logger/www/lib/nav-bar.tcl	9 May 2003 15:08:17 -0000	1.7
+++ openacs-4/packages/logger/www/lib/nav-bar.tcl	11 Dec 2003 21:40:07 -0000	1.8
@@ -19,7 +19,7 @@
 # My log entrie page
 if { [ad_conn user_id] != 0 } {
     lappend link_list $index_urls
-    lappend link_list [list [list selected_user_id $user_id]]
+    lappend link_list [list [list user_id $user_id]]
     lappend link_list "My Entries"
 
     lappend link_list [list "${package_url}project-select"]
Index: openacs-4/packages/monitoring/monitoring.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/monitoring/monitoring.info,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/monitoring/monitoring.info	28 Aug 2003 09:41:57 -0000	1.7
+++ openacs-4/packages/monitoring/monitoring.info	11 Dec 2003 21:40:08 -0000	1.8
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="monitoring" url="http://www.arsdigita.com/acs-repository/apm/packages/Monitoring" type="apm_application">
+<package key="monitoring" url="http://openacs.org/repository/apm/packages/Monitoring" type="apm_application">
     <package-name>Monitoring</package-name>
     <pretty-plural>Monitoring</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.1" url="http://www.openacs.org/repository/download/apm/monitoring-4.1.apm">
+    <version name="4.1" url="http://openacs.org/repository/download/apm/monitoring-4.1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner>Joseph Bank</owner>
         <owner url="mailto:vinod@kurup.com">Vinod Kurup</owner>
-        <summary>Monitoring apps ported from ACS 3.4.x</summary>
+        <summary>Server and database monitoring.</summary>
         <release-date>2002-08-19</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
-        <description format="text/html">The monitoring apps from ACS 3.4.x /admin/monitoring directory.  Includes Cassandracle, Watchdog, etc.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">A collection of tools for monitoring server and database health, including cassandracle (oracle monitoring), watchdog (error log monitoring).  Derived from the ACS 3.4.x /admin/monitoring tools.</description>
 
         <requires url="acs-kernel" version="4.6.2"/>
 
Index: openacs-4/packages/news/news.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/news.info,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/news/news.info	10 Nov 2003 16:36:31 -0000	1.12
+++ openacs-4/packages/news/news.info	11 Dec 2003 21:40:08 -0000	1.13
@@ -1,24 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="news" url="http://openacs.org/acs-repository/apm/packages/news/" type="apm_application">
+<package key="news" url="http://openacs.org/repository/apm/packages/news/" type="apm_application">
     <package-name>News</package-name>
     <pretty-plural>News</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
     <version name="5.0d2" url="http://openacs.org/repository/download/apm/news-5.0d2.apm">
         <owner url="http://opeancs.org">OpenACS</owner>
-        <summary>News application</summary>
+        <summary>Used for announcements and news items.</summary>
         <release-date>2003-11-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
-        <description format="text/plain">News publication tool for corporate and website news in HTML and plain text format.
-Beta release. </description>
+        <description format="text/plain">News publication tool.  Publication of plain text or html news items with support for scheduled publication and commentability.</description>
 
         <provides url="news" version="5.0d2"/>
-        <requires url="acs-content-repository" version="5.0.0a5"/>
+        <requires url="acs-content-repository" version="5.0.0b4"/>
         <requires url="acs-datetime" version="4.0"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
         <requires url="general-comments" version="4.1"/>
 
         <callbacks>
Index: openacs-4/packages/news-aggregator-portlet/news-aggregator-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/news-aggregator-portlet.info,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/news-aggregator-portlet/news-aggregator-portlet.info	12 Nov 2003 14:24:48 -0000	1.3
+++ openacs-4/packages/news-aggregator-portlet/news-aggregator-portlet.info	11 Dec 2003 21:40:08 -0000	1.4
@@ -10,6 +10,7 @@
     <version name="0.1" url="http://openacs.org/repository/download/apm/news-aggregator-portlet-0.1.apm">
         <owner url="mailto:simon@bcuni.net">Simon Carstensen</owner>
         <release-date>2003-05-15</release-date>
+        <summary>A portlet interface to News Aggregator</summary>
 
         <provides url="news-aggregator-portlet" version="0.1"/>
         <requires url="news-aggregator" version="0.2d"/>
Index: openacs-4/packages/notes/notes.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notes/notes.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/notes/notes.info	8 Oct 2003 16:05:26 -0000	1.6
+++ openacs-4/packages/notes/notes.info	11 Dec 2003 21:40:08 -0000	1.7
@@ -1,23 +1,24 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="notes" url="http://www.arsdgita.com/acs-repository/apm/packages/notes" type="apm_application">
+<package key="notes" url="http://openacs.org/repository/apm/packages/notes" type="apm_application">
     <package-name>Note</package-name>
     <pretty-plural>Notes</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="0.12d" url="http://www.arsdigita.com/acs-repository/download/apm/notes-0.12d.apm">
+    <version name="0.12d" url="http://openacs.org/repository/download/apm/notes-0.12d.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:vkurup@massmed.org">Vinod Kurup</owner>
         <owner>Rafael Schloming</owner>
-        <summary>A sample ACS Application that allows users to manage notes online.</summary>
+        <summary>Sample application for users to manage notes online.</summary>
         <release-date>2001-03-05</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
-        <description format="text/plain">This is a sample application for ACS 4.x.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/plain">This is a sample application for OpenACS 4.x to show how applications should be built, unfortunately it
+        has not kept pace with current best practices.</description>
 
         <requires url="acs-kernel" version="5.0d13"/>
         <requires url="acs-templating" version="4.1.2"/>
Index: openacs-4/packages/notifications/notifications.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/notifications.info,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/notifications/notifications.info	10 Nov 2003 16:36:31 -0000	1.23
+++ openacs-4/packages/notifications/notifications.info	11 Dec 2003 21:40:08 -0000	1.24
@@ -8,13 +8,14 @@
     <singleton-p>t</singleton-p>
     <auto-mount>notifications</auto-mount>
 
-    <version name="5.0.0a5" url="http://openacs.org/repository/download/apm/notifications-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/notifications-5.0.0b4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <summary>Notification Management</summary>
+        <summary>Email notifications management</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://openacs.org/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Provides an API for packages to provide subscription based email notifications and handle replies.  Used by forums, bug-tracker, etc.  The currently prefered package for email notifications.</description>
 
-        <provides url="notifications" version="5.0.0a5"/>
+        <provides url="notifications" version="5.0.0b4"/>
         <requires url="acs-mail-lite" version="0.1d"/>
 
         <callbacks>
@@ -24,7 +25,7 @@
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailDomain"  description="The domain for the notification email address" section_name="email"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailQmailQueue"  description="The location of the qmail queue for incoming email" section_name="email"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailQmailQueue"  description="The location of the qmail queue for incoming email, mail will be looked for in EmailQmailQueue/new/*" section_name="email"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EmailQmailQueueScanP"  default="0" description="Should the package scan the qmail queue for incoming mail? (1 is true, 0 is false)" section_name="email"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailReplyAddressPrefix"  default="notification" description="The prefix for email replies" section_name="email"/>
         </parameters>
Index: openacs-4/packages/notifications/sql/oracle/notifications-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/oracle/notifications-core-create.sql,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/notifications/sql/oracle/notifications-core-create.sql	28 Aug 2003 09:41:58 -0000	1.12
+++ openacs-4/packages/notifications/sql/oracle/notifications-core-create.sql	11 Dec 2003 21:40:08 -0000	1.13
@@ -154,7 +154,8 @@
                                     not null,
     -- this is to allow responses to notifications
     response_id                     constraint notif_reponse_id_fk
-                                    references acs_objects (object_id),
+                                    references acs_objects (object_id)
+                                    on delete cascade,
     notif_user                      integer
                                     constraint notif_user_id_fk
                                     references users(user_id),
Index: openacs-4/packages/notifications/sql/oracle/notifications-replies-extra-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/oracle/notifications-replies-extra-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/notifications/sql/oracle/notifications-replies-extra-create.sql	6 Nov 2003 19:23:02 -0000	1.2
+++ openacs-4/packages/notifications/sql/oracle/notifications-replies-extra-create.sql	11 Dec 2003 21:40:08 -0000	1.3
@@ -1,8 +1,9 @@
 create table notification_email_hold (
     reply_id			integer
-    				references  notification_replies(reply_id)
-				primary key,
-    to_addr			text,
-    header			text,
-    body			text
+				constraint notification_email_hold_pk primary key
+				constraint notif_email_hold_reply_id_ref
+				references notification_replies(reply_id),
+    to_addr			clob,
+    headers			clob,
+    body			clob
 );
Index: openacs-4/packages/notifications/sql/oracle/upgrade/upgrade-4.6.4-5.0d1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/oracle/upgrade/upgrade-4.6.4-5.0d1.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/notifications/sql/oracle/upgrade/upgrade-4.6.4-5.0d1.sql	6 Nov 2003 19:23:02 -0000	1.2
+++ openacs-4/packages/notifications/sql/oracle/upgrade/upgrade-4.6.4-5.0d1.sql	11 Dec 2003 21:40:08 -0000	1.3
@@ -1,8 +1,9 @@
 create table notification_email_hold (
     reply_id			integer
-    				references  notification_replies(reply_id)
-				primary key,
-    to_addr			text,
-    header			text,
-    body			text
+				constraint notification_email_hold_pk primary key
+				constraint notif_email_hold_reply_id_ref
+				references notification_replies(reply_id),
+    to_addr			clob,
+    headers			clob,
+    body			clob
 );
Index: openacs-4/packages/notifications/sql/oracle/upgrade/upgrade-5.0.0a5-5.0.0a6.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/oracle/upgrade/upgrade-5.0.0a5-5.0.0a6.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/notifications/sql/oracle/upgrade/upgrade-5.0.0a5-5.0.0a6.sql	11 Dec 2003 21:40:08 -0000	1.2
@@ -0,0 +1,8 @@
+-- Add the on delete cascade to response_id column,
+-- see Bug http://openacs.org/bugtracker/openacs/bug?filter%2estatus=resolved&filter%2eactionby=6815&bug%5fnumber=260
+-- @author Peter Marklund
+alter table notifications drop constraint notif_reponse_id_fk;
+alter table notifications add constraint notif_reponse_id_fk
+                              foreign key (response_id)
+                              references acs_objects (object_id)
+                              on delete cascade;
Index: openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql	28 Aug 2003 09:41:58 -0000	1.11
+++ openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql	11 Dec 2003 21:40:09 -0000	1.12
@@ -166,7 +166,8 @@
     -- this is to allow responses to notifications
     response_id                     integer
                                     constraint notif_reponse_id_fk
-                                    references acs_objects (object_id),
+                                    references acs_objects (object_id)
+                                    on delete cascade,
     -- this is the user that caused the notification to go out
     notif_user                      integer
                                     constraint notif_user_id_fk
Index: openacs-4/packages/notifications/sql/postgresql/notifications-replies-extra-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/postgresql/notifications-replies-extra-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/notifications/sql/postgresql/notifications-replies-extra-create.sql	6 Nov 2003 19:23:02 -0000	1.2
+++ openacs-4/packages/notifications/sql/postgresql/notifications-replies-extra-create.sql	11 Dec 2003 21:40:09 -0000	1.3
@@ -1,7 +1,8 @@
 create table notification_email_hold (
     reply_id			integer
-    				references  notification_replies(reply_id)
-				primary key,
+				constraint notification_email_hold_pk primary key
+				constraint notif_email_hold_reply_id_ref
+				references notification_replies(reply_id),
     to_addr			text,
     headers 			text,
     body			text
Index: openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-4.6.4-5.0d1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-4.6.4-5.0d1.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-4.6.4-5.0d1.sql	6 Nov 2003 19:23:02 -0000	1.1
+++ openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-4.6.4-5.0d1.sql	11 Dec 2003 21:40:09 -0000	1.2
@@ -1,8 +1,9 @@
 create table notification_email_hold (
     reply_id			integer
-    				references  notification_replies(reply_id)
-				primary key,
+				constraint notification_email_hold_pk primary key
+				constraint notif_email_hold_reply_id_ref
+				references notification_replies(reply_id),
     to_addr			text,
-    header			text,
+    headers 			text,
     body			text
 );
Index: openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql	11 Dec 2003 21:40:09 -0000	1.2
@@ -0,0 +1,15 @@
+-- Add on delete cascade to the notifications.response_id column foreign key constraint
+-- see Bug http://openacs.org/bugtracker/openacs/bug?filter%2estatus=resolved&filter%2eactionby=6815&bug%5fnumber=260
+-- @author Peter Marklund
+alter table notifications drop constraint notif_reponse_id_fk;
+alter table notifications add constraint notif_reponse_id_fk
+                              foreign key (response_id)
+                              references acs_objects (object_id)
+                              on delete cascade;
+
+-- Add on delete cascade to notification_user_map.notification_in foreign key constraint
+alter table notification_user_map drop constraint notif_user_map_notif_id_fk;
+alter table notification_user_map add constraint notif_user_map_notif_id_fk 
+                                      foreign key (notification_id) 
+                                      references notifications(notification_id) 
+                                      on delete cascade;
Index: openacs-4/packages/notifications/tcl/notification-email-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/notifications/tcl/notification-email-procs-oracle.xql	11 Dec 2003 21:40:09 -0000	1.2
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<queryset>
+  <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="notification::email::load_qmail_mail_queue.holdinsert">
+      <querytext>
+        insert into notification_email_hold
+        (reply_id,to_addr,headers,body)
+        values
+        (:reply_id,empty_clob(),empty_clob(),empty_clob())
+       returning to_addr, headers, body into :1, :2, :3
+      </querytext>
+    </fullquery>
+
+</queryset>
+
Index: openacs-4/packages/notifications/tcl/notification-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	6 Nov 2003 19:23:02 -0000	1.18
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	11 Dec 2003 21:40:09 -0000	1.19
@@ -182,20 +182,28 @@
         @param queue_dir The location of the qmail mail queue in
         the file-system.
     } {
+	ns_log notice "load_qmail_mail_queue: checking $queue_dir/new/ for incoming mail"
+
         if {[catch {
             set messages [glob "$queue_dir/new/*"]
         } errmsg]} {
-            ns_log Debug "load_qmail_mail_queue: queue dir = $queue_dir/new/*, no messages"
-            return [list]
+	    if {[string match "no files matched glob pattern*"  $errmsg ]} { 
+		ns_log Debug "load_qmail_mail_queue: queue dir = $queue_dir/new/*, no messages"		
+	    } else { 
+		ns_log Error "load_qmail_mail_queue: queue dir = $queue_dir/new/ error $errmsg"
+	    }
+	    return {}
         }
 
         set list_of_reply_ids [list]
         set new_messages_p 0
 
         foreach msg $messages {
             ns_log Debug "load_qmail_mail_queue: opening file: $msg"
-            if [catch {set f [open $msg r]}] {
-                continue
+            if {[catch {set f [open $msg r]} errmsg]} {
+		# spit out an error message for failure to open and contiue to next message
+		ns_log Warning "load_qmail_mail_queue: error opening file $errmsg"
+		continue
             }
             set orig_file [read $f]
             close $f
@@ -210,7 +218,7 @@
 
             # walk through the headers and extract each one
             set is_auto_reply_p 0
-            while ![empty_string_p $line] {
+            while {![empty_string_p $line]} {
                 set next_line [lindex $file [expr $i + 1]]
                 if {[regexp {^[ ]*$} $next_line match] && $i > 0} {
                     set end_of_headers_p 1
@@ -219,24 +227,24 @@
                 if {[regexp {^([^:]+):[ ]+(.+)$} $line match name value]} {
                     # join headers that span more than one line (e.g. Received)
                     if { ![regexp {^([^:]+):[ ]+(.+)$} $next_line match] && !$end_of_headers_p} {
-                    set multiline_header_p 1
-                } else {
-                    # we only want messages a person typed in themselves - nothing
-                    # from any sort of auto-responder.
-                    if { [string compare -nocase $name "Auto-Submitted"] == 0 } {
-                        set is_auto_reply_p 1
-                        break
-                    } elseif { [string compare -nocase $name "Subject"] == 0 && [string first "Out of Office AutoReply:" $value] == 0 } {
-                        # added for BP
-                        set is_auto_reply_p 1
-                        break
-                    } else {
-                        lappend headers [string tolower $name] $value
-			append orig_headers "$line\n"
-                    }
-                }
+			set multiline_header_p 1
+		    } else {
+			# we only want messages a person typed in themselves - nothing
+			# from any sort of auto-responder.
+			if { [string compare -nocase $name "Auto-Submitted"] == 0 } {
+			    set is_auto_reply_p 1
+			    break
+			} elseif { [string compare -nocase $name "Subject"] == 0 && [string first "Out of Office AutoReply:" $value] == 0 } {
+			    # added for BP
+			    set is_auto_reply_p 1
+			    break
+			} else {
+			    lappend headers [string tolower $name] $value
+			    append orig_headers "$line\n"
+			}
+		    }
 
-                    if {$end_of_headers_p} {
+		    if {$end_of_headers_p} {
                         incr i
                         break
                     }
@@ -255,10 +263,11 @@
                 }
             }
 
+
             # a break above just exited the while loop;  now we need to skip
             # the rest of the foreach as well
             if { $is_auto_reply_p } {
-                ns_log Debug "load_qmail_mail_queue: message is from an auto-responder, skipping"
+                ns_log Debug "load_qmail_mail_queue: message $msg is from an auto-responder, skipping"
                 if {[catch {ns_unlink $msg} errmsg]} {
                     ns_log Warning "load_qmail_mail_queue: couldn't remove message $msg:  $errmsg"
                 }
@@ -267,14 +276,17 @@
 
             set body [parse_incoming_email $orig_file]
 
+
+
             # okay now we have a list of headers and the body, let's
             # put it into notifications stuff
             array set email_headers $headers
 
-            if [catch {set from $email_headers(from)}] {
+
+            if {[catch {set from $email_headers(from)}]} {
                 set from ""
             }
-            if [catch {set to $email_headers(to)}] {
+            if {[catch {set to $email_headers(to)}]} {
                 set to ""
             }
 
@@ -286,48 +298,60 @@
 
             # We don't accept empty users for now
             if {[empty_string_p $from_user]} {
-                ns_log Notice "load_qmail_mail_queue: no user $from"
-		# bounce message here
-		bounce_mail_message  -to_addr $email_headers(from) -from_addr $email_headers(to) -body $body  -message_headers $orig_headers -reason "invalid sender.  You must be a member of the site."
+                ns_log Notice "load_qmail_mail_queue: no user for from address: $from, to: $to. bouncing message."
+		# bounce message with an informative error.
+		bounce_mail_message  -to_addr $email_headers(from) \
+		    -from_addr $email_headers(to) \
+		    -body $body  \
+		    -message_headers $orig_headers \
+		    -reason "Invalid sender.  You must be a member of the site and\nyour From address must match your registered address."
+
                 if {[catch {ns_unlink $msg} errmsg]} {
-                    ns_log Warning "load_qmail_mail_queue: couldn't remove message $msg:  $errmsg"
+                    ns_log Warning "load_qmail_mail_queue: couldn't remove message $msg: $errmsg"
                 }
                 continue
             }
 
             set to_stuff [parse_reply_address -reply_address $to]
-
             # We don't accept a bad incoming email address
             if {[empty_string_p $to_stuff]} {
-                ns_log Notice "load_qmail_mail_queue: bad to address $to"
+                ns_log Notice "load_qmail_mail_queue: bad to address $to from $from. bouncing message."
+
 		# bounce message here
-		bounce_mail_message -to_addr $email_headers(from) -from_addr $email_headers(to)  -body $body  -message_headers $orig_headers -reason "Invalid Address"
+		bounce_mail_message -to_addr $email_headers(from) \
+		    -from_addr $email_headers(to) \
+		    -body $body \
+		    -message_headers $orig_headers \
+		    -reason "Invalid To Address"
 
                 if {[catch {ns_unlink $msg} errmsg]} {
-                    ns_log Warning "load_qmail_mail_queue: couldn't remove message $msg:  $errmsg"
+                    ns_log Warning "load_qmail_mail_queue: couldn't remove message file $msg: $errmsg"
                 }
                 continue
             }
 
             set object_id [lindex $to_stuff 0]
             set type_id [lindex $to_stuff 1]
-	    set to_addr "$to" 
+	    set to_addr $to 
 
-            db_transaction {
-                set reply_id [notification::reply::new \
-                        -object_id $object_id \
-                        -type_id $type_id \
-                        -from_user $from_user \
-                        -subject $email_headers(subject) \
-                        -content $body]
+            db_transaction {  
+		set reply_id [notification::reply::new \
+				  -object_id $object_id \
+				  -type_id $type_id \
+				  -from_user $from_user \
+				  -subject $email_headers(subject) \
+				  -content $body]
 	        set headers $orig_headers
-                db_dml holdinsert {}
-                catch {ns_unlink $msg}
+                db_dml holdinsert {} -clobs [list $to_addr $headers $body]
 
+                if {[catch {ns_unlink $msg} errmsg]} { 
+		    ns_log Error "load_qmail_mail_queue: unable to delete queued message $msg: $errmsg"
+		}
+
                 lappend list_of_reply_ids $reply_id
-            } on_error {
+	    } on_error {
                 ns_log Error "load_qmail_mail_queue: error inserting incoming email into the queue: $errmsg"
-            }
+	    }
         }
 
         return $list_of_reply_ids
Index: openacs-4/packages/notifications/tcl/reply-sweep-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/reply-sweep-init.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/notifications/tcl/reply-sweep-init.tcl	16 Jan 2003 13:53:10 -0000	1.3
+++ openacs-4/packages/notifications/tcl/reply-sweep-init.tcl	11 Dec 2003 21:40:09 -0000	1.4
@@ -17,4 +17,4 @@
 if { $scan_replies_p == 1 } {
     ad_schedule_proc -thread t 60 notification::reply::sweep::scan_all_replies
     ad_schedule_proc -thread t 60 notification::reply::sweep::process_all_replies
-} 
+}
Index: openacs-4/packages/notifications/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/admin/index.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/notifications/www/admin/index.adp	25 Feb 2003 10:06:31 -0000	1.1
+++ openacs-4/packages/notifications/www/admin/index.adp	11 Dec 2003 21:40:09 -0000	1.2
@@ -4,4 +4,9 @@
   <li>
     <a href="sweep-now">Send out notifications now</a>
   </li>
+
+  <li>
+    <a href="@parameters_url@">Parameters</a>
+  </li>
+
 </ul>
Index: openacs-4/packages/notifications/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/admin/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/notifications/www/admin/index.tcl	25 Feb 2003 10:06:31 -0000	1.1
+++ openacs-4/packages/notifications/www/admin/index.tcl	11 Dec 2003 21:40:09 -0000	1.2
@@ -2,3 +2,4 @@
     Notifications admin page
 }
 
+set parameters_url [export_vars -base "/shared/parameters" { { return_url [ad_return_url] } { package_id {[ad_conn package_id]} } }]
Index: openacs-4/packages/openfts-driver/openfts-driver.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openfts-driver/openfts-driver.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/openfts-driver/openfts-driver.info	16 Jan 2003 13:54:04 -0000	1.6
+++ openacs-4/packages/openfts-driver/openfts-driver.info	11 Dec 2003 21:40:09 -0000	1.7
@@ -1,39 +1,22 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="openfts-driver" url="http://www.arsdigita.com/acs-repository/apm/packages/openfts-driver" type="apm_service">
+<package key="openfts-driver" url="http://openacs.org/repository/apm/packages/openfts-driver" type="apm_service">
     <package-name>OpenFTS Driver</package-name>
     <pretty-plural>OpenFTS Drivers</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.2" url="http://www.arsdigita.com/acs-repository/download/apm/openfts-driver-4.2.apm">
+    <version name="4.2" url="http://openacs.org/repository/download/apm/openfts-driver-4.2.apm">
     <database-support>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:k2pts@yahoo.com">Neophytos Demetriou</owner>
+        <summary>Full text search support for Search via OpenFTS.</summary>
+        <description format="text/html">Provides an implementation for the search packages service contract for searching on postgresql.</description>
 
         <!-- No dependency information -->
 
-        <files>
-            <file type="package_spec" path="openfts-driver.info"/>
-            <file type="data_model_create" db_type="postgresql" path="sql/postgresql/openfts-driver-create.sql"/>
-            <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/openfts-driver-drop.sql"/>
-            <file type="data_model" db_type="postgresql" path="sql/postgresql/openfts-driver-sc-create.sql"/>
-            <file type="data_model" db_type="postgresql" path="sql/postgresql/openfts-driver-sc-drop.sql"/>
-            <file type="tcl_init" path="tcl/openfts-driver-init.tcl"/>
-            <file type="tcl_procs" path="tcl/openfts-driver-procs.tcl"/>
-            <file type="tcl_util" path="www/admin/destroy.tcl"/>
-            <file path="www/admin/index.adp"/>
-            <file type="tcl_util" path="www/admin/index.tcl"/>
-            <file type="tcl_util" path="www/admin/initialize-2.tcl"/>
-            <file path="www/admin/initialize.adp"/>
-            <file type="tcl_util" path="www/admin/initialize.tcl"/>
-            <file type="documentation" path="www/doc/INSTALL"/>
-            <file type="documentation" path="www/doc/index.html"/>
-            <file path="www/index.adp"/>
-            <file type="tcl_util" path="www/index.tcl"/>
-        </files>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="permission_check_enabled_p"  default="1" description="Check whether the user is allowed to read the object. This is used to filter the search results w.r.t the privileges of the user performing the query."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="openfts_tcl_src_path"  default="/usr/local/src/Search-OpenFTS-tcl-0.31/" description="Path to OpenFTS-TCL source directory."/>
Index: openacs-4/packages/organizations/organizations.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/organizations.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/organizations/organizations.info	8 Oct 2003 16:05:26 -0000	1.2
+++ openacs-4/packages/organizations/organizations.info	11 Dec 2003 21:40:09 -0000	1.3
@@ -13,10 +13,16 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@mayuli.com">Jon Griffin</owner>
-        <summary>Implementation of HR-XML organizations spec.</summary>
-        <vendor url="http://www.mayuli.com">Mayuli Enterprises LLC</vendor>
-        <description format="text/plain">Implementation of HR-XML organizations spec.</description>
+        <summary>Implementation of HR-XML organizations datamodel.</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
 
+        <description format="text/plain">Provides the datamodel for an
+      implementation of the HR-XML organizations spec, but no API for
+      manipulating the data.  Also note that the Oracle code is out of sync
+      with the Postgres code. The source code has comments in it indicating
+      what needs to be updated to make things work correctly [Jade Rubick].
+        </description>
+
         <requires url="acs-kernel" version="5.0d13"/>
 
         <files>
Index: openacs-4/packages/organizations/status.txt
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/status.txt,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/organizations/status.txt	11 Dec 2003 21:40:09 -0000	1.2
@@ -0,0 +1,10 @@
+11/24/03 Jade Rubick
+
+Note that the Oracle code is out of sync with the Postgres code. The
+source code has comments in it indicating what needs to be updated to
+make things work correctly.
+
+The Postgres code is the reference version at this point. 
+
+In general, getting things in sync will not be that difficult. The
+/sql/oracle files will need to be updated, and that's about it.
Index: openacs-4/packages/organizations/sql/oracle/organizations-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/sql/oracle/organizations-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/organizations/sql/oracle/organizations-create.sql	14 Mar 2003 15:53:52 -0000	1.1
+++ openacs-4/packages/organizations/sql/oracle/organizations-create.sql	11 Dec 2003 21:40:09 -0000	1.2
@@ -50,5 +50,19 @@
     notes             varchar2(4000)
 ); 
 
+-- create an index? Postgres version does
+-- create index organization_name_ix on organizations(name);
 
+-- this is untested, copied from Postgres. Needs to be tested to work for
+-- Oracle.
+create table organization_type_map (
+    organization_id             integer
+                                constraint org_type_map_org_id_fk
+                                references organizations(organization_id),
+    organization_type_id        integer
+                                constraint org_type_map_type_fk
+                                references organization_types(organization_type_id)
+);
+
+
 @ 'organizations-plsql-create.sql'
Index: openacs-4/packages/organizations/sql/oracle/organizations-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/sql/oracle/organizations-drop.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/organizations/sql/oracle/organizations-drop.sql	11 Dec 2003 21:40:09 -0000	1.2
@@ -0,0 +1 @@
+-- Yes, this is also missing a drop script!
Index: openacs-4/packages/organizations/sql/oracle/organizations-plsql-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/sql/oracle/organizations-plsql-create.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/organizations/sql/oracle/organizations-plsql-create.sql	30 Sep 2003 12:10:08 -0000	1.2
+++ openacs-4/packages/organizations/sql/oracle/organizations-plsql-create.sql	11 Dec 2003 21:40:09 -0000	1.3
@@ -42,6 +42,10 @@
 /
 show errors
 
+
+-- behavior is different between oracle and postgres. Postgres
+-- version adds in the first organization_type to the organization_type_map
+-- table, to specify which type this organization is.
 create or replace package body organization
 as
     function new (
@@ -102,9 +106,12 @@
   ) 
   is
   begin
+
+   -- these delete statements should not be necessary
    delete from acs_permissions 
      where object_id = organization.del.p_organization_id; 
 
+   -- need to remove items from organization_type_map, like postgres
    delete from organizations 
      where organization_id = organization.del.p_organization_id;
 
@@ -115,3 +122,5 @@
 end organization;
 /
 show errors
+
+-- name function is missing in Oracle version!! Need to port from Postgres
Index: openacs-4/packages/organizations/sql/postgresql/organizations-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/sql/postgresql/organizations-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/organizations/sql/postgresql/organizations-create.sql	14 Mar 2003 15:55:17 -0000	1.1
+++ openacs-4/packages/organizations/sql/postgresql/organizations-create.sql	11 Dec 2003 21:40:10 -0000	1.2
@@ -27,7 +27,7 @@
 insert into organization_types values (acs_object_id_seq.nextval,'Vendor');
 insert into organization_types values (acs_object_id_seq.nextval,'Customer');
 insert into organization_types values (acs_object_id_seq.nextval,'Prospect');
-insert into organization_types values (acs_object_id_seq.nextval,'Misc.');
+insert into organization_types values (acs_object_id_seq.nextval,'Other');
 
 -- organization
 -- this will be a party
@@ -52,4 +52,14 @@
 ); 
 
 create index organization_name_ix on organizations(name);
+
+create table organization_type_map (
+    organization_id             integer
+                                constraint org_type_map_org_id_fk
+                                references organizations(organization_id),
+    organization_type_id        integer
+                                constraint org_type_map_type_fk
+                                references organization_types(organization_type_id)
+);
+
 \i organizations-plsql-create.sql
Index: openacs-4/packages/organizations/sql/postgresql/organizations-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/sql/postgresql/organizations-drop.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/organizations/sql/postgresql/organizations-drop.sql	11 Dec 2003 21:40:10 -0000	1.2
@@ -0,0 +1,41 @@
+-- @cvs-id $Id: organizations-drop.sql,v 1.2 2003/12/11 21:40:10 jeffd Exp $
+
+select drop_package('organization');
+
+-- drop permissions
+delete from acs_permissions where object_id in (select organization_id from organizations);
+
+-- drop objects
+
+create function inline_0()
+returns integer as '
+declare
+        object_rec              record;
+begin
+        for object_rec in select object_id from acs_objects where object_type=''organization''
+        loop
+                perform acs_object__delete( object_rec.object_id );
+        end loop;
+        return 0;
+end;' language 'plpgsql';
+
+select inline_0();
+drop function inline_0();
+
+--drop table
+drop table organization_type_map;
+
+drop table organizations cascade;
+
+--drop type
+select acs_object_type__drop_type(
+           'organization',
+           't'
+    );
+
+
+drop table organization_types; 
+
+
+
+
Index: openacs-4/packages/organizations/sql/postgresql/organizations-plsql-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/sql/postgresql/organizations-plsql-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/organizations/sql/postgresql/organizations-plsql-create.sql	14 Mar 2003 15:55:17 -0000	1.1
+++ openacs-4/packages/organizations/sql/postgresql/organizations-plsql-create.sql	11 Dec 2003 21:40:10 -0000	1.2
@@ -10,16 +10,16 @@
 returns integer as '  
 begin 
     PERFORM acs_object_type__create_type (  
-      ''organization'', -- object_type  
-      ''Organization'', -- pretty_name 
-      ''Organization'',  -- pretty_plural 
-      ''party'',   -- supertype 
-      ''organizations'',  -- table_name 
-      ''organization_id'', -- id_column 
-      ''organization'', -- package_name 
-      ''f'', -- abstract_p 
-      null, -- type_extension_table 
-      null -- name_method 
+      ''organization'',      -- object_type  
+      ''Organization'',      -- pretty_name 
+      ''Organization'',      -- pretty_plural 
+      ''party'',             -- supertype 
+      ''organizations'',     -- table_name 
+      ''organization_id'',   -- id_column 
+      ''organization'',      -- package_name 
+      ''f'',                 -- abstract_p 
+      null,                  -- type_extension_table 
+      ''organization__name'' -- name_method 
   ); 
  
   return 0;  
@@ -32,26 +32,39 @@
 
 
 ------ start of oacs new proc
-create or replace function organization__new ( varchar,varchar,text,integer,varchar, 
-varchar,varchar,integer,varchar,integer )
-returns integer as ' 
+select define_function_args('organization__new','legal_name,name,notes,organization_id,organization_type_id,reg_number,email,url,creation_user,creation_ip,context_id'); 
+
+create or replace function organization__new ( 
+	varchar, -- legal_name
+	varchar, -- name
+	text,    -- notes
+	integer, -- organization_id
+	integer, -- organization_type_id
+	varchar, -- reg_number
+	varchar, -- email
+	varchar, -- url
+	integer, -- creation_user
+	varchar, -- creation_ip
+	integer  -- context_id
+) returns integer as ' 
 declare 
-    p_legal_name         alias for $1; -- comment
-    p_name               alias for $2; -- comment
-    p_notes              alias for $3; -- comment
-    p_organization_id    alias for $4; -- comment
-    p_reg_number         alias for $5; -- comment
-    p_email              alias for $6; -- email
-    p_url                alias for $7;
-    p_creation_user      alias for $8; -- comment
-    p_creation_ip        alias for $9;
-    p_context_id         alias for $10; -- comment
+    p_legal_name           alias for $1; -- comment
+    p_name                 alias for $2; -- comment
+    p_notes                alias for $3; -- comment
+    p_organization_id      alias for $4; -- comment
+    p_organization_type_id alias for $5; -- comment
+    p_reg_number           alias for $6; -- comment
+    p_email                alias for $7; -- email
+    p_url                  alias for $8;
+    p_creation_user        alias for $9; -- comment
+    p_creation_ip          alias for $10;
+    p_context_id           alias for $11; -- comment
 
     -- local vars
     v_organization_id organizations.organization_id%TYPE; 
 begin 
   v_organization_id := party__new (  
-    null,              -- party_id
+    p_organization_id,     -- party_id
     ''organization'',
     now(), 
     p_creation_user,
@@ -77,6 +90,14 @@
     p_reg_number 
   ); 
 
+  insert into organization_type_map (
+    organization_id,
+    organization_type_id
+  ) values (
+    v_organization_id,
+    p_organization_type_id
+  );
+
   PERFORM acs_permission__grant_permission (
      v_organization_id,
      p_creation_user,
@@ -90,27 +111,41 @@
 
 ------ end new proc
 
+
+------ start of oacs del proc
+select define_function_args('organization__del','organization_id'); 
+
 create or replace function organization__del (integer) 
 returns integer as ' 
 declare 
  p_organization_id    alias for $1; 
  v_return integer := 0;  
 begin 
 
+   -- these should not be necessary
    delete from acs_permissions 
      where object_id = p_organization_id; 
 
+   delete from organization_type_map
+     where organization_id = p_organization_id;
+
    delete from organizations 
      where organization_id = p_organization_id;
 
    raise NOTICE ''Deleting organization - %'',p_organization_id;
 
-   PERFORM party_delete(p_organization_id);
+   PERFORM party__delete(p_organization_id);
 
    return v_return;
 
 end;' language 'plpgsql';
 
+------ end del proc
+
+
+------ start of oacs set proc
+select define_function_args('organization__set','legal_name,name,notes,organization_id,reg_number'); 
+
 create or replace function organization__set (varchar,varchar,text,integer,varchar)
 returns integer as ' 
 declare 
@@ -135,4 +170,25 @@
   raise NOTICE ''Updating  - organization - %'',organization_id;
 
 return v_return;
-end;' language 'plpgsql';
\ No newline at end of file
+end;' language 'plpgsql';
+
+------ end set proc
+
+
+------ start of oacs name proc
+select define_function_args('organization___name','organization_id');
+
+create or replace function organization__name (integer)
+returns varchar as '
+declare
+    p_organization_id    alias for $1;
+    v_organization_name  organization.name%TYPE;
+begin
+        select name into v_organization_name
+                from organizations
+                where organization_id = p_organization_id;
+    return v_organization_name;
+end;
+' language 'plpgsql';
+------ end name proc
+
Index: openacs-4/packages/page/page.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/page/page.info,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/page/page.info	23 Aug 2003 00:29:11 -0000	1.8
+++ openacs-4/packages/page/page.info	11 Dec 2003 21:40:10 -0000	1.9
@@ -1,21 +1,22 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="page" url="http://www.arsdigita.com/acs-repository/apm/packages/page/" type="apm_application">
+<package key="page" url="http://openacs.org/repository/apm/packages/page/" type="apm_application">
     <package-name>Page</package-name>
     <pretty-plural>Pages</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="4.5" url="http://www.openacs.org/repository/download/apm/page-4.5.apm">
+    <version name="4.5" url="http://openacs.org/repository/download/apm/page-4.5.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner>Rafael Schloming</owner>
-        <summary>Creates a page.</summary>
+        <summary>Minimal site node package</summary>
         <release-date>2002-05-15</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">a minimal package which exists primarily as a site-node placeholder for a path component (so that the context bar can be properly constructed</description>
 
         <requires url="acs-kernel" version="4.6.2"/>
 
Index: openacs-4/packages/payflowpro/payflowpro.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/payflowpro/Attic/payflowpro.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/payflowpro/payflowpro.info	23 Sep 2002 23:32:24 -0000	1.4
+++ openacs-4/packages/payflowpro/payflowpro.info	11 Dec 2003 21:40:10 -0000	1.5
@@ -16,7 +16,7 @@
         <summary>PayFlowPro payment gateway.</summary>
         <release-date>2002-05-13</release-date>
         <vendor url="http://www.furfly.net">furfly.net, LLC</vendor>
-        <description format="text/html">This is a payment gateway for Verisign's PayFlowPro.</description>
+        <description format="text/html">This is a payment gateway for Verisign's PayFlowPro. Note that there are problems with the supplied libraries from verisign and it is anticipated that this package will be deprecated or removed see &lt;a href="http://openacs.org/forums/message-view?message_id=149360"&gt;TIP 33&lt;/a&gt;</description>
 
         <requires url="payment-gateway" version="4.6"/>
 
Index: openacs-4/packages/payment-gateway/payment-gateway.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/payment-gateway/payment-gateway.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/payment-gateway/payment-gateway.info	16 Jan 2003 13:54:22 -0000	1.5
+++ openacs-4/packages/payment-gateway/payment-gateway.info	11 Dec 2003 21:40:10 -0000	1.6
@@ -17,7 +17,7 @@
         <summary>Payment Gateway Service Contract</summary>
         <release-date>2002-05-13</release-date>
         <vendor url="http://www.furfly.net">furfly.net, LLC</vendor>
-        <description format="text/html">This service contract provides an API for modules to interact with a credit card payment service provider.</description>
+        <description format="text/html">This service contract defines an API for modules to interact with a credit card payment service providers.</description>
 
         <provides url="payment-gateway" version="4.6"/>
         <requires url="acs-service-contract" version="4.2"/>
Index: openacs-4/packages/photo-album/photo-album.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/photo-album.info,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/photo-album/photo-album.info	18 Nov 2003 02:11:39 -0000	1.9
+++ openacs-4/packages/photo-album/photo-album.info	11 Dec 2003 21:40:10 -0000	1.10
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="photo-album" url="http://www.arsdgita.com/acs-repository/apm/packages/photo-album" type="apm_application">
+<package key="photo-album" url="http://openacs.org/repository/apm/packages/photo-album" type="apm_application">
     <package-name>Photo Album</package-name>
     <pretty-plural>Photo Albums</pretty-plural>
     <initial-install-p>f</initial-install-p>
@@ -11,25 +11,19 @@
         <owner url="mailto:davis@xarg.net">Jeff Davis</owner>
         <owner url="mailto:wtem@olywa.net">Walter McGinnis</owner>
         <owner>Tom Baginski</owner>
-        <summary>A photo album application that provides photo display
-and grouping functionality using the ACS Content Repository.</summary>
+        <summary>Organization, editing and display of user uploaded photos.</summary>
         <release-date>2003-09-26</release-date>
-        <vendor url="http://xarg.net/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/plain">A photo album application that provides photo display and grouping
 functionality using the ACS Content Repository.
-
+&lt;p&gt;
 Allows users to upload photos, store and edit attributes, and group
-photos into albums and folders.  Allows site administrators to set
-permissions that control who can do and see what within a photo album
-application.  Includes sub-site support.
-
+photos into albums and folders.  Supports permissioning, exif data, and user clipboards.
+&lt;p&gt;
 Requires installation of ImageMagick and jhead on host machine.  See design doc
-
 for details.
+</description>
 
-Heavily modified from the original Ars Digita version by
-davis@xarg.net.</description>
-
         <provides url="photo-album" version="5.0d1"/>
         <requires url="acs-content-repository" version="5.0d1"/>
         <requires url="acs-kernel" version="5.0d13"/>
Index: openacs-4/packages/photo-album/www/pa_master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/pa_master.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/photo-album/www/pa_master.tcl	10 Jun 2003 10:07:11 -0000	1.1
+++ openacs-4/packages/photo-album/www/pa_master.tcl	11 Dec 2003 21:40:10 -0000	1.2
@@ -1 +1,7 @@
-set context_bar [eval ad_context_bar $context_list]
+set cmd [list ad_context_bar --]
+foreach elem $context_list {
+    lappend cmd $elem
+}
+set context_bar [eval $cmd]
+
+
Index: openacs-4/packages/postal-address/postal-address.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/postal-address/postal-address.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/postal-address/postal-address.info	13 Mar 2003 21:49:44 -0000	1.1
+++ openacs-4/packages/postal-address/postal-address.info	11 Dec 2003 21:40:10 -0000	1.2
@@ -13,63 +13,14 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@mayuli.com">Jon Griffin</owner>
-        <summary>This is an implementation of HR-XML's address standard.</summary>
-        <vendor url="http://www.mayuli.com">Mayuli Enterprises LLC</vendor>
-        <description format="text/html">This is an implementation of HR-XML's address standard.&lt;p&gt;
-Originally part of Contacts-Lite, it is now a service.</description>
+        <summary>An implementation of HR-XML's address standard.</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <description format="text/html">This is an implementation of HR-XML's address standard.&lt;p&gt;Originally part of Contacts-Lite, now a service.</description>
 
         <requires url="acs-kernel" version="4.6"/>
         <requires url="acs-reference" version="0.2d"/>
         <requires url="ref-countries" version="0.1d"/>
 
-        <files>
-            <file type="package_spec" path="postal-address.info"/>
-            <file path="sql/oracle/oracle.notes"/>
-            <file type="data_model_create" db_type="postgresql" path="sql/postgresql/postal-address-create.sql"/>
-            <file type="data_model" db_type="postgresql" path="sql/postgresql/postal-address-plsql.sql"/>
-            <file type="query_file" db_type="oracle" path="www/add-edit-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/add-edit-postgresql.xql"/>
-            <file type="content_page" path="www/add-edit.adp"/>
-            <file type="content_page" path="www/add-edit.tcl"/>
-            <file type="query_file" path="www/add-edit.xql"/>
-            <file type="query_file" db_type="oracle" path="www/address-delete-2-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/address-delete-2-postgresql.xql"/>
-            <file type="content_page" path="www/address-delete-2.tcl"/>
-            <file type="query_file" path="www/address-delete-2.xql"/>
-            <file type="content_page" path="www/address-delete.adp"/>
-            <file type="content_page" path="www/address-delete.tcl"/>
-            <file type="query_file" path="www/address-delete.xql"/>
-            <file type="content_page" path="www/admin/address-type/add-edit.adp"/>
-            <file type="content_page" path="www/admin/address-type/add-edit.tcl"/>
-            <file type="query_file" path="www/admin/address-type/add-edit.xql"/>
-            <file type="content_page" path="www/admin/address-type/delete-2.tcl"/>
-            <file type="content_page" path="www/admin/address-type/delete.adp"/>
-            <file type="content_page" path="www/admin/address-type/delete.tcl"/>
-            <file type="query_file" path="www/admin/address-type/delete.xql"/>
-            <file type="content_page" path="www/admin/address-type/index.adp"/>
-            <file type="content_page" path="www/admin/address-type/index.tcl"/>
-            <file type="query_file" path="www/admin/address-type/index.xql"/>
-            <file type="content_page" path="www/admin/index.adp"/>
-            <file type="content_page" path="www/admin/index.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/delete-2-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/delete-2-postgresql.xql"/>
-            <file type="content_page" path="www/delete-2.tcl"/>
-            <file type="query_file" path="www/delete-2.xql"/>
-            <file type="content_page" path="www/delete.adp"/>
-            <file type="content_page" path="www/delete.tcl"/>
-            <file type="query_file" path="www/delete.xql"/>
-            <file type="query_file" db_type="oracle" path="www/index-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/index-postgresql.xql"/>
-            <file type="content_page" path="www/index.adp"/>
-            <file type="content_page" path="www/index.tcl"/>
-            <file type="query_file" path="www/index.xql"/>
-            <file type="content_page" path="www/notes.txt"/>
-            <file type="query_file" db_type="oracle" path="www/one-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/one-postgresql.xql"/>
-            <file type="content_page" path="www/one.adp"/>
-            <file type="content_page" path="www/one.tcl"/>
-            <file type="query_file" path="www/one.xql"/>
-        </files>
         <parameters>
         <!-- No version parameters -->
         </parameters>
Index: openacs-4/packages/press/press.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/press.info,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/press/press.info	31 Oct 2003 16:09:23 -0000	1.7
+++ openacs-4/packages/press/press.info	11 Dec 2003 21:40:10 -0000	1.8
@@ -1,20 +1,22 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="press" url="http://www.arsdgita.com/acs-repository/apm/packages/press" type="apm_application">
+<package key="press" url="http://openacs.org/repository/apm/packages/press" type="apm_application">
     <package-name>Press</package-name>
     <pretty-plural>Press</pretty-plural>
     <singleton-p>f</singleton-p>
 
-    <version name="5.0d1" url="http://www.arsdigita.com/acs-repository/download/apm/press-5.0d1.apm">
+    <version name="5.0d1" url="http://openacs.org/repository/download/apm/press-5.0d1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:sarah@arsdigita.com">Sarah Barwig</owner>
-        <summary>Press allows publishers to display external press coverage of their site.</summary>
+        <owner>Sarah Barwig</owner>
+        <summary>Display external press coverage.</summary>
         <release-date>2001-01-17</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Supports templated display of press coverage with templates to 
+        support bibliographic style display and excerpts of print and web based external press converage.</description>
 
         <requires url="acs-content-repository" version="5.0d1"/>
         <requires url="acs-datetime" version="4.0"/>
Index: openacs-4/packages/redirect/redirect.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/redirect/redirect.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/redirect/redirect.info	29 Sep 2003 13:17:37 -0000	1.1
+++ openacs-4/packages/redirect/redirect.info	11 Dec 2003 21:40:10 -0000	1.2
@@ -9,13 +9,9 @@
     
     <version name="0.3" url="http://openacs.org/repository/download/apm/redirect-0.3.apm">
         <owner url="mailto:tils@tils.net">Tilmann Singer</owner>
-        <summary>Simple package that redirects from the URL it is mounted on to another URL.</summary>
+        <summary>Simple redirection package.</summary>
         <release-date>2003-09-29</release-date>
-        <description format="text/plain">Simple package that redirects from the URL it is mounted on to another URL. Useful when you have moved content to a new place but don't want old links to break.
-
-The new URL can be entered with a parameter setting.
-
-Note that it does not pass through requests to another application, e.g. one that is running on apache. Use the gatekeeper package for this.</description>
+        <description format="text/plain">Redirects from the URL at which it is mounted on to another URL. Useful when you have moved content to a new place but don't want old links to break.  The new URL can be entered with a parameter setting.  Note that it does not pass through requests to another application, e.g. one that is running on apache. Use the gatekeeper package for this.</description>
 
         <!-- No dependency information -->
 
Index: openacs-4/packages/ref-countries/ref-countries.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-countries/ref-countries.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/ref-countries/ref-countries.info	17 May 2003 11:05:58 -0000	1.4
+++ openacs-4/packages/ref-countries/ref-countries.info	11 Dec 2003 21:40:11 -0000	1.5
@@ -13,9 +13,9 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
-        <summary>This is geo-spatial country data.</summary>
-        <vendor url="www.mayuli.com">Mayuli Enterprises, LLC</vendor>
-        <description format="text/html">Countries supplies the ISO 3166 Country data.</description>
+        <summary>ISO 3166 country data.</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <description format="text/html">Countries supplies the ISO 3166 Country data for acs-reference.</description>
 
         <provides url="ref-countries" version="0.1d"/>
         <requires url="acs-kernel" version="4.6.2"/>
Index: openacs-4/packages/ref-currency/ref-currency.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-currency/ref-currency.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/ref-currency/ref-currency.info	17 May 2003 11:07:06 -0000	1.5
+++ openacs-4/packages/ref-currency/ref-currency.info	11 Dec 2003 21:40:11 -0000	1.6
@@ -13,8 +13,8 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
-        <summary>This is the currency sub-module for acs-reference.</summary>
-        <vendor url="www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <summary>Currency Data, ISO 4217 for acs-reference.</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
         <description format="text/plain">This is the currency sub-module for acs-reference.
 It provides ISO 4217 compatibility.</description>
 
Index: openacs-4/packages/ref-itu/ref-itu.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-itu/ref-itu.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/ref-itu/ref-itu.info	25 Oct 2003 14:31:40 -0000	1.4
+++ openacs-4/packages/ref-itu/ref-itu.info	11 Dec 2003 21:40:11 -0000	1.5
@@ -13,9 +13,9 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
-        <summary>List of ITU-T Recommendation E.164 assigned country codes</summary>
-        <vendor url="http://www.mayuli.com">Mayuli Enterprises LLC</vendor>
-        <description format="text/html">List of ITU-T Recommendation E.164 assigned country codes</description>
+        <summary>Telecom Country codes, ITU-T Recommendation E.164 for acs-reference.</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <description format="text/html">List of ITU-T Recommendation E.164 assigned country codes.</description>
 
         <provides url="ref-itu" version="0.1d"/>
         <requires url="acs-kernel" version="4.6"/>
Index: openacs-4/packages/ref-language/ref-language.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-language/ref-language.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/ref-language/ref-language.info	17 May 2003 11:07:51 -0000	1.6
+++ openacs-4/packages/ref-language/ref-language.info	11 Dec 2003 21:40:11 -0000	1.7
@@ -13,10 +13,9 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
-        <summary>This is the ISO language reference data.</summary>
-        <vendor url="www.mayuli.com">Mayuli Enterprises LLC</vendor>
-        <description format="text/plain">This is the ISO language reference data.
-You should use this if you are using the reference data package as many other reference data packages are dependent on this.</description>
+        <summary>ISO 639-1 language reference data for acs-reference.</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <description format="text/plain">This is the ISO 639-1 language reference data (with languages names in english).</description>
 
         <provides url="ref-language" version="0.1d"/>
         <requires url="acs-kernel" version="4.6.2"/>
Index: openacs-4/packages/ref-language/sql/common/languages.dat
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-language/sql/common/Attic/languages.dat,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/ref-language/sql/common/languages.dat	17 Jul 2003 01:10:41 -0000	1.1
+++ openacs-4/packages/ref-language/sql/common/languages.dat	11 Dec 2003 21:40:11 -0000	1.2
@@ -112,7 +112,7 @@
 sv,Swedish
 sw,Swahili
 ta,Tamil
-te,Tegulu
+te,Telugu
 tg,Tajik
 th,Thai
 ti,Tigrinya
Index: openacs-4/packages/ref-timezones/ref-timezones.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-timezones/ref-timezones.info,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/ref-timezones/ref-timezones.info	10 Nov 2003 14:28:56 -0000	1.11
+++ openacs-4/packages/ref-timezones/ref-timezones.info	11 Dec 2003 21:40:11 -0000	1.12
@@ -7,16 +7,16 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0a5" url="http://openacs.org/repository/download/apm/ref-timezones-5.0.0a5.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/ref-timezones-5.0.0b4.apm">
         <owner url="mailto:jon@mayuli.com">Jon Griffin</owner>
-        <summary>This is the timezone data for the reference data package.</summary>
+        <summary>Timezone data for acs-reference.</summary>
         <release-date>2003-11-07</release-date>
-        <vendor url="www.mayuli.com">Mayuli Enterprises LLC</vendor>
-        <description format="text/plain">This is the timezone data for the reference data package.</description>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <description format="text/plain">This is the timezone data for the acs-reference data package.  Used by acs-lang (among others) for localized times.</description>
 
-        <provides url="ref-timezones" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
-        <requires url="acs-reference" version="5.0.0a5"/>
+        <provides url="ref-timezones" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
+        <requires url="acs-reference" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/ref-timezones/sql/postgresql/ref-timezones-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-timezones/sql/postgresql/ref-timezones-create.sql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/ref-timezones/sql/postgresql/ref-timezones-create.sql	18 Aug 2003 10:37:03 -0000	1.8
+++ openacs-4/packages/ref-timezones/sql/postgresql/ref-timezones-create.sql	11 Dec 2003 21:40:11 -0000	1.9
@@ -114,7 +114,7 @@
   p_raw_date alias for $1;
 begin
   return "timestamptz" (p_raw_date || ''+00'');
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable strict;
 
 create or replace function timezone__new (varchar, varchar) returns integer as '
 declare
@@ -144,12 +144,13 @@
   p_tz alias for $1;
   v_tz_id integer;
 begin
-  select tz_id into v_tz_id 
+
+  return tz_id
   from   timezones
   where  tz = p_tz;
-  return v_tz_id;
-end;' language 'plpgsql';
 
+end;' language 'plpgsql' stable strict;
+
 create or replace function timezone__add_rule (varchar, varchar, integer, varchar, varchar, varchar, varchar, varchar) returns integer as '
 declare
   p_tz alias for $1;
@@ -211,7 +212,7 @@
   from   timezone_rules
   where  tz_id = p_tz_id and v_base_time between utc_start and utc_end;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 
 create or replace function timezone__get_offset (integer, timestamptz) returns interval as '
@@ -227,7 +228,7 @@
   where  tz_id = p_tz_id and p_time between utc_start and utc_end;
 
   return "interval" (v_offset || ''seconds'');
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
     
 create or replace function timezone__get_rawoffset (integer, timestamptz) returns interval as '
 declare
@@ -247,7 +248,7 @@
   where  tz_id  = p_tz_id and p_time between utc_start and utc_end;
 
   return v_offset;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 create or replace function timezone__get_abbrev (integer, timestamptz) returns varchar as '
 declare
@@ -262,7 +263,7 @@
   where  tz_id = p_tz_id and p_time between local_start and local_end;
 	 
   return v_abbrev;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 -- Returns a formatted date with timezone info appended  
 
@@ -298,7 +299,7 @@
 
   return v_date;
 
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
 
 -- Returns 't' if timezone is currently using DST
 create or replace function timezone__isdst_p (integer, timestamptz) returns boolean as '
@@ -314,4 +315,4 @@
   where  tz_id = p_tz_id and p_time between local_start and local_end;
 
   return v_isdst_p;
-end;' language 'plpgsql';
+end;' language 'plpgsql' stable;
Index: openacs-4/packages/ref-us-counties/ref-us-counties.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-us-counties/ref-us-counties.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/ref-us-counties/ref-us-counties.info	23 Sep 2002 23:32:28 -0000	1.4
+++ openacs-4/packages/ref-us-counties/ref-us-counties.info	11 Dec 2003 21:40:12 -0000	1.5
@@ -13,9 +13,9 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@mayuli.com">Jon Griffin</owner>
-        <summary>This is geo-spatial data of US Counties.</summary>
-        <vendor url="www.mayuli.com">Mayuli Enterprises, LLC</vendor>
-        <description format="text/plain">Needs US States as well as other ref- packages.</description>
+        <summary>US Counties geo-spatial data.</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <description format="text/plain">Provides FIPS codes, name,state, population, land area, latitude and longitute, etc.</description>
 
         <provides url="ref-us-counties" version="0.1d"/>
         <requires url="ref-us-states" version="0.1d"/>
Index: openacs-4/packages/ref-us-states/ref-us-states.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-us-states/ref-us-states.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/ref-us-states/ref-us-states.info	17 May 2003 11:12:39 -0000	1.6
+++ openacs-4/packages/ref-us-states/ref-us-states.info	11 Dec 2003 21:40:12 -0000	1.7
@@ -13,10 +13,9 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
-        <summary>This is all the US States.</summary>
-        <vendor url="www.mayuli.com">Mayuli Enterprises, LLC</vendor>
-        <description format="text/plain">This is all the US States.
-It is needed by many other packages.</description>
+        <summary>US States</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <description format="text/plain">This is all the US States.  Provides abbreviation, name, and FIPS state code.</description>
 
         <provides url="ref-us-states" version="0.1d"/>
         <requires url="acs-kernel" version="4.6.2"/>
Index: openacs-4/packages/ref-us-zipcodes/ref-us-zipcodes.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ref-us-zipcodes/ref-us-zipcodes.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/ref-us-zipcodes/ref-us-zipcodes.info	17 May 2003 11:13:48 -0000	1.5
+++ openacs-4/packages/ref-us-zipcodes/ref-us-zipcodes.info	11 Dec 2003 21:40:12 -0000	1.6
@@ -13,9 +13,9 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
-        <summary>This is US Zipcodes. Part of the ACS-Reference package</summary>
-        <vendor url="www.mayuli.com">Mayuli Enterprises, LLC</vendor>
-        <description format="text/html">This is needed by ecommerce among other things.</description>
+        <summary>US Zipcodes</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
+        <description format="text/html">Provides zipcode, name, FIPS state and county codes, latitude and longitude.  Does not provide ZIP+4 data.</description>
 
         <provides url="ref-us-zipcodes" version="0.1d"/>
         <requires url="acs-kernel" version="4.6.2"/>
Index: openacs-4/packages/robot-detection/robot-detection.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/robot-detection/robot-detection.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/robot-detection/robot-detection.info	28 Aug 2003 09:41:58 -0000	1.5
+++ openacs-4/packages/robot-detection/robot-detection.info	11 Dec 2003 21:40:12 -0000	1.6
@@ -1,21 +1,23 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="robot-detection" url="http://www.arsdgita.com/acs-repository/apm/packages/robot-detection" type="apm_application">
+<package key="robot-detection" url="http://openacs.org/repository/apm/packages/robot-detection" type="apm_application">
     <package-name>Robot Detection</package-name>
     <pretty-plural>Robot Detections</pretty-plural>
     <singleton-p>t</singleton-p>
 
-    <version name="4.0.1" url="http://www.arsdigita.com/acs-repository/download/apm/robot-detection-4.0.1.apm">
+    <version name="4.0.1" url="http://openacs.org/repository/download/apm/robot-detection-4.0.1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:rogerh@arsdigita.com">Roger Hsueh</owner>
-        <summary>Redirects web robots to a specified URL</summary>
+        <owner>Roger Hsueh</owner>
+        <summary>Redirect web robots to specified URLs</summary>
         <release-date>2001-01-26</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/html">With this package, you can automatically redirect web robots from search engines away from areas that require login and into a separate area which should have content suitable for indexing.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">With this package, you can automatically redirect web robots from search engines away from areas that require login and into a separate area which provides content suitable for indexing.  You should be aware that this is sometimes considered to be 
+&lt;a href="http://www.google.com/webmasters/faq.html#cloaking"&gt;cloaking&lt;/a&gt; so excercise care here.
+</description>
 
         <requires url="acs-kernel" version="4.6.2"/>
 
Index: openacs-4/packages/robot-detection/sql/oracle/robot-detection-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/robot-detection/sql/oracle/robot-detection-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/robot-detection/sql/oracle/robot-detection-create.sql	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/robot-detection/sql/oracle/robot-detection-create.sql	11 Dec 2003 21:40:12 -0000	1.2
@@ -28,5 +28,6 @@
 	-- insertion_date records when this row was actually inserted
 	-- used to determine if we need to re-populate the table from
 	-- the text file at Web Robots DB.
-	insertion_date                  date default sysdate not null
+	insertion_date                  date default sysdate not null,
+	modified_date			date
 );
Index: openacs-4/packages/robot-detection/sql/postgresql/robot-detection-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/robot-detection/sql/postgresql/robot-detection-create.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/robot-detection/sql/postgresql/robot-detection-create.sql	2 May 2001 20:21:04 -0000	1.1
+++ openacs-4/packages/robot-detection/sql/postgresql/robot-detection-create.sql	11 Dec 2003 21:40:12 -0000	1.2
@@ -28,5 +28,6 @@
 	-- insertion_date records when this row was actually inserted
 	-- used to determine if we need to re-populate the table from
 	-- the text file at Web Robots DB.
-	insertion_date                  date default now() not null
+	insertion_date                  date default now() not null,
+	modified_date                   date
 );
Index: openacs-4/packages/rss-support/rss-support.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/rss-support.info,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/rss-support/rss-support.info	10 Nov 2003 16:36:31 -0000	1.12
+++ openacs-4/packages/rss-support/rss-support.info	11 Dec 2003 21:40:12 -0000	1.13
@@ -12,17 +12,24 @@
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <owner url="mailto:jerry@theashergroup.com">Jerry Asher</owner>
         <owner url="mailto:aegrumet@alum.mit.edu">Andrew Grumet</owner>
-        <summary>Basic support for RSS generation (and parsing).  RDF Site Summary (RSS) is a lightweight multipurpose extensible metadata description and syndication format.  This package can be used to publish ACS objects in a manner useful to other websites and webservices.
-</summary>
+        <summary>Service contracts and support for generating RSS feeds</summary>
         <release-date>2003-11-10</release-date>
-        <description format="text/html">For each item (news event, ticket, bboard message, ...) that you want to publish, you create a property list that describes that item (url to item, title of item, description of item, etc.). You pass a list of those items 
-(and some other parameters) to rss_gen, and it will generate your XML for you.
-
-&lt;ul&gt;
-&lt;li&gt; &lt;a href='http://www.google.com/search?q=rss+0.91'&gt;RSS 0.91 specification&lt;/a&gt;
-&lt;li&gt; &lt;a href='http://groups.yahoo.com/group/rss-dev/files/specification.html'&gt;RSS 1.0 specification&lt;/a&gt;
-&lt;/ul&gt;
-
+        <description format="text/html"> Basic support for RSS
+generation and parsing.  RDF Site Summary (RSS) is a lightweight
+multipurpose extensible metadata description and syndication format.
+This package can be used to publish site content in a manner useful to
+other websites and webservices.  &lt;p&gt; For each item (news event,
+ticket, bboard message, ...) that you want to publish, you create a
+property list that describes that item (url to item, title of item,
+description of item, etc.). You pass a list of those items (and some
+other parameters) to rss_gen, and it will generate your XML for you.
+You can also implenent a set of functions that satisfy the RSS service
+contracts and the RSS can be recreated from a scheduled procedure.
+
+&lt;ul&gt;
+&lt;li&gt; &lt;a href='http://www.google.com/search?q=rss+0.91'&gt;RSS 0.91 specification&lt;/a&gt;
+&lt;li&gt; &lt;a href='http://groups.yahoo.com/group/rss-dev/files/specification.html'&gt;RSS 1.0 specification&lt;/a&gt;
+&lt;/ul&gt;
 </description>
 
         <provides url="rss-support" version="0.3d1"/>
Index: openacs-4/packages/sample-gateway/sample-gateway.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/sample-gateway/sample-gateway.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/sample-gateway/sample-gateway.info	5 Jun 2002 02:32:58 -0000	1.1
+++ openacs-4/packages/sample-gateway/sample-gateway.info	11 Dec 2003 21:40:12 -0000	1.2
@@ -15,7 +15,7 @@
         <owner url="mailto:janine@furfly.net">Janine Sisk</owner>
         <summary>Sample payment gateway.</summary>
         <vendor url="http://www.furfly.net">furfly.net, LLC</vendor>
-        <description format="text/html">This is a sample payment gateway, suitable for copying to create a real one.</description>
+        <description format="text/html">A sample payment gateway, suitable for testing and as a skeletion for a full implementation.</description>
 
         <requires url="payment-gateway" version="4.5b"/>
 
Index: openacs-4/packages/schema-browser/schema-browser.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/schema-browser.info,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/schema-browser/schema-browser.info	15 Oct 2003 09:33:15 -0000	1.6
+++ openacs-4/packages/schema-browser/schema-browser.info	11 Dec 2003 21:40:12 -0000	1.7
@@ -1,41 +1,27 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="schema-browser" url="http://www.arsdigita.com/acs-repository/apm/packages/schema-browser" type="apm_application">
+<package key="schema-browser" url="http://openacs.org/repository/apm/packages/schema-browser" type="apm_application">
     <package-name>Schema Browser</package-name>
     <pretty-plural>Schema Browsers</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     <auto-mount>schema</auto-mount>
 
-    <version name="4.0a" url="http://www.arsdigita.com/acs-repository/download/apm/schema-browser-4.0a.apm">
+    <version name="4.0a" url="http://openacs.org/repository/download/apm/schema-browser-4.0a.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:markc@arsdigita.com">Mark Ciccarello</owner>
-        <owner url="mailto:jbank@arsdigita.com">Joseph Bank</owner>
-        <summary>Schema browser, basically just a copy of the ACS 3.4 stuff packagized.</summary>
+        <owner>Mark Ciccarello</owner>
+        <owner>Joseph Bank</owner>
+        <summary>OpenACS datamodel browser.</summary>
         <release-date>2001-01-24</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Lets you browse the tables and procedures in an OpenACS instance.</description>
 
         <requires url="acs-kernel" version="4.6.2"/>
 
-        <files>
-            <file type="package_spec" path="schema-browser.info"/>
-            <file type="tcl_procs" db_type="oracle" path="tcl/schema-browser-procs-oracle.tcl"/>
-            <file type="tcl_procs" db_type="postgresql" path="tcl/schema-browser-procs-postgresql.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/column-comments-2-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/column-comments-2-postgresql.xql"/>
-            <file type="content_page" path="www/column-comments-2.tcl"/>
-            <file type="content_page" path="www/column-comments.tcl"/>
-            <file type="content_page" path="www/index.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/trigger-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/trigger-postgresql.xql"/>
-            <file type="content_page" path="www/trigger.tcl"/>
-            <file type="query_file" db_type="postgresql" path="www/function-body-postgresql.xql"/>
-            <file type="content_page" path="www/function-body.tcl"/>
-        </files>
         <parameters>
         <!-- No version parameters -->
         </parameters>
Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/search/search.info	10 Nov 2003 14:28:56 -0000	1.9
+++ openacs-4/packages/search/search.info	11 Dec 2003 21:40:13 -0000	1.10
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="search" url="http://www.openacs.org/acs-repository/apm/packages/search" type="apm_application">
+<package key="search" url="http://openacs.org/repository/apm/packages/search" type="apm_application">
     <package-name>Search</package-name>
     <pretty-plural>Search</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.0.0a5" url="http://www.openacs.org/repository/download/apm/search-5.0.0a5.apm">
-        <owner url="http://www.openacs.org">OpenACS</owner>
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/search-5.0.0b4.apm">
+        <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2003-11-07</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
+        <summary>Site wide search</summary>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Site wide search implemented with service contracts, currently 
+        only supports postgres via the OpenFTS driver.</description>
 
-        <provides url="search" version="5.0.0a5"/>
+        <provides url="search" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/shipping-gateway/shipping-gateway.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/shipping-gateway/shipping-gateway.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/shipping-gateway/shipping-gateway.info	19 Sep 2002 20:02:41 -0000	1.2
+++ openacs-4/packages/shipping-gateway/shipping-gateway.info	11 Dec 2003 21:40:13 -0000	1.3
@@ -13,29 +13,13 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:bart.teeuwisse@7-sisters.com">Bart Teeuwisse</owner>
-        <summary>First stab at a service contract for shipping services like UPS, Fedex or home grown shipping rates.</summary>
+        <summary>Service contract definitions for for shipping services like UPS or Fedex.</summary>
         <release-date>2002-05-13</release-date>
-        <description format="text/plain">First stab at a service contract for shipping services like UPS, Fedex or home grown shipping rates like value-based shipping rates.</description>
+        <description format="text/plain">First stab at a service contract to define an interface to shipping services like UPS, Fedex or home grown shipping rates like value-based shipping rates.</description>
 
         <provides url="shipping-gateway" version="4.6"/>
         <requires url="acs-service-contract" version="4.2"/>
 
-        <files>
-            <file type="package_spec" path="shipping-gateway.info"/>
-            <file type="data_model_create" db_type="oracle" path="sql/oracle/shipping-gateway-create.sql"/>
-            <file type="data_model_drop" db_type="oracle" path="sql/oracle/shipping-gateway-drop.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/shipping-gateway-sc-create.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/shipping-gateway-sc-drop.sql"/>
-            <file type="data_model_create" db_type="postgresql" path="sql/postgresql/shipping-gateway-create.sql"/>
-            <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/shipping-gateway-drop.sql"/>
-            <file type="data_model" db_type="postgresql" path="sql/postgresql/shipping-gateway-sc-create.sql"/>
-            <file type="data_model" db_type="postgresql" path="sql/postgresql/shipping-gateway-sc-drop.sql"/>
-            <file type="documentation" path="www/doc/index.adp"/>
-            <file type="documentation" path="www/doc/index.css"/>
-            <file type="documentation" path="www/doc/index.tcl"/>
-            <file type="documentation" path="www/doc/license.adp"/>
-            <file type="documentation" path="www/doc/license.tcl"/>
-        </files>
         <parameters>
         <!-- No version parameters -->
         </parameters>
Index: openacs-4/packages/simple-survey/simple-survey.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/simple-survey.info,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/simple-survey/simple-survey.info	8 Oct 2003 16:05:26 -0000	1.11
+++ openacs-4/packages/simple-survey/simple-survey.info	11 Dec 2003 21:40:13 -0000	1.12
@@ -1,154 +1,27 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="simple-survey" url="http://software.arsdigita.com/packages/simple-survey" type="apm_application">
+<package key="simple-survey" url="http://openacs.org/repository/apm/simple-survey" type="apm_application">
     <package-name>Simple Survey</package-name>
     <pretty-plural>Simple Surveys</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="0.2d" url="http://software.arsdigita.com/packages/simple-survey-0.2d.apm">
+    <version name="0.2d" url="http://openacs.org/repository/download/apm/simple-survey-0.2d.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:nstrug@arsdigita.com">Nicholas Strugnell</owner>
-        <summary>Ask users questions and record results.	</summary>
+        <owner url="mailto:nstrug@redhat.com">Nicholas Strugnell</owner>
+        <summary>Ask users questions and record results.</summary>
         <release-date>2001-02-14</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/html">Simple survey is a survey builder. Surveys can contain questions with different types of answer several types: multiple choice (radio buttons), multiple answer (checkboxes) or free text entry. Multiple choice questions may also be scored on one or more variables.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Simple survey is a survey builder. Surveys can contain questions with different types of answer several types: multiple choice (radio buttons), multiple answer (checkboxes) or free text entry. Multiple choice questions may also be scored on one or more variables.
+In general survey is a better choice than simple-survey.
+</description>
 
         <requires url="acs-kernel" version="5.0d13"/>
 
-        <files>
-            <file type="package_spec" path="simple-survey.info"/>
-            <file type="data_model_create" db_type="oracle" path="sql/oracle/simple-survey-create.sql"/>
-            <file type="data_model_drop" db_type="oracle" path="sql/oracle/simple-survey-drop.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/simple-survey-package-create.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/simple-survey-package-drop.sql"/>
-            <file type="data_model_create" db_type="postgresql" path="sql/postgresql/simple-survey-create.sql"/>
-            <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/simple-survey-drop.sql"/>
-            <file type="query_file" db_type="oracle" path="tcl/survsimp-procs-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="tcl/survsimp-procs-postgresql.xql"/>
-            <file type="tcl_procs" path="tcl/survsimp-procs.tcl"/>
-            <file type="query_file" path="tcl/survsimp-procs.xql"/>
-            <file type="content_page" path="www/admin/description-edit-2.adp"/>
-            <file type="content_page" path="www/admin/description-edit-2.tcl"/>
-            <file type="query_file" path="www/admin/description-edit-2.xql"/>
-            <file type="content_page" path="www/admin/description-edit.adp"/>
-            <file type="content_page" path="www/admin/description-edit.tcl"/>
-            <file type="query_file" path="www/admin/description-edit.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/edit-logic-2-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/edit-logic-2-postgresql.xql"/>
-            <file type="content_page" path="www/admin/edit-logic-2.tcl"/>
-            <file type="content_page" path="www/admin/edit-logic.tcl"/>
-            <file type="query_file" path="www/admin/edit-logic.xql"/>
-            <file type="content_page" path="www/admin/index.adp"/>
-            <file type="content_page" path="www/admin/index.tcl"/>
-            <file type="query_file" path="www/admin/index.xql"/>
-            <file type="content_page" path="www/admin/modify-responses-2.tcl"/>
-            <file type="query_file" path="www/admin/modify-responses-2.xql"/>
-            <file type="content_page" path="www/admin/modify-responses.tcl"/>
-            <file type="query_file" path="www/admin/modify-responses.xql"/>
-            <file type="content_page" path="www/admin/name-edit-2.tcl"/>
-            <file type="content_page" path="www/admin/name-edit.adp"/>
-            <file type="content_page" path="www/admin/name-edit.tcl"/>
-            <file type="content_page" path="www/admin/one-respondent.tcl"/>
-            <file type="query_file" path="www/admin/one-respondent.xql"/>
-            <file type="content_page" path="www/admin/one.adp"/>
-            <file type="content_page" path="www/admin/one.tcl"/>
-            <file type="query_file" path="www/admin/one.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/question-active-toggle-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/question-active-toggle-postgresql.xql"/>
-            <file type="content_page" path="www/admin/question-active-toggle.tcl"/>
-            <file type="content_page" path="www/admin/question-add-2.adp"/>
-            <file type="content_page" path="www/admin/question-add-2.tcl"/>
-            <file type="query_file" path="www/admin/question-add-2.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/question-add-3-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/question-add-3-postgresql.xql"/>
-            <file type="content_page" path="www/admin/question-add-3.tcl"/>
-            <file type="query_file" path="www/admin/question-add-3.xql"/>
-            <file type="content_page" path="www/admin/question-add.adp"/>
-            <file type="content_page" path="www/admin/question-add.tcl"/>
-            <file type="query_file" path="www/admin/question-add.xql"/>
-            <file type="content_page" path="www/admin/question-delete-2.tcl"/>
-            <file type="query_file" path="www/admin/question-delete-2.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/question-delete-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/question-delete-postgresql.xql"/>
-            <file type="content_page" path="www/admin/question-delete.tcl"/>
-            <file type="query_file" path="www/admin/question-delete.xql"/>
-            <file type="content_page" path="www/admin/question-modify-text-2.tcl"/>
-            <file type="query_file" path="www/admin/question-modify-text-2.xql"/>
-            <file type="content_page" path="www/admin/question-modify-text.adp"/>
-            <file type="content_page" path="www/admin/question-modify-text.tcl"/>
-            <file type="query_file" path="www/admin/question-modify-text.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/question-required-toggle-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/question-required-toggle-postgresql.xql"/>
-            <file type="content_page" path="www/admin/question-required-toggle.tcl"/>
-            <file type="content_page" path="www/admin/question-swap.tcl"/>
-            <file type="query_file" path="www/admin/question-swap.xql"/>
-            <file type="content_page" path="www/admin/respondents.adp"/>
-            <file type="content_page" path="www/admin/respondents.tcl"/>
-            <file type="query_file" path="www/admin/respondents.xql"/>
-            <file type="content_page" path="www/admin/response-drill-down.tcl"/>
-            <file type="query_file" path="www/admin/response-drill-down.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/response-editable-toggle-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/response-editable-toggle-postgresql.xql"/>
-            <file type="content_page" path="www/admin/response-editable-toggle.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/admin/response-limit-toggle-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/response-limit-toggle-postgresql.xql"/>
-            <file type="content_page" path="www/admin/response-limit-toggle.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/admin/responses-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/responses-postgresql.xql"/>
-            <file type="content_page" path="www/admin/responses.adp"/>
-            <file type="content_page" path="www/admin/responses.tcl"/>
-            <file type="query_file" path="www/admin/responses.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/survey-category-add-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/survey-category-add-postgresql.xql"/>
-            <file type="content_page" path="www/admin/survey-category-add.tcl"/>
-            <file type="query_file" path="www/admin/survey-category-add.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/survey-create-2-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/survey-create-2-postgresql.xql"/>
-            <file type="content_page" path="www/admin/survey-create-2.tcl"/>
-            <file type="query_file" path="www/admin/survey-create-2.xql"/>
-            <file type="content_page" path="www/admin/survey-create-choice.tcl"/>
-            <file type="content_page" path="www/admin/survey-create-confirm.adp"/>
-            <file type="content_page" path="www/admin/survey-create.adp"/>
-            <file type="content_page" path="www/admin/survey-create.tcl"/>
-            <file type="content_page" path="www/admin/survey-display-type-edit.tcl"/>
-            <file type="content_page" path="www/admin/survey-toggle.tcl"/>
-            <file type="query_file" path="www/admin/survey-toggle.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/view-text-responses-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/view-text-responses-postgresql.xql"/>
-            <file type="content_page" path="www/admin/view-text-responses.tcl"/>
-            <file type="query_file" path="www/admin/view-text-responses.xql"/>
-            <file type="documentation" path="www/doc/index.html"/>
-            <file type="documentation" path="www/doc/porting.html"/>
-            <file type="query_file" db_type="oracle" path="www/index-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/index-postgresql.xql"/>
-            <file type="content_page" path="www/index.adp"/>
-            <file type="content_page" path="www/index.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/one-respondent-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/one-respondent-postgresql.xql"/>
-            <file type="content_page" path="www/one-respondent.adp"/>
-            <file type="content_page" path="www/one-respondent.tcl"/>
-            <file type="query_file" path="www/one-respondent.xql"/>
-            <file type="content_page" path="www/one.adp"/>
-            <file type="content_page" path="www/one.tcl"/>
-            <file type="query_file" path="www/one.xql"/>
-            <file type="content_page" path="www/one_list.adp"/>
-            <file type="content_page" path="www/one_paragraph.adp"/>
-            <file type="content_page" path="www/one_table.adp"/>
-            <file type="query_file" db_type="oracle" path="www/process-response-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/process-response-postgresql.xql"/>
-            <file type="content_page" path="www/process-response.adp"/>
-            <file type="content_page" path="www/process-response.tcl"/>
-            <file type="query_file" path="www/process-response.xql"/>
-            <file type="query_file" db_type="oracle" path="www/view-attachment-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/view-attachment-postgresql.xql"/>
-            <file type="content_page" path="www/view-attachment.tcl"/>
-            <file type="query_file" path="www/view-attachment.xql"/>
-        </files>
         <parameters>
         <!-- No version parameters -->
         </parameters>
Index: openacs-4/packages/site-wide-search/site-wide-search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/site-wide-search.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/site-wide-search/site-wide-search.info	17 May 2003 11:32:49 -0000	1.4
+++ openacs-4/packages/site-wide-search/site-wide-search.info	11 Dec 2003 21:40:13 -0000	1.5
@@ -1,70 +1,26 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="site-wide-search" url="http://www.arsdgita.com/acs-repository/apm/packages/site-wide-search" type="apm_service">
+<package key="site-wide-search" url="http://openacs.org/repository/apm/packages/site-wide-search" type="apm_service">
     <package-name>site-wide-search</package-name>
     <pretty-plural>site-wide-search</pretty-plural>
     <singleton-p>f</singleton-p>
 
-    <version name="4.0.1" url="http://www.arsdigita.com/acs-repository/download/apm/site-wide-search-4.0.1.apm">
+    <version name="4.0.1" url="http://openacs.org/repository/download/apm/site-wide-search-4.0.1.apm">
     <database-support>
         <database>oracle</database>
     </database-support>
-        <owner url="mailto:khy@arsdigita.com">Khy Huang</owner>
-        <summary>Provides search functionality for application data. Supports permissioning, subsites, and searching by keywords.</summary>
+        <owner>Khy Huang</owner>
+        <summary>Provides site wide search functionality for application data. oracle only.</summary>
         <release-date>2001-02-09</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Provides search functionality for application data. Supports permissioning, subsites, and searching by keywords. This version fixed a few bottle necks in the installation process.  There are scripts to support news, bboards , and file-storage.</description>
 
         <provides url="site-wide-search" version="4.0.1"/>
         <requires url="acs-content" version="4.0"/>
         <requires url="acs-interface" version="4.0.1"/>
         <requires url="acs-kernel" version="4.6.2"/>
 
-        <files>
-            <file type="package_spec" path="site-wide-search.info"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/acs-object-util-remove.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/acs-object-util.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/bboard-sws-drop.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/bboard-sws.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/content-revision-sws-drop.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/content-revision-sws.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/file-storage-sws-drop.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/file-storage-sws.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/index-remove.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/index.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/intermedia-setup-remove.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/intermedia-setup.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/news-sws-drop.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/news-sws.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/pot-remove.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/pot.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/search-tables-remove.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/search-tables.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/sws-install.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/sws-package-all-drop.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/sws-package-all.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/sws-reindex.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/sws-service-interface-remove.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/sws-service-interface.sql"/>
-            <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade-4.0.1b3-4.0.1.sql"/>
-            <file type="tcl_procs" path="tcl/sws-procs.tcl"/>
-            <file type="documentation" path="www/doc/design.html"/>
-            <file type="documentation" path="www/doc/how-to.html"/>
-            <file type="documentation" path="www/doc/index.html"/>
-            <file type="documentation" path="www/doc/requirements.html"/>
-            <file type="content_page" path="www/index.adp"/>
-            <file type="content_page" path="www/index.tcl"/>
-            <file type="content_page" path="www/intermedia-categories.adp"/>
-            <file type="content_page" path="www/intermedia-categories.tcl"/>
-            <file type="content_page" path="www/list-all.adp"/>
-            <file type="content_page" path="www/list-all.tcl"/>
-            <file type="content_page" path="www/search-form.adp"/>
-            <file type="content_page" path="www/search-form.tcl"/>
-            <file type="content_page" path="www/search-redirect.tcl"/>
-            <file type="content_page" path="www/search.adp"/>
-            <file type="content_page" path="www/search.tcl"/>
-        </files>
         <parameters>
         <!-- No version parameters -->
         </parameters>
Index: openacs-4/packages/skin/skin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/skin/skin.info,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/skin/skin.info	30 May 2003 08:17:14 -0000	1.7
+++ openacs-4/packages/skin/skin.info	11 Dec 2003 21:40:13 -0000	1.8
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="skin" url="http://www.arsdigita.com/acs-repository/apm/packages/skin" type="apm_service">
+<package key="skin" url="http://openacs.org/repository/apm/packages/skin" type="apm_service">
     <package-name>Skin</package-name>
     <pretty-plural>Skins</pretty-plural>
     <singleton-p>t</singleton-p>
     <initial-install-p>f</initial-install-p>
 
-    <version name="4.5" url="http://www.openacs.org/repository/download/apm/skin-4.5.apm">
+    <version name="4.5" url="http://openacs.org/repository/download/apm/skin-4.5.apm">
         <database-support>
              <database>oracle</database>
              <database>postgresql</database>
         </database-support>
         <owner>Christian Brechbuhler</owner>
-        <summary>Demonstration of skins or cobranding.</summary>
+        <summary>Demonstration of themes or co-branding.</summary>
         <release-date>2002-05-15</release-date>
-        <vendor url="http://www.openacs.org/">OpenACS</vendor>
-        <description format="text/html">Show how the template system lets you give different looks to pages depending on the subsite under which they are mounted.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">An example package to show how to theme via master templates.</description>
 
         <requires url="acs-kernel" version="4.6.2"/>
         <requires url="acs-subsite" version="4.2"/>
Index: openacs-4/packages/spam/spam.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/spam.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/spam/spam.info	17 May 2003 11:34:41 -0000	1.5
+++ openacs-4/packages/spam/spam.info	11 Dec 2003 21:40:13 -0000	1.6
@@ -1,116 +1,32 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="spam" url="http://www.arsdgita.com/acs-repository/apm/packages/spam" type="apm_application">
+<package key="spam" url="http://openacs.org/repository/apm/packages/spam" type="apm_application">
     <package-name>Spam System</package-name>
     <pretty-plural>Spam Systems</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.1" url="http://www.arsdigita.com/acs-repository/download/apm/spam-4.1.apm">
+    <version name="4.1" url="http://openacs.org/repository/download/apm/spam-4.1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:tilmann.singer@tils.net">Tilmann Singer</owner>
         <owner>Bill Schneider</owner>
         <owner>Mark Dalrymple</owner>
-        <summary>Port of the spam system to 4.1</summary>
+        <summary>Send mail to collections of users.</summary>
         <release-date>2001-02-06</release-date>
-        <vendor url="http://openacs.org/">OpenACS</vendor>
-        <description format="text/plain">Port of the spam system to 4.1.  Provides a set of user-interface pages for sending e-mail to groups of users, selected based on some criteria in the database.  Applications may link to the spam system with their own set of criteria (SQL queries).  </description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/plain">Provides a UI for sending e-mail to groups of users, selected based on some criteria in the database.  Applications may link to the spam system with their own set of criteria (SQL queries).  Bulk-mail is now the prefered package for this functionality.  </description>
 
         <provides url="spam" version="4.1"/>
         <requires url="acs-content" version="4.1"/>
         <requires url="acs-kernel" version="4.6.2"/>
         <requires url="acs-mail" version="4.1"/>
 
-        <files>
-            <file type="package_spec" path="spam.info"/>
-            <file type="data_model_create" db_type="oracle" path="sql/oracle/spam-create.sql"/>
-            <file type="data_model_drop" db_type="oracle" path="sql/oracle/spam-drop.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/spam-packages.sql"/>
-            <file type="data_model" db_type="oracle" path="sql/oracle/spam-views.sql"/>
-            <file type="data_model_create" db_type="postgresql" path="sql/postgresql/spam-create.sql"/>
-            <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/spam-drop.sql"/>
-            <file type="data_model" db_type="postgresql" path="sql/postgresql/spam-packages.sql"/>
-            <file type="data_model" db_type="postgresql" path="sql/postgresql/spam-views.sql"/>
-            <file type="tcl_init" path="tcl/spam-init.tcl"/>
-            <file type="query_file" db_type="oracle" path="tcl/spam-procs-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="tcl/spam-procs-postgresql.xql"/>
-            <file type="tcl_procs" path="tcl/spam-procs.tcl"/>
-            <file type="query_file" path="tcl/spam-procs.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/index-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/index-postgresql.xql"/>
-            <file type="content_page" path="www/admin/index.adp"/>
-            <file type="content_page" path="www/admin/index.tcl"/>
-            <file type="query_file" path="www/admin/index.xql"/>
-            <file type="content_page" path="www/admin/process-queue.tcl"/>
-            <file type="content_page" path="www/admin/spam-confirm.adp"/>
-            <file type="content_page" path="www/admin/spam-confirm.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/admin/spam-edit-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/spam-edit-postgresql.xql"/>
-            <file type="content_page" path="www/admin/spam-edit.adp"/>
-            <file type="content_page" path="www/admin/spam-edit.tcl"/>
-            <file type="query_file" path="www/admin/spam-edit.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/spam-show-users-oracle.xql"/>
-            <file type="content_page" path="www/admin/spam-show-users.adp"/>
-            <file type="content_page" path="www/admin/spam-show-users.tcl"/>
-            <file type="query_file" path="www/admin/spam-show-users.xql"/>
-            <file type="content_page" path="www/admin/spam-update.adp"/>
-            <file type="content_page" path="www/admin/spam-update.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/admin/spam-view-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/spam-view-postgresql.xql"/>
-            <file type="content_page" path="www/admin/spam-view.adp"/>
-            <file type="content_page" path="www/admin/spam-view.tcl"/>
-            <file type="query_file" path="www/admin/spam-view.xql"/>
-            <file type="query_file" db_type="oracle" path="www/admin/toggle-approval-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/admin/toggle-approval-postgresql.xql"/>
-            <file type="content_page" path="www/admin/toggle-approval.tcl"/>
-            <file type="documentation" path="www/doc/admin-guide.html"/>
-            <file type="documentation" path="www/doc/index.html"/>
-            <file type="documentation" path="www/doc/release-notes.html"/>
-            <file type="documentation" path="www/doc/spam-design.html"/>
-            <file type="documentation" path="www/doc/spam-requirements.html"/>
-            <file type="query_file" db_type="oracle" path="www/index-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/index-postgresql.xql"/>
-            <file type="content_page" path="www/index.adp"/>
-            <file type="content_page" path="www/index.html"/>
-            <file type="content_page" path="www/index.tcl"/>
-            <file type="query_file" path="www/index.xql"/>
-            <file type="content_page" path="www/spam-add.adp"/>
-            <file type="content_page" path="www/spam-add.tcl"/>
-            <file type="query_file" path="www/spam-add.xql"/>
-            <file type="content_page" path="www/spam-confirm.adp"/>
-            <file type="content_page" path="www/spam-confirm.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/spam-edit-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/spam-edit-postgresql.xql"/>
-            <file type="content_page" path="www/spam-edit.adp"/>
-            <file type="content_page" path="www/spam-edit.tcl"/>
-            <file type="query_file" path="www/spam-edit.xql"/>
-            <file type="content_page" path="www/spam-form-body.adp"/>
-            <file type="content_page" path="www/spam-send.adp"/>
-            <file type="content_page" path="www/spam-send.tcl"/>
-            <file type="query_file" path="www/spam-send.xql"/>
-            <file type="query_file" db_type="oracle" path="www/spam-show-users-oracle.xql"/>
-            <file type="content_page" path="www/spam-show-users.adp"/>
-            <file type="content_page" path="www/spam-show-users.tcl"/>
-            <file type="query_file" path="www/spam-show-users.xql"/>
-            <file type="content_page" path="www/spam-update.adp"/>
-            <file type="content_page" path="www/spam-update.tcl"/>
-            <file type="query_file" db_type="oracle" path="www/spam-view-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/spam-view-postgresql.xql"/>
-            <file type="content_page" path="www/spam-view.adp"/>
-            <file type="content_page" path="www/spam-view.tcl"/>
-            <file type="query_file" path="www/spam-view.xql"/>
-            <file type="query_file" db_type="oracle" path="www/toggle-approval-oracle.xql"/>
-            <file type="query_file" db_type="postgresql" path="www/toggle-approval-postgresql.xql"/>
-            <file type="content_page" path="www/toggle-approval.tcl"/>
-            <file type="content_page" path="www/images/spacer.gif"/>
-
-       </files>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SpamSender"  default="spam-robot@bill.arsdigita.com" description="fully-qualified e-mail address that will go in the To: header, e.g., 'spam-robot@yourdomain.com'"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SpamSender"  default="spam-robot@example.com" description="fully-qualified e-mail address that will go in the To: header, e.g., 'spam-robot@yourdomain.com'"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/static-pages/static-pages.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/static-pages.info,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/static-pages/static-pages.info	8 Oct 2003 16:05:26 -0000	1.15
+++ openacs-4/packages/static-pages/static-pages.info	11 Dec 2003 21:40:13 -0000	1.16
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="static-pages" url="http://www.arsdgita.com/acs-repository/apm/packages/static-pages" type="apm_application">
+<package key="static-pages" url="http://openacs.org/repository/apm/packages/static-pages" type="apm_application">
     <package-name>Static Pages</package-name>
     <pretty-plural>Static Pages</pretty-plural>
     <initial-install-p>f</initial-install-p>
@@ -14,9 +14,9 @@
     </database-support>
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <owner url="http://www.piskorski.com">Andrew Piskorski</owner>
-        <summary>Static Pages makes it possible to search and comment on static pages.</summary>
+        <summary>Support searchable and commentable static site content.</summary>
         <release-date>2002-12-11</release-date>
-        <vendor url="http://openacs.org/">OpenACS</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/plain">Static Pages loads the static pages of a site into the database so that their contents are available to other packages, such as site-wide-search.  It also allows users to make comments on static pages.</description>
 
         <provides url="static-pages" version="5.0d1"/>
Index: openacs-4/packages/survey/survey.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/survey.info,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/survey/survey.info	10 Nov 2003 16:36:31 -0000	1.10
+++ openacs-4/packages/survey/survey.info	11 Dec 2003 21:40:14 -0000	1.11
@@ -10,12 +10,12 @@
     <version name="0.2d" url="http://openacs.org/repository/download/apm/survey-0.2d.apm">
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <owner url="mailto:luke@museatech.net">Luke Pond</owner>
-        <summary>New version of survey package for dotLRN/OpenACS4.5</summary>
+        <summary>User defined surveys with reporting.</summary>
         <vendor url="http://openacs.org">OpenACS</vendor>
-        <description format="text/plain">New version of survey package for dotLRN/OpenACS4.5</description>
+        <description format="text/plain">Expanded functionality survey package derived from simple-survey.</description>
 
         <provides url="survey" version="0.2d"/>
-        <requires url="notifications" version="5.0.0a5"/>
+        <requires url="notifications" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	10 Nov 2003 22:55:41 -0000	1.7
+++ openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	11 Dec 2003 21:40:14 -0000	1.8
@@ -65,6 +65,7 @@
   <msg key="inactive">[inactive]</msg>
   <msg key="Integer">Integer</msg>
   <msg key="is">is</msg>
+  <msg key="list">list</msg>
   <msg key="Large">Large</msg>
   <msg key="Last_Name">Last Name</msg>
   <msg key="limit_to_one">limit to one</msg>
@@ -217,6 +218,7 @@
   <msg key="Move_Down">Move Down</msg>
   <msg key="Move_Up">Move Up</msg>
   <msg key="Multiple_Choice">Multiple Choice</msg>
+  <msg key="multiple_responses">multiple responses</msg>
   <msg key="Name_copy">Name</msg>
   <msg key="New_Survey">New Survey</msg>
   <msg key="No">No</msg>
@@ -231,6 +233,7 @@
   <msg key="One_Survey_name">One Survey: %name%</msg>
   <msg key="oops">oops</msg>
   <msg key="Original">Original</msg>
+  <msg key="paragraph">paragraph</msg>
   <msg key="Plain_Text">Plain Text</msg>
   <msg key="Preformatted_Text">Preformatted Text</msg>
   <msg key="Presentation_Type">Presentation Type</msg>
@@ -266,6 +269,7 @@
   <msg key="Survey_Name_1">Survey Name</msg>
   <msg key="Survey_Name_name">Survey Name: %name%</msg>
   <msg key="Surveys">Surveys</msg>
+  <msg key="table">table</msg>
   <msg key="Text">Text</msg>
   <msg key="This_survey_is">This survey is</msg>
   <msg key="True_or_False">True or False</msg>
Index: openacs-4/packages/survey/sql/oracle/survey-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/sql/oracle/survey-package-create.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/survey/sql/oracle/survey-package-create.sql	10 Oct 2003 14:41:45 -0000	1.4
+++ openacs-4/packages/survey/sql/oracle/survey-package-create.sql	11 Dec 2003 21:40:14 -0000	1.5
@@ -476,7 +476,7 @@
   (select max(response_id) as response_id
           from survey_responses
          group by nvl(initial_response_id, response_id)) latest
-  where nvl(sr.inital_response_id,sr.response_id) = o.object_id
+  where nvl(sr.initial_response_id,sr.response_id) = o.object_id
   and sr.response_id= latest.response_id;
 
 create or replace view survey_ques_responses_latest as
Index: openacs-4/packages/survey/tcl/survey-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/tcl/survey-procs.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/survey/tcl/survey-procs.xql	12 Mar 2003 01:05:25 -0000	1.3
+++ openacs-4/packages/survey/tcl/survey-procs.xql	11 Dec 2003 21:40:14 -0000	1.4
@@ -30,10 +30,10 @@
 <querytext>
 	select s.*,
 	       o.creation_user, o.creation_date, p.first_names || ' ' || p.last_name as creator_name, 
-	       (case when enabled_p = 't' then '#survey.Enable#' else '#survey.Disable#' end) as enabled_display,
-	       (case when single_response_p = 't' then '#survey.One_response#' else '#survey.Multiple_responses#' end) as single_response_display,
-	       (case when editable_p = 'f' then '#survey.Non-Editable#' else '#survey.Editable#' end) as editable_display, 
-	       (case when single_section_p = 'f' then '#survey.Multiple_sections#' else '#survey.Single_section#' end) as single_section_display
+	       (case when enabled_p = 't' then '#survey.enable#' else '#survey.disable#' end) as enabled_display,
+	       (case when single_response_p = 't' then '#survey.one_response#' else '#survey.multiple_responses#' end) as single_response_display,
+	       (case when editable_p = 'f' then '#survey.non-editable#' else '#survey.editable#' end) as editable_display, 
+	       (case when single_section_p = 'f' then '#survey.multiple_sections#' else '#survey.single_section#' end) as single_section_display
 	  from surveys s, acs_objects o, persons p
 	 where o.object_id = :survey_id	
 	   and s.survey_id = o.object_id
Index: openacs-4/packages/telecom-number/telecom-number.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/telecom-number/telecom-number.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/telecom-number/telecom-number.info	25 Oct 2003 14:33:17 -0000	1.2
+++ openacs-4/packages/telecom-number/telecom-number.info	11 Dec 2003 21:40:14 -0000	1.3
@@ -13,8 +13,8 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:jon@mayuli.com">Jon Griffin</owner>
-        <summary>This is a mapping of HR-XML's telecom standard.</summary>
-        <vendor url="http:://www.mayuli.com">Mayuli Enterprises LLC</vendor>
+        <summary>Datamodel and UI for the HR-XML telecom standard.</summary>
+        <vendor url="http://www.mayuli.com">Mayuli Enterprises, LLC</vendor>
         <description format="text/html">This is a mapping of HR-XML's telecom standard.&lt;p&gt;
 Originally part of contacts-lite, now stand-alone to allow for  use in other packages.</description>
 
Index: openacs-4/packages/trackback/trackback.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/trackback/trackback.info,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/trackback/trackback.info	1 Oct 2003 12:47:54 -0000	1.2
+++ openacs-4/packages/trackback/trackback.info	11 Dec 2003 21:40:14 -0000	1.3
@@ -10,9 +10,12 @@
 
     <version name="0.1d1" url="http://openacs.org/repository/download/apm/trackback-0.1d1.apm">
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
-        <summary>Support for sending and receiving trackback pings. </summary>
+        <summary>Support for sending and receiving trackback pings.</summary>
         <release-date>2003-09-30</release-date>
-        <description format="text/html">Implements the trackback ping specification: http://www.movabletype.org/docs/mttrackback.html </description>
+        <description format="text/html">Implements the trackback ping specification 
+&lt;a href="http://www.movabletype.org/docs/mttrackback.html"&gt;http://www.movabletype.org/docs/mttrackback.html&lt;/a&gt;,
+for use with lars-blogger.
+</description>
 
         <provides url="trackback" version="0.1d1"/>
         <requires url="general-comments" version="4.0"/>
Index: openacs-4/packages/user-preferences/user-preferences.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-preferences/user-preferences.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/user-preferences/user-preferences.info	10 Nov 2003 16:36:32 -0000	1.5
+++ openacs-4/packages/user-preferences/user-preferences.info	11 Dec 2003 21:40:14 -0000	1.6
@@ -10,6 +10,7 @@
     <version name="0.2d" url="http://openacs.org/repository/download/apm/user-preferences-0.2d.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2003-11-10</release-date>
+        <summary>A skeleton for how to implement user-preference storage</summary>
         <vendor url="http://openacs.org">OpenACS</vendor>
 
         <!-- No dependency information -->
Index: openacs-4/packages/value-based-shipping/value-based-shipping.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/value-based-shipping.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/value-based-shipping/value-based-shipping.info	19 Sep 2002 20:02:38 -0000	1.4
+++ openacs-4/packages/value-based-shipping/value-based-shipping.info	11 Dec 2003 21:40:15 -0000	1.5
@@ -13,9 +13,13 @@
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:bart.teeuwisse@7-sisters.com">Bart Teeuwisse</owner>
-        <summary>This package calculates the total shipping charges based on the total value of the shipment.</summary>
+        <summary>Calculates the shipping charges based on the total value of the shipment.</summary>
         <release-date>2002-05-13</release-date>
-        <description format="text/plain">This package calculates the total shipping charges for all available service levels based on the total value of the shipment.</description>
+        <description format="text/plain">
+        This package calculates the total shipping charges for all
+        available service levels based on the total value of the shipment.  An
+        implementation of the shipping-gateway service contract.
+        </description>
 
         <requires url="ref-countries" version="0.1d"/>
         <requires url="shipping-gateway" version="4.6"/>
Index: openacs-4/packages/version-control/version-control.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/version-control/version-control.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/version-control/version-control.info	30 Sep 2003 11:32:19 -0000	1.5
+++ openacs-4/packages/version-control/version-control.info	11 Dec 2003 21:40:15 -0000	1.6
@@ -1,21 +1,27 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="version-control" url="http://www.arsdgita.com/acs-repository/apm/packages/version-control" type="apm_service">
+<package key="version-control" url="http://openacs.org/repository/apm/packages/version-control" type="apm_service">
     <package-name>Version Control</package-name>
     <pretty-plural>Version Control</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.0d" url="http://www.arsdigita.com/acs-repository/download/apm/version-control-4.0d.apm">
+    <version name="4.0d" url="http://openacs.org/repository/download/apm/version-control-4.0d.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <owner url="mailto:ron@arsdigita.com">Ron Henderson</owner>
-        <summary>CVS abstraction layer for packages that need access to version control functions.</summary>
+        <owner>Ron Henderson</owner>
+        <summary>CVS abstraction layer for packages that need access to version control.</summary>
         <release-date>2001-01-26</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">
+        Provides an API for talking to the version control system for the
+        site.  It is hard-coded for the Concurrent Versions System (CVS).
+        There are procs to fetch various types of status information and procs
+        to execute certain version control operations on the underlying files.
+        </description>
 
         <provides url="version-control" version="4.0d"/>
         <requires url="acs-kernel" version="4.6.2"/>
Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet-oracle.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/weblogger-portlet/www/weblogger-portlet-oracle.xql	17 Oct 2003 00:39:55 -0000	1.3
+++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet-oracle.xql	11 Dec 2003 21:40:15 -0000	1.4
@@ -19,7 +19,7 @@
 		    from   apm_packages p,
                            pinds_blog_entries e,
 		           acs_objects o,
-		           all_users u
+		           acs_users_all u
 		    where  p.package_id in ([join $list_of_package_ids ", "])
                     and    e.package_id (+) = p.package_id
                     and    o.object_id (+) = e.entry_id
Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql	17 Oct 2003 00:39:56 -0000	1.3
+++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql	11 Dec 2003 21:40:15 -0000	1.4
@@ -19,7 +19,7 @@
 		    from   apm_packages p left outer join 
                            pinds_blog_entries e on (e.package_id = p.package_id) join 
 		           acs_objects o on (o.object_id = e.entry_id) join 
-		           all_users u on (u.user_id = o.creation_user)
+		           acs_users_all u on (u.user_id = o.creation_user)
 		    where  p.package_id in ([join $list_of_package_ids ", "])
 		    and    e.entry_date > current_timestamp - interval '30 days'
 		    and    e.draft_p = 'f'
Index: openacs-4/packages/webmail/webmail.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/webmail.info,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/webmail/webmail.info	17 May 2003 12:43:52 -0000	1.3
+++ openacs-4/packages/webmail/webmail.info	11 Dec 2003 21:40:15 -0000	1.4
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <!-- Generated by the ACS Package Manager -->
 
-<package key="webmail" url="http://www.arsdgita.com/acs-repository/apm/packages/webmail" type="apm_application">
+<package key="webmail" url="http://openacs.org/repository/apm/packages/webmail" type="apm_application">
     <package-name>Webmail</package-name>
     <pretty-plural>Webmail</pretty-plural>
     <singleton-p>t</singleton-p>
 
-    <version name="4.0" url="http://www.arsdigita.com/acs-repository/download/apm/webmail-4.0.apm">
+    <version name="4.0" url="http://openacs.org/repository/download/apm/webmail-4.0.apm">
     <database-support>
         <database>oracle</database>
     </database-support>
-        <owner url="mailto:erik@arsdigita.com">Erik Bielefeldt</owner>
+        <owner>Erik Bielefeldt</owner>
         <summary>Web-based email service.</summary>
         <release-date>2001-02-15</release-date>
-        <vendor url="http://www.arsdigita.com">ArsDigita Corporation</vendor>
-        <description format="text/html">Provides a web-based email service for ACS 4.x.  Please follow the installation instructions in /webmail/www/doc/ that are provided with the package.</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/html">Provides a web-based email service for ACS 4.x, uses the database for message storage.  Broken and oracle only.</description>
 
         <requires url="acs-kernel" version="4.6.2"/>
 
Index: openacs-4/packages/workflow/workflow.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/workflow.info,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/workflow/workflow.info	18 Nov 2003 17:57:56 -0000	1.12
+++ openacs-4/packages/workflow/workflow.info	11 Dec 2003 21:40:15 -0000	1.13
@@ -11,18 +11,23 @@
     <version name="2.0d1" url="http://openacs.org/repository/download/apm/workflow-2.0d1.apm">
         <owner url="http://pinds.com">Lars Pind</owner>
         <owner url="http://petermarklund.com">Peter Marklund</owner>
-        <summary>A Tcl API for creating workflows that support the Bug Tracker, CMS publication, simple approval, and much more.</summary>
+        <summary>A Tcl API for creating and managing workflows.</summary>
         <release-date>2003-11-18</release-date>
         <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
-        <description format="text/html">This package lets you define the process that your tickets, articles, documents, reports, claims, change requests, or any other object of interest, must go through to ensure consistent quality and to avoid that any cases falls through the cracks.
-&lt;p&gt;
+        <description format="text/html">
+          This package lets you define the process that your tickets, articles,
+          documents, reports, claims, change requests, or any other
+          object of interest, must go through to ensure consistent quality and
+          to avoid that any cases falls through the cracks.
+          It supports the Bug Tracker, CMS publication, simple approval, and much more.
+&lt;p&gt;
 For more information, see: &lt;a href=&quot;http://www.collaboraid.biz/developer/workflow-spec&quot;&gt;the workflow specification&lt;/a&gt;.</description>
 
         <provides url="workflow" version="2.0d1"/>
-        <requires url="acs-content-repository" version="5.0.0a5"/>
-        <requires url="acs-kernel" version="5.0.0a5"/>
-        <requires url="acs-tcl" version="5.0.0a5"/>
-        <requires url="notifications" version="5.0.0a5"/>
+        <requires url="acs-content-repository" version="5.0.0b4"/>
+        <requires url="acs-kernel" version="5.0.0b4"/>
+        <requires url="acs-tcl" version="5.0.0b4"/>
+        <requires url="notifications" version="5.0.0b4"/>
 
         <callbacks>
             <callback type="after-install"  proc="workflow::install::package_install"/>
Index: openacs-4/packages/workflow/sql/oracle/workflow-procedural-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/oracle/workflow-procedural-create.sql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/workflow/sql/oracle/workflow-procedural-create.sql	3 Oct 2003 13:26:27 -0000	1.5
+++ openacs-4/packages/workflow/sql/oracle/workflow-procedural-create.sql	11 Dec 2003 21:40:15 -0000	1.6
@@ -58,18 +58,10 @@
   ) return integer
   is
   begin
-   for rec in (select cr.item_id
-                from cr_items cr, workflow_case_log wcl
-                where cr.item_id = wcl.entry_id
-                and wcl.case_id = delete_case_id)
-    loop
-        delete from workflow_case_log where entry_id = rec.item_id;
-        content_item.del(rec.item_id);
-    end loop;
-
     -- All workflow data cascades from the case id
-    delete from workflow_cases
-        where object_id = delete_case_id;
+    delete 
+    from   workflow_cases
+    where  object_id = workflow_case_pkg.del.delete_case_id;
 
     return 0;
   end del;
Index: openacs-4/packages/workflow/sql/oracle/workflow-tables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/oracle/workflow-tables-create.sql,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/workflow/sql/oracle/workflow-tables-create.sql	1 Dec 2003 09:53:19 -0000	1.9
+++ openacs-4/packages/workflow/sql/oracle/workflow-tables-create.sql	11 Dec 2003 21:40:15 -0000	1.10
@@ -1,4 +1,4 @@
->-- Data model for the workflow package, part of the OpenACS system.
+-- Data model for the workflow package, part of the OpenACS system.
 --
 -- @author Lars Pind (lars@collaboraid.biz)
 -- @author Peter Marklund (peter@collaboraid.biz)
Index: openacs-4/packages/workflow/sql/oracle/upgrade/upgrade-1.2d1-1.2b2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/oracle/upgrade/Attic/upgrade-1.2d1-1.2b2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/workflow/sql/oracle/upgrade/upgrade-1.2d1-1.2b2.sql	11 Dec 2003 21:40:15 -0000	1.2
@@ -0,0 +1,148 @@
+--
+-- Fixes case deletion, which can now be done completely through cascading delete
+-- Also adds missing upgrade scripts from that bug fix
+--
+-- @author Lars Pind (lars@collaboraid.biz)
+--
+-- @cvs-id $Id: upgrade-1.2d1-1.2b2.sql,v 1.2 2003/12/11 21:40:15 jeffd Exp $
+
+create or replace package body workflow_case_pkg
+as 
+  function get_pretty_state(
+    workflow_short_name in varchar,
+    object_id in integer
+  ) return varchar
+  is 
+    v_state_pretty varchar(4000);
+    v_object_id integer;
+  begin
+   v_object_id := object_id;   
+
+   select s.pretty_name
+   into   v_state_pretty
+   from   workflows w,
+          workflow_cases c,
+          workflow_case_fsm cfsm,
+          workflow_fsm_states s
+   where  w.short_name = workflow_short_name
+   and    c.object_id = v_object_id
+   and    c.workflow_id = w.workflow_id
+   and    cfsm.case_id = c.case_id
+   and    s.state_id = cfsm.current_state;
+
+   return v_state_pretty;
+
+  end get_pretty_state;    
+
+  function del(
+    delete_case_id in integer
+  ) return integer
+  is
+  begin
+    -- All workflow data cascades from the case id
+    delete 
+    from   workflow_cases
+    where  object_id = workflow_case_pkg.del.delete_case_id;
+
+    return 0;
+  end del;
+
+end workflow_case_pkg;
+/
+show errors
+
+
+
+create or replace package body workflow_case_log_entry
+as 
+   function new(
+    entry_id in integer,
+    case_id in integer,
+    action_id in integer,
+    comment in varchar,
+    comment_mime_type in varchar,
+    creation_user in integer,
+    creation_ip in varchar,
+    content_type in varchar default 'workflow_case_log_entry'
+    ) return integer
+  is
+    v_name                        varchar2(4000); -- XXX aufflick fix this
+    v_action_short_name           varchar2(4000);
+    v_action_pretty_past_tense    varchar2(4000);
+    v_case_object_id              integer;
+    v_item_id                     integer;
+    v_revision_id                 integer;
+  begin
+    select short_name, pretty_past_tense
+    into   v_action_short_name, v_action_pretty_past_tense
+    from   workflow_actions
+    where  action_id = new.action_id;
+
+    -- use case object as context_id
+    select object_id
+    into   v_case_object_id
+    from   workflow_cases
+    where  case_id = new.case_id;
+
+    -- build the unique name
+    if entry_id is not null then
+        v_item_id := entry_id;
+    else
+        select acs_object_id_seq.nextval into v_item_id from dual;
+    end if;
+    v_name := v_action_short_name || ' ' || v_item_id;
+
+    v_item_id := content_item.new (
+        item_id        => v_item_id,
+        name            => v_name,
+        parent_id       => v_case_object_id,
+        title           => v_action_pretty_past_tense,
+        creation_date   => sysdate(),
+        creation_user   => creation_user,
+        context_id      => v_case_object_id,
+        creation_ip     => creation_ip,
+        is_live         => 't',
+        mime_type       => comment_mime_type,
+        text            => comment,
+        storage_type    => 'text',
+        item_subtype    => 'content_item',
+        content_type    => content_type
+    );
+
+    -- insert the row into the single-column entry revision table
+    v_revision_id := content_item.get_live_revision (v_item_id);
+
+    insert into workflow_case_log_rev (entry_rev_id)
+    values (v_revision_id);
+
+    -- insert into workflow-case-log
+    -- raise_application_error(-20000, 'about to insert ' || v_item_id || ',' || new.case_id || ',' || new.action_id);
+    insert into workflow_case_log (entry_id, case_id, action_id)
+    values (v_item_id, new.case_id, new.action_id);
+
+    -- return id of newly created item
+    return v_item_id;
+  end new;
+
+end workflow_case_log_entry;
+/
+show errors
+    
+
+
+-- Now change parent_id of existing cases
+
+begin
+    for rec in (select c.object_id, 
+                       l.entry_id 
+                from   workflow_cases c, 
+                       workflow_case_log l 
+                where  c.case_id = l.case_id)
+    loop
+        update cr_items
+        set    parent_id = rec.object_id
+        where  item_id = rec.entry_id;
+    end loop;
+end;
+/
+show errors
Index: openacs-4/packages/workflow/sql/postgresql/workflow-procedural-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/postgresql/workflow-procedural-create.sql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/workflow/sql/postgresql/workflow-procedural-create.sql	3 Oct 2003 13:26:27 -0000	1.8
+++ openacs-4/packages/workflow/sql/postgresql/workflow-procedural-create.sql	11 Dec 2003 21:40:15 -0000	1.9
@@ -36,16 +36,6 @@
   delete_case_id                alias for $1;
   rec                           record;
 begin
-
-    for rec in select cr.item_id
-                   from cr_items cr, workflow_case_log wcl
-                   where cr.item_id = wcl.entry_id
-                   and wcl.case_id = delete_case_id loop
-
-                delete from workflow_case_log where entry_id = rec.item_id;
-                perform content_item__delete(rec.item_id);                
-    end loop;
-
     -- All workflow data cascades from the case id
     delete from workflow_cases
       where case_id = delete_case_id;    
Index: openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2d1-1.2b2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/sql/postgresql/upgrade/Attic/upgrade-1.2d1-1.2b2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.2d1-1.2b2.sql	11 Dec 2003 21:40:16 -0000	1.2
@@ -0,0 +1,130 @@
+--
+-- Fixes case deletion, which can now be done completely through cascading delete
+-- Also adds missing upgrade scripts from that bug fix
+--
+-- @author Lars Pind (lars@collaboraid.biz)
+--
+-- @cvs-id $Id: upgrade-1.2d1-1.2b2.sql,v 1.2 2003/12/11 21:40:16 jeffd Exp $
+
+create or replace function workflow_case_pkg__delete (integer)
+returns integer as '
+declare
+  delete_case_id                alias for $1;
+  rec                           record;
+begin
+    -- All workflow data cascades from the case id
+    delete from workflow_cases
+      where case_id = delete_case_id;    
+
+  return 0; 
+end;' language 'plpgsql';
+
+
+
+create or replace function workflow_case_log_entry__new (
+    integer,                  -- entry_id
+    varchar,                  -- content_type
+    integer,                  -- case_id
+    integer,                  -- action_id
+    varchar,                  -- comment
+    varchar,                  -- comment_mime_type
+    integer,                  -- creation_user
+    varchar                   -- creation_ip
+) returns integer as '
+declare
+    p_item_id           alias for $1;
+    p_content_type      alias for $2;
+    p_case_id           alias for $3;
+    p_action_id         alias for $4;
+    p_comment           alias for $5;
+    p_comment_mime_type alias for $6;
+    p_creation_user     alias for $7;
+    p_creation_ip       alias for $8;
+        
+    v_name                        varchar;
+    v_action_short_name           varchar;
+    v_action_pretty_past_tense    varchar;
+    v_case_object_id              integer;
+    v_item_id                     integer;
+    v_revision_id                 integer;
+begin
+    select short_name, pretty_past_tense
+    into   v_action_short_name, v_action_pretty_past_tense
+    from   workflow_actions
+    where  action_id = p_action_id;
+
+    -- use case object as context_id
+    select object_id
+    into   v_case_object_id
+    from   workflow_cases
+    where  case_id = p_case_id;
+
+    -- build the unique name
+    if p_item_id is not null then
+        v_item_id := p_item_id;
+    else
+        select nextval
+        into   v_item_id
+        from   acs_object_id_seq;
+    end if;
+    v_name := v_action_short_name || '' '' || v_item_id;
+
+    v_item_id := content_item__new (
+        v_item_id,                   -- item_id
+        v_name,                      -- name
+        v_case_object_id,            -- parent_id
+        v_action_pretty_past_tense,  -- title
+        now(),                       -- creation_date
+        p_creation_user,             -- creation_user
+        v_case_object_id,            -- context_id
+        p_creation_ip,               -- creation_ip
+        ''t'',                       -- is_live
+        p_comment_mime_type,         -- mime_type
+        p_comment,                   -- text
+        ''text'',                    -- storage_type
+        ''t'',                       -- security_inherit_p
+        ''CR_FILES'',                -- storage_area_key
+        ''content_item'',            -- item_subtype
+        p_content_type               -- content_type
+    );
+
+    -- insert the row into the single-column entry revision table
+    select content_item__get_live_revision (v_item_id)
+    into v_revision_id;
+
+    insert into workflow_case_log_rev (entry_rev_id)
+    values (v_revision_id);
+
+    -- insert into workflow-case-log
+    insert into workflow_case_log (entry_id, case_id, action_id)
+    values (v_item_id, p_case_id, p_action_id);
+
+    -- return id of newly created item
+    return v_item_id;
+end;' language 'plpgsql';
+
+
+-- Now change parent_id of existing cases
+
+create or replace function inline_0() returns integer as '
+declare
+  rec                           record;
+begin
+    for rec in select c.object_id, 
+                       l.entry_id 
+                from   workflow_cases c, 
+                       workflow_case_log l 
+                where  c.case_id = l.case_id
+    loop
+        update cr_items
+        set    parent_id = rec.object_id
+        where  item_id = rec.entry_id;
+    end loop;
+
+    return 0;
+end;' language 'plpgsql';
+
+select inline_0();
+
+drop function inline_0();
+
Index: openacs-4/packages/workflow/tcl/case-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/case-procs-oracle.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/workflow/tcl/case-procs-oracle.xql	18 Nov 2003 17:57:57 -0000	1.5
+++ openacs-4/packages/workflow/tcl/case-procs-oracle.xql	11 Dec 2003 21:40:16 -0000	1.6
@@ -129,7 +129,7 @@
    <fullquery name="workflow::case::delete.delete_case">
     <querytext>
         begin
-            :1 := workflow_case.del(:case_id);
+            :1 := workflow_case_pkg.del(:case_id);
         end;
     </querytext>
   </fullquery>
Index: openacs-4/packages/wp-slim/wp-slim.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/wp-slim.info,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/wp-slim/wp-slim.info	8 Oct 2003 16:05:27 -0000	1.14
+++ openacs-4/packages/wp-slim/wp-slim.info	11 Dec 2003 21:40:16 -0000	1.15
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="wp-slim" url="http://www.arsdgita.com/acs-repository/apm/packages/wp-slim" type="apm_application">
+<package key="wp-slim" url="http://openacs.org/repository/apm/packages/wp-slim" type="apm_application">
     <package-name>Wimpy Point</package-name>
     <pretty-plural>Wimpy Points</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.0d1" url="http://arsdigita.com/acs-repository/download/apm/wp-slim-5.0d1.apm">
+    <version name="5.0d1" url="http://openacs.org/repository/download/apm/wp-slim-5.0d1.apm">
         <owner url="mailto:roc@viaro.net">Rocael Hernandez Rizzardini</owner>
-        <summary>Wimpy Point allows users to collaborate and share online presentations.</summary>
+        <summary>A collaborative online presentation package.</summary>
         <release-date>2003-03-27</release-date>
-        <vendor url="http://openacs.org/">Openacs</vendor>
-        <description format="text/plain">Scalability test, permission revision, enhancements from WPII and other features added (Rocael). Ported (Jack). Fixed several bugs. Added new features (e.g. versioning and authorization).</description>
+        <vendor url="http://openacs.org">OpenACS</vendor>
+        <description format="text/plain">Wimpy Point allows users to create online slide presentations and supports collaborative editing, customizable style sheets, printable output, and commentability.</description>
 
         <requires url="acs-content-repository" version="5.0d1"/>
         <requires url="acs-kernel" version="5.0d13"/>
Index: openacs-4/packages/wp-slim/www/style-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-list-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/style-list-postgresql.xql	28 Aug 2003 09:42:00 -0000	1.2
+++ openacs-4/packages/wp-slim/www/style-list-postgresql.xql	11 Dec 2003 21:40:16 -0000	1.3
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
 <fullquery name="style_select_data">      
       <querytext>
Index: openacs-4/tcl/0-acs-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/tcl/0-acs-init.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/tcl/0-acs-init.tcl	29 Aug 2001 21:22:49 -0000	1.4
+++ openacs-4/tcl/0-acs-init.tcl	11 Dec 2003 21:40:16 -0000	1.5
@@ -17,8 +17,26 @@
 ns_log "Notice" "Sourcing $bootstrap_file"
 
 if { [file isfile $bootstrap_file] } {
+
+    # Check that the appropriate version of tDom (http://www.tdom.org) is installed
+    # and spit out a comment or try to install it if not.
+    if {[string equal {} [info commands domNode]]} { 
+	if {[ns_info version] < 4} {
+	    ns_log Error "0-acs-init.tcl: domNode command not found -- libtdom.so not loaded?"
+	} elseif {[ns_info version] >= 4} {
+	    if {[catch {set version [package require tdom]} errmsg]} { 
+		ns_log Error "0-acs-init.tcl: error loading tdom: $errmsg" 
+	    } else {
+		foreach {major minor point} [split $version .] { break }
+		if {$major == 0 
+		    && ( $minor < 7 || ($minor == 7 && $point < 8))} { 
+		    ns_log Error "0-acs-init.tcl: please use tdom version 0.7.8 or greater (you have version $version)"
+		}
+	    }
+	}
+    }
+        
     source $bootstrap_file
 } else {
     ns_log "Error" "$bootstrap_file does not exist. Aborting the OpenACS load process."
 }
-
Index: openacs-4/www/blank-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/www/blank-master.adp	30 Sep 2003 09:52:00 -0000	1.3
+++ openacs-4/www/blank-master.adp	11 Dec 2003 21:40:16 -0000	1.4
@@ -17,5 +17,7 @@
   <include src="/packages/acs-lang/lib/messages-to-translate">
 </if>
 
+<if @lang_admin_p@ true><a href="@toggle_translator_mode_url@">Toggle translator mode</a></if>
+
 </body>
 </html>
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/www/blank-master.tcl	30 Sep 2003 09:52:00 -0000	1.5
+++ openacs-4/www/blank-master.tcl	11 Dec 2003 21:40:16 -0000	1.6
@@ -81,3 +81,12 @@
 }
 
 set translator_mode_p [lang::util::translator_mode_p]
+
+# Toggle translator mode link
+
+set acs_lang_url [apm_package_url_from_key "acs-lang"]
+set lang_admin_p [permission::permission_p \
+                      -object_id [site_node::get_element -url $acs_lang_url -element object_id] \
+                      -privilege admin \
+                      -party_id [ad_conn untrusted_user_id]]
+set toggle_translator_mode_url [export_vars -base "${acs_lang_url}admin/translator-mode-toggle" { { return_url [ad_return_url] } }]
Index: openacs-4/www/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/www/site-master.adp	16 Oct 2003 20:38:34 -0000	1.9
+++ openacs-4/www/site-master.adp	11 Dec 2003 21:40:16 -0000	1.10
@@ -67,6 +67,15 @@
 
 <slave>
 
+<if @num_of_locales@ gt 1>
+    <p><a href="@change_locale_url@">Change Locale</a>
+</if>
+<else>
+  <if @locale_admin_url@ not nil>
+    <a href="@locale_admin_url@">Install Locales</a>
+  </if>
+</else>
+
 <if @curriculum_bar_p@ true>
-<include src="/packages/curriculum/lib/bar" />
+<p><include src="/packages/curriculum/lib/bar" />
 </if>
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/www/site-master.tcl	23 Oct 2003 15:52:58 -0000	1.9
+++ openacs-4/www/site-master.tcl	11 Dec 2003 21:40:16 -0000	1.10
@@ -46,8 +46,9 @@
     set sw_admin_p [acs_user::site_wide_admin_p -user_id [ad_conn untrusted_user_id]]
 
     if { $sw_admin_p } {
-            set admin_url "/acs-admin/"
-            set devhome_url "/acs-admin/developer"
+        set admin_url "/acs-admin/"
+        set devhome_url "/acs-admin/developer"
+        set locale_admin_url "/acs-lang/admin"
     } else {
         set subsite_admin_p [permission::permission_p \
                                  -object_id [subsite::get_element -element object_id] \
@@ -67,7 +68,11 @@
 # Context bar
 if { [template::util::is_nil no_context_p] } {
     if { ![template::util::is_nil context] } {
-        set context_bar [eval ad_context_bar -from_node $subsite_node_id $context]
+        set cmd [list ad_context_bar -from_node $subsite_node_id --]
+        foreach elem $context {
+            lappend cmd $elem
+        }
+        set context_bar [eval $cmd]
     }
     if [template::util::is_nil context_bar] { 
         set context_bar [ad_context_bar -from_node $subsite_node_id]
@@ -76,5 +81,14 @@
     set context_bar {}
 }
 
+# change locale
+set num_of_locales [llength [lang::system::get_locales]]
+if { $num_of_locales > 1 } {
+    set change_locale_url \
+        "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]"
+}
+
+
+
 # Curriculum bar
 set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $subsite_node_id]]