[TWiki-Dev] [SVN] MichaelDaum r16742 - in twiki/trunk/DBCacheContrib: data/TWiki lib/TWiki/Contrib

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

Author: MichaelDaum
Date: 2008-04-28 12:17:30 -0500 (Mon, 28 Apr 2008)
New Revision: 16742
Trac url: http://develop.twiki.org/trac/changeset/16742

Modified:
   twiki/trunk/DBCacheContrib/data/TWiki/DBCacheContrib.txt
   twiki/trunk/DBCacheContrib/lib/TWiki/Contrib/DBCacheContrib.pm
Log:
Item5575: remove META data from 'text' hash; include META data in 'all' hash


Modified: twiki/trunk/DBCacheContrib/data/TWiki/DBCacheContrib.txt
===================================================================
--- twiki/trunk/DBCacheContrib/data/TWiki/DBCacheContrib.txt	2008-04-28 17:14:09 UTC (rev 16741)
+++ twiki/trunk/DBCacheContrib/data/TWiki/DBCacheContrib.txt	2008-04-28 17:17:30 UTC (rev 16742)
@@ -134,6 +134,7 @@
 |  License: | As required for the publication of all extensions to TWiki, this software is published under the terms of the GNU General Public License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details, published at http://www.gnu.org/copyleft/gpl.html |
 |  Version: | %$VERSION% |
 |  Change History: | |
+|  16347 | remove META data from text hash; include META data in all hash. TWiki:Main.MichaelDaum |
 |  16346 | caching all topic elements to an =all= field to allow th search in all of the text and the formfields like \
            the normal grep-based SEARCH does. TWiki:Main.MichaelDaum |
 |  15868 | fixed WITHIN_DAYS and EARLIER_THAN. TWiki:Main.MichaelDaum |

Modified: twiki/trunk/DBCacheContrib/lib/TWiki/Contrib/DBCacheContrib.pm
===================================================================
--- twiki/trunk/DBCacheContrib/lib/TWiki/Contrib/DBCacheContrib.pm	2008-04-28 17:14:09 UTC (rev 16741)
+++ twiki/trunk/DBCacheContrib/lib/TWiki/Contrib/DBCacheContrib.pm	2008-04-28 17:17:30 UTC (rev 16742)
@@ -120,8 +120,8 @@
     my $tailMeta = 0;
     local $/ = "\n";
     while ( $line = <$fh> ) {
+	$all .= $line;
         if ( $line =~ m/^%META:FORM{name=\"([^\"]*)\"}%/o ) {
-            $all .= " $1 ";
             $form = new TWiki::Contrib::DBCacheContrib::Map() unless $form;
             my( $web, $topic ) = TWiki::Func::normalizeWebTopicName('', $1);
             $form->set( 'name', $web.'.'.$topic );
@@ -131,31 +131,26 @@
             $meta->set( $topic, $form );
             $tailMeta = 1;
         } elsif ( $line =~ m/^%META:TOPICPARENT{name=\"([^\"]*)\"}%/o ) {
-            $all .= " $1 ";
             $meta->set( 'parent', $1 );
             $tailMeta = 1;
         } elsif ( $line =~ m/^%META:TOPICINFO{(.*)}%/o ) {
             my $att = new TWiki::Contrib::DBCacheContrib::Map($1);
-            $all .= " $1 ";
             $att->set( '_up', $meta );
             $att->set( '_web', $this );
             $meta->set( 'info', $att );
         } elsif ( $line =~ m/^%META:TOPICMOVED{(.*)}%/o ) {
-            $all .= " $1 ";
             my $att = new TWiki::Contrib::DBCacheContrib::Map($1);
             $att->set( '_up', $meta );
             $att->set( '_web', $this );
             $meta->set( 'moved', $att );
             $tailMeta = 1;
         } elsif ( $line =~ m/^%META:FIELD{(.*)}%/o ) {
-            $all .= " $1 ";
             my $fs = new TWiki::Attrs($1);
             $form = new TWiki::Contrib::DBCacheContrib::Map() unless $form;
             $form->set( '_web', $this );
             $form->set( $fs->get('name'), $fs->get('value'));
             $tailMeta = 1;
         } elsif ( $line =~ m/^%META:FILEATTACHMENT{(.*)}%/o ) {
-            $all .= " $1 ";
             my $att = new TWiki::Contrib::DBCacheContrib::Map($1);
             $att->set( '_up', $meta );
             $att->set( '_web', $this );
@@ -167,7 +162,6 @@
             $atts->add( $att );
             $tailMeta = 1;
         } elsif ( $line =~ m/^%META:PREFERENCE{(.*)}%/o ) {
-            $all .= " $1 ";
             my $pref = new TWiki::Contrib::DBCacheContrib::Map($1);
             $pref->set( '_up', $meta);
             $pref->set( '_web', $this);
@@ -181,11 +175,8 @@
         } else {
             if ($this->can('readTopicLine')) {
                 $line = $this->readTopicLine( $topic, $meta, $line, $fh );
-            }
-            if ($line) {
-              $all .= " $line ";
-              $text .= $line;
-            }
+	    }
+	    $text .= $line if $line && $line !~ /%META:[A-Z].*?}%/o;
         }
     }
     close( $fh );