Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item10658: Add back in SEARCHDEFAULTTTYPE
Note the spelling error, an extra T - historical use.

git-svn-id: http://svn.foswiki.org/branches/Release01x01@11726 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed May 22, 2011
1 parent 8424ed5 commit 2a734f7
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
16 changes: 16 additions & 0 deletions core/data/System/ReleaseNotes01x01.txt
Expand Up @@ -43,6 +43,22 @@ Foswiki 1.1 ships with the following:


#Release01x01Changes
---++ Important Changes since Foswiki 1.1.3

---+++ SEARCHDEFAULTTTYPE restored

The default search type used in the WebSearch page was not carried forward from 1.0. to 1.1. This option has been restored in 1.1.4, with some changes:

* It only applies to the WebSearch and WebSearchAdvanced. On Foswiki 1.0 it also applied to the =%SEARCH= macro.
* The (ignored) default in DefaultPreferences is =keyword=, but on 1.1, WebSearch defaulted to =word=
* WebSearchAdvanced had a hardcoded default of =word= on both 1.0 and 1.1. This is changed to use the SEARCHDEFAULTTTYPE setting.
* The historical mis-spelling =(SEARCHDEFAULT<b>T</b>TYPE)= is preserved.

| *Migration* | ==%SEARCH== | ==WebSearch== | ==WebSearchAdvanced== |
| 1.0 to &lt;= 1.1.3 | Default type is =word=, configuration setting no longer used. | Type =word=, not configurable. | No change |
| 1.0 to 1.1.4 | Default type is =word=, configuration setting no longer used. | No Change | Default type changes from =word= to configured =%<nop>SEARCHDEFAULTTTYPE% (%SEARCHDEFAULTTTYPE%)= |
| 1.1.x to 1.1.4 | No Change | Default changes from =word= to configured =%SEARCHDEFAULTTTYPE% (%SEARCHDEFAULTTTYPE%= | Default type changes from =word= to configured =%<nop>SEARCHDEFAULTTTYPE% (%SEARCHDEFAULTTTYPE%)= |

---++ Important Changes since Foswiki 1.1.2

---+++ Changes to %<nop>GROUPS% and %<nop>GROUPINFO% Macros
Expand Down
10 changes: 5 additions & 5 deletions core/data/System/WebSearch.txt
Expand Up @@ -52,10 +52,10 @@ hideimgleft="%ICONURLPATH{toggleclose}%"
</div></noautolink>%ENDSECTION{"form"}%


%STARTSECTION{"searchparamssimple"}%search=%URLPARAM{"search" encode="url"}%;scope=%URLPARAM{"scope" encode="url" default="all"}%;web=%URLPARAM{"web" encode="url"}%%ENDSECTION{"searchparamssimple"}%
%STARTSECTION{"searchparamssimple"}%search=%URLPARAM{"search" encode="url"}%;scope=%URLPARAM{"scope" encode="url" default="all"}%;web=%URLPARAM{"web" encode="url";type=%URLPARAM{"type" encode="url" default="%SEARCHDEFAULTTTYPE%"}%}%%ENDSECTION{"searchparamssimple"}%


%STARTSECTION{"searchparamsadvanced"}%%INCLUDE{"%TOPIC%" section="searchparamssimple"}%;type=%URLPARAM{"type" encode="url" default="word"}%;nosearch=%URLPARAM{"nosearch" encode="url"}%;limit=%URLPARAM{"limit" encode="url"}%;excludetopic=%URLPARAM{"excludetopic" encode="url"}%;casesensitive=%URLPARAM{"casesensitive" encode="url"}%%ENDSECTION{"searchparamsadvanced"}%
%STARTSECTION{"searchparamsadvanced"}%%INCLUDE{"%TOPIC%" section="searchparamssimple"}%;type=%URLPARAM{"type" encode="url" default="%SEARCHDEFAULTTTYPE%"}%;nosearch=%URLPARAM{"nosearch" encode="url"}%;limit=%URLPARAM{"limit" encode="url"}%;excludetopic=%URLPARAM{"excludetopic" encode="url"}%;casesensitive=%URLPARAM{"casesensitive" encode="url"}%%ENDSECTION{"searchparamsadvanced"}%


%STARTSECTION{"tabs"}%<noautolink><div class="foswikiTabs">
Expand Down Expand Up @@ -110,8 +110,8 @@ hideimgleft="%ICONURLPATH{toggleclose}%"
<hr />
<input type="checkbox" class="foswikiCheckbox" id="casesensitive" name="casesensitive" %IF{" '%URLPARAM{casesensitive}%' = 'on' " then="checked=\"checked\"" else=""}% /><label for="casesensitive"> %MAKETEXT{"Case sensitive"}%</label><br />
<hr />
<input type="radio" class="foswikiRadioButton" id="word" name="type" value="word" %IF{" '%URLPARAM{"type" default="word"}%' = 'word' " then="checked=\"checked\"" else=""}% /><label for="topic"> %MAKETEXT{"Word search"}%</label><br />
<input type="radio" class="foswikiRadioButton" id="keyword" name="type" value="keyword" %IF{" '%URLPARAM{type}%' = 'keyword' " then="checked=\"checked\"" else=""}% /><label for="topic"> %MAKETEXT{"Keyword search"}%</label><br />
<input type="radio" class="foswikiRadioButton" id="word" name="type" value="word" %IF{" '%URLPARAM{"type" default="%SEARCHDEFAULTTTYPE%"}%' = 'word' " then="checked=\"checked\"" else=""}% /><label for="topic"> %MAKETEXT{"Word search"}%</label><br />
<input type="radio" class="foswikiRadioButton" id="keyword" name="type" value="keyword" %IF{" '%URLPARAM{"type" default="%SEARCHDEFAULTTTYPE%"}%' = 'keyword' " then="checked=\"checked\"" else=""}% /><label for="topic"> %MAKETEXT{"Keyword search"}%</label><br />
<input type="radio" class="foswikiRadioButton" id="literal" name="type" value="literal" %IF{" '%URLPARAM{type}%' = 'literal' " then="checked=\"checked\"" else=""}% /><label for="modified"> %MAKETEXT{"Literal search"}%</label><br />
<input type="radio" class="foswikiRadioButton" id="regex" name="type" value="regex" %IF{" '%URLPARAM{type}%' = 'regex' " then="checked=\"checked\"" else=""}% /><label for="editby"> %MAKETEXT{"Regular expression search"}%</label><br />
<input type="radio" class="foswikiRadioButton" id="query" name="type" value="query" %IF{" '%URLPARAM{type}%' = 'query' " then="checked=\"checked\"" else=""}% /><label for="editby"> %MAKETEXT{"Query Search"}%</label>
Expand Down Expand Up @@ -165,7 +165,7 @@ zeroresults="%IF{ "defined search and $search!=''" then="on" else="off" }%"
<pre class="foswikiSmall">
%<nop>SEARCH{
"%URLPARAM{"search" encode="quote"}%"
type="%URLPARAM{"type" default="word"}%"
type="%URLPARAM{"type" default="%SEARCHDEFAULTTTYPE%"}%"
%IF{"defined scope" then=" scope=\"%URLPARAM{"scope" encode="quote"}%\"$n"}%%IF{"defined web" then=" web=\"%URLPARAM{"web" encode="quote"}%\"$n"}%%IF{"defined nosearch" then=" nosearch=\"%URLPARAM{"nosearch" encode="quote"}%\"$n"}%%IF{"defined casesensitive" then=" casesensitive=\"%URLPARAM{"casesensitive" encode="quote"}%\"$n"}%%IF{"defined nosummary" then=" nosummary=\"%URLPARAM{"nosummary" encode="quote"}%\"$n"}%%IF{"defined nototal" then=" nototal=\"%URLPARAM{"nototal" encode="quote"}%\"$n"}%%IF{"defined order" then=" order=\"%URLPARAM{"order" encode="quote"}%\"$n"}%%IF{"defined reverse" then=" reverse=\"%URLPARAM{"reverse" encode="quote"}%\"$n"}%%IF{"defined limit" then=" limit=\"%URLPARAM{"limit" encode="quote"}%\"$n"}% zeroresults="%IF{ "defined search" then="on" else="off" }%"
}%
</pre>
Expand Down

0 comments on commit 2a734f7

Please sign in to comment.