svn commit: r1340762 - in /sling/site/tools/conversion: convert_cwiki_markup.pl export_site.pl

[fmeschbe]

Author: fmeschbe
Date: Sun May 20 16:18:57 2012
New Revision: 1340762

URL: http://svn.apache.org/viewvc?rev=1340762&view=rev
Log:
SLING-2002 URL cleanup: Replace non-word characters with dash, replace 
consecutive dashes to a single on, remove trailing dash; both when creating the 
file on Confluence export and when converting the Confluence links to Markdown 
links.

Modified:
    sling/site/tools/conversion/convert_cwiki_markup.pl
    sling/site/tools/conversion/export_site.pl

Modified: sling/site/tools/conversion/convert_cwiki_markup.pl
URL: 
http://svn.apache.org/viewvc/sling/site/tools/conversion/convert_cwiki_markup.pl?rev=1340762&r1=1340761&r2=1340762&view=diff
==============================================================================
--- sling/site/tools/conversion/convert_cwiki_markup.pl (original)
+++ sling/site/tools/conversion/convert_cwiki_markup.pl Sun May 20 16:18:57 2012
@@ -28,6 +28,10 @@ sub convertURL {
       return $url;
    }
    $url =~ s/\s/-/g;
+   $url =~ s/\W/-/g;
+   $url =~ s/--/-/g;
+   $url =~ s/--/-/g;
+   $url =~ s/-$//g;
    $url = lc($url).".html";
    return $url;
 }

Modified: sling/site/tools/conversion/export_site.pl
URL: 
http://svn.apache.org/viewvc/sling/site/tools/conversion/export_site.pl?rev=1340762&r1=1340761&r2=1340762&view=diff
==============================================================================
--- sling/site/tools/conversion/export_site.pl (original)
+++ sling/site/tools/conversion/export_site.pl Sun May 20 16:18:57 2012
@@ -55,7 +55,10 @@ foreach my $page (@pages) {
 
    my $page = $title;
    $page =~ s/\s/-/g;
-   # $page =~ s/\W/_/g;
+   $page =~ s/\W/-/g;
+   $page =~ s/--/-/g;
+   $page =~ s/--/-/g;
+   $page =~ s/-$//g;
 
    my $cwikiFile = "content/".lc($page).".cwiki";
    open(CWIKI, ">$cwikiFile");
@@ -65,7 +68,7 @@ foreach my $page (@pages) {
    my $mdFile = $cwikiFile;
    $mdFile =~ s/\.cwiki/.mdtext/;
    
-   print "  Generating markdown file\n";
+   print "  Generating markdown file $mdFile\n";
    `$binPath/convert_cwiki_markup.pl "$title" "$cwikiFile" "$mdFile"`;
 
    print "  Finished processing $title\n\n";