Fisheye: Tag 1.25 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/tcl/site-nodes-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.14 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/tcl/site-nodes-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl,v
diff -u -r1.79 -r1.80
--- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	15 May 2007 20:14:27 -0000	1.79
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	7 Jun 2007 14:28:58 -0000	1.80
@@ -178,11 +178,11 @@
     # We associate content using portal mapping (ben)
     # This SHOULD NOT work, but it does cause we're 
     # reinstantiating calendar
+    set calendar_node_url [site_node::get_children -package_key [package_key] -node_id $node_id]
+    set calendar_node_id [site_node::get_node_id -url $calendar_node_url]
+
     site_node_object_map::new \
-	    -node_id \
-	    [site_nodes::get_node_id_from_child_name \
-	    -parent_node_id $node_id \
-	    -name [package_key]] \
+	    -node_id $calendar_node_id \
 	    -object_id $calendar_id
 
     # Explicitly grant admin to community admins and read to community members.
@@ -285,11 +285,9 @@
 		-package_id [parameter::get_from_package_key -package_key [my_package_key] -parameter main_calendar_package_id]]
 
 	# Here we map the calendar to the main dotlrn package
-	set node_id [site_nodes::get_node_id_from_child_name \
-		-parent_node_id [dotlrn::get_node_id] \
-		-name [package_key]
-	]
-	
+    set node_url [site_node::get_children -package_key [package_key] -node_id [dotlrn::get_node_id]]
+    set node_id [site_node::get_node_id $node_url]
+
 	site_node_object_map::new -node_id $node_id -object_id $calendar_id
     }
 
Index: openacs-4/packages/new-portal/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/Attic/site-nodes-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/new-portal/tcl/site-nodes-procs.tcl	20 Apr 2004 21:13:51 -0000	1.2
+++ openacs-4/packages/new-portal/tcl/site-nodes-procs.tcl	7 Jun 2007 14:28:58 -0000	1.3
@@ -22,191 +22,162 @@
     @version $Id$
 }
 
