From 19eb0986cbcc2d2fab0d338a42339be357ba5eb0 Mon Sep 17 00:00:00 2001 From: dakkar Date: Tue, 6 Jan 2009 12:08:52 +0000 Subject: ora genera davvero i feed git-svn-id: svn://luxion/repos/WebCoso/trunk@398 fcb26f47-9200-0410-b104-b98ab5b095f3 --- Makefile.PL | 1 + lib/WebCoso/Common.pm | 6 ++---- lib/WebCoso/Maker.pm | 4 ++-- t/test-site/src/feed.it.tt | 15 ++++++++++++++- t/test-site/src/feed.tt | 14 -------------- 5 files changed, 19 insertions(+), 21 deletions(-) mode change 120000 => 100644 t/test-site/src/feed.it.tt delete mode 100644 t/test-site/src/feed.tt diff --git a/Makefile.PL b/Makefile.PL index c22d054..5124f7b 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -20,6 +20,7 @@ WriteMakefile( 'Path::Class' => '0', 'Slay::Maker' => '0', 'Template' => '0', + 'Template::Plugin::DateTime::Format' => '0', 'Test::Exception' => '0', 'Test::More' => '0', 'Text::Restructured' => '0', 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; }, diff --git a/t/test-site/src/feed.it.tt b/t/test-site/src/feed.it.tt deleted file mode 120000 index 3902f44..0000000 --- a/t/test-site/src/feed.it.tt +++ /dev/null @@ -1 +0,0 @@ -feed.tt \ No newline at end of file diff --git a/t/test-site/src/feed.it.tt b/t/test-site/src/feed.it.tt new file mode 100644 index 0000000..398eaf3 --- /dev/null +++ b/t/test-site/src/feed.it.tt @@ -0,0 +1,14 @@ +[% USE df = DateTime::Format('DateTime::Format::Strptime', + { pattern => '%F %T', + locale => 'en_US', + time_zone => 'GMT' }) -%] + + +[% FOR c IN changed -%] + + [% IF c.value.creation %][% df.format(c.value.creation) %][% END %] + [% IF c.value.last_change %][% df.format(c.value.last_change) %][% END %] + [% dstUriFor(c.key) %] + +[% END -%] + diff --git a/t/test-site/src/feed.tt b/t/test-site/src/feed.tt deleted file mode 100644 index 398eaf3..0000000 --- a/t/test-site/src/feed.tt +++ /dev/null @@ -1,14 +0,0 @@ -[% USE df = DateTime::Format('DateTime::Format::Strptime', - { pattern => '%F %T', - locale => 'en_US', - time_zone => 'GMT' }) -%] - - -[% FOR c IN changed -%] - - [% IF c.value.creation %][% df.format(c.value.creation) %][% END %] - [% IF c.value.last_change %][% df.format(c.value.last_change) %][% END %] - [% dstUriFor(c.key) %] - -[% END -%] - -- cgit v1.2.3