Item10759: tml-tidy SEARCH so I can read them, and then add pagers to…

… the more interactive ones. Also noted that there are some queries like 'name=WebPreferences' - this is massivly slow, as it tests every topic, so I've re-written them to use the topic= param instead git-svn-id: http://svn.foswiki.org/trunk@11710 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · May 18, 2011 · d368bfa · d368bfa
1 parent 78362e9
commit d368bfa
Show file tree

Hide file tree

Showing 19 changed files with 177 additions and 31 deletions.
diff --git a/ImageGalleryPlugin/data/Main/UserListByPhotograph.txt b/ImageGalleryPlugin/data/Main/UserListByPhotograph.txt
@@ -3,6 +3,12 @@
 
 %INCLUDE{"UserListHeader"}%
 
-%IMAGEGALLERY{thumbtitle="[[$topic]]" topics="%SEARCH{"form.name='UserForm'" type="query" nonoise="on" separator="," format="$topic"}%" size="large" title="[[$topic]]"}%
+%IMAGEGALLERY{thumbtitle="[[$topic]]" topics="%SEARCH{
+                        "form.name='UserForm'" 
+                        type="query" 
+                        nonoise="on" 
+                        separator="," 
+                        format="$topic"
+                    }%" size="large" title="[[$topic]]"}%
 
 If Foswiki:Extensions.ImageGalleryPlugin is installed this page will show photos and names of all registered users. 
