Skip to content

Commit

Permalink
Item1652: fixed a performance issue reported by Ingo Kappler (thx Mic…
Browse files Browse the repository at this point in the history 
…hael Daum); released v1.030

git-svn-id: http://svn.foswiki.org/trunk/HolidaylistPlugin@5607 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
DanielRohde authored and DanielRohde committed Nov 24, 2009
1 parent 8ddabc5 commit 7b5bcd4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
12 changes: 6 additions & 6 deletions data/System/HolidaylistPlugin.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1181041089" format="1.0" version="$Rev: 18103 $"}%
%META:TOPICINFO{author="ProjectContributor" date="1181041089" format="1.0" version="$Rev: 18212 $"}%
<!--
This topic is part of the documentation for HolidaylistPlugin and is
automatically generated from Subversion. Do not edit it! Your edits
Expand Down Expand Up @@ -308,7 +308,7 @@ The syntax follows that of the !CalendarPlugin. See Foswiki:Extensions.CalendarP

* Install required CPAN modules (e.g. =perl -MCPAN -e "install Date::Calc"= )
* Download the ZIP file from the Plugin web (see below)
* Unzip ==%TOPIC%.zip== in your twiki installation directory. Content:
* Unzip ==%TOPIC%.zip== in your Foswiki installation directory. Content:
| *File:* | *Description:* |
| ==data/System/%TOPIC%.txt== | Plugin topic |
| ==data/System/VarHOLIDAYLIST.txt== | Documentation |
Expand All @@ -320,9 +320,9 @@ The syntax follows that of the !CalendarPlugin. See Foswiki:Extensions.CalendarP
---++ Plugin Info

| Plugin Author: | TWiki:Main.PeterJones, TWiki:Main.DanielRohde |
| Plugin Version: | v1.030 (BETA) |
| Plugin Version: | v1.030 (24 Nov 2009) |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| v1.030 (BETA) | TWiki:Main.DanielRohde: improved INCLUDE support requested by Foswiki:Main.IngoKappler; added multi language support for entry definitions; fixed unknown language bug |
| v1.030 (24 Nov 2009) | TWiki:Main.DanielRohde: improved INCLUDE support requested by Foswiki:Main.IngoKappler; added multi language support for entry definitions; fixed unknown language bug; fixed performance issue reported by Foswiki:Main.IngoKappler (thx Foswiki:Main.MichaelDaum) |
| v1.029 (6 Mar 2009) | TWiki:Main.DanielRohde: changed some defaults (showmonthheader, monthheaderformat, headerformat); fixed alignments (statistics, monthheader); added maxheight attribute; allowed color definitions in icon fields |
| v1.026 (28 Oct 2008) | TWiki:Main.DanielRohde: added missing anchor in showoptions form action; added row color feature (new attributes: namecolors, rowcolors); added order feature (new attribute: order); added namepos attribute (place names left and/or right of a row) |
| v1.025 (17 Oct 2008) | TWiki:Main.DanielRohde: added div tag with style overflow:auto requested by Matthew Thomson; added query parameters feature (hlp_&lt;attribute&gt; in URIs); added option form feature (new attributes: showoptions, optionspos, optionsformat) requested by Matthew Thomson; improved performance; fixed minor icon related bugs |
Expand All @@ -334,8 +334,8 @@ The syntax follows that of the !CalendarPlugin. See Foswiki:Extensions.CalendarP
| v1.019 (7 Aug 2006) | TWiki:Main.DanielRohde: improved navigation; fixed %<nop>ICON% tag handling bug reported by TWiki:Main.UlfJastrow; |
| v1.018 (25 Jul 2006) | TWiki:Main.DanielRohde: fixed periodic event bug; added navigation feature |
| v1.017 (31 May 2006) | TWiki:Main.DanielRohde: fixed minor bug (periodic repeater) |
| v1.016 (27 Apr 2006) | TWiki:Main.DanielRohde: fixed some major bugs: deep recursion bug reported by TWiki:Main.ChrisHausen; exception handling bug (concerns Dakar) |
| v1.015 (9 Feb 2006) | TWiki:Main.DanielRohde: added class attribute (holidaylistPluginTable) to table tag for stylesheet support (thanx TWiki:Main.HaraldJoerg and TWiki:Main.ArthurClemens); fixed mod_perl preload bug (removed 'use warnings;') reported by Foswiki:Main.KennethLavrsen |
| v1.016 (27 Apr 2006) | TWiki:Main.DanielRohde: fixed some major bugs: deep recursion bug reported by TWiki:Main.ChrisHausen; exception handling bug (concerns Foswiki) |
| v1.015 (9 Feb 2006) | TWiki:Main.DanielRohde: added class attribute (holidaylistPluginTable) to table tag for stylesheet support (thanx TWiki:Main.HaraldJoerg and Foswiki:Main.ArthurClemens); fixed mod_perl preload bug (removed 'use warnings;') reported by Foswiki:Main.KennethLavrsen |
| v1.014 (23 Jan 2006) | TWiki:Main.DanielRohde: incorporated documentation fixes by Foswiki:Main.KennethLavrsen (Bugs:Item1440) |
| v1.013 (8 Nov 2005) | TWiki:Main.DanielRohde: added Perl strict pragma; |
| v1.012 (5 Sep 2005): | TWiki:Main.DanielRohde: added public holiday support requested by TWiki:Main.IlltudDaniel; improved documentation; improved forced link handling in alt/title attributes of img tags; fixed documentation bug reported by TWiki:Main.FranzJosefSilli |
Expand Down
14 changes: 8 additions & 6 deletions lib/Foswiki/Plugins/HolidaylistPlugin.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ use vars qw(
%rendererCache
);

