[TWiki-Dev] CVS: twiki/lib TWiki.pm,1.23,1.24

[John T. <ta...@us...>]

Update of /cvsroot/twiki/twiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv26931/lib

Modified Files:
	TWiki.pm 
Log Message:
Search noempty tag.


Index: TWiki.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** TWiki.pm	2001/04/19 17:07:27	1.23
--- TWiki.pm	2001/04/30 19:40:56	1.24
***************
*** 488,491 ****
--- 488,492 ----
      $htext =~ s/%TOPIC%/$theTopic/go;  # resolve topic
      $htext =~ s/%WIKITOOLNAME%/$wikiToolName/go; # resolve TWiki tool name
+     $htext =~ s/%META:.*?%//go;        # Remove meta data variables
      $htext =~ s/[\%\[\]\*\|=_]/ /go;   # remove Wiki formatting chars & defuse %VARS%
      $htext =~ s/\-\-\-+\+*/ /go;       # remove heading formatting
***************
*** 628,631 ****
--- 629,633 ----
      my $attrRenameview    = extractNameValuePair( $attributes, "renameview" );
      my $attrShowlock      = extractNameValuePair( $attributes, "showlock" );
+     my $attrNoEmpty       = extractNameValuePair( $attributes, "noempty" );
  
      return &TWiki::Search::searchWeb( "1", $attrWeb, $searchVal, $attrScope,
***************
*** 633,637 ****
         $attrCasesensitive, $attrNosummary, $attrNosearch,
         $attrNoheader, $attrNototal, $attrBookview, $attrRenameview,
!        $attrShowlock
      );
  }
--- 635,639 ----
         $attrCasesensitive, $attrNosummary, $attrNosearch,
         $attrNoheader, $attrNototal, $attrBookview, $attrRenameview,
!        $attrShowlock, $attrNoEmpty
      );
  }
***************
*** 939,944 ****
      my $text = "$attachmentText\n$movedText";
      
!     my $text = getRenderedVersion( $text, $web );
!     my $text = handleCommonTags( $text, $topic, $web );
      
      return $text;
--- 941,946 ----
      my $text = "$attachmentText\n$movedText";
      
!     $text = getRenderedVersion( $text, $web );
!     $text = handleCommonTags( $text, $topic, $web );
      
      return $text;
***************
*** 983,987 ****
      foreach( split( /\|/, $theRow ) ) {
          $attr = "";
!         s/$TranslationToken([0-9]+)//o;
          $attr = " colspan=\"$1\"" if $1 && $1 > 0;
          s/^\s$/   /o;
--- 985,989 ----
      foreach( split( /\|/, $theRow ) ) {
          $attr = "";
!         s/$TranslationToken([0-9]+)//; # No o flag for mod-perl compatibility
          $attr = " colspan=\"$1\"" if $1 && $1 > 0;
          s/^\s$/   /o;