diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/WebCoso/Common.pm | 6 | ||||
-rw-r--r-- | lib/WebCoso/Maker.pm | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/WebCoso/Common.pm b/lib/WebCoso/Common.pm index 00f0b6b..30b18fe 100644 --- a/lib/WebCoso/Common.pm +++ b/lib/WebCoso/Common.pm @@ -154,6 +154,7 @@ sub getTags { sub fromTo { my ($base,$opts)=@_; + DEBUG("fromTo: $base,{@{[ %$opts ]}}"); my $iter=File::Next::files( { file_filter=>$opts->{files}, @@ -212,10 +213,7 @@ our %docfiles=( files=>sub{m{^document\.}}, dirs=>sub{!m{^(tags$|_|\.)}}); our %feedfiles=( - files=>sub{m{^feed\.(?:[^.]+\.)*tt$}}, - dirs=>sub{!m{^[_.]}}); -our %feedfilesXML=( - files=>sub{m{^feed\.[^.]+\.xml$}}, + files=>sub{m{^feed\.(?:[^.]+\.)+tt$}}, dirs=>sub{!m{^[_.]}}); 1; diff --git a/lib/WebCoso/Maker.pm b/lib/WebCoso/Maker.pm index 11aa9c4..e46eb29 100644 --- a/lib/WebCoso/Maker.pm +++ b/lib/WebCoso/Maker.pm @@ -233,9 +233,9 @@ my @passes=( }), WebCoso::Common::fromTo("$WebCoso::Common::SRCPATH/", { - %WebCoso::Common::feedfilesXML, + %WebCoso::Common::feedfiles, transform=>sub{ - (my $file=$_[0]) + (my $file=WebCoso::Common::typedAs($_[0],'xml')) =~s{^\Q$WebCoso::Common::SRCPATH\E/}{$WebCoso::Common::DSTPATH/}; return $file; }, |