Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/imsld/tcl/imsld-procs.tcl 25 Nov 2005 12:11:36 -0000 1.12 +++ openacs-4/packages/imsld/tcl/imsld-procs.tcl 13 Dec 2005 17:35:24 -0000 1.13 @@ -457,7 +457,7 @@ if { [string eq "" $one_service_url] } { lappend services_list "[_ imsld.lt_li_desc_no_file_assoc]" } else { - set services_list [concat [list $services_list] [list $one_service_url]] + set services_list [expr { [llength $services_list] ? [concat [list $services_list] [list $one_service_url]] : $one_service_url }] } } if_no_rows { ns_log notice "[_ imsld.lt_li_desc_no_file_assoc]" @@ -560,9 +560,9 @@ and ar.rel_type = 'imsld_env_env_rel' } { set one_nested_environment_list [imsld::process_environment -environment_item_id $nested_environment_item_id] + # the title is stored in [lindex $one_nested_environment_list 0], but is not returned for displaying porpouses set nested_environment_list [concat [list $nested_environment_list] \ - [list "Nested Environment: [lindex $one_nested_environment_list 0]" \ - [lindex $one_nested_environment_list 1] \ + [list [lindex $one_nested_environment_list 1] \ [lindex $one_nested_environment_list 2] \ [lindex $one_nested_environment_list 3]]] } @@ -608,7 +608,7 @@ # get learning object info db_1row objective_info { - select coalesce(lo.pretty_title, lo.title) as objective_title, + select coalesce(lo.pretty_title, '') as objective_title, lo.learning_objective_id from imsld_learning_objectivesi lo where lo.item_id = :learning_objective_item_id @@ -691,7 +691,7 @@ # get prerequisite info db_1row prerequisite_info { - select coalesce(pre.pretty_title, pre.title) as prerequisite_title, + select coalesce(pre.pretty_title, '') as prerequisite_title, pre.prerequisite_id from imsld_prerequisitesi pre where pre.item_id = :prerequisite_item_id @@ -845,6 +845,7 @@ -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] + # get associated files db_foreach associated_files { select cpf.imsld_file_id, cpf.file_name, @@ -869,7 +870,17 @@ }] set file_url "[apm_package_url_from_id $fs_package_id]view/${file_url}" append files_lis " $file_name " - } + } + # get associated urls + db_foreach associated_urls { + select url + from acs_rels ar, + cr_extlinks links + where ar.object_id_one = :resource_item_id + and ar.object_id_two = links.extlink_id + } { + append files_lis " $url " + } } } return $files_lis @@ -1451,7 +1462,7 @@ set environments "" regsub -all {
  • [ ]*
  • } $environments "" environments }