followup

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e7422cba571337f2db7f70d519fab896b0c9c3e0..3802559a53d6c60569464a17b95109f9eab807a5 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -87,6 +87,7 @@ sub defaultconfig () { #{{{
        numbacklinks => 10,
        account_creation_password => "",
        prefix_directives => 0,
+       hardlink => 0,
 } #}}}
 
 sub checkconfig () { #{{{
@@ -323,12 +324,9 @@ sub readfile ($;$$) { #{{{
        return $ret;
 } #}}}
 
-sub writefile ($$$;$$) { #{{{
-       my $file=shift; # can include subdirs
-       my $destdir=shift; # directory to put file in
-       my $content=shift;
-       my $binary=shift;
-       my $writer=shift;
+sub prep_writefile ($$) {
+       my $file=shift;
+       my $destdir=shift;
        
        my $test=$file;
        while (length $test) {
@@ -337,12 +335,8 @@ sub writefile ($$$;$$) { #{{{
                }
                $test=dirname($test);
        }
-       my $newfile="$destdir/$file.ikiwiki-new";
-       if (-l $newfile) {
-               error("cannot write to a symlink ($newfile)");
-       }
 
-       my $dir=dirname($newfile);
+       my $dir=dirname("$destdir/$file");
        if (! -d $dir) {
                my $d="";
                foreach my $s (split(m!/+!, $dir)) {
@@ -353,6 +347,23 @@ sub writefile ($$$;$$) { #{{{
                }
        }
 
+       return 1;
+}
+
+sub writefile ($$$;$$) { #{{{
+       my $file=shift; # can include subdirs
+       my $destdir=shift; # directory to put file in
+       my $content=shift;
+       my $binary=shift;
+       my $writer=shift;
+       
+       prep_writefile($file, $destdir);
+       
+       my $newfile="$destdir/$file.ikiwiki-new";
+       if (-l $newfile) {
+               error("cannot write to a symlink ($newfile)");
+       }
+       
        my $cleanup = sub { unlink($newfile) };
        open (my $out, '>', $newfile) || error("failed to write $newfile: $!", $cleanup);
        binmode($out) if ($binary);
@@ -610,6 +621,9 @@ sub userlink ($) { #{{{
                return "<a href=\"$user\">$oiduser</a>";
        }
        else {
+               eval q{use CGI 'escapeHTML'};
+               error($@) if $@;
+
                return htmllink("", "", escapeHTML(
                        length $config{userdir} ? $config{userdir}."/".$user : $user
                ), noimageinline => 1);
@@ -899,18 +913,28 @@ sub loadindex () { #{{{
                %pagesources=%pagemtime=%oldlinks=%links=%depends=
                %destsources=%renderedfiles=%pagecase=%pagestate=();
        }
-       open (my $in, "<", "$config{wikistatedir}/index") || return;
+       my $in;
+       if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
+               if (-e "$config{wikistatedir}/index") {
+                       system("ikiwiki-transition", "indexdb", $config{srcdir});
+                       open ($in, "<", "$config{wikistatedir}/indexdb") || return;
+               }
+               else {
+                       return;
+               }
+       }
        my $ret=Storable::fd_retrieve($in);
        if (! defined $ret) {
                return 0;
        }
        my %index=%$ret;
-       foreach my $page (keys %index) {
-               my %d=%{$index{$page}};
+       foreach my $src (keys %index) {
+               my %d=%{$index{$src}};
+               my $page=pagename($src);
                $pagectime{$page}=$d{ctime};
                if (! $config{rebuild}) {
+                       $pagesources{$page}=$src;
                        $pagemtime{$page}=$d{mtime};
-                       $pagesources{$page}=$d{src};
                        $renderedfiles{$page}=$d{dest};
                        if (exists $d{links} && ref $d{links}) {
                                $links{$page}=$d{links};
@@ -946,29 +970,29 @@ sub saveindex () { #{{{
        if (! -d $config{wikistatedir}) {
                mkdir($config{wikistatedir});
        }
-       my $newfile="$config{wikistatedir}/index.new";
+       my $newfile="$config{wikistatedir}/indexdb.new";
        my $cleanup = sub { unlink($newfile) };
        open (my $out, '>', $newfile) || error("cannot write to $newfile: $!", $cleanup);
        my %index;
        foreach my $page (keys %pagemtime) {
                next unless $pagemtime{$page};
+               my $src=$pagesources{$page};
 
-               $index{$page}={
+               $index{$src}={
                        ctime => $pagectime{$page},
                        mtime => $pagemtime{$page},
-                       src => $pagesources{$page},
                        dest => $renderedfiles{$page},
                        links => $links{$page},
                };
 
                if (exists $depends{$page}) {
-                       $index{$page}{depends} = $depends{$page};
+                       $index{$src}{depends} = $depends{$page};
                }
 
                if (exists $pagestate{$page}) {
                        foreach my $id (@hookids) {
                                foreach my $key (keys %{$pagestate{$page}{$id}}) {
-                                       $index{$page}{state}{$id}{$key}=$pagestate{$page}{$id}{$key};
+                                       $index{$src}{state}{$id}{$key}=$pagestate{$page}{$id}{$key};
                                }
                        }
                }
@@ -976,8 +1000,8 @@ sub saveindex () { #{{{
        my $ret=Storable::nstore_fd(\%index, $out);
        return if ! defined $ret || ! $ret;
        close $out || error("failed saving to $newfile: $!", $cleanup);
-       rename($newfile, "$config{wikistatedir}/index") ||
-               error("failed renaming $newfile to $config{wikistatedir}/index", $cleanup);
+       rename($newfile, "$config{wikistatedir}/indexdb") ||
+               error("failed renaming $newfile to $config{wikistatedir}/indexdb", $cleanup);
        
        return 1;
 } #}}}
@@ -1223,6 +1247,10 @@ sub pagespec_translate ($) { #{{{
                }
        }
 
+       if (! length $code) {
+               $code=0;
+       }
+
        return eval 'sub { my $page=shift; '.$code.' }';
 } #}}}