From: <de...@de...> - 2008-07-03 12:51:53
|
Author: MichaelDaum Date: 2008-07-03 07:52:01 -0500 (Thu, 03 Jul 2008) New Revision: 16970 Trac url: http://develop.twiki.org/trac/changeset/16970 Modified: twiki/trunk/FilterPlugin/data/TWiki/FilterPlugin.txt twiki/trunk/FilterPlugin/lib/TWiki/Plugins/FilterPlugin.pm twiki/trunk/FilterPlugin/lib/TWiki/Plugins/FilterPlugin/Core.pm Log: Item5749: FORMATLIST sorts the output but it should sort the input list Modified: twiki/trunk/FilterPlugin/data/TWiki/FilterPlugin.txt =================================================================== --- twiki/trunk/FilterPlugin/data/TWiki/FilterPlugin.txt 2008-07-03 12:46:06 UTC (rev 16969) +++ twiki/trunk/FilterPlugin/data/TWiki/FilterPlugin.txt 2008-07-03 12:52:01 UTC (rev 16970) @@ -187,8 +187,9 @@ | Plugin Author: | TWiki:Main.MichaelDaum | | Copyright ©: | 2005-2008, Michael Daum http://michaeldaumconsulting.com | | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) | -| Plugin Version: | v1.50 | +| Plugin Version: | v1.51 | | Change History: | <!-- versions below in reverse order --> | +| 03 Jul 2008: | sorting a list _before_, not _after_, formatting it in FORMATLIST | | 08 May 2008: | added 'text' parameter to SUBST and EXTRACT; \ fixed SUBST as it was pretty useless before | | 07 Dec 2007: | added MAKEINDEX, added lazy compilation | @@ -217,6 +218,6 @@ | Feedback: | TWiki:Plugins/%TOPIC%Dev | | Appraisal: | TWiki:Plugins/%TOPIC%Appraisal | --- TWiki:Main.MichaelDaum - 08 May 2008 +-- TWiki:Main.MichaelDaum - 03 Jul 2008 %META:FILEATTACHMENT{name="wikiringlogo40x40.png" attr="h" autoattached="1" comment="" date="1189788323" path="wikiringlogo40x40.png" size="2571" user="TWikiContributor" version="1"}% Modified: twiki/trunk/FilterPlugin/lib/TWiki/Plugins/FilterPlugin/Core.pm =================================================================== --- twiki/trunk/FilterPlugin/lib/TWiki/Plugins/FilterPlugin/Core.pm 2008-07-03 12:46:06 UTC (rev 16969) +++ twiki/trunk/FilterPlugin/lib/TWiki/Plugins/FilterPlugin/Core.pm 2008-07-03 12:52:01 UTC (rev 16970) @@ -434,11 +434,21 @@ #writeDebug("theUnique='$theUnique'"); #writeDebug("theExclude='$theExclude'"); + my @theList = split(/$theSplit/, $theList); + if ($theSort ne 'off') { + if ($theSort eq 'alpha' || $theSort eq 'on') { + @theList = sort {uc($a) cmp uc($b)} @theList; + } elsif ($theSort eq 'num') { + @theList = sort {$a <=> $b} @theList; + } + } + @theList = reverse @theList if $theReverse eq 'on'; + my %seen = (); my @result; my $count = 0; my $skip = $theSkip; - foreach my $item (split(/$theSplit/, $theList)) { + foreach my $item (@theList) { #writeDebug("found '$item'"); next if $theExclude && $item =~ /^($theExclude)$/; next if $item =~ /^$/; # skip empty elements @@ -487,15 +497,6 @@ #writeDebug("count=$count"); return '' if $count == 0; - if ($theSort ne 'off') { - if ($theSort eq 'alpha' || $theSort eq 'on') { - @result = sort {uc($a) cmp uc($b)} @result; - } elsif ($theSort eq 'num') { - @result = sort {$a <=> $b} @result; - } - } - @result = reverse @result if $theReverse eq 'on'; - my $result = $theHeader.join($theSeparator, @result).$theFooter; $result =~ s/\$count/$count/g; $result = &TWiki::Func::expandCommonVariables($result, $theTopic, $theWeb) Modified: twiki/trunk/FilterPlugin/lib/TWiki/Plugins/FilterPlugin.pm =================================================================== --- twiki/trunk/FilterPlugin/lib/TWiki/Plugins/FilterPlugin.pm 2008-07-03 12:46:06 UTC (rev 16969) +++ twiki/trunk/FilterPlugin/lib/TWiki/Plugins/FilterPlugin.pm 2008-07-03 12:52:01 UTC (rev 16970) @@ -25,7 +25,7 @@ ); $VERSION = '$Rev$'; -$RELEASE = '1.50'; +$RELEASE = '1.51'; $NO_PREFS_IN_TOPIC = 1; $SHORTDESCRIPTION = 'Substitute and extract information from content by using regular expressions'; |