Index: openacs-4/packages/dotlrn-forums/dotlrn-forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/dotlrn-forums.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-forums/dotlrn-forums.info	1 Jul 2002 18:56:23 -0000	1.3
+++ openacs-4/packages/dotlrn-forums/dotlrn-forums.info	2 Jul 2002 23:02:17 -0000	1.4
@@ -22,6 +22,9 @@
             <file type="package_spec" path="dotlrn-forums.info"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/dotlrn-forums-create.sql"/>
             <file type="tcl_procs" path="tcl/dotlrn-forums-procs.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/user-history-oracle.xql"/>
+            <file type="content_page" path="www/user-history.adp"/>
+            <file type="content_page" path="www/user-history.tcl"/>
         </files>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="auto_create_forum_p"  default="f" description="Should we create a forum by default when added to a community?"/>
Index: openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl	2 Jun 2002 22:30:37 -0000	1.2
+++ openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl	2 Jul 2002 23:02:17 -0000	1.3
@@ -17,11 +17,13 @@
 ad_library {
 
     Procs to set up the dotLRN Forums applet
-    (redone for Forums, not bboard)
-    
-    @author ben@openforce.net,arjun@openforce.net
+
+    @author Ben Adida (ben@openforce.net)
+    @author yon (yon@openforce.net)
+    @author Arjun Sanyal (arjun@openforce.net)
     @creation-date 2002-05-29
     @version $Id$
+
 }
 
 namespace eval dotlrn_forums {
@@ -30,7 +32,7 @@
     } {
         What's my applet key?
     } {
-        return "dotlrn_forums"
+        return dotlrn_forums
     }
 
     ad_proc -public my_package_key {
@@ -44,32 +46,34 @@
     } {
         What package does this applet deal with?
     } {
-        return "forums"
+        return forums
     }
 
     ad_proc -public get_pretty_name {
     } {
+        return the pretty name of this applet.
     } {
-        return "Discussion Forums"
+        return Forums
     }
 
     ad_proc -public add_applet {
     } {
         Add the forums applet to dotlrn - for one-time init
         Must be repeatable!
     } {
-        # register/activate self with dotlrn
-        # our service contract is in the db, but we must tell dotlrn
-        # that we exist and want to be active
-        if {![dotlrn_applet::is_applet_mounted -url "forums"]} {
+        ns_log notice "YON: dotlrn_forums::add_applet starting"
+
+        if {![dotlrn_applet::is_applet_mounted -url forums]} {
             dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key]
 
-            # Mount the package
-            dotlrn_applet::mount \
-                -package_key [my_package_key] \
-                    -url "forums" \
-                    -pretty_name "Forums"
+            ns_log notice "YON: dotlrn_forums::add_applet called dotlrn_applet::add_applet_to_dotlrn for [applet_key]"
+
+            dotlrn_applet::mount -package_key [my_package_key] -url forums -pretty_name [get_pretty_name]
+
+            ns_log notice "YON: dotlrn_forums::add_applet called dotlrn_applet::mount for package_key [my_package_key] and url forums"
         }
+
+        ns_log notice "YON: dotlrn_forums::add_applet ending"
     }
 
     ad_proc -public remove_applet {
@@ -84,71 +88,60 @@
     } {
         Add the forums applet to a dotlrn community
     } {
-        #
-        # set up stuff
-        #
-
         # Create and Mount
         set package_id [dotlrn::instantiate_and_mount \
-                            -mount_point "forums" \
-                            $community_id \
-                            [package_key]
+            -mount_point forums \
+            $community_id \
+            [package_key] \
         ]
 
         set auto_create_forum_p [parameter::get_from_package_key \
-                                     -package_key [my_package_key] \
-                                     -parameter "auto_create_forum_p"
+            -package_key [my_package_key] \
+            -parameter auto_create_forum_p \
         ]
 
         set auto_create_forum_name [parameter::get_from_package_key \
-                                        -package_key [my_package_key] \
-                                        -parameter "auto_create_forum_name" 
+            -package_key [my_package_key] \
+            -parameter auto_create_forum_name \
         ]
 
-        if {[string equal $auto_create_forum_p "t"]} {
+        if {[string equal $auto_create_forum_p t]} {
             forum::new \
-                    -name $auto_create_forum_name \
-                    -package_id $package_id
+                -name $auto_create_forum_name \
+                -package_id $package_id
         }
 
         # Set up permissions for basic members (Admins inherit no problem)
         set members [dotlrn_community::get_rel_segment_id \
-                -community_id $community_id \
-                -rel_type dotlrn_member_rel
+            -community_id $community_id \
+            -rel_type dotlrn_member_rel \
         ]
-        
+
         permission::grant -party_id $members -object_id $package_id -privilege forum_read
         permission::grant -party_id $members -object_id $package_id -privilege forum_post
 
-        #
-        # portlet stuff
-        #
-
         # set up the admin portlet
-
         set admin_portal_id [dotlrn_community::get_admin_portal_id \
-                                 -community_id $community_id
+            -community_id $community_id \
         ]
 
         forums_admin_portlet::add_self_to_page \
             -portal_id $admin_portal_id \
             -package_id $package_id
 
         # set up the bboard portlet for this community
-
         set portal_id [dotlrn_community::get_portal_id \
-                           -community_id $community_id
+            -community_id $community_id \
         ]
 
         # add the portlet to the comm's portal using add_portlet_helper
         set args [ns_set create]
         ns_set put $args package_id $package_id
         ns_set put $args display_group_name_p f
-        ns_set put $args param_action "overwrite"
+        ns_set put $args param_action overwrite
 
         dotlrn_forums::add_portlet_helper $portal_id $args
 
-        # return the package_id
         return $package_id
     }
 
@@ -164,16 +157,15 @@
         user_id
     } {
         Called when the user is initially added as a dotlrn user.
-        For one-time init stuff. 
+        For one-time init stuff.
     } {
-        # noop
     }
 
     ad_proc -public remove_user {
         user_id
     } {
+        called when a user is removed from dotlrn.
     } {
-        # noop
     }
 
     ad_proc -public add_user_to_community {
@@ -184,13 +176,13 @@
     } {
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
         set package_id [dotlrn_community::get_applet_package_id \
-                            $community_id \
-                            [applet_key]
+            $community_id \
+            [applet_key] \
         ]
         set args [ns_set create]
         ns_set put $args package_id $package_id
-        ns_set put $args param_action "append"
-        
+        ns_set put $args param_action append
+
         # don't use the cached version
         dotlrn_forums::add_portlet_helper \
             [dotlrn::get_portal_id_not_cached -user_id $user_id] \
@@ -203,11 +195,11 @@
             set forum_id [ns_set get $forum forum_id]
 
             notification::request::new \
-                    -type_id [notification::type::get_type_id -short_name forums_forum_notif] \
-                    -user_id $user_id \
-                    -object_id $forum_id \
-                    -interval_id [notification::get_interval_id -name instant] \
-                    -delivery_method_id [notification::get_delivery_method_id -name email]
+                -type_id [notification::type::get_type_id -short_name forums_forum_notif] \
+                -user_id $user_id \
+                -object_id $forum_id \
+                -interval_id [notification::get_interval_id -name instant] \
+                -delivery_method_id [notification::get_delivery_method_id -name email]
         }
     }
 
