From a517b38a8ff6e6c7d0c4ea289bf7f640c4d7aab1 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 27 Jul 2007 16:44:13 +0000 Subject: web commit by arpitjain11 --- .../Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn | 80 +++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn index b2f67ebc0..37660a7b8 100644 --- a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn +++ b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn @@ -2,45 +2,45 @@ This patch adds function bestdir() which returns best directory from the directo ------- -Index: IkiWiki.pm -=================================================================== ---- IkiWiki.pm (revision 9) -+++ IkiWiki.pm (working copy) -@@ -391,6 +391,35 @@ - return ""; - } #}}} - -+sub bestdir ($$) { #{{{ -+ my $page=shift; -+ my $link=shift; -+ my $cwd=$page; -+ -+ if ($link=~s/^\/+//) { -+ $cwd=""; -+ } -+ -+ do { -+ my $l=$cwd; -+ $l.="/" if length $l; -+ $l.=$link; -+ if (-d "$config{srcdir}/$l") { -+ return $l; -+ } -+ } while $cwd=~s!/?[^/]+$!!; -+ -+ if (length $config{userdir}) { -+ my $l = "$config{userdir}/".lc($link); -+ -+ if (-d $l) { -+ return $l; -+ } -+ } -+ -+ return ""; -+} #}}} -+ - sub isinlinableimage ($) { #{{{ - my $file=shift; - + Index: IkiWiki.pm + =================================================================== + --- IkiWiki.pm (revision 9) + +++ IkiWiki.pm (working copy) + @@ -391,6 +391,35 @@ + return ""; + } #}}} + + +sub bestdir ($$) { #{{{ + + my $page=shift; + + my $link=shift; + + my $cwd=$page; + + + + if ($link=~s/^\/+//) { + + $cwd=""; + + } + + + + do { + + my $l=$cwd; + + $l.="/" if length $l; + + $l.=$link; + + if (-d "$config{srcdir}/$l") { + + return $l; + + } + + } while $cwd=~s!/?[^/]+$!!; + + + + if (length $config{userdir}) { + + my $l = "$config{userdir}/".lc($link); + + + + if (-d $l) { + + return $l; + + } + + } + + + + return ""; + +} #}}} + + + sub isinlinableimage ($) { #{{{ + my $file=shift; + ---- -[[users/arpitjain]] \ No newline at end of file -- cgit v1.2.3