Index: openacs-4/packages/acs-bootstrap-installer/installer/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/index.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-bootstrap-installer/installer/index.tcl	17 May 2003 09:40:03 -0000	1.10
+++ openacs-4/packages/acs-bootstrap-installer/installer/index.tcl	17 Jun 2003 01:04:45 -0000	1.11
@@ -61,10 +61,15 @@
 
 if { [file exists [acs_root_dir]/install.xml] } {
 
+    # Parse the xml document
     set file [open "[acs_root_dir]/install.xml"]
-    nsv_set acs_application node [xml_doc_get_first_node_by_name [xml_parse -persist [xml_prepare_data [read $file]]] application]
+    set root_node [xml_doc_get_first_node [xml_parse -persist [read $file]]]
     close $file
 
+    if { ![string equal [xml_node_get_name $root_node] application] } {
+        error "Installer: Could not find root node application in install.xml file"
+    }
+
     nsv_set acs_application name [apm_required_attribute_value [nsv_get acs_application node] name]
     nsv_set acs_application pretty_name \
         [apm_attribute_value -default [nsv_get acs_application name] [nsv_get acs_application node] pretty-name]
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 -r1.23 -r1.24
--- openacs-4/packages/acs-lang/acs-lang.info	17 May 2003 09:48:12 -0000	1.23
+++ openacs-4/packages/acs-lang/acs-lang.info	17 Jun 2003 01:04:46 -0000	1.24
@@ -16,9 +16,9 @@
         <summary>OpenACS Internationalization Utilities</summary>
         <release-date>2003-02-17</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 format="text/plain">OpenACS Internationalization Utilities. Routines for manipulating Locales,
+request processor hooks, templating, message catalog, and
+locale-specific formatting functions.
 </description>
 
         <provides url="acs-lang" version="4.7d8"/>
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 -r1.14 -r1.15
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	10 Jun 2003 01:40:44 -0000	1.14
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	17 Jun 2003 01:04:46 -0000	1.15
@@ -94,6 +94,7 @@
 
         @author Peter Marklund (peter@collaboraid.biz)
     } {      
+
         # Check arguments
         if { [empty_string_p $catalog_file_contents] } {
             error "lang::catalog::parse the catalog_file_contents arguments is the empty string"
@@ -112,11 +113,11 @@
         array set msg_catalog_array {}
 
         # Parse the xml document
-        set tree [xml_parse $catalog_file_contents]
+        set tree [xml_parse -persist $catalog_file_contents]
 
         # Get the message catalog root node
-        set root_node [xml_doc_get_first_node_by_name $tree ${MESSAGE_CATALOG_TAG}]
-        if { [empty_string_p $root_node] } {
+        set root_node [xml_doc_get_first_node $tree]
+        if { ![string equal [xml_node_get_name $root_node] ${MESSAGE_CATALOG_TAG}] } {
             error "lang::catalog_parse: Could not find root node ${MESSAGE_CATALOG_TAG}"
         }
 
Index: openacs-4/packages/notifications/tcl/delivery-method-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/delivery-method-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/notifications/tcl/delivery-method-procs.tcl	30 Nov 2002 17:40:18 -0000	1.6
+++ openacs-4/packages/notifications/tcl/delivery-method-procs.tcl	17 Jun 2003 01:04:46 -0000	1.7
@@ -73,4 +73,20 @@
         return [acs_sc_call NotificationDeliveryMethod ScanReplies $args $impl_key]
     }
 
+    ad_proc -public get_id_from_name {
+        -name:required
+    } {
+
+        Return the delivery_method_id for the given name
+
+        @param name A delivery type name (email etc)
+
+        @author Don Baccus (dhogaza@pacifier.com)
+
+    } {
+
+        return [db_string get_delivery_method_id {}]
+
+    }
+
 }
Index: openacs-4/packages/notifications/tcl/delivery-method-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/delivery-method-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/notifications/tcl/delivery-method-procs.xql	28 Jun 2002 20:21:50 -0000	1.2
+++ openacs-4/packages/notifications/tcl/delivery-method-procs.xql	17 Jun 2003 01:04:46 -0000	1.3
@@ -3,11 +3,19 @@
 <queryset>
 
 <fullquery name="notification::delivery::get_impl_key.select_impl_key">
-<querytext>
-select impl_name from acs_sc_impls, notification_delivery_methods
-where acs_sc_impls.impl_id = notification_delivery_methods.sc_impl_id
-and delivery_method_id= :delivery_method_id
-</querytext>
+  <querytext>
+    select impl_name from acs_sc_impls, notification_delivery_methods
+    where acs_sc_impls.impl_id = notification_delivery_methods.sc_impl_id
+      and delivery_method_id= :delivery_method_id
+  </querytext>
 </fullquery>
 
+
+<fullquery name="notification::delivery::get_id_from_name.get_delivery_method_id">
+  <querytext>
+    select delivery_method_id
+    from notification_delivery_methods where short_name = 'email'
+  </querytext>
+</fullquery>
+
 </queryset>
Index: openacs-4/packages/notifications/tcl/interval-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/interval-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/notifications/tcl/interval-procs.tcl	30 Nov 2002 17:40:18 -0000	1.2
+++ openacs-4/packages/notifications/tcl/interval-procs.tcl	17 Jun 2003 01:04:46 -0000	1.3
@@ -1,12 +1,7 @@
 ad_library {
 
-    Notification Intervals.
+    Notification Intervals Utilities.
 
-    Procs to manage notification intervals. Intervals are the duration of time between notifications.
-    Possible intervals range from "instantaneous" to "weekly".
-
-    CURRENTLY DEPRECATED AND USELESS.
-
     @creation-date 2002-05-24
     @author Ben Adida <ben@openforce.biz>
     @cvs-id $Id$
@@ -15,17 +10,19 @@
 
 namespace eval notification::interval {
 
-    ad_proc -public schedule_all {} {
-        This schedules all the notification procs
+    ad_proc -public get_id_from_name {
+        -name:required
     } {
-    }
 
-    ad_proc -public sweep_notifications {
-        {-interval_id:required}
+        Returns the interval_id for a given interval_name
+
+        @param name The name of interval (weekly, etc)
+        @author Don Baccus (dhogaza@pacifier.com)
+
     } {
-        This sweeps for notifications in a particular interval
-    } {
 
+        return [db_string get_id {}]
+
     }
 
 }