+
Index: openacs-4/packages/imsld/lib/monitor/activity-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/monitor/activity-tree.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/lib/monitor/activity-tree.adp 18 Feb 2009 19:01:13 -0000 1.1
+++ openacs-4/packages/imsld/lib/monitor/activity-tree.adp 17 Jun 2009 08:00:01 -0000 1.2
@@ -4,10 +4,22 @@
@imsld_title@
Index: openacs-4/packages/imsld/sql/postgresql/imsld-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-create.sql,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/imsld/sql/postgresql/imsld-create.sql 24 Oct 2006 10:09:50 -0000 1.16
+++ openacs-4/packages/imsld/sql/postgresql/imsld-create.sql 17 Jun 2009 08:00:01 -0000 1.17
@@ -12,3 +12,5 @@
\i imsld-production-delivery-package-create.sql
\i imsld-tree-create.sql
\i imsld-level-c-create.sql
+
+\i imsld-gsi-a-create.sql
Index: openacs-4/packages/imsld/sql/postgresql/imsld-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-drop.sql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/imsld/sql/postgresql/imsld-drop.sql 24 Oct 2006 10:09:50 -0000 1.10
+++ openacs-4/packages/imsld/sql/postgresql/imsld-drop.sql 17 Jun 2009 08:00:01 -0000 1.11
@@ -11,10 +11,10 @@
\i imsld-cp-drop.sql
-\i imsld-production-delivery-drop.sql
-
\i imsld-production-delivery-package-drop.sql
+\i imsld-production-delivery-drop.sql
+
\i imsld-level-b-drop.sql
\i imsld-level-c-drop.sql
Index: openacs-4/packages/imsld/sql/postgresql/imsld-level-a-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-level-a-drop.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/imsld/sql/postgresql/imsld-level-a-drop.sql 5 Jun 2008 17:40:03 -0000 1.5
+++ openacs-4/packages/imsld/sql/postgresql/imsld-level-a-drop.sql 17 Jun 2009 08:00:01 -0000 1.6
@@ -7,6 +7,10 @@
drop table imsld_scheduled_time_limits;
+drop table imsld_res_files_rels;
+
+drop table imsld_res_xowiki_rels;
+
drop table imsld_learning_objects cascade;
drop table imsld_imslds cascade;
Index: openacs-4/packages/imsld/sql/postgresql/imsld-level-c-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-level-c-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/sql/postgresql/imsld-level-c-drop.sql 21 Dec 2006 15:20:47 -0000 1.2
+++ openacs-4/packages/imsld/sql/postgresql/imsld-level-c-drop.sql 17 Jun 2009 08:00:01 -0000 1.3
@@ -11,4 +11,6 @@
drop table imsld_runtime_activities_rels cascade;
-drop sequence imsld_rar_seq;
+drop view imsld_rar_seq;
+
+drop sequence t_imsld_rar_seq;
Index: openacs-4/packages/imsld/sql/postgresql/imsld-production-delivery-package-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-production-delivery-package-drop.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/sql/postgresql/imsld-production-delivery-package-drop.sql 16 May 2006 09:24:35 -0000 1.1
+++ openacs-4/packages/imsld/sql/postgresql/imsld-production-delivery-package-drop.sql 17 Jun 2009 08:00:01 -0000 1.2
@@ -5,6 +5,12 @@
delete from acs_objects where object_type = 'imsld_run';
+select acs_attribute__drop_attribute('imsld_run', 'imsld_id');
+
+select acs_attribute__drop_attribute('imsld_run', 'status');
+
+delete from acs_object_type_tables where object_type = 'imsld_run';
+
select acs_object_type__drop_type('imsld_run','f');
delete from acs_rels where rel_type = 'imsld_run_users_group_rel';
Index: openacs-4/packages/imsld/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/apm-callback-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/imsld/tcl/apm-callback-procs.tcl 18 Dec 2008 19:12:12 -0000 1.11
+++ openacs-4/packages/imsld/tcl/apm-callback-procs.tcl 17 Jun 2009 08:00:01 -0000 1.12
@@ -26,6 +26,9 @@
# create default relationships with non IMS-LD objects
imsld::install::init_ext_rels
+ #create the GSI model
+ imsld::gsi::install::do_install
+
return 1
}
@@ -51,7 +54,9 @@
} {
Proc calls and tasks needed to be donde before the uninstallation of the imsld package.
} {
-
+ #clean the GSI model
+ imsld::gsi::uninstall::do_uninstall
+
# clean rels
imsld::uninstall::delete_rels
imsld::uninstall::delete_ext_rels
@@ -95,6 +100,9 @@
-attribute_name resource_handler -datatype string \
-pretty_name "#imsld.Resource_Handler#" -column_spec "varchar(100)"
}
+ 1.7d 1.8d {
+ imsld::gsi::install::do_install
+ }
}
}
Index: openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl 17 Apr 2008 17:18:16 -0000 1.25
+++ openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl 17 Jun 2009 08:00:01 -0000 1.26
@@ -180,12 +180,20 @@
ad_proc -public imsld::condition::eval_change_property_value {
-change_property_value_xml:required
-run_id:required
+ -user_id
} {
Executes the expression of the change-property-value and sets the result to the associated property.
} {
dom parse $change_property_value_xml document
$document documentElement change_property_value_root
- imsld::statement::execute -run_id $run_id -statement [$change_property_value_root childNodes]
+ ns_log Notice "[info vars]"
+ if {![info exists user_id]} {
+ ns_log Notice "eval_change_property_value without user_id"
+ imsld::statement::execute -run_id $run_id -statement [$change_property_value_root childNodes]
+ } {
+ ns_log Notice "eval_change_property_value with user_id: $user_id"
+ imsld::statement::execute -run_id $run_id -statement [$change_property_value_root childNodes] -user_id $user_id
+ }
}
ad_proc -public imsld::condition::eval_when_prop_value_is_set {
@@ -637,6 +645,7 @@
if {![info exist user_id]} {
set user_id [ad_conn user_id]
}
+ ns_log Notice "statement::execute with user_id: $user_id"
foreach executeNode $statement {
switch -- [$executeNode localName] {
@@ -751,7 +760,13 @@
{property-ref} {
set propertyValue [imsld::runtime::property::property_value_get -run_id $run_id -user_id $user_id -identifier [$propertyvalueChildNode getAttribute {ref}]]
}
-
+ {external-value} {
+ #gsi-hook for external-value type.
+ #The value will be extracted from the proper service
+ set propertyValue [imsld::gsi::get_external_value -run_id $run_id \
+ -user_id $user_id \
+ -node $propertyvalueChildNode]
+ }
}
}
{TEXT_NODE} {
Index: openacs-4/packages/imsld/tcl/imsld-export-files-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-export-files-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/tcl/imsld-export-files-procs.tcl 18 Feb 2009 11:10:46 -0000 1.1
+++ openacs-4/packages/imsld/tcl/imsld-export-files-procs.tcl 17 Jun 2009 08:00:01 -0000 1.2
@@ -1,3 +1,5 @@
+package require http
+
namespace eval imsld::export::files {}
###############################################################################
@@ -20,8 +22,6 @@
file mkdir $path/$inside_path/
}
-
-
if {[fs_file_p [expr $imsld_file_id-1]] == 1} {
set data [fs__datasource $imsld_file_id]
set url [lindex $data [expr [lsearch $data content]+1]]
@@ -31,3 +31,484 @@
}
}
}
+
+
+###############################################################################
+# Call this function to change references in html labels
+###############################################################################
+ad_proc -public imsld::export::files::modify_links {
+ -manifest_id:required
+ -xo_page_id:required
+ -path:required
+} {
+ This proc is called to change references in html labels for exporting the UoL
+} {
+ #Get page name
+ db_1row get_page_name {select title from acs_objects where object_id=:xo_page_id}
+ set page_title [string map {"%2f" "/"} $title]
+ set page_name [string range $page_title [expr [string last "/" $page_title]+1] end]
+##############################################
+ #Change : for _ in case language is specified in name
+ regsub -all {:} $page_name {_} page_name
+ if {[string first "." $page_name] == -1} {
+ set page_name ${page_name}.html
+ }
+##############################################
+
+ #Get Xowiki page
+ set file_data "[imsld::xowiki::page_content -item_id $xo_page_id]"
+
+ #Get root path to files stored in xowiki
+ #Get xowiki package url
+ db_1row get_xowiki_package_id {select package_id, title from acs_objects where object_id=:xo_page_id}
+ set xowiki_package_url [apm_package_url_from_id $package_id]
+
+ #Parse Xowiki page
+ set data_tree [dom parse -html $file_data]
+ set root [$data_tree documentElement]
+
+
+ #Call proc that changes href attribute in a labels
+ imsld::export::files::modify_a -root $root -xowiki_package_url $xowiki_package_url
+ imsld::export::files::modify_frame -root $root -xowiki_package_url $xowiki_package_url
+ imsld::export::files::modify_css -root $root -xowiki_package_url $xowiki_package_url
+ set resource_files_list [imsld::export::files::modify_img -root $root -xowiki_package_url $xowiki_package_url -xowiki_package_id $package_id -path $path]
+
+ #Once we have changed the references of the file, then we copy the file
+ #Write page file
+ set new_file [open "${path}/$page_name" w]
+ #Delete unnecessary code from page
+ set data [$root asHTML]
+ set pos [string last "content-chunk-footer" $data]
+ if {$pos > 0} {set data [string range $data 0 [expr $pos-13]]}
+ if {[string first "
${data}
+ title="#imsld.completed#" >
- 
- 
+ 
+ 
+ 
+