Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	31 Jan 2007 12:29:57 -0000	1.21
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	4 Mar 2007 21:32:40 -0000	1.22
@@ -166,7 +166,7 @@
   ::xowiki::Link::file instproc resolve {} {
     set item_id [next]
     # my log "-- file, lookup of [my name] returned $item_id"
-    if {$item_id eq 0 && [regsub {^file:} [my name] image: name]} {
+    if {$item_id == 0 && [regsub {^file:} [my name] image: name]} {
       set item_id [::Generic::CrItem lookup -name $name -parent_id [my folder_id]]
     }
     return $item_id
@@ -176,6 +176,39 @@
         right center no-repeat; padding-right:9px'>$label</a>"
   }
 
+  Class create ::xowiki::Link::swf -superclass ::xowiki::Link::file -parameter {
+    width height bgcolor version
+    quality wmode align salign play loop menu scale
+  }
+  ::xowiki::Link::swf instproc resolve {} {
+    set item_id [next]
+    my log "--file, lookup of [my name] returned $item_id"
+    if {$item_id == 0 && [regsub {^swf:} [my name] file: name]} {
+      set item_id [::Generic::CrItem lookup -name $name -parent_id [my folder_id]]
+      my log "--file, 2nd lookup of $name returned $item_id"
+    }
+    return $item_id
+  }
+  ::xowiki::Link::swf instproc render_found {href label} {
+    ::xowiki::Page requireJS /resources/xowiki/swfobject.js
+    my instvar package_id name
+    #set link [$package_id pretty_link -absolute true  -siteurl http://localhost:8003 $name]/download.swf
+    foreach {width height bgcolor version} {320 240 #999999 7} break
+    foreach a {width height bgcolor version} {if {[my exists $a]} {set $a [my set $a]}}
+    set addParams ""
+    foreach a {quality wmode align salign play loop menu scale} {
+      if {[my exists $a]} {append addParams "so.addParam('$a', '[my set $a]');\n"}
+    }
+    
+    return "<div id='[self]'>$label</div>
+    <script type='text/javascript'>
+    var so = new SWFObject('$href', '$name', '$width', '$height', '$version', '$bgcolor');
+    $addParams so.write('[self]');
+    </script>
+    "
+  }
+
+
   #
   # glossary links
   #
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	1 Mar 2007 10:25:10 -0000	1.40
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	4 Mar 2007 21:32:40 -0000	1.41
@@ -125,8 +125,10 @@
     set default_lang [my default_language]
     if {$lang eq ""} {
       if {![regexp {^(..):(.*)$} $name _ lang name]} {
-        if {![regexp {^(file|image):(.*)$} $name _ lang name]} {
+        if {![regexp {^(file|image|swf):(.*)$} $name _ lang name]} {
           set lang $default_lang
+        } else {
+          set lang file
         }
       }
     }
Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	27 Feb 2007 08:33:12 -0000	1.4
+++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	4 Mar 2007 21:32:40 -0000	1.5
@@ -116,7 +116,7 @@
     if {$description eq ""} {set description [::$folder_id set description]}
     my set link $siteurl[site_node::get_url_from_object_id -object_id $package_id]
 
-    my log "--rss WHERE= [my extra_where_clause]"
+    #my log "--rss WHERE= [my extra_where_clause]"
 
     set content [my head]
     db_foreach get_pages \
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.81 -r1.82
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	4 Mar 2007 17:18:47 -0000	1.81
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	4 Mar 2007 21:32:40 -0000	1.82
@@ -495,7 +495,7 @@
     # do we have a language link (it starts with a ':')
     if {[regexp {^:(..):(.*)$} $link _ lang stripped_name]} {
       set link_type language
-    } elseif {[regexp {^(file|image):(.*)$} $link _ link_type stripped_name]} {
+    } elseif {[regexp {^(file|image|swf):(.*)$} $link _ link_type stripped_name]} {
       set lang ""
       set name $link
     } else {
Index: openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl	30 Dec 2006 01:55:17 -0000	1.16
+++ openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl	4 Mar 2007 21:32:40 -0000	1.17
@@ -21,7 +21,9 @@
   if {[$page set publish_status] eq "production"} {
     # no data source for for pages under construction
     ns_log notice "--sc page under construction, no datasource"
-    return
+    return   [list object_id $revision_id title "" \
+                  content "" keywords "" \
+                  storage_type text mime text/html]
   }
 
   $page absolute_links 1
Index: openacs-4/packages/xowiki/www/resources/swfobject.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/swfobject.js,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/resources/swfobject.js	4 Mar 2007 21:32:40 -0000	1.1
@@ -0,0 +1,8 @@
+/**
+ * SWFObject v1.5: Flash Player detection and embed - http://blog.deconcept.com/swfobject/
+ *
+ * SWFObject is (c) 2007 Geoff Stearns and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+if(typeof deconcept=="undefined"){var deconcept=new Object();}if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){if(!document.getElementById){return;}this.DETECT_KEY=_a?_a:"detectflash";this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);this.params=new Object();this.variables=new Object();this.attributes=new Array();if(_1){this.setAttribute("swf",_1);}if(id){this.setAttribute("id",id);}if(w){this.setAttribute("width",w);}if(h){this.setAttribute("height",h);}if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion();if(!window.opera&&document.all&&this.installedVer.major>7){deconcept.SWFObject.doPrepUnload=true;}if(c){this.addParam("bgcolor",c);}var q=_7?_7:"high";this.addParam("quality",q);this.setAttribute("useExpressInstall",false);this.setAttribute("doExpressInstall",false);var _c=(_8)?_8:window.location;this.setAttribute("xiRedirectUrl",_c);this.setAttribute("redirectUrl","");if(_9){this.setAttribute("redirectUrl",_9);}};deconcept.SWFObject.prototype={useExpressInstall:function(_d){this.xiSWFPath=!_d?"expressinstall.swf":_d;this.setAttribute("useExpressInstall",true);},setAttribute:function(_e,_f){this.attributes[_e]=_f;},getAttribute:function(_10){return this.attributes[_10];},addParam:function(_11,_12){this.params[_11]=_12;},getParams:function(){return this.params;},addVariable:function(_13,_14){this.variables[_13]=_14;},getVariable:function(_15){return this.variables[_15];},getVariables:function(){return this.variables;},getVariablePairs:function(){var _16=new Array();var key;var _18=this.getVariables();for(key in _18){_16[_16.length]=key+"="+_18[key];}return _16;},getSWFHTML:function(){var _19="";if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");this.setAttribute("swf",this.xiSWFPath);}_19="<embed type=\"application/x-shockwave-flash\" src=\""+this.getAttribute("swf")+"\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\"";_19+=" id=\""+this.getAttribute("id")+"\" name=\""+this.getAttribute("id")+"\" ";var _1a=this.getParams();for(var key in _1a){_19+=[key]+"=\""+_1a[key]+"\" ";}var _1c=this.getVariablePairs().join("&");if(_1c.length>0){_19+="flashvars=\""+_1c+"\"";}_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");this.setAttribute("swf",this.xiSWFPath);}_19="<object id=\""+this.getAttribute("id")+"\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\">";_19+="<param name=\"movie\" value=\""+this.getAttribute("swf")+"\" />";var _1d=this.getParams();for(var key in _1d){_19+="<param name=\""+key+"\" value=\""+_1d[key]+"\" />";}var _1f=this.getVariablePairs().join("&");if(_1f.length>0){_19+="<param name=\"flashvars\" value=\""+_1f+"\" />";}_19+="</object>";}return _19;},write:function(_20){if(this.getAttribute("useExpressInstall")){var _21=new deconcept.PlayerVersion([6,0,65]);if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){this.setAttribute("doExpressInstall",true);this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));document.title=document.title.slice(0,47)+" - Flash Player Installation";this.addVariable("MMdoctitle",document.title);}}if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){var n=(typeof _20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML();return true;}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return false;}};deconcept.SWFObjectUtil.getPlayerVersion=function(){var _23=new deconcept.PlayerVersion([0,0,0]);if(navigator.plugins&&navigator.mimeTypes.length){var x=navigator.plugins["Shockwave Flash"];if(x&&x.description){_23=new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}}else{if(navigator.userAgent&&navigator.userAgent.indexOf("Windows CE")>=0){var axo=1;var _26=3;while(axo){try{_26++;axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26);_23=new deconcept.PlayerVersion([_26,0,0]);}catch(e){axo=null;}}}else{try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");_23=new deconcept.PlayerVersion([6,0,21]);axo.AllowScriptAccess="always";}catch(e){if(_23.major==6){return _23;}}try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(e){}}if(axo!=null){_23=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}}}return _23;};deconcept.PlayerVersion=function(_29){this.major=_29[0]!=null?parseInt(_29[0]):0;this.minor=_29[1]!=null?parseInt(_29[1]):0;this.rev=_29[2]!=null?parseInt(_29[2]):0;};deconcept.PlayerVersion.prototype.versionIsValid=function(fv){if(this.major<fv.major){return false;}if(this.major>fv.major){return true;}if(this.minor<fv.minor){return false;}if(this.minor>fv.minor){return true;}if(this.rev<fv.rev){return false;}return true;};deconcept.util={getRequestParameter:function(_2b){var q=document.location.search||document.location.hash;if(_2b==null){return q;}if(q){var _2d=q.substring(1).split("&");for(var i=0;i<_2d.length;i++){if(_2d[i].substring(0,_2d[i].indexOf("="))==_2b){return _2d[i].substring((_2d[i].indexOf("=")+1));}}}return "";}};deconcept.SWFObjectUtil.cleanupSWFs=function(){var _2f=document.getElementsByTagName("OBJECT");for(var i=_2f.length-1;i>=0;i--){_2f[i].style.display="none";for(var x in _2f[i]){if(typeof _2f[i][x]=="function"){_2f[i][x]=function(){};}}}};if(deconcept.SWFObject.doPrepUnload){if(!deconcept.unloadSet){deconcept.SWFObjectUtil.prepUnload=function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs);};window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload);deconcept.unloadSet=true;}}if(!document.getElementById&&document.all){document.getElementById=function(id){return document.all[id];};}var getQueryParamValue=deconcept.util.getRequestParameter;var FlashObject=deconcept.SWFObject;var SWFObject=deconcept.SWFObject;
\ No newline at end of file