diff --git a/TopicUserMappingContrib/data/Main/UserHomepageHeader.txt b/TopicUserMappingContrib/data/Main/UserHomepageHeader.txt
@@ -8,7 +8,13 @@ The part between the horizontal rules gets included at the top of every [[%WIKIU
 
 -----
 %STARTINCLUDE%
-%SEARCH{ "%BASETOPIC%" scope="topic" topic="%BASETOPIC%" nonoise="on" format="---+!! $formfield(FirstName) $formfield(LastName)$n()$n()| Organization: | <b> $formfield(OrganisationName) </b> |&nbsp;| Country: | <b> $formfield(Country) </b> |&nbsp;| Location: | <b> $formfield(Location) </b> |$n()| Telephone: | <b> $formfield(Telephone) </b> |&nbsp;| E-mail: | <b> $formfield(Email) </b> |" }%
+%SEARCH{ 
+        "%BASETOPIC%" 
+        scope="topic" 
+        topic="%BASETOPIC%" 
+        nonoise="on" 
+        format="---+!! $formfield(FirstName) $formfield(LastName)$n()$n()| Organization: | <b> $formfield(OrganisationName) </b> |&nbsp;| Country: | <b> $formfield(Country) </b> |&nbsp;| Location: | <b> $formfield(Location) </b> |$n()| Telephone: | <b> $formfield(Telephone) </b> |&nbsp;| E-mail: | <b> $formfield(Email) </b> |" 
+    }%
 %TOC%
 %STOPINCLUDE%
 

diff --git a/TopicUserMappingContrib/data/Main/UserList.txt b/TopicUserMappingContrib/data/Main/UserList.txt
@@ -4,4 +4,13 @@
 
 %INCLUDE{"UserListHeader"}%
 
-%SEARCH{"form.name~'*UserForm'" nosearch="on" type="query" header="| *FirstName* | *LastName* | *Organization* | *State* | *Country* |" format="| [[$topic][$formfield(FirstName)]] | [[$topic][$formfield(LastName)]] | $formfield(OrganisationName) | $formfield(State) | $formfield(Country) |" excludetopic="Web*, *Template"}%
+%SEARCH{
+    "form.name~'*UserForm'" 
+    nosearch="on" 
+    type="query" 
+    header="| *FirstName* | *LastName* | *Organization* | *State* | *Country* |" 
+    format="| [[$topic][$formfield(FirstName)]] | [[$topic][$formfield(LastName)]] | $formfield(OrganisationName) | $formfield(State) | $formfield(Country) |" 
+    excludetopic="Web*, *Template"
+    pager="on"
+    pagesize="%DEFAULTPAGESIZE%"
+  }%
diff --git a/TopicUserMappingContrib/data/Main/UserListByDateJoined.txt b/TopicUserMappingContrib/data/Main/UserListByDateJoined.txt
@@ -5,4 +5,13 @@
 %INCLUDE{"UserListHeader"}%
 
 %TABLE{initsort="1" initdirection="up"}%
-%SEARCH{"form.name~'*UserForm'" type="query" header="| *Date joined* | *Last updated* | *FirstName* | *LastName* | *Organization* | *Country* |" format="| $createdate | $date | [[$topic][$formfield(FirstName)]] | [[$topic][$formfield(LastName)]] | $formfield(OrganisationName) | $formfield(Country) |" excludetopic="Web*, *Template" nosearch="on"}%
+%SEARCH{
+        "form.name~'*UserForm'" 
+        type="query" 
+        header="| *Date joined* | *Last updated* | *FirstName* | *LastName* | *Organization* | *Country* |" 
+        format="| $createdate | $date | [[$topic][$formfield(FirstName)]] | [[$topic][$formfield(LastName)]] | $formfield(OrganisationName) | $formfield(Country) |" 
+        excludetopic="Web*, *Template" 
+        nosearch="on"
+        pager="on"
+        pagesize="%DEFAULTPAGESIZE%"
+      }%
diff --git a/TopicUserMappingContrib/data/Main/UserListByLocation.txt b/TopicUserMappingContrib/data/Main/UserListByLocation.txt
@@ -5,4 +5,14 @@
 %INCLUDE{"UserListHeader"}%
 
 %TABLE{initsort="1"}%
-%SEARCH{"form.name~'*UserForm'" type="query" header="|*Country* | *State* | *FirstName* | *LastName* | *Organization* |" format="| $formfield(Country) | $formfield(State) | [[$topic][$formfield(FirstName)]] | [[$topic][$formfield(LastName)]] | $formfield(OrganisationName) |" excludetopic="Web*, *Template" nosearch="on" order="formfield(Country)"}%
+%SEARCH{
+        "form.name~'*UserForm'" 
+        type="query" 
+        header="|*Country* | *State* | *FirstName* | *LastName* | *Organization* |" 
+        format="| $formfield(Country) | $formfield(State) | [[$topic][$formfield(FirstName)]] | [[$topic][$formfield(LastName)]] | $formfield(OrganisationName) |" 
+        excludetopic="Web*, *Template" 
+        nosearch="on" 
+        order="formfield(Country)"
+        pager="on"
+        pagesize="%DEFAULTPAGESIZE%"
+     }%
diff --git a/TopicUserMappingContrib/data/Main/UserListHeader.txt b/TopicUserMappingContrib/data/Main/UserListHeader.txt
@@ -1,3 +1,12 @@
 %META:TOPICINFO{author="ProjectContributor" date="1231502400" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="UserList"}%
-*Related topics:* %SEARCH{"name='WikiUsers' OR name='WikiGroups' OR name='UserList' OR name~'UserListBy*'" type="query" web="%USERSWEB%" scope="topic" separator=", " nonoise="on" format="[[$web.$topic][$topic]]" excludetopic="%INCLUDINGTOPIC%"}%
+*Related topics:* %SEARCH{
+                "name='WikiUsers' OR name='WikiGroups' OR name='UserList' OR name~'UserListBy*'" 
+                type="query" 
+                web="%USERSWEB%" 
+                scope="topic" 
+                separator=", " 
+                nonoise="on" 
+                format="[[$web.$topic][$topic]]" 
+                excludetopic="%INCLUDINGTOPIC%"
+            }%
diff --git a/TopicUserMappingContrib/data/System/BulkResetPassword.txt b/TopicUserMappingContrib/data/System/BulkResetPassword.txt
@@ -28,6 +28,8 @@ Users whose passwords are reset with this will be sent an e-mail at the address
   header="|*WikiName*  |*User page created*  |*User page changed*  | *Reset* |"
   format="| $web.$topic |$createdate  |$date  |  <input %NOTMODIFYABLE% type='checkbox' name='LoginName' value='$topic'>  |"
   excludetopic="Web*" nosearch="on" nototal="on"
+  pager="on"
+  pagesize="%DEFAULTPAGESIZE%"
 }%
 
 *Note* if you don't see all the users you expect in this table, make sure their home topic has an attached %SYSTEMWEB%.UserForm. This is used to identify users.

diff --git a/core/data/Sandbox/WebHome.txt b/core/data/Sandbox/WebHome.txt
@@ -27,7 +27,17 @@
 
 ---++ %MAKETEXT{"Recently changed topics"}%
 <dl>
-%SEARCH{ ".*" regex="on" nosearch="on" nototal="on" order="modified" reverse="on" limit="7" format="<dt>[[$topic]]</dt><dd>$summary<br /><span class='foswikiGrayText'>$date - $wikiusername</span></dd>"}%
+%SEARCH{ 
+  ".*" 
+  regex="on" 
+  nosearch="on" 
+  nototal="on" 
+  order="modified" 
+  reverse="on" 
+  format="<dt>[[$topic]]</dt><dd>$summary<br /><span class='foswikiGrayText'>$date - $wikiusername</span></dd>"
+  pager="on"
+  pagesize="7"
+ }%
 </dl>
 %MAKETEXT{"A more extensive changes list is available via ~[~[[_1]~]~[Recent changes~]~]." args="WebChanges"}%
 

diff --git a/core/data/System/ContributedAddOns.txt b/core/data/System/ContributedAddOns.txt
@@ -14,7 +14,13 @@ An add-on runs separately from the Foswiki scripts, e.g. for data import, export
 
 ---++ Add-Ons Installed on this site
 
-%SEARCH{ "AddOn" scope="topic" topic="*AddOn" nosearch="on" format="   * <b>[[$topic]]</b>: <nop>$pattern(.*?\*\sSet\sSHORTDESCRIPTION\s\=([^\n\r]*).*) <span style=\"color: gray;\">- version $pattern(.*?Version\:?\s*\|([^\n\r\|]*)\|.*)</span> <br /> <span style=\"color: gray; font-size: 80%\"> Author: $pattern(.*?\sAuthors?:\s*\|\s*(.*?)\s*\|.*) - last modified: r$rev - [[%SCRIPTURL{rdiff}%/$web/$topic][$date]] - $wikiusername </span>" }%
+%SEARCH{ 
+   "AddOn" 
+   scope="topic" 
+   topic="*AddOn" 
+   nosearch="on" 
+   format="   * <b>[[$topic]]</b>: <nop>$pattern(.*?\*\sSet\sSHORTDESCRIPTION\s\=([^\n\r]*).*) <span style=\"color: gray;\">- version $pattern(.*?Version\:?\s*\|([^\n\r\|]*)\|.*)</span> <br /> <span style=\"color: gray; font-size: 80%\"> Author: $pattern(.*?\sAuthors?:\s*\|\s*(.*?)\s*\|.*) - last modified: r$rev - [[%SCRIPTURL{rdiff}%/$web/$topic][$date]] - $wikiusername </span>" 
+ }%
 
 ---++ Installing Add-Ons
 

diff --git a/core/data/System/DefaultPreferences.txt b/core/data/System/DefaultPreferences.txt
@@ -156,6 +156,8 @@ Preference settings local to your site should be set in [[%LOCALSITEPREFS%]] (th
       * Set SEARCHVARDEFAULTTYPE = literal
    * Stop words, e.g., common words and characters to exclude from a keyword search:
       * Set SEARCHSTOPWORDS = a, all, am, an, and, any, as, at, b, be, by, c, d, e, for, from, g, h, how, i, i'm, i.e., in, is, isn't, it, it's, its, j, k, l, m, n, o, of, on, or, p, q, r, s, t, that, that's, the, this, to, u, v, w, was, wasn't, what, what's, when, where, who, who's, will, with, x, y, z
+   * Default page size for Index topics - such as WebIndex, WebSearch
+      * Set DEFAULTPAGESIZE = 50
 
 ---+++ E-mail Settings
 

diff --git a/core/data/System/SitePermissions.txt b/core/data/System/SitePermissions.txt
@@ -9,7 +9,10 @@
    scope="topic"
    topic="%WEBPREFSTOPIC%"
    nototal="on" nosearch="on"
-   format="| [[$web.%WEBPREFSTOPIC%][<img src=\"%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/wrench.gif\" alt=\"Preferences\" title=\"Preferences of <nop>$web web\" width=\"16\" height=\"16\" border=\"0\" />]] [[$web.%HOMETOPIC%][<img src=\"%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/home.gif\" alt=\"Home\" title=\"Home of <nop>$web web\" width=\"16\" height=\"16\" border=\"0\" />]] [[$web.%HOMETOPIC%][$web]] | $percentVAR{ \"SITEMAPLIST\" web=\"$web\" }$percent | $percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'DENYWEBVIEW'$dollarquot then=$dollarquot$dollardollarpercentDENYWEBVIEW$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'ALLOWWEBVIEW'$dollarquot then=$dollarquot$dollardollarpercentALLOWWEBVIEW$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'DENYWEBCHANGE'$dollarquot then=$dollarquot$dollardollarpercentDENYWEBCHANGE$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'ALLOWWEBCHANGE'$dollarquot then=$dollarquot$dollardollarpercentALLOWWEBCHANGE$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'DENYWEBRENAME'$dollarquot then=$dollarquot$dollardollarpercentDENYWEBRENAME$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'ALLOWWEBRENAME'$dollarquot then=$dollarquot$dollardollarpercentALLOWWEBRENAME$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |" }%
+   format="| [[$web.%WEBPREFSTOPIC%][<img src=\"%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/wrench.gif\" alt=\"Preferences\" title=\"Preferences of <nop>$web web\" width=\"16\" height=\"16\" border=\"0\" />]] [[$web.%HOMETOPIC%][<img src=\"%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/home.gif\" alt=\"Home\" title=\"Home of <nop>$web web\" width=\"16\" height=\"16\" border=\"0\" />]] [[$web.%HOMETOPIC%][$web]] | $percentVAR{ \"SITEMAPLIST\" web=\"$web\" }$percent | $percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'DENYWEBVIEW'$dollarquot then=$dollarquot$dollardollarpercentDENYWEBVIEW$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'ALLOWWEBVIEW'$dollarquot then=$dollarquot$dollardollarpercentALLOWWEBVIEW$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'DENYWEBCHANGE'$dollarquot then=$dollarquot$dollardollarpercentDENYWEBCHANGE$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'ALLOWWEBCHANGE'$dollarquot then=$dollarquot$dollardollarpercentALLOWWEBCHANGE$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'DENYWEBRENAME'$dollarquot then=$dollarquot$dollardollarpercentDENYWEBRENAME$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |$percentEXPAND{ $quot$dollarpercentIF{$dollarquotdefined 'ALLOWWEBRENAME'$dollarquot then=$dollarquot$dollardollarpercentALLOWWEBRENAME$dollardollarpercent$dollarquot else=$dollarquot_not set_$dollarquot}$dollarpercent$quot scope=$quot$web.%WEBPREFSTOPIC%$quot }$percent |" 
+   pager="on"
+   pagesize="%DEFAULTPAGESIZE%"
+ }%
 
 *Please Note:*
 