@@ -247,11 +239,11 @@
         set args [ns_set create]
         ns_set put $args package_id 0
         ns_set put $args display_group_name_p f
-        ns_set put $args param_action "overwrite"
+        ns_set put $args param_action overwrite
 
         set type [dotlrn::get_type_from_portal_id -portal_id $portal_id]
 
-        if {[string equal $type "user"]} {
+        if {[string equal $type user]} {
             # portal_id is a user portal template
             ns_set put $args display_group_name_p t
         }
@@ -265,27 +257,27 @@
     } {
         This does the call to add the portlet to the given portal.
         Params for the portlet are set by the calllers.
-        
+
         @param portal_id
         @param args An ns_set of params
-    } { 
+    } {
         forums_portlet::add_self_to_page \
             -portal_id $portal_id \
-            -package_id [ns_set get $args "package_id"] \
-            -param_action [ns_set get $args "param_action"] \
-            -display_group_name_p [ns_set get $args "display_group_name_p"]
+            -package_id [ns_set get $args package_id] \
+            -param_action [ns_set get $args param_action] \
+            -display_group_name_p [ns_set get $args display_group_name_p]
     }
 
     ad_proc -public remove_portlet {
         portal_id
         args
     } {
-        A helper proc to remove the underlying portlet from the given portal. 
-        
+        A helper proc to remove the underlying portlet from the given portal.
+
         @param portal_id
         @param args An ns_set of args
-    } { 
-        set package_id [ns_set get $args "package_id"]
+    } {
+        set package_id [ns_set get $args package_id]
         forums_portlet::remove_self_from_page $portal_id $package_id
     }
 
@@ -295,9 +287,7 @@
     } {
         Clone this applet's content from the old community to the new one
     } {
-        ns_log notice "Cloning: [applet_key]"
         dotlrn_forums::add_applet_to_community $new_community_id
     }
 
-
 }
