From 45acf3b71d8f04ffb608ae2c9ba9e0da6030e66d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 16 Oct 2007 01:14:39 +0100
Subject: image list, extracting conditions and regex visited

---
 lib/sisu/v0/sisupod_make.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib/sisu/v0/sisupod_make.rb')

diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb
index 277358c4..af60cf4e 100644
--- a/lib/sisu/v0/sisupod_make.rb
+++ b/lib/sisu/v0/sisupod_make.rb
@@ -167,9 +167,12 @@ module SiSU_Doc
       file_array=IO.readlines(use_file,'')
       skin,images,doc_import=[],[],[]
       file_array.each do |f|                                                  #% work area
-        if f !~/^%\s/
+        if f !~/^%+\s/
           skin << f.scan(@rgx_skin).uniq.flatten if f =~@rgx_skin
-          images << f.scan(@rgx_image).uniq if f =~@rgx_image
+          if f !~/^%+\s/ \
+          and f =~@rgx_image
+            images << f.scan(@rgx_image).uniq
+          end
         elsif f =~/^%\s/ \
         and @opt.fns =~/\.ssm\.sst$/
           doc_import << f.scan(@rgx_doc_import).uniq if f =~@rgx_doc_import
@@ -208,7 +211,10 @@ module SiSU_Doc
       #2. need images used by skin, scan skin??
       if images \
       and images.length > 1
-        images.flatten!.uniq!
+        images.flatten!
+        images.uniq!
+        images.delete_if {|x| x =~/http:\/\// }
+        #images.sort!
         image_path_pwd='_sisu/image'
         path_pod_conf="#{@env.path.processing}/sisupod/_sisu"
         images_path_pod="#{path_pod_conf}/image"
-- 
cgit v1.2.3