Return-Path: Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: (qmail 96383 invoked from network); 26 Jan 2011 16:57:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Jan 2011 16:57:31 -0000 Received: (qmail 44301 invoked by uid 500); 26 Jan 2011 16:57:31 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 44266 invoked by uid 500); 26 Jan 2011 16:57:30 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 44258 invoked by uid 99); 26 Jan 2011 16:57:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jan 2011 16:57:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jan 2011 16:57:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EFA0F23888CE; Wed, 26 Jan 2011 16:57:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1063794 - in /zookeeper/site/trunk/lib: path.pm view.pm Date: Wed, 26 Jan 2011 16:57:06 -0000 To: commits@zookeeper.apache.org From: breed@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110126165706.EFA0F23888CE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: breed Date: Wed Jan 26 16:57:06 2011 New Revision: 1063794 URL: http://svn.apache.org/viewvc?rev=1063794&view=rev Log: fixed to compile textile instead of markdown Modified: zookeeper/site/trunk/lib/path.pm zookeeper/site/trunk/lib/view.pm Modified: zookeeper/site/trunk/lib/path.pm URL: http://svn.apache.org/viewvc/zookeeper/site/trunk/lib/path.pm?rev=1063794&r1=1063793&r2=1063794&view=diff ============================================================================== --- zookeeper/site/trunk/lib/path.pm (original) +++ zookeeper/site/trunk/lib/path.pm Wed Jan 26 16:57:06 2011 @@ -5,14 +5,14 @@ use ASF::Value; our @patterns = ( - [qr!\.mdtext$!, single_narrative => { template => "single_narrative.html" }], + [qr!\.textile$!, single_narrative => { template => "single_narrative.html" }], ); # for specifying interdependencies between files #our %dependencies = ( -# "/dev/sitemap.html" => [ grep s!^content!!, glob "content/dev/*.mdtext" ], +# "/dev/sitemap.html" => [ grep s!^content!!, glob "content/dev/*.textile" ], #); 1; Modified: zookeeper/site/trunk/lib/view.pm URL: http://svn.apache.org/viewvc/zookeeper/site/trunk/lib/view.pm?rev=1063794&r1=1063793&r2=1063794&view=diff ============================================================================== --- zookeeper/site/trunk/lib/view.pm (original) +++ zookeeper/site/trunk/lib/view.pm Wed Jan 26 16:57:06 2011 @@ -28,7 +28,7 @@ sub single_narrative { my %args = @_; my $file = "content$args{path}"; my $template = $args{template}; - $args{path} =~ s/\.mdtext$/\.html/; + $args{path} =~ s/\.textile$/\.html/; $args{breadcrumbs} = breadcrumbs($args{path}); read_text_file $file, \%args; @@ -36,8 +36,8 @@ sub single_narrative { my $page_path = $file; $page_path =~ s/\.[^.]+$/.page/; if (-d $page_path) { - for my $f (grep -f, glob "$page_path/*.mdtext") { - $f =~ m!/([^/]+)\.mdtext$! or die "Bad filename: $f\n"; + for my $f (grep -f, glob "$page_path/*.textile") { + $f =~ m!/([^/]+)\.textile$! or die "Bad filename: $f\n"; $args{$1} = {}; read_text_file $f, $args{$1}; } @@ -56,7 +56,7 @@ sub sitemap { opendir my $dh, $dir or die "Can't opendir $dir: $!\n"; my %data; for (map "$dir/$_", grep $_ ne "." && $_ ne ".." && $_ ne ".svn", readdir $dh) { - if (-f and /\.mdtext$/) { + if (-f and /\.textile$/) { my $file = $_; $file =~ s/^content//; no warnings 'once'; @@ -65,7 +65,7 @@ sub sitemap { next unless $file =~ $re; my $s = view->can($method) or die "Can't locate method: $method\n"; my ($content, $ext, $vars) = $s->(path => $file, %$args); - $file =~ s/\.mdtext$/.$ext/; + $file =~ s/\.textile$/.$ext/; $data{$file} = $vars; last; }