diff --git a/core/data/System/TopicsAndWebs.txt b/core/data/System/TopicsAndWebs.txt
@@ -124,7 +124,7 @@ Each web has:
   nonoise="on"
   web="_default"
   excludetopic="%HOMETOPIC%"
-  format="      * $topic"
+  format="      * $web.$topic"
   separator="$n"
 }%
 

diff --git a/core/data/System/WebAtomBase.txt b/core/data/System/WebAtomBase.txt
@@ -42,7 +42,17 @@ Below part is included by each <nop>WebAtom topic:
 %STARTINCLUDE%<link rel="self" type="application/atom+xml" href="%SCRIPTURL{"view"}%/%BASEWEB%/%BASETOPIC%"/>
 <id>%SCRIPTURL{"view"}%/%BASEWEB%</id>
 <rights>%WEBRSSCOPYRIGHT%</rights>%CALC{$SET(c,0)}%
-%SEARCH{"%URLPARAM{"search" encode="quote" default=".*" }%" web="%BASEWEB%" type="regex" nosearch="on" order="modified" reverse="on" nototal="on" limit="16" format="$percentCALC{$IF($GET(c)>0, , <updated>$isodate</updated>$CHAR(10))$SETM(c, +1)}$percent<entry>$n <title>$topic</title>$n <link rel=\"alternate\" type=\"text/html\" href=\"%SCRIPTURL{"view"}%/$web/$topic?t=$isodate\"/>$n <id>%SCRIPTURL{"view"}%/$web/$topic</id>$n <updated>$isodate</updated>$n <summary>$summary (last changed by <nop>$wikiname)</summary>$n <author>$n  <name><nop>$wikiname</name></author>$n</entry>"}%
+%SEARCH{
+   "%URLPARAM{"search" encode="quote" default=".*" }%" 
+   web="%BASEWEB%" 
+   type="regex" 
+   nosearch="on" 
+   order="modified" 
+   reverse="on" 
+   nototal="on" 
+   limit="16" 
+   format="$percentCALC{$IF($GET(c)>0, , <updated>$isodate</updated>$CHAR(10))$SETM(c, +1)}$percent<entry>$n <title>$topic</title>$n <link rel=\"alternate\" type=\"text/html\" href=\"%SCRIPTURL{"view"}%/$web/$topic?t=$isodate\"/>$n <id>%SCRIPTURL{"view"}%/$web/$topic</id>$n <updated>$isodate</updated>$n <summary>$summary (last changed by <nop>$wikiname)</summary>$n <author>$n  <name><nop>$wikiname</name></author>$n</entry>"
+}%
 %STOPINCLUDE%
 </verbatim>
 -----

