Index: openacs-4/packages/lors/tcl/lors-imscp-blackboard5-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-imscp-blackboard5-procs.tcl,v diff -u -N -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/lors/tcl/lors-imscp-blackboard5-procs.tcl 5 Jan 2005 17:00:37 -0000 1.2.2.1 +++ openacs-4/packages/lors/tcl/lors-imscp-blackboard5-procs.tcl 26 Apr 2005 16:49:12 -0000 1.2.2.2 @@ -165,7 +165,7 @@ @author Ernie Ghiglione (ErnieG@mm.st) } { - set docx [dom parse [read [open $file]]] + set docx [dom parse [::tDOM::xmlReadFile $file]] set usersnode [$docx documentElement] set userlist [list] Index: openacs-4/packages/lors/tcl/lors-imscp-blackboard6-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-imscp-blackboard6-procs.tcl,v diff -u -N -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/lors/tcl/lors-imscp-blackboard6-procs.tcl 5 Jan 2005 17:00:37 -0000 1.2.2.1 +++ openacs-4/packages/lors/tcl/lors-imscp-blackboard6-procs.tcl 26 Apr 2005 16:49:12 -0000 1.2.2.2 @@ -207,12 +207,8 @@ @option file filename @author Ernie Ghiglione (ErnieG@mm.st) } { - - # set utf-8 system encoding - encoding system utf-8 - # open xml file - set doc [dom parse [read [open $file]]] + set doc [dom parse [::tDOM::xmlReadFile $file]] # coursetoc set coursetoc [$doc documentElement] @@ -247,12 +243,8 @@ @option file filename @author Ernie Ghiglione (ErnieG@mm.st) } { - - # set utf-8 system encoding - encoding system utf-8 - # open xml file - set doc [dom parse [read [open $file]]] + set doc [dom parse [::tDOM::xmlReadFile $file]] # content set content [$doc documentElement] @@ -328,10 +320,6 @@ @option filename directory and filename where we are putting the file @author Ernie Ghiglione (ErnieG@mm.st) } { - - # set utf-8 system encoding - encoding system utf-8 - # get directory info set dirname [file dirname $filename] @@ -389,12 +377,8 @@ @option file filename @author Ernie Ghiglione (ErnieG@mm.st) } { - - # set utf-8 system encoding - encoding system utf-8 - # open xml file - set doc [dom parse [read [open $file]]] + set doc [dom parse [::tDOM::xmlReadFile $file]] # content set announcement [$doc documentElement] @@ -552,12 +536,8 @@ @option file filename @author Ernie Ghiglione (ErnieG@mm.st) } { - - # set utf-8 system encoding - encoding system utf-8 - # open xml file - set doc [dom parse [read [open $file]]] + set doc [dom parse [::tDOM::xmlReadFile $file]] # content set forum [$doc documentElement] @@ -594,11 +574,8 @@ @option file filename @author Ernie Ghiglione (ErnieG@mm.st) } { - # set utf-8 system encoding - encoding system utf-8 - # open manifest file with tDOM - set doc [dom parse [read [open $tmp_dir/$file]]] + set doc [dom parse [::tDOM::xmlReadFile $tmp_dir/$file]] # gets the manifest tree set manifest [$doc documentElement] # we add the xml namespace for dotLRN @@ -613,7 +590,7 @@ if {[empty_string_p $metadata]} { set filex res00001.dat - set docx [dom parse [read [open $tmp_dir/$filex]]] + set docx [dom parse [::tDOM::xmlReadFile $tmp_dir/$filex]] # gets BB's course info set course [$docx documentElement] @@ -669,18 +646,8 @@ @option file filename @author Ernie Ghiglione (ErnieG@mm.st) } { - - # set utf-8 system encoding - encoding system utf-8 - - # search for manifest file - set file $file - - # set utf-8 system encoding - encoding system utf-8 - # open xml file - set doc [dom parse [read [open $tmp_dir/$file]]] + set doc [dom parse [::tDOM::xmlReadFile $tmp_dir/$file]] # gets the manifest tree set manifest [$doc documentElement] @@ -898,12 +865,9 @@ @author Ernie Ghiglione (ErnieG@mm.st) } { ## Opens imsmanifest.xml - - # set utf-8 system encoding - encoding system utf-8 # open manifest file with tDOM - set doc [dom parse [read [open $tmp_dir/$file]]] + set doc [dom parse [::tDOM::xmlReadFile $tmp_dir/$file]] # gets the manifest tree set manifest [$doc documentElement] @@ -1247,4 +1211,4 @@ } -### End Cleanup Functions \ No newline at end of file +### End Cleanup Functions Index: openacs-4/packages/lors/tcl/lors-imscp-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-imscp-procs.tcl,v diff -u -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/lors/tcl/lors-imscp-procs.tcl 5 Jan 2005 17:00:37 -0000 1.4.2.1 +++ openacs-4/packages/lors/tcl/lors-imscp-procs.tcl 26 Apr 2005 16:49:12 -0000 1.4.2.2 @@ -38,9 +38,6 @@ @author Ernie Ghiglione (ErnieG@mm.st) } { - # set utf-8 system encoding - encoding system utf-8 - set items "" set itemx [$tree child all item] @@ -213,9 +210,6 @@ @option creation_ip ip-address of the user that adds the category. [ad_conn peeraddr] used by default. @author Ernie Ghiglione (ErnieG@mm.st) } { - # set utf-8 system encoding - encoding system utf-8 - if {[empty_string_p $user_id]} { set user_id [ad_conn user_id] } @@ -307,9 +301,6 @@ @option creation_ip ip-address of the user that adds the category. [ad_conn peeraddr] used by default. @author Ernie Ghiglione (ErnieG@mm.st) } { - # set utf-8 system encoding - encoding system utf-8 - if {[empty_string_p $user_id]} { set user_id [ad_conn user_id] } @@ -410,9 +401,6 @@ @option creation_ip ip-address of the user that adds the category. [ad_conn peeraddr] used by default. @author Ernie Ghiglione (ErnieG@mm.st) } { - # set utf-8 system encoding - encoding system utf-8 - if {[empty_string_p $user_id]} { set user_id [ad_conn user_id] } @@ -538,9 +526,6 @@ @author Ernie Ghiglione (ErnieG@mm.st) } { - # set utf-8 system encoding - encoding system utf-8 - set retlist "" foreach item $itemlist { @@ -627,9 +612,6 @@ @option creation_ip ip-address of the user that adds the category. [ad_conn peeraddr] used by default. @author Ernie Ghiglione (ErnieG@mm.st) } { - # set utf-8 system encoding - encoding system utf-8 - if {[empty_string_p $user_id]} { set user_id [ad_conn user_id] } Index: openacs-4/packages/lors/tcl/lors-imsmd-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lors/tcl/lors-imsmd-procs.tcl,v diff -u -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/lors/tcl/lors-imsmd-procs.tcl 5 Jan 2005 17:00:37 -0000 1.4.2.1 +++ openacs-4/packages/lors/tcl/lors-imsmd-procs.tcl 26 Apr 2005 16:49:12 -0000 1.4.2.2 @@ -140,7 +140,8 @@ set prefix [[$tree child all imsmd:record] prefix] set lom [$tree child all $var_lom] } elseif { ![empty_string_p [$tree child all adlcp:location]] } { - set lom [[dom parse [read [open $dir/[[$tree child all adlcp:location] text]]]] documentElement] + dom parse [::tDOM::xmlReadFile $dir/[[$tree child all adlcp:location] text]] doc + set lom [$doc documentElement] set prefix [$lom prefix] } else { set lom 0 Index: openacs-4/packages/lorsm/www/course-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-add-2.tcl,v diff -u -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/lorsm/www/course-add-2.tcl 5 Jan 2005 17:01:51 -0000 1.4.2.1 +++ openacs-4/packages/lorsm/www/course-add-2.tcl 26 Apr 2005 16:49:12 -0000 1.4.2.2 @@ -173,7 +173,7 @@ ## Opens imsmanifest.xml # open manifest file with tDOM - set doc [dom parse [read [open $manifest]]] + dom parse [::tDOM::xmlReadFile $manifest] doc # gets the manifest tree set manifest [$doc documentElement] Index: openacs-4/packages/lorsm/www/course-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/Attic/course-add-3.tcl,v diff -u -N -r1.6.2.2 -r1.6.2.3 --- openacs-4/packages/lorsm/www/course-add-3.tcl 11 Jan 2005 18:31:33 -0000 1.6.2.2 +++ openacs-4/packages/lorsm/www/course-add-3.tcl 26 Apr 2005 16:49:12 -0000 1.6.2.3 @@ -200,7 +200,7 @@ ## Opens imsmanifest.xml # open manifest file with tDOM - set doc [dom parse [read [open $tmp_dir/imsmanifest.xml]]] + dom parse [::tDOM::xmlReadFile $tmp_dir/imsmanifest.xml] doc # gets the manifest tree set manifest [$doc documentElement] @@ -587,4 +587,4 @@ ad_progress_bar_end -url [apm_package_url_from_id [ad_conn package_id]] -} \ No newline at end of file +}