Index: openacs-4/packages/dotlrn-imsld/tcl/dotlrn-imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-imsld/tcl/dotlrn-imsld-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-imsld/tcl/dotlrn-imsld-procs.tcl 6 Oct 2005 14:28:26 -0000 1.3
+++ openacs-4/packages/dotlrn-imsld/tcl/dotlrn-imsld-procs.tcl 9 Dec 2005 12:00:25 -0000 1.4
@@ -69,13 +69,13 @@
ns_set put $args package_id $package_id
add_portlet_helper $portal_id $args
- # intializate rels, only if they are not initialized yet (a previous
- # call when istantiating the applet in another community)
- if { ![plsql_utility::object_type_exists_p imsld_community_manifest_rel] } {
- rel_types::new imsld_community_manifest_rel "dotLRN Community - IMS LD Manifests rel" "dotLRN Community - IMS LD Manifests rels" \
- [acs_object::get_element -object_id $community_id -element object_type] 0 {} \
- content_item 0 {}
- }
+ ### Create the CR Root folder for the community
+ set cr_root_folder_id [content::folder::new -name "imsld_root_cr_folder_${community_id}" \
+ -label "imsld_root_cr_folder_${community_id}"]
+ content::folder::register_content_type -folder_id $cr_root_folder_id -content_type content_revision -include_subtypes t
+ content::folder::register_content_type -folder_id $cr_root_folder_id -content_type content_folder -include_subtypes t
+ content::folder::register_content_type -folder_id $cr_root_folder_id -content_type content_extlink -include_subtypes t
+ content::folder::register_content_type -folder_id $cr_root_folder_id -content_type content_simlink -include_subtypes t
return $package_id
}
Index: openacs-4/packages/imsld/tcl/imsld-cp-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-cp-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/imsld/tcl/imsld-cp-procs.tcl 15 Nov 2005 17:20:24 -0000 1.3
+++ openacs-4/packages/imsld/tcl/imsld-cp-procs.tcl 9 Dec 2005 12:01:31 -0000 1.4
@@ -105,9 +105,9 @@
set package_id [expr { [empty_string_p $package_id] ? [ad_conn package_id] : $package_id }]
set item_id [expr { [empty_string_p $item_id] ? [db_nextval "acs_object_id_seq"] : $item_id }]
- if { [empty_string_p $parent_id] } {
+ if { [string eq "" $parent_id] } {
set parent_id [content::item::get_id -item_path "cr_manifest_${manifest_id}" -resolve_index f]
- if { [empty_string_p $parent_id] } {
+ if { [string eq "" $parent_id] } {
return -code error "IMSLD::imsld::cp::organization_new: No parent folder for organization $item_id"
}
}
Index: openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl 5 Oct 2005 15:33:25 -0000 1.3
+++ openacs-4/packages/imsld/tcl/imsld-cr-procs.tcl 9 Dec 2005 12:01:31 -0000 1.4
@@ -127,3 +127,18 @@
return $item_id
}
+
+ad_proc -public imsld::cr::get_root_folder {
+ {-community_id ""}
+} {
+ @option community_id community_id. Default value is [dotlrn_community::get_community_id]
+} {
+ set community_id [expr { [string eq "" $community_id] ? [dotlrn_community::get_community_id] : $community_id }]
+
+ set folder_id [content::item::get_id -item_path "imsld_root_cr_folder_${community_id}" -resolve_index f]
+ if { [string eq "" $folder_id] } {
+ ad_return_error "<#_ No parent folder found #>" "<#_ No parent folder found for the ims-ld in the community %community_id%. Please report this error to the administrator. #>"
+ ad_script_abort
+ }
+ return $folder_id
+}
Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl 24 Nov 2005 11:05:47 -0000 1.22
+++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl 9 Dec 2005 12:01:31 -0000 1.23
@@ -375,7 +375,7 @@
Initializes the cr folders where all the cr items of the manifest will be stored in, and sets the respective permissions. There are two folders for each imsld. One to store the files and show them in the fs, and the other to store the items..
It won't create the files in the cr since not every file will be handled by the cr (some files may be handled by other packages).
- Returns a list of two elements, the firs one is the folder_id in the fs of the root folder for that manifest, and the ohter one is the folder_id where the cr items and revisions are stored.
+ Returns a list of two elements, the first one is the folder_id in the fs of the root folder for that manifest, and the ohter one is the folder_id where the cr items and revisions are stored.
@param community_id The community_id that owns the folder.
@option manifest_identifier The identifier of the manifest that is being parsed uset to create the label of the fs folder.
@@ -396,24 +396,24 @@
-package_id [dotlrn_community::get_package_id $community_id] \
-package_key "file-storage"]
- set root_folder_id [fs::get_root_folder -package_id $fs_package_id]
-
+ set fs_root_folder_id [fs::get_root_folder -package_id $fs_package_id]
+ set cr_root_folder_id [imsld::cr::get_root_folder -community_id $community_id]
- set fs_folder_id [content::item::get_id -item_path "manifest_${manifest_id}" -root_folder_id $root_folder_id -resolve_index f]
- set cr_folder_id [content::item::get_id -item_path "cr_manifest_${manifest_id}" -resolve_index f]
+ set fs_folder_id [content::item::get_id -item_path "manifest_${manifest_id}" -root_folder_id $fs_root_folder_id -resolve_index f]
+ set cr_folder_id [content::item::get_id -item_path "cr_manifest_${manifest_id}" -root_folder_id $cr_root_folder_id -resolve_index f]
if { [empty_string_p $fs_folder_id] } {
db_transaction {
set folder_name "manifest_${manifest_id}"
# checks for write permission on the parent folder
- if { ![empty_string_p $root_folder_id] } {
- ad_require_permission $root_folder_id write
+ if { ![empty_string_p $fs_root_folder_id] } {
+ ad_require_permission $fs_root_folder_id write
}
# create the root cr dir
- set fs_folder_id [imsld::cr::folder_new -parent_id $root_folder_id -folder_name $folder_name -folder_label $folder_label]
+ set fs_folder_id [imsld::cr::folder_new -parent_id $fs_root_folder_id -folder_name $folder_name -folder_label $folder_label]
# PERMISSIONS FOR FILE-STORAGE
@@ -452,7 +452,7 @@
set folder_label "cr_${folder_label}"
set folder_name "cr_manifest_${manifest_id}"
# create the cr dir
- set cr_folder_id [imsld::cr::folder_new -folder_name $folder_name -folder_label $folder_label]
+ set cr_folder_id [imsld::cr::folder_new -folder_name $folder_name -folder_label $folder_label -parent_id $cr_root_folder_id]
# register content types
content::folder::register_content_type -folder_id $cr_folder_id -content_type imsld_learning_object
@@ -562,7 +562,8 @@
foreach dependency $resource_dependencies {
set dependency_identifierref [imsld::parse::get_attribute -node $dependency -attr_name identifierref]
set dependency_id [imsld::cp::dependency_new -resource_id $resource_id \
- -identifierref $dependency]
+ -identifierref $dependency \
+ -parent_id $parent_id]
# look for the resource in the manifest and add it to the CR
set resources [$manifest child all imscp:resources]
if { ![llength $resources] } {
@@ -2630,16 +2631,13 @@
-version $manifest_version \
-parent_id $cr_folder_id]
- # map manifest with the community
- relation_add imsld_community_manifest_rel $community_id $manifest_id
-
# organizaiton
set organizations [$manifest child all imscp:organizations]
if { ![llength $organizations] } {
set organizations [$manifest child all organizations]
}
imsld::parse::validate_multiplicity -tree $organizations -multiplicity 1 -element_name organizations -equal
- set organization_id [imsld::cp::organization_new -manifest_id $manifest_id]
+ set organization_id [imsld::cp::organization_new -manifest_id $manifest_id -parent_id $cr_folder_id]
# IMS-LD
set imsld [$organizations child all imsld:learning-design]
Index: openacs-4/packages/imsld/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/index.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/imsld/www/index.tcl 25 Nov 2005 08:58:56 -0000 1.9
+++ openacs-4/packages/imsld/www/index.tcl 9 Dec 2005 12:01:31 -0000 1.10
@@ -5,16 +5,19 @@
set context {}
set community_id [dotlrn_community::get_community_id]
+set cr_root_folder_id [imsld::cr::ger_root_folder -community_id $community_id]
+
db_multirow imslds_in_class get_manifests {
select cr3.item_id as imsld_id,
coalesce(imsld.title, imsld.identifier) as imsld_title
- from acs_rels ar, cr_items cr1, cr_items cr2, cr_items cr3, imsld_cp_manifests icm, imsld_cp_organizations ico, imsld_imsldsi imsld
- where ar.object_id_one = :community_id
- and ar.rel_type = 'imsld_community_manifest_rel'
- and ar.object_id_two = cr1.item_id
- and cr1.live_revision = icm.manifest_id
+ from cr_items cr1, cr_items cr2, cr_items cr3, cr_items cr4,
+ imsld_cp_manifests icm, imsld_cp_organizations ico, imsld_imsldsi imsld
+ where cr1.live_revision = icm.manifest_id
+ and cr1.parent_id = cr4.item_id
+ and cr4.parent_id = :cr_root_folder_id
and ico.manifest_id = cr1.item_id
and imsld.organization_id = cr2.item_id
and cr2.live_revision = ico.organization_id
and cr3.live_revision = imsld.imsld_id
+} {
}
Index: openacs-4/packages/imsld/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/www/admin/index.tcl 25 Nov 2005 13:55:24 -0000 1.1
+++ openacs-4/packages/imsld/www/admin/index.tcl 9 Dec 2005 12:01:32 -0000 1.2
@@ -59,21 +59,20 @@
}
set community_id [dotlrn_community::get_community_id]
+set cr_root_folder_id [imsld::cr::ger_root_folder -community_id $community_id]
db_multirow -extend { delete_template } imslds get_imslds {
- select imsld.imsld_id,
- coalesce(imsld.title, imsld.identifier) as imsld_title,
- cr3.item_id,
- cr3.live_revision
- from acs_rels ar, cr_items cr1, cr_items cr2, cr_items cr3, imsld_cp_manifests icm, imsld_cp_organizations ico, imsld_imsldsi imsld
- where ar.object_id_one = :community_id
- and ar.rel_type = 'imsld_community_manifest_rel'
- and ar.object_id_two = cr1.item_id
- and cr1.live_revision = icm.manifest_id
+ select cr3.item_id as imsld_id,
+ coalesce(imsld.title, imsld.identifier) as imsld_title
+ from cr_items cr1, cr_items cr2, cr_items cr3, cr_items cr4,
+ imsld_cp_manifests icm, imsld_cp_organizations ico, imsld_imsldsi imsld
+ where cr1.live_revision = icm.manifest_id
+ and cr1.parent_id = cr4.item_id
+ and cr4.parent_id = :cr_root_folder_id
and ico.manifest_id = cr1.item_id
and imsld.organization_id = cr2.item_id
and cr2.live_revision = ico.organization_id
- and cr3.item_id = imsld.item_id
+ and cr3.live_revision = imsld.imsld_id
} {
if { [empty_string_p $live_revision] } {
set delete_template "<span style=\"font-style: italic; color: red; font-size: 9pt;\">Deleted</span> <a href=[export_vars -base "index" { {set_imsld_id_live $item_id} }]>Make it live</a>"
Index: openacs-4/packages/imsld-portlet/www/imsld-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld-portlet/www/imsld-portlet.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/imsld-portlet/www/imsld-portlet.tcl 24 Nov 2005 15:50:26 -0000 1.3
+++ openacs-4/packages/imsld-portlet/www/imsld-portlet.tcl 9 Dec 2005 12:01:01 -0000 1.4
@@ -19,14 +19,16 @@
if { ![empty_string_p $community_id] } {
# were are inside a community
+ set cr_root_folder_id [imsld::cr::ger_root_folder -community_id $community_id]
+
db_multirow imslds_in_class get_manifests {
select cr3.item_id as imsld_id,
coalesce(imsld.title, imsld.identifier) as imsld_title
- from acs_rels ar, cr_items cr1, cr_items cr2, cr_items cr3, imsld_cp_manifests icm, imsld_cp_organizations ico, imsld_imsldsi imsld
- where ar.object_id_one = :community_id
- and ar.rel_type = 'imsld_community_manifest_rel'
- and ar.object_id_two = cr1.item_id
- and cr1.live_revision = icm.manifest_id
+ from cr_items cr1, cr_items cr2, cr_items cr3, cr_items cr4,
+ imsld_cp_manifests icm, imsld_cp_organizations ico, imsld_imsldsi imsld
+ where cr1.live_revision = icm.manifest_id
+ and cr1.parent_id = cr4.item_id
+ and cr4.parent_id = :cr_root_folder_id
and ico.manifest_id = cr1.item_id
and imsld.organization_id = cr2.item_id
and cr2.live_revision = ico.organization_id