diff --git a/core/data/System/WebChanges.txt b/core/data/System/WebChanges.txt
@@ -1,8 +1,18 @@
 %META:TOPICINFO{author="ProjectContributor" date="1231502400" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="WebHome"}%
----+ %MAKETEXT{"[_1] recent changes in [_2] Web" args="%URLPARAM{"limit" default="50"}%, <nop>%BASEWEB%"}% <span style="font-size: 50%">%MAKETEXT{"retrieved at [_1]" args="%DISPLAYTIME{"$hour:$min ($tz)"}%"}%</span>
+---+ %MAKETEXT{"[_1] recent changes in [_2] Web" args="%URLPARAM{"limit" default="%DEFAULTPAGESIZE%"}%, <nop>%BASEWEB%"}% <span style="font-size: 50%">%MAKETEXT{"retrieved at [_1]" args="%DISPLAYTIME{"$hour:$min ($tz)"}%"}%</span>
 
-%SEARCH{"'1'" web="%BASEWEB%" type="query" nosearch="on" noheader="on" order="modified" limit="%URLPARAM{"limit" default="50"}%" reverse="on"}%
+%SEARCH{
+    "'1'" 
+    web="%BASEWEB%" 
+    type="query" 
+    nosearch="on" 
+    noheader="on" 
+    order="modified" 
+    pager="on"
+    pagesize="%URLPARAM{"limit" default="%DEFAULTPAGESIZE%"}%" 
+    reverse="on"
+    }%
 
 <strong><em>%MAKETEXT{"See also:"}%</em></strong>
 %ICON{rss-small}%

