X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3479809f96fa9c7a5d9f86c18c581f9a343a3aef..07ef42afee4c10722610c8ca2b3998d88af32abc:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index db16a0854..684713821 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -902,7 +902,7 @@ sub loadindex () { #{{{
 	my $in;
 	if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
 		if (-e "$config{wikistatedir}/index") {
-			system("ikiwiki-transition", "indexdb", $config{wikistatedir});
+			system("ikiwiki-transition", "indexdb", $config{srcdir});
 			open ($in, "<", "$config{wikistatedir}/indexdb") || return;
 		}
 		else {
@@ -914,12 +914,13 @@ sub loadindex () { #{{{
 		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};
@@ -961,23 +962,23 @@ sub saveindex () { #{{{
 	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};
 				}
 			}
 		}