added --getctime

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index f8b43d7204950ff9c7bcfcbbe5bfde28e7b4f47d..ab9f3fc2f68d862284787258c699ebc33bdcd410 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -21,7 +21,7 @@ sub getconfig () { #{{{
                        wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
                        wiki_link_regexp => qr/\[\[([^\s\]]+)\]\]/,
                        wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]+)\]\]/,
-                       wiki_file_regexp => qr/(^[-A-Za-z0-9_.\&;:\/+]+$)/,
+                       wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,
                        verbose => 0,
                        wikiname => "wiki",
                        default_pageext => ".mdwn",
@@ -32,8 +32,9 @@ sub getconfig () { #{{{
                        historyurl => '',
                        diffurl => '',
                        anonok => 0,
-                       rss => 1,
+                       rss => 0,
                        rebuild => 0,
+                       getctime => 0,
                        wrapper => undef,
                        wrappermode => undef,
                        srcdir => undef,
@@ -49,6 +50,7 @@ sub getconfig () { #{{{
                        "wikiname=s" => \$config{wikiname},
                        "verbose|v!" => \$config{verbose},
                        "rebuild!" => \$config{rebuild},
+                       "getctime" => \$config{getctime},
                        "wrappermode=i" => \$config{wrappermode},
                        "svn!" => \$config{svn},
                        "anonok!" => \$config{anonok},
@@ -262,7 +264,7 @@ sub htmllink ($$;$$) { #{{{
                $bestlink="$page/".lc($link);
        }
 
-       my $linktext=pagetitle($link);
+       my $linktext=pagetitle(basename($link));
        
        return $linktext if length $bestlink && $page eq $bestlink;
        
@@ -486,6 +488,7 @@ sub main () { #{{{
                loadindex();
                require IkiWiki::Render;
                rcs_update();
+               rcs_getctime() if $config{getctime};
                refresh();
                saveindex();
        }