[TWiki-Dev] [SVN] PeterThoeny r26132 - in twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins: . DoxygenImportPlugin

[<de...@de...>]

Author: PeterThoeny
Date: 2013-07-25 21:00:36 -0500 (Thu, 25 Jul 2013)
New Revision: 26132
Trac url: http://develop.twiki.org/trac/changeset/26132

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 - change DOXYGEN variable to DOXYGENIMPORT

Modified: twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin/Core.pm
===================================================================
--- twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin/Core.pm	2013-07-26 01:58:35 UTC (rev 26131)
+++ twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin/Core.pm	2013-07-26 02:00:36 UTC (rev 26132)
@@ -44,19 +44,19 @@
     if( $query && $query->param( 'doxygen_action' ) ) {
         my $params;
         $params->{action} = $query->param( 'doxygen_action' );
-        $this->VarDOXYGEN( undef, $params, $baseTopic, $baseWeb );
+        $this->VarDOXYGENIMPORT( undef, $params, $baseTopic, $baseWeb );
     }
 
     return $this;
 }
 
 # =========================
-sub VarDOXYGEN {
+sub VarDOXYGENIMPORT {
     my ( $this, $session, $params, $topic, $web ) = @_;
 
     my $query = TWiki::Func::getCgiQuery();
     my $action = $params->{_DEFAULT} || $params->{action} || 'navigation';
-    TWiki::Func::writeDebug( "- ${pluginName}::Core::VarDOXYGEN( action=$action )" ) if $debug;
+    TWiki::Func::writeDebug( "- ${pluginName}::Core::VarDOXYGENIMPORT( action=$action )" ) if $debug;
     $this->{text}     = '';
     $this->{note}     = '';
     $this->{error}    = '';
@@ -272,8 +272,8 @@
             my $html = TWiki::Func::readFile( "$tempDir/$file" );
             my ( $title, $text ) = $this->_convertHtmlToTWiki( $baseWeb, $baseTopic, $html );
             if( $name eq 'index' ) {
-                # Do NOT update base topic content, assume it contains %DOXYGEN{navigation}%.
-                # Instead, attach the content as a file, to be used by %DOXYGEN{navigation}%.
+                # Do NOT update base topic content, assume it contains %DOXYGENIMPORT{navigation}%.
+                # Instead, attach the content as a file, to be used by %DOXYGENIMPORT{navigation}%.
                 TWiki::Func::saveFile( "$tempDir/$file", $text );
                 $this->_attachFile( $baseWeb, $baseTopic, $tempDir, $file );
             } else {

Modified: twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin.pm
===================================================================
--- twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin.pm	2013-07-26 01:58:35 UTC (rev 26131)
+++ twiki/branches/TWikiRelease05x01/DoxygenImportPlugin/lib/TWiki/Plugins/DoxygenImportPlugin.pm	2013-07-26 02:00:36 UTC (rev 26132)
@@ -44,7 +44,7 @@
 
     $core = undef;
     $previousAfterSave = '';
-    TWiki::Func::registerTagHandler( 'DOXYGEN', \&_DOXYGEN );
+    TWiki::Func::registerTagHandler( 'DOXYGENIMPORT', \&_DOXYGENIMPORT );
 
     # Plugin correctly initialized
     TWiki::Func::writeDebug( "- DoxygenImportPlugin::initPlugin( "
@@ -54,7 +54,7 @@
 }
 
 # =========================
-sub _DOXYGEN {
+sub _DOXYGENIMPORT {
 #   my ( $session, $params, $theTopic, $theWeb ) = @_;
 
     # Lazy loading, e.g. compile core module only when needed
@@ -62,7 +62,7 @@
         require TWiki::Plugins::DoxygenImportPlugin::Core;
         $core = new TWiki::Plugins::DoxygenImportPlugin::Core( $baseWeb, $baseTopic );
     }
-    return $core->VarDOXYGEN( @_ );
+    return $core->VarDOXYGENIMPORT( @_ );
 }
 
 # =========================