Index: openacs-4/packages/scorm-player/embed/player.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/scorm-player/embed/player.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/scorm-player/embed/player.adp	13 May 2010 17:11:27 -0000	1.2
+++ openacs-4/packages/scorm-player/embed/player.adp	14 May 2010 16:57:54 -0000	1.3
@@ -60,9 +60,9 @@
       
   </table>
 
-  <script type="text/javascript" src="@rte_url@"></script>
-  <script type="text/javascript" src="/resources/scorm-player/scripts/openacs/rte-changes.js">
-  </script>
+  <!--script type="text/javascript" src="@rte_url@"></script-->
+  <!--script type="text/javascript" src="/resources/scorm-player/scripts/openacs/rte-changes.js">
+  </script-->
 
   <script type="text/javascript">
     //<![CDATA[
Index: openacs-4/packages/scorm-player/embed/player.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/scorm-player/embed/player.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/scorm-player/embed/player.tcl	13 May 2010 01:17:53 -0000	1.1
+++ openacs-4/packages/scorm-player/embed/player.tcl	14 May 2010 16:57:54 -0000	1.2
@@ -34,13 +34,10 @@
 template::head::add_script -type text/javascript -src $treeview_url -order 3
 template::head::add_script -type text/javascript \
     -src /resources/scorm-player/scripts/ilias/rteconfig.js -order 4
+template::head::add_script -type text/javascript -src $rte_url -order 5
+template::head::add_script -type text/javascript \
+    -src /resources/scorm-player/scripts/openacs/rte-changes.js -order 6
 
-# Unfortunately the RTE begins by inspecting the document, which fails if it's loaded
-# in the HEAD section of the document, even with defer set.  That code should be
-# put in the init function so it's not executed until it's called from the body.  This
-# also prevents me from putting my overwriting functions in rte-changes.js into the
-# HEAD.  At least Yahoo does it right ...
-
 set body(class) loadingState
 set body(id) scormplayer
 set scorm_init_args [scorm_player::get_scorm_init_args -id $id]
Index: openacs-4/packages/scorm-player/embed/sco/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/scorm-player/embed/sco/index.vuh,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/scorm-player/embed/sco/index.vuh	13 May 2010 01:17:53 -0000	1.1
+++ openacs-4/packages/scorm-player/embed/sco/index.vuh	14 May 2010 16:57:54 -0000	1.2
@@ -16,8 +16,16 @@
 
 db_1row get_folder_id {}
 
-cr_write_content -item_id [content::item::get_id \
-                              -item_path $resource_url \
-                              -root_folder_id $folder_id]
+set item_id [content::item::get_id \
+                -item_path $resource_url \
+                -root_folder_id $folder_id]
 
+# Give a nice error if the item doesn't exist, return its content if it does.
+
+if { $item_id eq "" } {
+    ns_return 200 text/html [scorm_player::rte_api::specialPage_GET -id $id -page _NOTHING_]
+} else {
+    cr_write_content -item_id $item_id
+}
+
 ad_script_abort