X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4cdf41df0cd1383f50060922ea9dafb8c5323051..623c7e17989f53ef049f12639950d2c50c9edd4f:/doc/bugs/map_is_inconsistent_about_bare_directories.mdwn

diff --git a/doc/bugs/map_is_inconsistent_about_bare_directories.mdwn b/doc/bugs/map_is_inconsistent_about_bare_directories.mdwn
index 6e9dc104d..a53296dfc 100644
--- a/doc/bugs/map_is_inconsistent_about_bare_directories.mdwn
+++ b/doc/bugs/map_is_inconsistent_about_bare_directories.mdwn
@@ -72,49 +72,15 @@ I could imagine including all 'bare' directories in the map, and I could imagine
 
 Attached is a [[patch]] that fixes the issue.  The current map code makes one pass over the sorted list of pages.  This adds an initial pass that goes through and makes sure that all parent directories are included.  With this initial pass added, the following pass could probably be simplified.
 
+One solution could also use the [[plugins/autoindex]] plugin to make sure that parent pages actually exist.  This is really only a stop-gap solution until the patch is applied - map still needs to be made bug-free.
+
 Note: This patch adds items to a map while it is in a foreach loop over a sorted list of keys from that same map.  Changing a map while iterating through it is normally problematic.  I'm assuming the sort insulates the code from this - I do not need to iterate over any of the newly added elements.
 
-    diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
-    index 5b6a843..16de45e 100644
-    --- a/IkiWiki/Plugin/map.pm
-    +++ b/IkiWiki/Plugin/map.pm
-    @@ -67,6 +67,39 @@ sub preprocess (@) { #{{{
-     	# are removed.
-     	add_depends($params{page}, join(" or ", keys %mapitems));
-     
-    +	# Include all the parent directories in the map
-    +	my $lastbase="";
-    +	my $commonbase = "";
-    +	$commonbase = $common_prefix if defined $common_prefix && length $common_prefix;
-    +	foreach my $item (sort keys %mapitems) {
-    +		$item=~s/^\Q$common_prefix\E\///
-    +			if defined $common_prefix && length $common_prefix;
-    +		my $itembase=IkiWiki::dirname($item);
-    +		if ($itembase ne $lastbase) {
-    +			# find the common dir
-    +			my @a=split(/\//, $itembase);
-    +			my @b=split(/\//, $lastbase);
-    +			my $common_dir=$commonbase;
-    +			while (@a && @b && $a[0] eq $b[0]) {
-    +				if (length $common_dir) {
-    +					$common_dir.="/";
-    +				}
-    +				$common_dir.=shift(@a);
-    +				shift @b;
-    +			}
-    +			# add all the dirs down to the current base
-    +			while (@a) {
-    +				if (length $common_dir) {
-    +					$common_dir.="/";
-    +				}
-    +				$common_dir.=shift(@a);
-    +				$mapitems{$common_dir}=''
-    +					unless defined $mapitems{$common_dir};
-    +			}
-    +			$lastbase = $itembase;
-    +		}
-    +	}
-    +
-     	# Create the map.
-     	my $parent="";
-     	my $indent=0;
+-- [[users/Will]]
+
+> The patch is subtly buggy and just papers over the actual bug with a
+> lot of extra code. Thanks for trying to come up with a patch for this
+> annyoingly complicated bug.. I think I've fixed the underlying bug now.
+> --[[Joey]]
+> 
+> [[!tag done]]