[TWiki-Dev] [SVN] r9393 - in twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin: data/TWiki lib/TWiki/Plugins lib/TWiki/Plugins/DBCachePlugin

[<Mic...@nt...>]

Author: MichaelDaum
Date: 2006-03-20 05:07:48 -0800 (Mon, 20 Mar 2006)
New Revision: 9393

Modified:
   twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/data/TWiki/DBCachePlugin.txt
   twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin.pm
   twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin/WebDB.pm
Log:
Item1916: use TWiki::Attrs to parse in section names

released as v1.01



Modified: twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/data/TWiki/DBCachePlugin.txt
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/data/TWiki/DBCachePlugin.txt	2006-03-20 12:46:14 UTC (rev 9392)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/data/TWiki/DBCachePlugin.txt	2006-03-20 13:07:48 UTC (rev 9393)
@@ -249,8 +249,9 @@
 |  Plugin Author: | TWiki:Main.MichaelDaum |
 |  Copyright ©: | 2005-2006, Michael Daum |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Plugin Version: | v1.00 |
+|  Plugin Version: | v1.01 |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  20 Mar 2006: | using TWiki::Attrs to parse section names |
 |  12 Mar 2006: | added hidenull to DBSTATS |
 |  10 Mar 2006: | use ENV instead of the CGI object to detect the current cgi action |
 |  02 Mar 2006: | fixed bad init error showing up on speedy/mod_perl |

Modified: twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin/WebDB.pm
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin/WebDB.pm	2006-03-20 12:46:14 UTC (rev 9392)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin/WebDB.pm	2006-03-20 13:07:48 UTC (rev 9393)
@@ -20,6 +20,7 @@
 use strict;
 use TWiki::Contrib::DBCacheContrib;
 use TWiki::Plugins::DBCachePlugin;
+use TWiki::Attrs;
 
 @TWiki::Plugins::DBCachePlugin::WebDB::ISA = ("TWiki::Contrib::DBCacheContrib");
 
@@ -117,10 +118,10 @@
     # CAUTION: %SECTION will be deleted in the near future. 
     # so please convert all %SECTION to %STARTSECTION
 
-    while($text =~ s/%(?:START)?SECTION{[^}]*?"(.*?)"}%(.*?)%ENDSECTION{[^}]*?"(.*?)"}%//s) {
-      my $name = $1;
+    while($text =~ s/%(?:START)?SECTION{(.*?)}%(.*?)%ENDSECTION{[^}]*?"(.*?)"}%//s) {
+      my $attrs = new TWiki::Attrs($1);
+      my $name = $attrs->{name} || $attrs->{_DEFAULT} || '';
       my $sectionText = $2;
-      #applyGlue($sectionText);
       $topic->set("_section$name", $sectionText);
     }
   }
@@ -129,15 +130,6 @@
 }
 
 ###############################################################################
-# local copy from GluePlugin
-sub applyGlue {
-
-  $_[0] =~ s/%~~\s+([A-Z]+{)/%$1/gos;  # %~~
-  $_[0] =~ s/\s*[\n\r]+~~~\s+/ /gos;   # ~~~
-  $_[0] =~ s/\s*[\n\r]+\*~~\s+//gos;   # *~~
-}
-
-###############################################################################
 sub getFormField {
   my ($this, $theTopic, $theFormField) = @_;
 

Modified: twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin.pm
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin.pm	2006-03-20 12:46:14 UTC (rev 9392)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin.pm	2006-03-20 13:07:48 UTC (rev 9393)
@@ -20,7 +20,7 @@
 );
 
 $VERSION = '$Rev$';
-$RELEASE = '0.99';
+$RELEASE = '1.01';
 
 ###############################################################################
 # plugin initializer