From a5160113175b9ac389c0458ca14592408e1a9bd7 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Sun, 15 Dec 2019 01:22:06 +0100 Subject: Debug. Refactor. Plugin. Redo debug output print message for origin clarity --- .ikiwiki/IkiWiki/Plugin/pandoc.pm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.ikiwiki/IkiWiki/Plugin/pandoc.pm b/.ikiwiki/IkiWiki/Plugin/pandoc.pm index adff519..dca28c5 100755 --- a/.ikiwiki/IkiWiki/Plugin/pandoc.pm +++ b/.ikiwiki/IkiWiki/Plugin/pandoc.pm @@ -72,7 +72,7 @@ sub debug_get_filename_prefix { } # DEBUG Print -print "D: First file read.\n"; +print "D: pandoc: First file read.\n"; $fnm = debug_get_filename_prefix ("verify"); open($fh, '>', $fnm) or die "Could not"; print $fh "Hej du glade på fil\n"; @@ -84,7 +84,7 @@ close $fh; sub import { # DEBUG Print - print "D: Run import.\n"; + print "D: pandoc:import: Run.\n"; my $fnm_pfx = debug_get_filename_prefix ("import",""); my $fnm = $fnm_pfx; open($fh, '>', $fnm) or die "Could not open $fnm ."; @@ -142,7 +142,7 @@ sub import { sub getsetup () { # DEBUG - print "D: Run getsetup.\n"; + print "D: pandoc:getsetup: Run.\n"; # END return @@ -430,7 +430,7 @@ sub htmlize ($@) { my @args = (); # DEBUG Print params - print "D: Run htmlize for ", $page, "\n"; + print "D: pandoc:htmlize: Run for ", $page, "\n"; my $fnm_pfx = debug_get_filename_prefix ("htmlize", $page); my $m = 0; $fnm = sprintf "%s.%.1d.%s", $fnm_pfx, $m++, "params"; @@ -547,7 +547,7 @@ sub htmlize ($@) { } # DEBUG Half way content which is plenty data - print "D: Pandoc command: ", " ", $command, " ", '-f', " ", + print "D: pandoc:htmlize: Pandoc command: ", " ", $command, " ", '-f', " ", $markdown_fmt, " ", '-t', " ", 'json', " ", @args, "\n"; @@ -704,7 +704,7 @@ sub htmlize ($@) { waitpid $to_html_pid, 0; - print "D: Pandoc command: ", " ", $command, " ", '-f', " ", + print "D: pandoc:htmlize: Pandoc command: ", " ", $command, " ", '-f', " ", 'json', " ", '-t', $htmlformat, " ", @html_args, "\n"; $content = Encode::decode_utf8(join('', @html)); @@ -738,7 +738,7 @@ sub htmlize ($@) { # END # DEBUG - print "D: Return htmlize.\n"; + print "D: pandoc:htmlize: Return.\n"; # END return $content; @@ -755,7 +755,7 @@ sub pagetemplate (@) { my $filename = $template->{'options'}{'filename'}; $filename =~ /^.*\/([a-z]*).tmpl$/; my $filenamebase = $1; - print "D: Run pagetemplate for $page and $filenamebase \n"; + print "D: pandoc:pagetemplate: Run for $page and $filenamebase \n"; # END foreach my $k (keys %{$pagestate{$page}{meta}}) { @@ -793,7 +793,7 @@ sub pageactions { my %args = @_; my $page = $args{page}; - print "D: Run pageactions for ", $page, "\n"; + print "D: pandoc:pageactions: Run for ", $page, "\n"; my @links = (); return unless $pagestate{$page}{pandoc_extra_formats}; @@ -818,7 +818,7 @@ sub export_file { my ($page, $ext, $json_content, $command, @args) = @_; # DEBUG - print "D: Run export_file for $page.\n"; + print "D: pandoc:export_file: Run for $page.\n"; # END my ($export_path, $export_url) = _export_file_path_and_url($page, $ext); @@ -873,7 +873,7 @@ sub export_file { print EXPORT $json_content; close EXPORT or die "Could not close pipe for $ext: $!"; - print "D: Pandoc command: ", " ", $command, " ", '-f' => + print "D: pandoc:export_file: Pandoc command: ", " ", $command, " ", '-f' => 'json', " ", '-t' => $to_format, " ", '-o' => $tmp_export_path, " ", @args, " ", @extra_args; @@ -918,7 +918,7 @@ sub remove_exported_file { } # DEBUG - print "D: remove_exported_file: ", + print "D: pandoc:remove_exported_file: ", "file removed for $page and $ext: $export_path.\n"; # END -- cgit v1.2.3