[TWiki-Dev] CVS: twiki/bin attach,1.4,1.5 upload,1.8,1.9

[Peter T. <pet...@us...>]

Update of /cvsroot/TWiki/twiki/bin
In directory slayer.i.sourceforge.net:/tmp/cvs-serv31893

Modified Files:
	attach upload 
Log Message:
Codev.AttachmentsWithSpacedWikiFileNames

Index: attach
===================================================================
RCS file: /cvsroot/TWiki/twiki/bin/attach,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** attach	2000/11/17 08:00:37	1.4
--- attach	2000/12/05 04:07:40	1.5
***************
*** 41,44 ****
--- 41,45 ----
              $filePath =~ s/<TwkData value="(.*)">//go;
              if( $1 ) { $filePath = $1; } else { $filePath = ""; }
+             $filePath =~ s/\%NOP\%//goi;   # delete placeholder that prevents WikiLinks
              ( $before, $fileSize,    $after ) = split( /<(?:\/)*TwkFileSize>/, $set );
              if( ! $fileSize ) { $fileSize = "0"; }

Index: upload
===================================================================
RCS file: /cvsroot/TWiki/twiki/bin/upload,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** upload	2000/11/17 08:00:37	1.8
--- upload	2000/12/05 04:07:40	1.9
***************
*** 62,65 ****
--- 62,68 ----
      my $fileIcon = filenameToIcon( $fileName );
  
+     # prevent links for $filePath, i.e. "\some\File with WikiName.txt"
+     $filePath =~ s/([\(\-\*\s]+)([A-Z]+)/$1\%NOP\%$2/go;
+ 
      my $result = $atTableBefore;
      my $found = 0;