diff options
| author | Marc Green <marcgreen@cpan.org> | 2011-06-14 12:37:03 -0400 |
|---|---|---|
| committer | Marc Green <marcgreen@cpan.org> | 2011-10-31 13:26:40 -0400 |
| commit | a4fca47160a93b0fd7f11a25ee3cf8f303946666 (patch) | |
| tree | 84056ca808061192b699f7571eaf732d49c177bf | |
| parent | c20b65d069e6172389bae24cec36195645978e28 (diff) | |
| download | perl-a4fca47160a93b0fd7f11a25ee3cf8f303946666.tar.gz | |
Fix ::Search callback arg; fix @Podpath mapping
I remove $Podroot in the ::Search callback for correct crossreferencing.
I update @Podpath mapping to use File::Spec instead of normal string concat
| -rw-r--r-- | ext/Pod-Html/lib/Pod/Html.pm | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/ext/Pod-Html/lib/Pod/Html.pm b/ext/Pod-Html/lib/Pod/Html.pm index c4a8445671..4bb2d1e2f7 100644 --- a/ext/Pod-Html/lib/Pod/Html.pm +++ b/ext/Pod-Html/lib/Pod/Html.pm @@ -241,8 +241,12 @@ sub pod2html { init_globals(); parse_command_line(); + # Prevent '//' in urls + $Htmlroot = "" if $Htmlroot eq "/"; + $Htmldir =~ s#/\z##; + # Get the full path - @Podpath = map { $Podroot.$_ } @Podpath; + @Podpath = map { File::Spec->catdir($Podroot, $_) } @Podpath; # finds all pod modules/pages in podpath, stores in %Pages # --recurse is implemented in _save_page for now (its inefficient right now) @@ -254,12 +258,14 @@ sub pod2html { my $parser = Pod::Simple::XHTML::LocalPodLinks->new(); $parser->pages(\%Pages); $parser->backlink($Backlink); + $parser->htmldir($Htmldir); + $parser->htmlroot($Htmlroot); $parser->index($Doindex); $parser->output_string(\my $output); # written to file later $parser->quiet($Quiet); $parser->verbose($Verbose); - # TODO: implement default title generator in ::xhtml + # TODO: implement default title generator in pod::simple::xhtml $Title = html_escape($Title); my $csslink = ''; @@ -283,7 +289,7 @@ sub pod2html { </table> END_OF_BLOCK - # need to create own header/footer because of --header + # create own header/footer because of --header $parser->html_header(<<"HTMLHEAD"); <?xml version="1.0" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -466,7 +472,10 @@ sub _save_page { # discard any pages that are below top level dir } - my ($file, $dir) = fileparse($modspec, qr/\.[^.]*/); # strip .ext + # Remove $Podroot from path for cross referencing + my $rel_path = substr($modspec, length($Podroot) + 1); + + my ($file, $dir) = fileparse($rel_path, qr/\.[^.]*/); # strip .ext $Pages{$modname} = $dir . $file; } |