diff --git a/core/data/System/WebIndex.txt b/core/data/System/WebIndex.txt
@@ -1,5 +1,12 @@
 %META:TOPICINFO{author="ProjectContributor" date="1231502400" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="WebHome"}%
-%SEARCH{"'1'" scope="topic" type="query" nosearch="on"}%
+%SEARCH{
+    "'1'" 
+    scope="topic" 
+    type="query" 
+    nosearch="on"
+    pager="on"
+    pagesize="%DEFAULTPAGESIZE%"
+  }%
 
 %MAKETEXT{"See also the faster [_1]" args="[[%BASEWEB%.WebTopicList][WebTopicList]]"}%
diff --git a/core/data/System/WebRssBase.txt b/core/data/System/WebRssBase.txt
@@ -49,7 +49,22 @@ The part below is included by each <nop>WebRss topic:
   <dc:source>%WIKITOOLNAME%</dc:source>
   <items>
     <rdf:Seq>
-%SEARCH{"%URLPARAM{"search" encode="quote" default=".*" }%" web="%URLPARAM{"web" encode="quote" default="%BASEWEB%" }%" excludetopic="%URLPARAM{"excludetopic" encode="quote" default="WebStatistics" }%" type="%URLPARAM{"type" encode="quote" default="regex" }%" nosearch="on" order="modified" reverse="on" nototal="on" limit="%URLPARAM{"limit" encode="quote" default="16" }%" scope="%URLPARAM{"scope" encode="quote" default="text" }%" casesensitive="%URLPARAM{"casesensitive" encode="quote" default="on" }%" date="%URLPARAM{"date" encode="quote" default="" }%" format="      <rdf:li rdf:resource=\"%SCRIPTURL{"view"}%/$web/$topic\" />"}%
+%SEARCH{
+  "%URLPARAM{"search" 
+  encode="quote" default=".*" }%" 
+  web="%URLPARAM{"web" encode="quote" default="%BASEWEB%" }%" 
+  excludetopic="%URLPARAM{"excludetopic" encode="quote" default="WebStatistics" }%" 
+  type="%URLPARAM{"type" encode="quote" default="regex" }%" 
+  nosearch="on" 
+  order="modified" 
+  reverse="on" 
+  nototal="on" 
+  limit="%URLPARAM{"limit" encode="quote" default="16" }%" 
+  scope="%URLPARAM{"scope" encode="quote" default="text" }%" 
+  casesensitive="%URLPARAM{"casesensitive" encode="quote" default="on" }%" 
+  date="%URLPARAM{"date" encode="quote" default="" }%" 
+  format="      <rdf:li rdf:resource=\"%SCRIPTURL{"view"}%/$web/$topic\" />"
+ }%
     </rdf:Seq>
   </items>
 </channel>
