From: Walter M. <eth...@us...> - 2004-04-25 19:15:31
|
Update of /cvsroot/twiki/twiki/lib/TWiki/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5530/lib/TWiki/UI Modified Files: Changes.pm Edit.pm Manage.pm Oops.pm Preview.pm RDiff.pm Upload.pm View.pm Log Message: A more conservative (for now), but working(as well as I can see), Render.pm refactoring. Index: Changes.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki/UI/Changes.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Changes.pm 11 Apr 2004 05:28:51 -0000 1.1 --- Changes.pm 25 Apr 2004 17:18:40 -0000 1.2 *************** *** 49,53 **** $text = &TWiki::handleCommonTags( $text, $topic ); ! $text = &TWiki::getRenderedVersion( $text ); $text =~ s/\%META{.*?}\%//go; # remove %META{"parent"}% --- 49,53 ---- $text = &TWiki::handleCommonTags( $text, $topic ); ! $text = &TWiki::Render::getRenderedVersion( $text ); $text =~ s/\%META{.*?}\%//go; # remove %META{"parent"}% *************** *** 79,83 **** $foo =~ s/%TIME%/$time/go; $foo =~ s/%REVISION%/$frev/go; ! $foo = &TWiki::getRenderedVersion( $foo ); $summary = &TWiki::Store::readFileHead( "$TWiki::dataDir\/$webName\/$bar[0].txt", 16 ); --- 79,83 ---- $foo =~ s/%TIME%/$time/go; $foo =~ s/%REVISION%/$frev/go; ! $foo = &TWiki::Render::getRenderedVersion( $foo ); $summary = &TWiki::Store::readFileHead( "$TWiki::dataDir\/$webName\/$bar[0].txt", 16 ); Index: Edit.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki/UI/Edit.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Edit.pm 11 Apr 2004 05:28:51 -0000 1.1 --- Edit.pm 25 Apr 2004 17:18:40 -0000 1.2 *************** *** 202,206 **** $tmpl =~ s/%META{[^}]*}%//go; } ! $tmpl = &TWiki::getRenderedVersion( $tmpl ); # Don't want to render form fields, so this after getRenderedVersion --- 202,206 ---- $tmpl =~ s/%META{[^}]*}%//go; } ! $tmpl = &TWiki::Render::getRenderedVersion( $tmpl ); # Don't want to render form fields, so this after getRenderedVersion Index: Manage.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki/UI/Manage.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Manage.pm 11 Apr 2004 05:28:51 -0000 1.1 --- Manage.pm 25 Apr 2004 17:18:40 -0000 1.2 *************** *** 612,616 **** $tmpl =~ s/%ATTACHMENT%/$theAttachment/go; $tmpl = &TWiki::handleCommonTags( $tmpl, $oldTopic, $oldWeb ); ! $tmpl = &TWiki::getRenderedVersion( $tmpl, $oldWeb ); $tmpl =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois; # remove <nop> and <noautolink> tags TWiki::writeHeader( $query ); --- 612,616 ---- $tmpl =~ s/%ATTACHMENT%/$theAttachment/go; $tmpl = &TWiki::handleCommonTags( $tmpl, $oldTopic, $oldWeb ); ! $tmpl = &TWiki::Render::getRenderedVersion( $tmpl, $oldWeb ); $tmpl =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois; # remove <nop> and <noautolink> tags TWiki::writeHeader( $query ); *************** *** 655,659 **** $tmpl = _setVars( $tmpl, $oldTopic, $newWeb, $newTopic, $nonWikiWordFlag ); $tmpl = &TWiki::handleCommonTags( $tmpl, $oldTopic, $oldWeb ); ! $tmpl = &TWiki::getRenderedVersion( $tmpl ); if( $currentWebOnly ) { $tmpl =~ s/%RESEARCH\{.*?web=\"all\".*\}%/(skipped)/o; # Remove search all web search --- 655,659 ---- $tmpl = _setVars( $tmpl, $oldTopic, $newWeb, $newTopic, $nonWikiWordFlag ); $tmpl = &TWiki::handleCommonTags( $tmpl, $oldTopic, $oldWeb ); ! $tmpl = &TWiki::Render::getRenderedVersion( $tmpl ); if( $currentWebOnly ) { $tmpl =~ s/%RESEARCH\{.*?web=\"all\".*\}%/(skipped)/o; # Remove search all web search *************** *** 682,686 **** my $tmpl = TWiki::Store::readTemplate( "renamerefs", $skin ); $tmpl = _setVars( $tmpl, $oldTopic, $newWeb, $newTopic ); ! $tmpl = TWiki::getRenderedVersion( $tmpl ); $tmpl =~ s/%RESEARCH/%SEARCH/go; # Pre search result from being rendered $tmpl = TWiki::handleCommonTags( $tmpl, $oldTopic, $oldWeb ); --- 682,686 ---- my $tmpl = TWiki::Store::readTemplate( "renamerefs", $skin ); $tmpl = _setVars( $tmpl, $oldTopic, $newWeb, $newTopic ); ! $tmpl = TWiki::Render::getRenderedVersion( $tmpl ); $tmpl =~ s/%RESEARCH/%SEARCH/go; # Pre search result from being rendered $tmpl = TWiki::handleCommonTags( $tmpl, $oldTopic, $oldWeb ); Index: Oops.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki/UI/Oops.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Oops.pm 11 Apr 2004 05:28:51 -0000 1.1 --- Oops.pm 25 Apr 2004 17:18:40 -0000 1.2 *************** *** 66,70 **** $tmplData = &TWiki::handleCommonTags( $tmplData, $topic ); ! $tmplData = &TWiki::getRenderedVersion( $tmplData ); $tmplData =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois; # remove <nop> and <noautolink> tags --- 66,70 ---- $tmplData = &TWiki::handleCommonTags( $tmplData, $topic ); ! $tmplData = &TWiki::Render::getRenderedVersion( $tmplData ); $tmplData =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois; # remove <nop> and <noautolink> tags Index: Preview.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki/UI/Preview.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Preview.pm 11 Apr 2004 05:28:51 -0000 1.1 --- Preview.pm 25 Apr 2004 17:18:40 -0000 1.2 *************** *** 110,114 **** $ptext = &TWiki::Prefs::updateSetFromForm( $meta, $ptext ); $ptext = &TWiki::handleCommonTags( $ptext, $topic ); ! $ptext = &TWiki::getRenderedVersion( $ptext ); # do not allow click on link before save: (mods by TedPavlic) --- 110,114 ---- $ptext = &TWiki::Prefs::updateSetFromForm( $meta, $ptext ); $ptext = &TWiki::handleCommonTags( $ptext, $topic ); ! $ptext = &TWiki::Render::getRenderedVersion( $ptext ); # do not allow click on link before save: (mods by TedPavlic) *************** *** 123,127 **** $tmpl = &TWiki::handleCommonTags( $tmpl, $topic ); $tmpl = &TWiki::handleMetaTags( $webName, $topic, $tmpl, $meta ); ! $tmpl = &TWiki::getRenderedVersion( $tmpl ); $tmpl =~ s/%TEXT%/$ptext/go; --- 123,127 ---- $tmpl = &TWiki::handleCommonTags( $tmpl, $topic ); $tmpl = &TWiki::handleMetaTags( $webName, $topic, $tmpl, $meta ); ! $tmpl = &TWiki::Render::getRenderedVersion( $tmpl ); $tmpl =~ s/%TEXT%/$ptext/go; Index: RDiff.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki/UI/RDiff.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** RDiff.pm 11 Apr 2004 05:28:51 -0000 1.1 --- RDiff.pm 25 Apr 2004 17:18:40 -0000 1.2 *************** *** 82,86 **** $data = &TWiki::handleCommonTags( $data, $topic ); ! $data = &TWiki::getRenderedVersion( $data ); if( $data =~ m/<\/?(th|td|table)/i ) { --- 82,86 ---- $data = &TWiki::handleCommonTags( $data, $topic ); ! $data = &TWiki::Render::getRenderedVersion( $data ); if( $data =~ m/<\/?(th|td|table)/i ) { *************** *** 327,331 **** my( $date, $user ) = &TWiki::Store::getRevisionInfo( $web, $topic, "1.$rev"); ! $user = TWiki::getRenderedVersion( TWiki::userToWikiName( $user ) ); if ( $short ) { --- 327,331 ---- my( $date, $user ) = &TWiki::Store::getRevisionInfo( $web, $topic, "1.$rev"); ! $user = TWiki::Render::getRenderedVersion( TWiki::userToWikiName( $user ) ); if ( $short ) { *************** *** 457,461 **** $before =~ s/%REVTITLE2%/$revTitle2/go; $before = &TWiki::handleCommonTags( $before, $topic ); ! $before = &TWiki::getRenderedVersion( $before ); $before =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois; # remove <nop> and <noautolink> tags &TWiki::writeHeader( $query ); --- 457,461 ---- $before =~ s/%REVTITLE2%/$revTitle2/go; $before = &TWiki::handleCommonTags( $before, $topic ); ! $before = &TWiki::Render::getRenderedVersion( $before ); $before =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois; # remove <nop> and <noautolink> tags &TWiki::writeHeader( $query ); *************** *** 544,548 **** $after = &TWiki::handleCommonTags( $after, $topic ); ! $after = &TWiki::getRenderedVersion( $after ); $after =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois; # remove <nop> and <noautolink> tags --- 544,548 ---- $after = &TWiki::handleCommonTags( $after, $topic ); ! $after = &TWiki::Render::getRenderedVersion( $after ); $after =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois; # remove <nop> and <noautolink> tags Index: Upload.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki/UI/Upload.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Upload.pm 14 Apr 2004 14:17:18 -0000 1.3 --- Upload.pm 25 Apr 2004 17:18:40 -0000 1.4 *************** *** 90,94 **** $tmpl =~ s/%FILEUSER%/$fileWikiUser/go; $tmpl = &TWiki::handleCommonTags( $tmpl, $topic ); ! $tmpl = &TWiki::getRenderedVersion( $tmpl ); $tmpl = &TWiki::handleMetaTags( $webName, $topic, $tmpl, $meta ); $tmpl =~ s/%HIDEFILE%/$isHideChecked/go; --- 90,94 ---- $tmpl =~ s/%FILEUSER%/$fileWikiUser/go; $tmpl = &TWiki::handleCommonTags( $tmpl, $topic ); ! $tmpl = &TWiki::Render::getRenderedVersion( $tmpl ); $tmpl = &TWiki::handleMetaTags( $webName, $topic, $tmpl, $meta ); $tmpl =~ s/%HIDEFILE%/$isHideChecked/go; Index: View.pm =================================================================== RCS file: /cvsroot/twiki/twiki/lib/TWiki/UI/View.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** View.pm 11 Apr 2004 05:28:51 -0000 1.1 --- View.pm 25 Apr 2004 17:18:42 -0000 1.2 *************** *** 155,159 **** $text = &TWiki::handleCommonTags( $text, $topic ); TWiki::UI::writeDebugTimes( "view - handleCommonTags done" ); ! $text = &TWiki::getRenderedVersion( $text ); TWiki::UI::writeDebugTimes( "view - getRendereredVersion done" ); } --- 155,159 ---- $text = &TWiki::handleCommonTags( $text, $topic ); TWiki::UI::writeDebugTimes( "view - handleCommonTags done" ); ! $text = &TWiki::Render::getRenderedVersion( $text ); TWiki::UI::writeDebugTimes( "view - getRendereredVersion done" ); } *************** *** 230,234 **** if( $topicExists ) { $revuser = &TWiki::userToWikiName( $revuser ); ! my $temp = &TWiki::getRenderedVersion( "r1.$rev - $revdate - $revuser" ); $tmpl =~ s/%REVINFO%/$temp$mirrorNote/go; } else { --- 230,234 ---- if( $topicExists ) { $revuser = &TWiki::userToWikiName( $revuser ); ! my $temp = &TWiki::Render::getRenderedVersion( "r1.$rev - $revdate - $revuser" ); $tmpl =~ s/%REVINFO%/$temp$mirrorNote/go; } else { *************** *** 243,247 **** } TWiki::UI::writeDebugTimes( "view - handleCommonTags for template done" ); ! $tmpl = &TWiki::getRenderedVersion( $tmpl, "", $meta ); ## better to use meta rendering? $tmpl =~ s/%TEXT%/$text/go; $tmpl =~ s/%MAXREV%/1.$maxrev/go; --- 243,247 ---- } TWiki::UI::writeDebugTimes( "view - handleCommonTags for template done" ); ! $tmpl = &TWiki::Render::getRenderedVersion( $tmpl, "", $meta ); ## better to use meta rendering? $tmpl =~ s/%TEXT%/$text/go; $tmpl =~ s/%MAXREV%/1.$maxrev/go; |