Menu
▾
▴
[TWiki-Dev] [SVN] PeterThoeny r17852 - in twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin: data/TWiki lib/TWiki/Plugins
|
From: <de...@de...> - 2009-02-28 23:27:01
|
Author: PeterThoeny Date: 2009-02-28 17:26:55 -0600 (Sat, 28 Feb 2009) New Revision: 17852 Trac url: http://develop.twiki.org/trac/changeset/17852 Modified: twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/data/TWiki/InterWikis.txt twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/data/TWiki/InterwikiPlugin.txt twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/lib/TWiki/Plugins/InterwikiPlugin.pm Log: Item5025: Add = and & to page regex Modified: twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/data/TWiki/InterWikis.txt =================================================================== --- twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/data/TWiki/InterWikis.txt 2009-02-28 22:32:49 UTC (rev 17851) +++ twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/data/TWiki/InterWikis.txt 2009-02-28 23:26:55 UTC (rev 17852) @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="TWikiContributor" date="1186881349" format="1.0" version="$Rev$"}% +%META:TOPICINFO{author="TWikiContributor" date="1235842556" format="1.1" version="$Rev$"}% ---++ <nop>Inter-Wiki Link Rules (or Links to other Sites) This topic lists all aliases needed to map Inter-Site links to external wikis/sites. @@ -7,11 +7,11 @@ ---+++ How to define Inter-Site links - * Inter-Site links are defined in the tables below. - * Each entry must be of format: <br /> ==| External site alias | URL | Tooltip help text |==. - * The Alias must start with an upper case letter and may contain alphanumeric letters. - * The URL and Tooltip Text may contain optional ==$page== variables; the variable gets expanded to the page name. - * __Note:__ The Tooltip Text must not contain any HTML tags (including ==<nop>== escape code), no internal %TWIKIWEB%.WikiWord links, and no external links. Hint: Escape =='WikiWords'== and =='$page'==. + * Inter-Site links are defined in the tables below. + * Each entry must be of format: <br /> ==| External site alias | URL | Tooltip help text |==. + * The Alias must start with an upper case letter and may contain alphanumeric letters. + * The URL and Tooltip Text may contain optional ==$page== variables; the variable gets expanded to the page name. + * __Note:__ The Tooltip Text must not contain any HTML tags (including ==<nop>== escape code), no internal %TWIKIWEB%.WikiWord links, and no external links. Hint: Escape =='WikiWords'== and =='$page'==. ---+++ General Inter-Site Links Modified: twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/data/TWiki/InterwikiPlugin.txt =================================================================== --- twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/data/TWiki/InterwikiPlugin.txt 2009-02-28 22:32:49 UTC (rev 17851) +++ twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/data/TWiki/InterwikiPlugin.txt 2009-02-28 23:26:55 UTC (rev 17852) @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="TWikiContributor" date="1186881349" format="1.1" version="$Rev$"}% +%META:TOPICINFO{author="PeterThoeny" date="1235842556" format="1.1" version="$Rev$"}% ---+!! Interwiki Plugin The <nop>%TOPIC% links ==ExternalSite:Page== text to external sites based on aliases defined in the %TWIKIWEB%.InterWikis topic. This plugin is inspired by <nop>UseMod Wiki's inter-wiki links, http://www.usemod.com/cgi-bin/wiki.pl?InterWiki. @@ -51,10 +51,11 @@ ---++ Plugin Info | Plugin Author: | TWiki:Main.AndreaSterbini, TWiki:Main.PeterThoeny | -| Copyright: | © 2001-2007, Andrea Sterbini, Peter Thoeny ([[http://www.twiki.net/][TWIKI.NET]]), %TWIKIWEB%.TWikiContributor | +| Copyright: | © 2001-2009, Andrea Sterbini, Peter Thoeny ([[http://www.twiki.net/][TWIKI.NET]]), %TWIKIWEB%.TWikiContributor | | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) | -| Plugin Version: | 03 Aug 2008 %$VERSION% | +| Plugin Version: | 28 Feb 2009 %$VERSION% | | Change History: | <!-- versions below in reverse order --> | +| 28 Feb 2009: | 17851 - TWikibug:Item5025 - Added === and =&= to page regex, allowing links such as =Site:ID=1234&sel=56= | | 03 Aug 2008: | TWiki 4.2.1 release version | | 22 Jan 2008: | TWiki 4.2.0 release version | | 25 Nov 2007: | 15752 - TWikibug:Item5006 - Renamed Bugs rule to TWikibug rule (PTh) | @@ -85,4 +86,4 @@ __Related Topics:__ %TWIKIWEB%.TWikiPlugins, %TWIKIWEB%.DeveloperDocumentationCategory, %TWIKIWEB%.AdminDocumentationCategory, %TWIKIWEB%.TWikiPreferences, %TWIKIWEB%.InterWikis --- TWiki:Main.PeterThoeny - 25 Nov 2007 +-- TWiki:Main.PeterThoeny - 28 Feb 2009 Modified: twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/lib/TWiki/Plugins/InterwikiPlugin.pm =================================================================== --- twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/lib/TWiki/Plugins/InterwikiPlugin.pm 2009-02-28 22:32:49 UTC (rev 17851) +++ twiki/branches/TWikiRelease04x03/twikiplugins/InterwikiPlugin/lib/TWiki/Plugins/InterwikiPlugin.pm 2009-02-28 23:26:55 UTC (rev 17852) @@ -58,7 +58,7 @@ # 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 # of the version number in PLUGINDESCRIPTIONS. -$RELEASE = '03 Aug 2008'; +$RELEASE = '28 Feb 2009'; BEGIN { # 'Use locale' for internationalisation of Perl sorting and searching - @@ -84,7 +84,7 @@ my $man = TWiki::Func::getRegularExpression('mixedAlphaNum'); my $ua = TWiki::Func::getRegularExpression('upperAlpha'); $sitePattern = "([$ua][$man]+)"; - $pagePattern = "([${man}_\/][$man" . '\.\/\+\_\,\;\:\!\?\%\#\@\-]*?)'; + $pagePattern = "([${man}_\/][$man" . '\.\/\+\_\,\&\;\:\=\!\?\%\#\@\-]*?)'; # Get plugin preferences from InterwikiPlugin topic $interLinkFormat = |