[cvs-annodex] commit (/annodex): AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js

[andre]

Update of /annodex (new revision 766)

Modified files:
   AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js

Log Message:
AnnodexFirefoxExtension:
 * Workaround for mod_annodex sending back a <stream> tag in the requested CMML when it shouldn't (see ticket:41 for details)

Modified: AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js
===================================================================
--- AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js	2005-01-28 16:01:07 UTC (rev 765)
+++ AnnodexFirefoxExtension/trunk/chrome/afeview/content/afeview.js	2005-01-28 16:15:55 UTC (rev 766)
@@ -484,8 +484,15 @@
       var descriptionNode = cmmlClipNode2RdfNode(child, clips, rdfService);
       clipsSequence.AppendElement(descriptionNode);
     }
-    else if (child.tagName == "stream")
+    else if (child.tagName == "stream" && isCMML(SourceURL))
     {
+      // n.b. We need the isCMML(SourceURL) check above, because if we request
+      // a .anx resource with the "Accept: text/x-cmml" HTTP header set,
+      // mod_annodex will serve out the original CMML file -- with the stream
+      // and import tags included!  This really should be fixed in mod_annodex,
+      // but it's prudent to ignore the stream tag if we ever receive it in the
+      // Annodex stream anyway, since it's really not meant to be there.
+
       // Look for an <import> tag
       for (j = 0; j < child.childNodes.length; j++)
       {


-- 
andre