From: <de...@de...> - 2013-07-30 22:47:57
|
Author: PeterThoeny Date: 2013-07-30 17:47:49 -0500 (Tue, 30 Jul 2013) New Revision: 26138 Trac url: http://develop.twiki.org/trac/changeset/26138 Modified: twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin.pm twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin/Core.pm Log: Item7295: Initial version of DoxygenImportPlugin - improve code comments Modified: twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin/Core.pm =================================================================== --- twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin/Core.pm 2013-07-30 22:47:05 UTC (rev 26137) +++ twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin/Core.pm 2013-07-30 22:47:49 UTC (rev 26138) @@ -204,7 +204,7 @@ if( $debug ) { TWiki::Func::writeDebug( "- ${pluginName}::Core::_rmTempDir( $tempDir ) " - . "- temp dir is NOT removed when debug is on" ); + . "- temp dir and unzipped content is NOT removed when debug is on" ); return; } foreach my $file ( keys %{ $zipContent } ) { @@ -286,7 +286,7 @@ } } - # Delete previously generated topics that are no longer used + # Delete previously generated topics that are obsolete for my $topic ( @oldDoxygenTopics ) { next if( exists $newDoxygenTopics->{$topic} ); # SMELL: No API to clean Trash to avoid move error, so delete file in Trash directly @@ -313,9 +313,11 @@ if( $html =~ /<head[^>]*>(.*?)<\/head>/s ) { my $head = $1; foreach my $line ( split( /[\n\r]/, $head ) ) { + # Remember title if( $line =~ /<title>(.*?)<\/title>/ ) { $title = $1; } + # Add link and script tags to body text, but ignore jquery.js next unless( $line =~ /^<(link|script)/ ); next if( $line =~ /src="jquery.js"/ ); $line =~ s/( (href|src)=")(?=[a-z])/$1$doxygenPub\//; @@ -324,14 +326,15 @@ } $text =~ s/[\n\r]+$//s; - $html =~ s/.*<body[^>]*>//s; # cut header up to start of body - $html =~ s/<\/body>.*//s; # cut end body tag - $html =~ s/<div id="titlearea">.*<!-- end header part -->//s; # cut title area - $html =~ s/<!-- start footer.*?-->.*//s; # cut useless footer - $html =~ s/\n[\n\r]+/\n/s; # cut empty lines - $html =~ s/( src=")(?=[a-z])/$1$doxygenPub\//gs; + $html =~ s/.*<body[^>]*>//s; # Remove header and body tag + $html =~ s/<\/body>.*//s; # Remove end body tag + $html =~ s/<div id="titlearea">.*<!-- end header part -->//s; # Remove title area + $html =~ s/<!-- start footer.*?-->.*//s; # Remove useless footer + $html =~ s/\n[\n\r]+/\n/s; # Remove empty lines + $html =~ s/( src=")(?=[a-z])/$1$doxygenPub\//gs; # Point image refs to DoxygenFiles topic + # Convert HTML page links to topic URLs $html =~ s/( href=")([a-z_].*?)\.html/$1%SCRIPTURL{view}%\/$baseWeb\/${baseTopic}_$2/gs; - $html =~ s/($baseWeb\/${baseTopic})_index\b/$1/gs; # BASE_index -> BASE + $html =~ s/($baseWeb\/${baseTopic})_index\b/$1/gs; # BASENAME_index becomes BASENAME return ( $title, $text . $html ); } Modified: twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin.pm =================================================================== --- twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin.pm 2013-07-30 22:47:05 UTC (rev 26137) +++ twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin.pm 2013-07-30 22:47:49 UTC (rev 26138) @@ -22,7 +22,7 @@ # ========================= our $VERSION = '$Rev$'; -our $RELEASE = '2013-07-25'; +our $RELEASE = '2013-07-30'; our $SHORTDESCRIPTION = 'Import Doxygen documentation into TWiki by uploading a ZIP file containing Doxygen-generated files'; our $NO_PREFS_IN_TOPIC = 1; |