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 -N -r1.25 -r1.26
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	10 May 2007 10:07:26 -0000	1.25
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	10 Jul 2007 19:00:06 -0000	1.26
@@ -212,15 +212,16 @@
     #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 id [::xowiki::Portlet make_id]
     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>
+    return "<div id='$id'>$label</div>
     <script type='text/javascript'>
     var so = new SWFObject('$href', '$name', '$width', '$height', '$version', '$bgcolor');
-    $addParams so.write('[self]');
+    $addParams so.write('$id');
     </script>
     "
   }
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 -N -r1.64 -r1.65
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	29 Jun 2007 20:10:02 -0000	1.64
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	10 Jul 2007 19:00:06 -0000	1.65
@@ -414,13 +414,19 @@
         my log "--try $name -> $item_id // ::Generic::CrItem lookup -name $name -parent_id $folder_id"
         if {$item_id == 0 && $lang eq "file" && [regexp {(.+)/download.} $local_name _ base_name]} {
 	  set item_id [::Generic::CrItem lookup -name file:$base_name -parent_id $folder_id]
+	  if {$item_id == 0} {
+            set item_id [::Generic::CrItem lookup -name swf:$base_name -parent_id $folder_id]
+          }
 	  if {$item_id != 0} {
 	    upvar $method_var method
 	    set method download
 	  }
 	}
         if {$item_id == 0 && $lang eq "file"} {
-          set item_id [::Generic::CrItem lookup -name image:$local_name -parent_id $folder_id]
+          set item_id [::Generic::CrItem lookup -name swf:$local_name -parent_id $folder_id]
+          if {$item_id == 0} {
+            set item_id [::Generic::CrItem lookup -name image:$local_name -parent_id $folder_id]
+          }
           my log "--try image:$local_name -> $item_id"
         }
         if {$item_id == 0} {
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -N -r1.67 -r1.68
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	6 Jul 2007 13:35:12 -0000	1.67
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	10 Jul 2007 19:00:06 -0000	1.68
@@ -59,6 +59,10 @@
     return [string map [list : _ # _] [self]]
   }
 
+  ::xowiki::Portlet proc make_id {} {
+    return [string map [list : _ # _] [self]]
+  }
+
   ::xowiki::Portlet instproc screen_name {user_id} {
     acs_user::get -user_id $user_id -array user
     return [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]