@@ -58,7 +73,21 @@ The part below is included by each <nop>WebRss topic:
   <link>%SCRIPTURL{"view"}%/%BASEWEB%</link>
   <url>%WIKILOGOIMG%</url>
 </image>
-%SEARCH{"%URLPARAM{"search" encode="quote" default=".*" }%" web="%URLPARAM{"web" encode="quote" default="%BASEWEB%" }%" excludetopic="%URLPARAM{"excludetopic" encode="quote" default="WebStatistics" }%" type="%URLPARAM{"type" encode="quote" default="regex" }%" nosearch="on" order="modified" reverse="on" nototal="on" limit="%URLPARAM{"limit" encode="quote" default="16" }%" scope="%URLPARAM{"scope" encode="quote" default="text" }%" casesensitive="%URLPARAM{"casesensitive" encode="quote" default="on" }%" date="%URLPARAM{"date" encode="quote" default="" }%" format="<item rdf:about=\"%SCRIPTURL{"view"}%/$web/$topic\">$n  <title>$topic</title>$n  <link>%SCRIPTURL{"view"}%/$web/$topic</link>$n  <description>$summary (last changed by <nop>$wikiname)</description>$n  <dc:date>$isodate</dc:date>$n  <dc:contributor>$n    <rdf:Description link=\"%SCRIPTURL{"view"}%?topic=$wikiusername\">$n      <rdf:value>$username</rdf:value>$n    </rdf:Description>$n  </dc:contributor>$n</item>"}%
+%SEARCH{
+  "%URLPARAM{"search" encode="quote" default=".*" }%" 
+  web="%URLPARAM{"web" encode="quote" default="%BASEWEB%" }%" 
+  excludetopic="%URLPARAM{"excludetopic" encode="quote" default="WebStatistics" }%" 
+  type="%URLPARAM{"type" encode="quote" default="regex" }%" 
+  nosearch="on" 
+  order="modified" 
+  reverse="on" 
+  nototal="on" 
+  limit="%URLPARAM{"limit" encode="quote" default="16" }%" 
+  scope="%URLPARAM{"scope" encode="quote" default="text" }%" 
+  casesensitive="%URLPARAM{"casesensitive" encode="quote" default="on" }%" 
+  date="%URLPARAM{"date" encode="quote" default="" }%" 
+  format="<item rdf:about=\"%SCRIPTURL{"view"}%/$web/$topic\">$n  <title>$topic</title>$n  <link>%SCRIPTURL{"view"}%/$web/$topic</link>$n  <description>$summary (last changed by <nop>$wikiname)</description>$n  <dc:date>$isodate</dc:date>$n  <dc:contributor>$n    <rdf:Description link=\"%SCRIPTURL{"view"}%?topic=$wikiusername\">$n      <rdf:value>$username</rdf:value>$n    </rdf:Description>$n  </dc:contributor>$n</item>"
+}%
 %STOPINCLUDE%
 </verbatim>
 -----