Index: openacs-4/packages/dotlrn/tcl/applets-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/applets-procs.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/dotlrn/tcl/applets-procs.tcl 13 Jul 2002 00:13:09 -0000 1.14
+++ openacs-4/packages/dotlrn/tcl/applets-procs.tcl 13 Jul 2002 03:05:24 -0000 1.15
@@ -130,9 +130,9 @@
} {
is the applet specified mounted
} {
- if {[apm_package_id_from_key $package_key]} {
- }
- if {[nsv_exists site_nodes "[get_url]/$url/"]} {
+ ns_log notice "YON: dotlrn_applet::is_applet_mounted applet_key $applet_key"
+ ns_log notice "YON: dotlrn_applet::is_applet_mounted package_key [get_package_key -applet_key $applet_key]"
+ if {[apm_package_id_from_key [get_package_key -applet_key $applet_key]] != 0} {
return 1
} else {
return 0
@@ -142,10 +142,31 @@
ad_proc -public list_mounted_applets {} {
list all applets that are mounted
} {
+ set applets [list]
foreach applet [list_applets] {
+ if {[is_applet_mounted -applet_key $applet]} {
+ lappend applets $applet
+ }
}
+ return $applets
}
+ ad_proc -public get_package_key {
+ {-applet_key:required}
+ } {
+ get the package key associated with the given applet
+ } {
+ return [util_memoize "dotlrn_applet::get_package_key_not_cached -applet_key $applet_key"]
+ }
+
+ ad_proc -private get_package_key_not_cached {
+ {-applet_key:required}
+ } {
+ get the package key associated with the given applet
+ } {
+ return [db_string select_package_key_from_applet_key {} -default ""]
+ }
+
}
Index: openacs-4/packages/dotlrn/tcl/applets-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/applets-procs.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn/tcl/applets-procs.xql 13 Jul 2002 00:13:09 -0000 1.5
+++ openacs-4/packages/dotlrn/tcl/applets-procs.xql 13 Jul 2002 03:05:24 -0000 1.6
@@ -24,7 +24,7 @@
insert
into dotlrn_applets
- (applet_id, applet_key, package_key, status)
+ (applet_id, applet_key, package_key, active_p)
values
(acs_object_id_seq.nextval, :applet_key, :package_key, :active_p)
@@ -37,4 +37,12 @@
+
+
+ select package_key
+ from dotlrn_applets
+ where applet_key = :applet_key
+
+
+
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/dotlrn/www/admin/user.adp 2 Jun 2002 00:05:56 -0000 1.14
+++ openacs-4/packages/dotlrn/www/admin/user.adp 13 Jul 2002 03:05:24 -0000 1.15
@@ -165,8 +165,7 @@
- This user is not yet a member of dotLRN.
- Make them one.
+ Add this user to dotLRN.
Index: openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl 13 Jul 2002 00:13:09 -0000 1.6
+++ openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl 13 Jul 2002 03:05:24 -0000 1.7
@@ -58,18 +58,24 @@
used for one-time init - must be repeatable!
} {
if {![dotlrn::is_package_mounted -package_key [package_key]]} {
- set package_id [dotlrn::mount_package \
- -package_key [package_key] \
- -url [package_key] \
- -directory_p t \
- ]
- dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key] -package_key [my_package_key]
+ db_transaction {
+ set package_id [dotlrn::mount_package \
+ -package_key [package_key] \
+ -url [package_key] \
+ -directory_p t \
+ ]
- dotlrn_applet::mount \
- -package_key [my_package_key] \
- -url bm \
- -pretty_name [get_pretty_name]
+ dotlrn_applet::add_applet_to_dotlrn \
+ -applet_key [applet_key] \
+ -package_key [my_package_key]
+
+ dotlrn_applet::mount \
+ -package_key [my_package_key] \
+ -url bm \
+ -pretty_name [get_pretty_name]
+ }
+
}
}
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 -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl 13 Jul 2002 00:13:10 -0000 1.6
+++ openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl 13 Jul 2002 03:05:24 -0000 1.7
@@ -61,9 +61,19 @@
Add the forums applet to dotlrn - for one-time init
Must be repeatable!
} {
- if {![dotlrn_applet::is_applet_mounted -url forums]} {
- dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key] -package_key [my_package_key]
- dotlrn_applet::mount -package_key [my_package_key] -url forums -pretty_name [get_pretty_name]
+ if {![dotlrn_applet::applet_exists_p -applet_key [applet_key]]} {
+
+ db_transaction {
+ dotlrn_applet::mount \
+ -package_key [my_package_key] \
+ -url forums \
+ -pretty_name [get_pretty_name]
+
+ dotlrn_applet::add_applet_to_dotlrn \
+ -applet_key [applet_key] \
+ -package_key [my_package_key]
+ }
+
}
}
@@ -104,9 +114,9 @@
-node_id $attachments_node_id \
-object_id [apm_package_id_from_key attachments]
- set fs_package_id [dotlrn::get_community_applet_package_id \
+ set fs_package_id [dotlrn_community::get_applet_package_id \
-community_id $community_id \
- -package_key [dotlrn_fs::package_key]
+ -applet_key [dotlrn_fs::applet_key]
]
# map the fs root folder to the package_id of the new forums pkg
@@ -199,8 +209,8 @@
} {
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 $community_id \
+ -applet_key [applet_key] \
]
set args [ns_set create]
ns_set put $args package_id $package_id
@@ -233,7 +243,10 @@
Remove a user from a community
} {
set portal_id [dotlrn::get_portal_id -user_id $user_id]
- set package_id [dotlrn_community::get_applet_package_id $community_id [applet_key]]
+ set package_id [dotlrn_community::get_applet_package_id \
+ -community_id $community_id \
+ -applet_key [applet_key] \
+ ]
set args [ns_set create]
ns_set put $args package_id $package_id
Index: openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl 13 Jul 2002 00:16:37 -0000 1.26
+++ openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl 13 Jul 2002 03:05:24 -0000 1.27
@@ -29,21 +29,28 @@
} {
What's my applet key?
} {
- return "dotlrn_news"
+ return dotlrn_news
}
ad_proc -public package_key {
} {
What package do I deal with?
} {
- return "news"
+ return news
}
+ ad_proc -public my_package_key {
+ } {
+ What package do I deal with?
+ } {
+ return "dotlrn-news"
+ }
+
ad_proc -public get_pretty_name {
} {
returns the pretty name
} {
- return "News"
+ return News
}
ad_proc -public add_applet {
@@ -80,7 +87,7 @@
-package_id $package_id
set args [ns_set create]
- ns_set put $args "package_id" $package_id
+ ns_set put $args package_id $package_id
add_portlet_helper $portal_id $args
return $package_id
@@ -120,8 +127,8 @@
# use "append" here since we want to aggregate
set args [ns_set create]
- ns_set put $args "package_id" $package_id
- ns_set put $args "param_action" "append"
+ ns_set put $args package_id $package_id
+ ns_set put $args param_action append
add_portlet_helper $portal_id $args
}
@@ -150,8 +157,8 @@
# simple, no type specific stuff, just set some dummy values
set args [ns_set create]
- ns_set put $args "package_id" 0
- ns_set put $args "param_action" "overwrite"
+ ns_set put $args package_id 0
+ ns_set put $args param_action overwrite
add_portlet_helper $portal_id $args
}
@@ -166,8 +173,8 @@
} {
news_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"]
+ -package_id [ns_set get $args package_id] \
+ -param_action [ns_set get $args param_action]
}
ad_proc -public remove_portlet {
@@ -181,7 +188,7 @@
} {
news_portlet::remove_self_from_page \
-portal_id $portal_id \
- -package_id [ns_set get $args "package_id"]
+ -package_id [ns_set get $args package_id]
}
ad_proc -public clone {
Index: openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl 13 Jul 2002 00:13:10 -0000 1.24
+++ openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl 13 Jul 2002 03:05:24 -0000 1.25
@@ -59,14 +59,20 @@
Add the static applet to dotlrn - for one-time init
Must be repeatable!
} {
- if {![dotlrn_applet::is_applet_mounted -url [package_key]]} {
- dotlrn_applet::mount \
- -package_key [package_key] \
- -url [package_key] \
- -pretty_name [get_pretty_name]
- }
+ if {![dotlrn_applet::applet_exists_p -applet_key [applet_key]]} {
- dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key] -package_key [my_package_key]
+ db_transaction {
+ dotlrn_applet::mount \
+ -package_key [package_key] \
+ -url [package_key] \
+ -pretty_name [get_pretty_name]
+
+ dotlrn_applet::add_applet_to_dotlrn \
+ -applet_key [applet_key] \
+ -package_key [my_package_key]
+ }
+
+ }
}
ad_proc -public remove_applet {
Index: openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql 12 Jul 2002 21:26:48 -0000 1.18
+++ openacs-4/packages/new-portal/tcl/portal-procs-oracle.xql 13 Jul 2002 03:05:24 -0000 1.19
@@ -1,109 +1,140 @@
-oracle8.1.6
+ oracle8.1.6
-
-
+
+
+ begin
+ :1 := portal.new (
+ name => :name,
+ layout_id => :layout_id,
+ template_id => :template_id,
+ default_page_name => :default_page_name,
+ theme_id => :theme_id,
+ context_id => :context_id
+ );
+ end;
+
+
- begin
- :1 := portal.new (
- name => :name,
- layout_id => :layout_id,
- template_id => :template_id,
- default_page_name => :default_page_name,
- theme_id => :theme_id,
- context_id => :context_id
- );
- end;
+
+
+ begin
+ portal.delete(portal_id => :portal_id);
+ end;
+
+
-
-
+
+
+ update portal_element_map
+ set region = :region,
+ page_id = :page_id,
+ sort_key = (select nvl((select max(pem.sort_key) + 1
+ from portal_element_map pem
+ where pem.page_id = :page_id
+ and region = :region),
+ 1)
+ from dual)
+ where element_id = :element_id
+
+
-
-
- begin
- portal.delete (portal_id => :portal_id);
- end;
-
-
+
+
+ update portal_element_map
+ set page_id = :page_id,
+ region = :region,
+ sort_key = (select nvl((select max(sort_key) + 1
+ from portal_element_map
+ where page_id = :page_id
+ and region = :region),
+ 1)
+ from dual)
+ where element_id = :element_id
+
+
-
-
- update portal_element_map
- set region = :region,
- page_id = :page_id,
- sort_key = (select nvl((select max(pem.sort_key) + 1
- from portal_element_map pem
- where pem.page_id = :page_id
- and region = :region),
- 1)
- from dual)
- where element_id = :element_id
-
-
+
+
+ insert into portal_element_parameters
+ (parameter_id, element_id, config_required_p, configured_p, key, value)
+ select acs_object_id_seq.nextval, :new_element_id, config_required_p, configured_p, key, value
+ from portal_element_parameters
+ where element_id = :template_element_id
+
+
-
-
- update portal_element_map
- set page_id = :page_id,
- region = :region,
- sort_key = (select nvl((select max(sort_key) + 1
- from portal_element_map
- where page_id = :page_id
- and region = :region),
- 1)
- from dual)
- where element_id = :element_id
-
-
+
+
+ insert into portal_element_parameters
+ (parameter_id, element_id, config_required_p, configured_p, key, value)
+ select acs_object_id_seq.nextval, :new_element_id, config_required_p, configured_p, key, value
+ from portal_datasource_def_params where datasource_id= :ds_id
+
+
-
-
- insert into portal_element_map
- (element_id, name, pretty_name, page_id, datasource_id, region, sort_key)
- values
- (:new_element_id, :ds_name, :pretty_name, :page_id, :ds_id, :region,
- nvl((select max(sort_key) + 1
- from portal_element_map
- where region = :region
- and page_id = :page_id), 1))
-
-
+
+
+ insert into portal_element_map
+ (element_id, name, pretty_name, page_id, datasource_id, region,
+ sort_key)
+ values
+ (:new_element_id, :ds_name, :pretty_name, :page_id, :ds_id, :region,
+ nvl((select max(sort_key) + 1
+ from portal_element_map
+ where region = :region
+ and page_id = :page_id), 1))
+
+
-
-
- update portal_element_map
- set region = :target_region,
- sort_key = (select nvl((select max(pem.sort_key) + 1
- from portal_element_map pem
- where page_id = :my_page_id
- and region = :target_region),
- 1)
- from dual)
- where element_id = :element_id
-
-
+
+
+ insert into portal_element_parameters
+ (parameter_id, element_id, configured_p, key, value)
+ select acs_object_id_seq.nextval, :element_id, 't', :key, :value
+ from dual
+ where not exists (select parameter_id
+ from portal_element_parameters
+ where element_id = :element_id
+ and key = :key
+ and value= :value)
+
+
-
-
- begin
- :1 := portal_page.new (
- pretty_name => :pretty_name,
- portal_id => :portal_id,
- layout_id => :layout_id
- );
- end;
-
-
+
+
+ update portal_element_map
+ set region = :target_region,
+ sort_key = (select nvl((select max(pem.sort_key) + 1
+ from portal_element_map pem
+ where page_id = :my_page_id
+ and region = :target_region),
+ 1)
+ from dual)
+ where element_id = :element_id
+
+
-
-
- begin
- portal_page.delete ( page_id => :page_id );
- end;
-
-
+
+
+ begin
+ :1 := portal_page.new(
+ pretty_name => :pretty_name,
+ portal_id => :portal_id,
+ layout_id => :layout_id
+ );
+ end;
+
+
-
+
+
+ begin
+ portal_page.delete(page_id => :page_id);
+ end;
+
+
+
Index: openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql 12 Jul 2002 21:26:48 -0000 1.7
+++ openacs-4/packages/new-portal/tcl/portal-procs-postgresql.xql 13 Jul 2002 03:05:24 -0000 1.8
@@ -1,114 +1,143 @@
-postgresql7.1
+ postgresql7.1
-
-
-
- select portal__new (
- null,
- :name,
- :theme_id,
- :layout_id,
- :template_id,
- :default_page_name,
- 'portal',
- now(),
- null,
- null,
- :context_id
- );
-
-
-
+
+
+ select portal__new(
+ null,
+ :name,
+ :theme_id,
+ :layout_id,
+ :template_id,
+ :default_page_name,
+ 'portal',
+ now(),
+ null,
+ null,
+ :context_id
+ );
+
+
-
-
- begin
- portal__delete (:portal_id);
- end;
-
-
+
+
+ select portal__delete(:portal_id);
+
+
-
-
- update portal_element_map
- set region = :region,
- page_id = :page_id,
- sort_key = (select coalesce((select max(pem.sort_key) + 1
- from portal_element_map pem
- where pem.page_id = :page_id
- and region = :region),
- 1)
- from dual)
- where element_id = :element_id
-
-
+
+
+ update portal_element_map
+ set region = :region,
+ page_id = :page_id,
+ sort_key = (select coalesce((select max(pem.sort_key) + 1
+ from portal_element_map pem
+ where pem.page_id = :page_id
+ and region = :region),
+ 1)
+ from dual)
+ where element_id = :element_id
+
+
-
-
- update portal_element_map
- set page_id = :page_id,
- region = :region,
- sort_key = (select coalesce((select max(sort_key) + 1
- from portal_element_map
- where page_id = :page_id
- and region = :region),
- 1)
- from dual)
- where element_id = :element_id
-
-
+
+
+ update portal_element_map
+ set page_id = :page_id,
+ region = :region,
+ sort_key = (select coalesce((select max(sort_key) + 1
+ from portal_element_map
+ where page_id = :page_id
+ and region = :region),
+ 1)
+ from dual)
+ where element_id = :element_id
+
+
-
-
- insert into portal_element_map
- (element_id, name, pretty_name, page_id, datasource_id, region, sort_key)
- values
- (:new_element_id, :ds_name, :pretty_name, :page_id, :ds_id, :region,
- coalesce((select max(sort_key) + 1
- from portal_element_map
- where region = :region
- and page_id = :page_id), 1))
-
-
+
+
+ insert into portal_element_parameters
+ (parameter_id, element_id, config_required_p, configured_p, key, value)
+ select nextval('t_acs_object_id_seq'), :new_element_id, config_required_p, configured_p, key, value
+ from portal_element_parameters
+ where element_id = :template_element_id
+
+
-
-
- update portal_element_map
- set region = :target_region,
- sort_key = (select coalesce((select max(pem.sort_key) + 1
- from portal_element_map pem
- where page_id = :my_page_id
- and region = :target_region),
- 1)
- from dual)
- where element_id = :element_id
-
-
+
+
+ insert into portal_element_parameters
+ (parameter_id, element_id, config_required_p, configured_p, key, value)
+ select nextval('t_acs_object_id_seq'), :new_element_id, config_required_p, configured_p, key, value
+ from portal_datasource_def_params where datasource_id= :ds_id
+
+
-
-
- select portal_page__new (
- null,
- :pretty_name,
- :portal_id,
- :layout_id,
- 'portal_page',
- now(),
- null,
- null,
- null
- );
-
-
+
+
+ insert into portal_element_map
+ (element_id, name, pretty_name, page_id, datasource_id, region,
+ sort_key)
+ values
+ (:new_element_id, :ds_name, :pretty_name, :page_id, :ds_id, :region,
+ coalesce((select max(sort_key) + 1
+ from portal_element_map
+ where region = :region
+ and page_id = :page_id), 1))
+
+
-
-
- select portal_page__delete ( :page_id );
-
-
+
+
+ insert into portal_element_parameters
+ (parameter_id, element_id, configured_p, key, value)
+ select nextval('t_acs_object_id_seq'), :element_id, 't', :key, :value
+ from dual
+ where not exists (select parameter_id
+ from portal_element_parameters
+ where element_id = :element_id
+ and key = :key
+ and value= :value)
+
+
-
+
+
+ update portal_element_map
+ set region = :target_region,
+ sort_key = (select coalesce((select max(pem.sort_key) + 1
+ from portal_element_map pem
+ where page_id = :my_page_id
+ and region = :target_region),
+ 1)
+ from dual)
+ where element_id = :element_id
+
+
+
+
+ select portal_page__new(
+ null,
+ :pretty_name,
+ :portal_id,
+ :layout_id,
+ 'portal_page',
+ now(),
+ null,
+ null,
+ null
+ );
+
+
+
+
+
+ select portal_page__delete(:page_id);
+
+
+
+
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -N -r1.153 -r1.154
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl 12 Jul 2002 21:26:48 -0000 1.153
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 13 Jul 2002 03:05:24 -0000 1.154
@@ -16,11 +16,13 @@
# tcl/portal-procs.tcl
ad_library {
+
Portal.
@author Arjun Sanyal (arjun@openforce.net)
@creation-date Sept 2001
@version $Id$
+
}
namespace eval portal {
@@ -29,21 +31,6 @@
# acs-service-contract procs
#
- ad_proc -private log_time {str} {
- global old_time
- set time "[expr [expr [clock clicks] + 1000000000] / 1000]"
-
- if {![info exists old_time]} {
- set diff "--"
- } else {
- set diff [expr "$time - $old_time"]
- }
-
- set old_time $time
-
- ns_log Notice "DEBUG-TIME: $time ($diff) - $str"
- }
-
ad_proc -public datasource_call {
{-datasource_name ""}
ds_id
@@ -86,12 +73,11 @@
}
}
-
#
# Special Hacks
#
- # The mangement is not responsible for the results of multi-mounting
+ # The management is not responsible for the results of multi-mounting
ad_proc -private package_key {} {
Returns the package_key
@@ -356,7 +342,6 @@
db_dml update {}
}
-
ad_proc -public configure {
{-referer ""}
{-template_p f}
@@ -371,9 +356,11 @@
@param portal_id
@return_url
} {
+
#
# check perms
#
+
set edit_p [permission::permission_p \
-object_id $portal_id \
-privilege portal_edit_portal]
@@ -386,6 +373,7 @@
#
# Set up some whole page stuff
#
+
set master_template [ad_parameter master_template]
set action_string [generate_action_string]
if { $template_p == "f" } {
@@ -404,6 +392,7 @@
#
# Begin creating the template
#
+
set template "
@@ -413,6 +402,7 @@
#
# Theme selection chunk
#
+
set theme_chunk "