-namespace eval site_nodes {
+namespace eval site_nodes {}
 
-    ad_proc -public get_node_id_from_child_name {
-        {-parent_node_id:required}
-        {-name:required}
-    } {
-        return [db_string get_child_node_id {
-            select node_id from site_nodes where parent_id = :parent_node_id
-            and name = :name} -default ""]
-    }
+ad_proc -private get_site_nodes_list {
+} {
+    Return the list-ified site_nodes array.
+} {
+    return [nsv_array get site_nodes]
+}
 
-    ad_proc -public get_parent_name {
-        {-package_id ""}
-    } {
-        get the name of the parent of this instance
-    } {
-        return [util_memoize "site_nodes::get_parent_name_not_cached -package_id $package_id"]
-    }
+ad_proc -private get_site_nodes_list_key {
+    {-site_nodes_list:required}
+    {-index:required}
+} {
+    return [lindex $site_nodes_list $index]
+}
 
-    ad_proc -public get_parent_name_not_cached {
-        {-package_id ""}
-    } {
-        memoizing helper
-    } {
-        return [db_string select_parent_name_by_id {} -default ""]
-    }
+ad_proc -private get_site_nodes_list_value {
+    {-site_nodes_list:required}
+    {-index:required}
+} {
+    return [lindex $site_nodes_list [expr $index + 1]]
+}
 
-    # site_nodes_list procs
+ad_proc -private get_site_nodes_list_value_param {
+    {-site_nodes_list:required}
+    {-index:required}
+    {-param:required}
+} {
+    The 'site_nodes' nsv_array is chock full of information
+    about every package mounted on every node in the system, let's
+    access that information.
 
-    ad_proc -public get_site_nodes_list {
-    } {
-        Return the list-ified site_nodes array.
-    } {
-        return [nsv_array get site_nodes]
-    }
+    Here's a sample:
+    key = /portal/
 
-    ad_proc -public get_site_nodes_list_key {
-        {-site_nodes_list:required}
-        {-index:required}
-    } {
-        return [lindex $site_nodes_list $index]
-    }
+    value = directory_p t
+    object_type apm_package
+    package_key new-portal
+    package_id 3482
+    pattern_p t
+    node_id 3481
+    url /portal/
+    object_id 3482
 
-    ad_proc -public get_site_nodes_list_value {
-        {-site_nodes_list:required}
-        {-index:required}
-    } {
-        return [lindex $site_nodes_list [expr $index + 1]]
-    }
+    @author arjun@openforce.net
+} {
+    array set snlv [get_site_nodes_list_value \
+                        -site_nodes_list $site_nodes_list \
+                        -index $index]
 
-    ad_proc -public get_site_nodes_list_value_param {
-        {-site_nodes_list:required}
-        {-index:required}
-        {-param:required}
-    } {
-        The 'site_nodes' nsv_array is chock full of information
-        about every package mounted on every node in the system, let's
-        access that information.
-
-        Here's a sample:
-        key = /portal/
-
-        value = directory_p t
-        object_type apm_package
-        package_key new-portal
-        package_id 3482
-        pattern_p t
-        node_id 3481
-        url /portal/
-        object_id 3482
-
-        @author arjun@openforce.net
-    } {
-        array set snlv [get_site_nodes_list_value \
-                -site_nodes_list $site_nodes_list \
-                -index $index]
-
-	switch $param {
-	    "directory_p" {
-                return $snlv(directory_p)
-	    }
-	    "object_type" {
-                return $snlv(object_type)
-	    }
-	    "package_key" {
-                return $snlv(package_key)
-	    }
-	    "package_id" {
-                return $snlv(package_id)
-	    }
-	    "pattern_p" {
-                return $snlv(pattern_p)
-	    }
-	    "node_id" {
-                return $snlv(node_id)
-	    }
-	    "url" {
-                return $snlv(url)
-	    }
-	    "object_id" {
-                return $snlv(object_id)
-	    }
-            default {
- 		ns_log Error \
-			"site_nodes::get_site_nodes_list_value_param failed! \n
+    switch $param {
+        "directory_p" {
+            return $snlv(directory_p)
+        }
+        "object_type" {
+            return $snlv(object_type)
+        }
+        "package_key" {
+            return $snlv(package_key)
+        }
+        "package_id" {
+            return $snlv(package_id)
+        }
+        "pattern_p" {
+            return $snlv(pattern_p)
+        }
+        "node_id" {
+            return $snlv(node_id)
+        }
+        "url" {
+            return $snlv(url)
+        }
+        "object_id" {
+            return $snlv(object_id)
+        }
+        default {
+            ns_log Error \
+                "site_nodes::get_site_nodes_list_value_param failed! \n
                 bad param ($param) was specified"
-		ad_return_complaint 1 \
-			"site_nodes::get_site_nodes_list_value_param failed! \n
+            ad_return_complaint 1 \
+                "site_nodes::get_site_nodes_list_value_param failed! \n
                 bad param ($param) was specified"
-            }
         }
     }
+}
 
-    ad_proc -private get_info {
-        {-return:required}
-        {-param ""}
-        {-package_key:required}
-    } {
-        returns either 1. number of times this package_key is mounted
-        2. the url a singleton is mounted at (or the first match it finds
-        for a multi-mounted package) or 3. a singleon's param (see list above).
-        Same deal appiles to non-singletons
+ad_proc -public get_info {
+    {-return:required}
+    {-param ""}
+    {-package_key:required}
+} {
+    returns either 1. number of times this package_key is mounted
+    2. the url a singleton is mounted at (or the first match it finds
+                                          for a multi-mounted package) or 3. a singleon's param (see list above).
+    Same deal appiles to non-singletons
 
-        ret = count, url, param
-    } {
+    ret = count, url, param
+} {
 
-        set get_count_p 0
-        set get_url_p 0
-        set get_param_p 0
+    set get_count_p 0
+    set get_url_p 0
+    set get_param_p 0
 
-        if {$return == "count"} {
-            set get_count_p 1
-            set $param "package_key"
-        } elseif {$return == "url"} {
-            set get_url_p 1
-        } elseif {$return == "param"} {
-            if {[empty_string_p $param]} {
- 		ns_log Error \
-			"site_nodes::get_info failed! \n
+    if {$return == "count"} {
+        set get_count_p 1
+        set $param "package_key"
+    } elseif {$return == "url"} {
+        set get_url_p 1
+    } elseif {$return == "param"} {
+        if {[empty_string_p $param]} {
+            ns_log Error \
+                "site_nodes::get_info failed! \n
                 no param specified to get"
-		ad_return_complaint 1 \
-			"site_nodes::get_info failed! \n
+            ad_return_complaint 1 \
+                "site_nodes::get_info failed! \n
                 no param specified to get"
-            } else {
-                set get_param_p 1
-            }
+        } else {
+            set get_param_p 1
         }
+    }
 
-        set site_nodes_list [get_site_nodes_list]
+    set site_nodes_list [get_site_nodes_list]
 
-        # iterate through the array, counting the number of times the
-        # passed in package key is in the site_nodes array
-        set count 0
+    # iterate through the array, counting the number of times the
+    # passed in package key is in the site_nodes array
+    set count 0
 
-        for {set x 0} {$x < [llength $site_nodes_list]} {incr x 2} {
+    for {set x 0} {$x < [llength $site_nodes_list]} {incr x 2} {
 
-            set key [get_site_nodes_list_key \
-                    -site_nodes_list $site_nodes_list \
-                    -index $x]
+        set key [get_site_nodes_list_key \
+                     -site_nodes_list $site_nodes_list \
+                     -index $x]
 
-            if {$get_url_p} { return $key }
+        if {$get_url_p} { return $key }
 
-            set poss_key_match [get_site_nodes_list_value_param \
-                    -site_nodes_list $site_nodes_list \
-                    -index $x \
-                    -param "package_key"]
+        set poss_key_match [get_site_nodes_list_value_param \
+                                -site_nodes_list $site_nodes_list \
+                                -index $x \
+                                -param "package_key"]
 
-            if { $poss_key_match == $package_key} {
+        if { $poss_key_match == $package_key} {
 
-                if {$get_param_p} {
-                    return [get_site_nodes_list_value_param \
+            if {$get_param_p} {
+                return [get_site_nodes_list_value_param \
                             -site_nodes_list $site_nodes_list \
                             -index $x \
                             -param $param]
-                }
-
-                incr count
             }
-        }
 
-        if {$get_count_p} {
-            return $count
-        } else {
-            ns_log error "site_nodes::get_info get_count_p assertion failed! We should never get here return=$return param=$param package_key=$package_key"
+            incr count
         }
     }
-}
 
+    if {$get_count_p} {
+        return $count
+    } else {
+        ns_log error "site_nodes::get_info get_count_p assertion failed! We should never get here return=$return param=$param package_key=$package_key"
+    }
+}
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/tcl/site-nodes-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?