# This should always be $Rev: 18103 $ so that TWiki can determine the checked-in
# This should always be $Rev: 18212 $ so that Foswiki can determine the checked-in
# status of the plugin. It is used by the build automation tools, so
# you should leave it alone.
$VERSION = '$Rev: 18103 $';
$VERSION = '$Rev: 18212 $';

# This is a free-form string you can use to "name" your own plugin version.
# It is *not* used by the build automation tools, but is reported as part
Expand All @@ -69,8 +69,8 @@ $REVISION = '1.0.30'; #dro# improved INCLUDE support requested by Foswiki:Main.I
#$REVISION = '1.019'; #dro# improved navigation; fixed %<nop>ICON% tag handling bug reported by TWiki:Main.UlfJastrow;
#$REVISION = '1.018'; #dro# fixed periodic event bug; added navigation feature
#$REVISION = '1.017'; #dro# fixed minor bug (periodic repeater)
#$REVISION = '1.016'; #dro# fixed some major bugs: deep recursion bug reported by TWiki:Main.ChrisHausen; exception handling bug (concerns Dakar)
#$REVISION = '1.015'; #dro# added class attribute (holidaylistPluginTable) to table tag for stylesheet support (thanx TWiki:Main.HaraldJoerg and TWiki:Main.ArthurClemens); fixed mod_perl preload bug (removed 'use warnings;') reported by Foswiki:Main.KennethLavrsen
#$REVISION = '1.016'; #dro# fixed some major bugs: deep recursion bug reported by TWiki:Main.ChrisHausen; exception handling bug (concerns Foswiki)
#$REVISION = '1.015'; #dro# added class attribute (holidaylistPluginTable) to table tag for stylesheet support (thanx TWiki:Main.HaraldJoerg and Foswiki:Main.ArthurClemens); fixed mod_perl preload bug (removed 'use warnings;') reported by Foswiki:Main.KennethLavrsen
#$REVISION = '1.014'; #dro# incorporated documentation fixes by Foswiki:Main.KennethLavrsen (Bugs:Item1440)
#$REVISION = '1.013'; #dro# added Perl strict pragma;
#$VERSION = '1.012'; #dro# added public holiday support requested by TWiki:Main.IlltudDaniel; improved documentation; improved forced link handling in alt/title attributes of img tags; fixed documentation bug reported by TWiki:Main.FranzJosefSilli
Expand Down Expand Up @@ -118,10 +118,12 @@ sub commonTagsHandler

Foswiki::Func::writeDebug( "- ${pluginName}::commonTagsHandler( $_[2].$_[1] )" ) if $debug;

return if Foswiki::Func::getContext()->{'save'};

# This is the place to define customized tags and variables
# Called by Foswiki::handleCommonTags, after %INCLUDE:"..."%

#### eval is bad because Dakar works with exceptions
#### eval is bad because Foswiki works with exceptions
####eval {
$_[0] =~ s/%HOLIDAYLIST%/&handleHolidaylist("", $_[0], $_[1], $_[2])/ge;
$_[0] =~ s/%HOLIDAYLIST{(.*?)}%/&handleHolidaylist($1, $_[0], $_[1], $_[2])/ge;
Expand Down Expand Up @@ -1064,7 +1066,7 @@ sub renderHolidaylist() {
}


# overwrite personal holidays with public holidays:
# override personal holidays with public holidays:
if ($options{enablepubholidays} && defined $$aptableref[$i]) {
$icon = $iconstates{$$aptableref[$i]};
$$itableref[$i]=$$aitableref[$i];
Expand Down

0 comments on commit 7b5bcd4

Please sign in to comment.