From: <de...@de...> - 2008-05-26 10:05:36
|
Author: SvenDowideit Date: 2008-05-26 05:05:40 -0500 (Mon, 26 May 2008) New Revision: 16838 Trac url: http://develop.twiki.org/trac/changeset/16838 Modified: twiki/branches/TWikiRelease04x02/data/TWiki/QuerySearch.txt twiki/branches/TWikiRelease04x02/lib/TWiki/Meta.pm Log: Item5655: add an info.rev node to IF and QuerySearch Modified: twiki/branches/TWikiRelease04x02/data/TWiki/QuerySearch.txt =================================================================== --- twiki/branches/TWikiRelease04x02/data/TWiki/QuerySearch.txt 2008-05-26 10:05:22 UTC (rev 16837) +++ twiki/branches/TWikiRelease04x02/data/TWiki/QuerySearch.txt 2008-05-26 10:05:40 UTC (rev 16838) @@ -37,7 +37,8 @@ * =author= * =date= * =format= - * =version= + * =rev= - topic revision (=12=) to match =%<nop>REVINFO{'$rev'}%= and FormattedSearch =$rev= + * =version= - internal Store topic version (=1.12= for rcs based Stores) * =META:TOPICMOVED= * =by= * =date= Modified: twiki/branches/TWikiRelease04x02/lib/TWiki/Meta.pm =================================================================== --- twiki/branches/TWikiRelease04x02/lib/TWiki/Meta.pm 2008-05-26 10:05:22 UTC (rev 16837) +++ twiki/branches/TWikiRelease04x02/lib/TWiki/Meta.pm 2008-05-26 10:05:40 UTC (rev 16838) @@ -496,10 +496,19 @@ foreach my $type ( grep { /$types/ } keys %$this ) { foreach my $item ( @{$this->{$type}} ) { + #remove the internal 'info.rev' + my $topicRev = $item->{'rev'}; + if ($type eq 'TOPICINFO') { + undef $item->{'rev'}; + } + my @itemKeys = sort keys %$item; $s .= "$type: " . join(' ', map{ "$_='".($item->{$_}||'')."'" } - sort keys %$item ) . + @itemKeys ) . "\n"; + if ($type eq 'TOPICINFO' && defined($topicRev)) { + $item->{'rev'} = $topicRev; + } } } return $s; @@ -721,6 +730,8 @@ $sep = ' '; } foreach my $key ( sort keys %$item ) { + #don't store the rev created in addTOPICINFO + next if ($type eq 'TOPICINFO' && $key eq 'rev'); if( $key ne 'name' ) { $text .= $sep; $text .= _writeKeyValue( $key, $item->{$key} ); @@ -752,6 +763,7 @@ # RCS rev numbers save with them so old code can # read these topics version => '1.'.$rev, + rev => $rev, date => $time, author => $user, format => $format, |