Index: openacs-4/packages/dotlrn-forums/www/user-history-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/www/Attic/user-history-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-forums/www/user-history-oracle.xql	6 Jun 2002 03:43:55 -0000	1.1
+++ openacs-4/packages/dotlrn-forums/www/user-history-oracle.xql	2 Jul 2002 23:02:17 -0000	1.2
@@ -1,23 +1,45 @@
 <?xml version="1.0"?>
 
 <queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
     <fullquery name="select_messages">
         <querytext>
             select forums_messages.message_id,
                    forums_messages.subject,
                    to_char(forums_messages.posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
                    forums_forums.forum_id,
+                   forums_forums.package_id,
                    forums_forums.name as forum_name,
-                   (select site_node.url(node_id) from site_nodes where object_id= forums_forums.package_id) as url,
-                   package_id
+                   (select site_node.url(node_id)
+                    from site_nodes
+                    where object_id = forums_forums.package_id) as url
             from forums_messages,
                  forums_forums
             where forums_messages.user_id = :user_id
             and forums_messages.forum_id = forums_forums.forum_id
-            and forums_forums.package_id in $package_id_list_sql
-            $sql_order_by
+            order by forums_messages.posting_date desc
         </querytext>
     </fullquery>
 
+    <fullquery name="select_messages_by_forum">
+        <querytext>
+            select forums_messages.message_id,
+                   forums_messages.subject,
+                   to_char(forums_messages.posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
+                   forums_forums.forum_id,
+                   forums_forums.package_id,
+                   forums_forums.name as forum_name,
+                   (select site_node.url(node_id)
+                    from site_nodes
+                    where object_id = forums_forums.package_id) as url
+            from forums_messages,
+                 forums_forums
+            where forums_messages.user_id = :user_id
+            and forums_messages.forum_id = forums_forums.forum_id
+            order by forum_name,
+                     forums_messages.posting_date desc
+        </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/dotlrn-forums/www/user-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/www/Attic/user-history.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-forums/www/user-history.adp	6 Jun 2002 03:43:55 -0000	1.1
+++ openacs-4/packages/dotlrn-forums/www/user-history.adp	2 Jul 2002 23:02:17 -0000	1.2
@@ -43,7 +43,7 @@
     <tr bgcolor="#d9e4f9">
   </else>
 
-      <td><a href="@messages.url@forum-view?forum_id=@messages.forum_id@"><%= $community_names($messages(package_id)) %>: @messages.forum_name@</a></td>
+      <td><a href="@messages.url@forum-view?forum_id=@messages.forum_id@">@messages.forum_name@</a></td>
       <td><a href="@messages.url@message-view?message_id=@messages.message_id@">@messages.subject@</a></td>
       <td align="center">@messages.posting_date@</td>
 
@@ -70,7 +70,7 @@
   <table bgcolor="#cccccc" width="95%">
 
     <tr bgcolor="#eeeeee">
-      <th align="left" colspan="2"><%= $community_names($messages(package_id)) %>: @messages.forum_name@<br><br></th>
+      <th align="left" colspan="2">@messages.forum_name@<br><br></th>
     </tr>
 
     <tr>
Index: openacs-4/packages/dotlrn-forums/www/user-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/www/Attic/user-history.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-forums/www/user-history.tcl	6 Jun 2002 03:43:55 -0000	1.1
+++ openacs-4/packages/dotlrn-forums/www/user-history.tcl	2 Jul 2002 23:02:17 -0000	1.2
@@ -1,6 +1,6 @@
 ad_page_contract {
     
-    Posting History for a User across communities
+    Posting History for a User
 
     @author Ben Adida (ben@openforce)
     @creation-date 2002-05-29
@@ -11,60 +11,29 @@
     {view "date"}
 }
 
-# The biggest issue here is finding all the package IDs
-# that are to be looked at for user history
-set package_user_id $user_id
-set applet_key [dotlrn_forums::applet_key]
-
-# Load up packages and community names
-set user_package_id_list [list]
-db_foreach select_user_package_id_list {} {
-    lappend user_package_id_list $package_id
-    set community_names($package_id) $community_pretty_name
-}
-
-if {[dotlrn::admin_p]} {
-    # If an admin, that's the package ID list
-    set package_id_list $user_package_id_list
-} else {
-    # If not an admin, we find the communities that the browsing
-    # user is a member of
-    set package_user_id [ad_conn user_id]
-
-    set browser_package_id_list [list]
-    db_foreach select_user_package_id_list {} {
-        lappend browser_package_id_list $package_id
-    }
-
-    # We merge the lists
-    set package_id_list [list]
-    foreach pack_id $user_package_id_list {
-        if {[lsearch -exact $browser_package_id_list $pack_id] > -1} {
-            lappend package_id_list $pack_id
-        }
-    }
-}
-
-set package_id_list_sql "([join $package_id_list ","])"
-
 # choosing the view
 set dimensional_list {
     {
         view "View:" date {
-            {date "by Date" { order by date desc } }
-            {forum "by Forum" { order by forums_forums.name, date desc } }
+            {date "by Date" {}}
+            {forum "by Forum" {}}
         }
     }
 }
 
-set sql_order_by [ad_dimensional_sql $dimensional_list]
+set query select_messages
+if {[string equal $view forum]} {
+    set query select_messages_by_forum
+}
 
 # Select the postings
-db_multirow messages select_messages {}
+db_multirow messages $query {}
 
 # Get user information
 oacs::user::get -user_id $user_id -array user
 
 set dimensional_chunk [ad_dimensional $dimensional_list]
+
 set context_bar {{Posting History}}
+
 ad_return_template
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-forums/www/user-history.xql'.
Fisheye: No comparison available.  Pass `N' to diff?