diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:22:03 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:25:53 +0100 |
| commit | 8e092e0f3acc154f60f296419d1fab4d59f65e53 (patch) | |
| tree | f4cc75bcad883a529fef8924e3edeaa2873064ec /lib/sisu/v0/composite.rb | |
| parent | remote_conn, accepting multiple remote hosts, sysenv also beginning of rearra... (diff) | |
regex matching of images, (and rearrangement of conditionals)
Diffstat (limited to 'lib/sisu/v0/composite.rb')
| -rw-r--r-- | lib/sisu/v0/composite.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v0/composite.rb index 4768522a..ebad049e 100644 --- a/lib/sisu/v0/composite.rb +++ b/lib/sisu/v0/composite.rb @@ -148,8 +148,8 @@ module SiSU_Assemble end def insertion(fni,insert_array) file={ :prepared=>[],:images=>[] } - rgx_image=/([a-zA-Z0-9._-]+?\.(?:png|jpg|gif))/ - #file[:prepared] << "#% Date " << "\n" + rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/ + #rgx_image=/([a-zA-Z0-9._-]+?\.(?:png|jpg|gif))/ file[:prepared] << "\n% |#{fni}|@|^|>>ok\n" @code_flag=false insert_array.each do |i| @@ -202,7 +202,8 @@ module SiSU_Assemble @@imager[image_uri] ||=[] @@imager[image_uri] << file[:images] file[:prepared] - elsif loadfile =~ /\.ss[ti]$/ and FileTest.file?(loadfile) + elsif loadfile =~ /\.ss[ti]$/ \ + and FileTest.file?(loadfile) insert_array=IO.readlines(loadfile,'') file=insertion(loadfile,insert_array) file[:prepared] |