*/
function wfSpecialSearch( $par = '' ) {
global $wgRequest, $wgUser;
-
// Strip underscores from title parameter; most of the time we'll want
// text form here. But don't strip underscores from actual text params!
$titleParam = str_replace( '_', ' ', $par );
-
+ // Fetch the search term
$search = str_replace( "\n", " ", $wgRequest->getText( 'search', $titleParam ) );
$searchPage = new SpecialSearch( $wgRequest, $wgUser );
- if( $wgRequest->getVal( 'fulltext' )
- || !is_null( $wgRequest->getVal( 'offset' ))
- || !is_null( $wgRequest->getVal( 'searchx' ))) {
- $searchPage->showResults( $search, 'search' );
+ if( $wgRequest->getVal( 'fulltext' )
+ || !is_null( $wgRequest->getVal( 'offset' ))
+ || !is_null( $wgRequest->getVal( 'searchx' )) )
+ {
+ $searchPage->showResults( $search );
} else {
$searchPage->goResult( $search );
}
* @param User $user
* @public
*/
- function SpecialSearch( &$request, &$user ) {
+ function __construct( &$request, &$user ) {
list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
-
+ $this->mPrefix = $request->getVal('prefix', '');
+ # Extract requested namespaces
$this->namespaces = $this->powerSearch( $request );
if( empty( $this->namespaces ) ) {
$this->namespaces = SearchEngine::userNamespaces( $user );
}
-
$this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
+ $this->searchAdvanced = $request->getVal( 'advanced' );
+ $this->active = 'advanced';
+ $this->sk = $user->getSkin();
+ $this->didYouMeanHtml = ''; # html of did you mean... link
+ $this->fulltext = $request->getVal('fulltext');
}
/**
* If an exact title match can be found, jump straight ahead to it.
* @param string $term
- * @public
*/
- function goResult( $term ) {
+ public function goResult( $term ) {
global $wgOut;
- global $wgGoToEdit;
-
$this->setupPage( $term );
-
# Try to go to page as entered.
$t = Title::newFromText( $term );
-
# If the string cannot be used to create a title
- if( is_null( $t ) ){
+ if( is_null( $t ) ) {
return $this->showResults( $term );
}
-
# If there's an exact or very near match, jump right there.
$t = SearchEngine::getNearMatch( $term );
if( !is_null( $t ) ) {
$wgOut->redirect( $t->getFullURL() );
return;
}
-
# No match, generate an edit URL
$t = Title::newFromText( $term );
- if( ! is_null( $t ) ) {
+ if( !is_null( $t ) ) {
+ global $wgGoToEdit;
wfRunHooks( 'SpecialSearchNogomatch', array( &$t ) );
# If the feature is enabled, go straight to the edit page
- if ( $wgGoToEdit ) {
- $wgOut->redirect( $t->getFullURL( 'action=edit' ) );
+ if( $wgGoToEdit ) {
+ $wgOut->redirect( $t->getFullURL( array( 'action' => 'edit' ) ) );
return;
}
}
-
- $wgOut->wrapWikiMsg( "==$1==\n", 'notitlematches' );
- if( $t->quickUserCan( 'create' ) && $t->quickUserCan( 'edit' ) ) {
- $wgOut->addWikiMsg( 'noexactmatch', wfEscapeWikiText( $term ) );
- } else {
- $wgOut->addWikiMsg( 'noexactmatch-nocreate', wfEscapeWikiText( $term ) );
- }
-
return $this->showResults( $term );
}
/**
* @param string $term
- * @public
*/
- function showResults( $term ) {
- $fname = 'SpecialSearch::showResults';
- wfProfileIn( $fname );
- global $wgOut, $wgUser;
- $sk = $wgUser->getSkin();
+ public function showResults( $term ) {
+ global $wgOut, $wgUser, $wgDisableTextSearch, $wgContLang, $wgScript;
+ wfProfileIn( __METHOD__ );
- $this->setupPage( $term );
+ $sk = $wgUser->getSkin();
- $wgOut->addWikiMsg( 'searchresulttext' );
+ $this->searchEngine = SearchEngine::create();
+ $search =& $this->searchEngine;
+ $search->setLimitOffset( $this->limit, $this->offset );
+ $search->setNamespaces( $this->namespaces );
+ $search->showRedirects = $this->searchRedirects;
+ $search->prefix = $this->mPrefix;
+ $term = $search->transformSearchTerm($term);
- if( '' === trim( $term ) ) {
- // Empty query -- straight view of search form
- $wgOut->setSubtitle( '' );
- $wgOut->addHTML( $this->powerSearchBox( $term ) );
- $wgOut->addHTML( $this->powerSearchFocus() );
- wfProfileOut( $fname );
- return;
- }
+ $this->setupPage( $term );
- global $wgDisableTextSearch;
- if ( $wgDisableTextSearch ) {
+ if( $wgDisableTextSearch ) {
global $wgSearchForwardUrl;
if( $wgSearchForwardUrl ) {
$url = str_replace( '$1', urlencode( $term ), $wgSearchForwardUrl );
$wgOut->redirect( $url );
+ wfProfileOut( __METHOD__ );
return;
}
global $wgInputEncoding;
) .
Xml::closeElement( 'fieldset' )
);
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return;
}
- $wgOut->addHTML( $this->shortDialog( $term ) );
+ $t = Title::newFromText( $term );
- $search = SearchEngine::create();
- $search->setLimitOffset( $this->limit, $this->offset );
- $search->setNamespaces( $this->namespaces );
- $search->showRedirects = $this->searchRedirects;
+ // fetch search results
$rewritten = $search->replacePrefixes($term);
$titleMatches = $search->searchTitle( $rewritten );
+ if( !($titleMatches instanceof SearchResultTooMany))
+ $textMatches = $search->searchText( $rewritten );
+
+ // did you mean... suggestions
+ if( $textMatches && $textMatches->hasSuggestion() ) {
+ $st = SpecialPage::getTitleFor( 'Search' );
+
+ # mirror Go/Search behaviour of original request ..
+ $didYouMeanParams = array( 'search' => $textMatches->getSuggestionQuery() );
+
+ if($this->fulltext != null)
+ $didYouMeanParams['fulltext'] = $this->fulltext;
+
+ $stParams = array_merge(
+ $didYouMeanParams,
+ $this->powerSearchOptions()
+ );
+
+ $suggestionSnippet = $textMatches->getSuggestionSnippet();
+
+ if( $suggestionSnippet == '' )
+ $suggestionSnippet = null;
+
+ $suggestLink = $sk->linkKnown(
+ $st,
+ $suggestionSnippet,
+ array(),
+ $stParams
+ );
+
+ $this->didYouMeanHtml = '<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>';
+ }
+ // start rendering the page
+ $wgOut->addHtml(
+ Xml::openElement(
+ 'form',
+ array(
+ 'id' => ( $this->searchAdvanced ? 'powersearch' : 'search' ),
+ 'method' => 'get',
+ 'action' => $wgScript
+ )
+ )
+ );
+ $wgOut->addHtml(
+ Xml::openElement( 'table', array( 'id'=>'mw-search-top-table', 'border'=>0, 'cellpadding'=>0, 'cellspacing'=>0 ) ) .
+ Xml::openElement( 'tr' ) .
+ Xml::openElement( 'td' ) . "\n" .
+ $this->shortDialog( $term ) .
+ Xml::closeElement('td') .
+ Xml::closeElement('tr') .
+ Xml::closeElement('table')
+ );
// Sometimes the search engine knows there are too many hits
- if ($titleMatches instanceof SearchResultTooMany) {
+ if( $titleMatches instanceof SearchResultTooMany ) {
$wgOut->addWikiText( '==' . wfMsg( 'toomanymatches' ) . "==\n" );
- $wgOut->addHTML( $this->powerSearchBox( $term ) );
- $wgOut->addHTML( $this->powerSearchFocus() );
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return;
}
-
- $textMatches = $search->searchText( $rewritten );
- // did you mean... suggestions
- if($textMatches && $textMatches->hasSuggestion()){
- $st = SpecialPage::getTitleFor( 'Search' );
- $stParams = wfArrayToCGI( array(
- 'search' => $textMatches->getSuggestionQuery(),
- 'fulltext' => wfMsg('search')),
- $this->powerSearchOptions());
-
- $suggestLink = '<a href="'.$st->escapeLocalURL($stParams).'">'.
- $textMatches->getSuggestionSnippet().'</a>';
-
- $wgOut->addHTML('<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>');
- }
-
- // show number of results
- $num = ( $titleMatches ? $titleMatches->numRows() : 0 )
- + ( $textMatches ? $textMatches->numRows() : 0);
- $totalNum = 0;
- if($titleMatches && !is_null($titleMatches->getTotalHits()))
- $totalNum += $titleMatches->getTotalHits();
- if($textMatches && !is_null($textMatches->getTotalHits()))
- $totalNum += $textMatches->getTotalHits();
- if ( $num > 0 ) {
- if ( $totalNum > 0 ){
- $top = wfMsgExt('showingresultstotal', array( 'parseinline' ),
- $this->offset+1, $this->offset+$num, $totalNum, $num );
- } elseif ( $num >= $this->limit ) {
- $top = wfShowingResults( $this->offset, $this->limit );
- } else {
- $top = wfShowingResultsNum( $this->offset, $this->limit, $num );
- }
- $wgOut->addHTML( "<p class='mw-search-numberresults'>{$top}</p>\n" );
+ $filePrefix = $wgContLang->getFormattedNsText(NS_FILE).':';
+ if( '' === trim( $term ) || $filePrefix === trim( $term ) ) {
+ $wgOut->addHTML( $this->searchFocus() );
+ $wgOut->addHTML( $this->formHeader($term, 0, 0));
+ if( $this->searchAdvanced ) {
+ $wgOut->addHTML( $this->powerSearchBox( $term ) );
+ }
+ $wgOut->addHTML( '</form>' );
+ // Empty query -- straight view of search form
+ wfProfileOut( __METHOD__ );
+ return;
}
+ // Get number of results
+ $titleMatchesNum = $titleMatches ? $titleMatches->numRows() : 0;
+ $textMatchesNum = $textMatches ? $textMatches->numRows() : 0;
+ // Total initial query matches (possible false positives)
+ $num = $titleMatchesNum + $textMatchesNum;
+
+ // Get total actual results (after second filtering, if any)
+ $numTitleMatches = $titleMatches && !is_null( $titleMatches->getTotalHits() ) ?
+ $titleMatches->getTotalHits() : $titleMatchesNum;
+ $numTextMatches = $textMatches && !is_null( $textMatches->getTotalHits() ) ?
+ $textMatches->getTotalHits() : $textMatchesNum;
+
+ // get total number of results if backend can calculate it
+ $totalRes = 0;
+ if($titleMatches && !is_null( $titleMatches->getTotalHits() ) )
+ $totalRes += $titleMatches->getTotalHits();
+ if($textMatches && !is_null( $textMatches->getTotalHits() ))
+ $totalRes += $textMatches->getTotalHits();
+
+ // show number of results and current offset
+ $wgOut->addHTML( $this->formHeader($term, $num, $totalRes));
+ if( $this->searchAdvanced ) {
+ $wgOut->addHTML( $this->powerSearchBox( $term ) );
+ }
+
+ $wgOut->addHtml( Xml::closeElement( 'form' ) );
+ $wgOut->addHtml( "<div class='searchresults'>" );
+
// prev/next links
if( $num || $this->offset ) {
+ // Show the create link ahead
+ $this->showCreateLink( $t );
$prevnext = wfViewPrevNext( $this->offset, $this->limit,
SpecialPage::getTitleFor( 'Search' ),
- wfArrayToCGI(
- $this->powerSearchOptions(),
- array( 'search' => $term ) ),
- ($num < $this->limit) );
- $wgOut->addHTML( "<p class='mw-search-pager-top'>{$prevnext}</p>\n" );
+ wfArrayToCGI( $this->powerSearchOptions(), array( 'search' => $term ) ),
+ max( $titleMatchesNum, $textMatchesNum ) < $this->limit
+ );
+ //$wgOut->addHTML( "<p class='mw-search-pager-top'>{$prevnext}</p>\n" );
wfRunHooks( 'SpecialSearchResults', array( $term, &$titleMatches, &$textMatches ) );
} else {
wfRunHooks( 'SpecialSearchNoResults', array( $term ) );
- }
+ }
if( $titleMatches ) {
- if( $titleMatches->numRows() ) {
+ if( $numTitleMatches > 0 ) {
$wgOut->wrapWikiMsg( "==$1==\n", 'titlematches' );
$wgOut->addHTML( $this->showMatches( $titleMatches ) );
}
$titleMatches->free();
}
-
if( $textMatches ) {
// output appropriate heading
- if( $textMatches->numRows() ) {
- if($titleMatches)
- $wgOut->wrapWikiMsg( "==$1==\n", 'textmatches' );
- else // if no title matches the heading is redundant
- $wgOut->addHTML("<hr/>");
- } elseif( $num == 0 ) {
+ if( $numTextMatches > 0 && $numTitleMatches > 0 ) {
+ // if no title matches the heading is redundant
+ $wgOut->wrapWikiMsg( "==$1==\n", 'textmatches' );
+ } elseif( $totalRes == 0 ) {
# Don't show the 'no text matches' if we received title matches
- $wgOut->wrapWikiMsg( "==$1==\n", 'notextmatches' );
+ # $wgOut->wrapWikiMsg( "==$1==\n", 'notextmatches' );
}
// show interwiki results if any
- if( $textMatches->hasInterwikiResults() )
- $wgOut->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ));
+ if( $textMatches->hasInterwikiResults() ) {
+ $wgOut->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) );
+ }
// show results
- if( $textMatches->numRows() )
+ if( $numTextMatches > 0 ) {
$wgOut->addHTML( $this->showMatches( $textMatches ) );
+ }
$textMatches->free();
}
-
- if ( $num == 0 ) {
- $wgOut->addWikiMsg( 'nonefound' );
+ if( $num === 0 ) {
+ $wgOut->addWikiMsg( 'search-nonefound', wfEscapeWikiText( $term ) );
+ $this->showCreateLink( $t );
+ }
+ $wgOut->addHtml( "</div>" );
+ if( $num === 0 ) {
+ $wgOut->addHTML( $this->searchFocus() );
}
+
if( $num || $this->offset ) {
$wgOut->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
}
- $wgOut->addHTML( $this->powerSearchBox( $term ) );
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
}
-
- #------------------------------------------------------------------
- # Private methods below this line
+ protected function showCreateLink( $t ) {
+ global $wgOut;
+
+ // show direct page/create link
+ if( !is_null($t) ) {
+ if( !$t->isKnown() ) {
+ $wgOut->addWikiMsg( 'searchmenu-new', wfEscapeWikiText( $t->getPrefixedText() ) );
+ } else {
+ $wgOut->addWikiMsg( 'searchmenu-exists', wfEscapeWikiText( $t->getPrefixedText() ) );
+ }
+ } else {
+ // preserve the paragraph for margins etc...
+ $wgOut->addHTML('<p></p>');
+ }
+ }
+
/**
*
*/
- function setupPage( $term ) {
+ protected function setupPage( $term ) {
global $wgOut;
- if( !empty( $term ) ){
+ // Figure out the active search profile header
+ $nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
+ if( $this->searchAdvanced )
+ $this->active = 'advanced';
+ else {
+ $profiles = $this->getSearchProfiles();
+
+ foreach( $profiles as $key => $data ) {
+ if ( $this->namespaces == $data['namespaces'] && $key != 'advanced')
+ $this->active = $key;
+ }
+
+ }
+ # Should advanced UI be used?
+ $this->searchAdvanced = ($this->active === 'advanced');
+ if( !empty( $term ) ) {
$wgOut->setPageTitle( wfMsg( 'searchresults') );
- $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term) ) );
- }
- $subtitlemsg = ( Title::newFromText( $term ) ? 'searchsubtitle' : 'searchsubtitleinvalid' );
- $wgOut->setSubtitle( $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ) );
+ $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term ) ) );
+ }
$wgOut->setArticleRelated( false );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
+ // add javascript specific to special:search
+ $wgOut->addScriptFile( 'search.js' );
}
/**
*
* @param WebRequest $request
* @return array
- * @private
*/
- function powerSearch( &$request ) {
+ protected function powerSearch( &$request ) {
$arr = array();
foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
if( $request->getCheck( 'ns' . $ns ) ) {
/**
* Reconstruct the 'power search' options for links
* @return array
- * @private
*/
- function powerSearchOptions() {
+ protected function powerSearchOptions() {
$opt = array();
foreach( $this->namespaces as $n ) {
$opt['ns' . $n] = 1;
}
$opt['redirs'] = $this->searchRedirects ? 1 : 0;
+ if( $this->searchAdvanced ) {
+ $opt['advanced'] = $this->searchAdvanced;
+ }
return $opt;
}
/**
- * Show whole set of results
- *
+ * Show whole set of results
+ *
* @param SearchResultSet $matches
*/
- function showMatches( &$matches ) {
- $fname = 'SpecialSearch::showMatches';
- wfProfileIn( $fname );
-
+ protected function showMatches( &$matches ) {
global $wgContLang;
+ wfProfileIn( __METHOD__ );
+
$terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
$out = "";
-
$infoLine = $matches->getInfo();
- if( !is_null($infoLine) )
+ if( !is_null($infoLine) ) {
$out .= "\n<!-- {$infoLine} -->\n";
-
-
+ }
$off = $this->offset + 1;
$out .= "<ul class='mw-search-results'>\n";
-
while( $result = $matches->next() ) {
$out .= $this->showHit( $result, $terms );
}
$out .= "</ul>\n";
// convert the whole thing to desired language variant
- global $wgContLang;
$out = $wgContLang->convert( $out );
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return $out;
}
* @param SearchResult $result
* @param array $terms terms to highlight
*/
- function showHit( $result, $terms ) {
- $fname = 'SpecialSearch::showHit';
- wfProfileIn( $fname );
- global $wgUser, $wgContLang, $wgLang;
-
+ protected function showHit( $result, $terms ) {
+ global $wgContLang, $wgLang, $wgUser;
+ wfProfileIn( __METHOD__ );
+
if( $result->isBrokenTitle() ) {
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return "<!-- Broken link in search result -->\n";
}
-
- $t = $result->getTitle();
+
$sk = $wgUser->getSkin();
+ $t = $result->getTitle();
+
+ $titleSnippet = $result->getTitleSnippet($terms);
+
+ if( $titleSnippet == '' )
+ $titleSnippet = null;
+
+ $link_t = clone $t;
+
+ wfRunHooks( 'ShowSearchHitTitle',
+ array( &$link_t, &$titleSnippet, $result, $terms, $this ) );
- $link = $sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
+ $link = $this->sk->linkKnown(
+ $link_t,
+ $titleSnippet
+ );
//If page content is not readable, just return the title.
//This is not quite safe, but better than showing excerpts from non-readable pages
//Note that hiding the entry entirely would screw up paging.
- if (!$t->userCanRead()) {
- wfProfileOut( $fname );
+ if( !$t->userCanRead() ) {
+ wfProfileOut( __METHOD__ );
return "<li>{$link}</li>\n";
}
// The least confusing at this point is to drop the result.
// You may get less results, but... oh well. :P
if( $result->isMissingRevision() ) {
- wfProfileOut( $fname );
- return "<!-- missing page " .
- htmlspecialchars( $t->getPrefixedText() ) . "-->\n";
+ wfProfileOut( __METHOD__ );
+ return "<!-- missing page " . htmlspecialchars( $t->getPrefixedText() ) . "-->\n";
}
// format redirects / relevant sections
$sectionTitle = $result->getSectionTitle();
$sectionText = $result->getSectionSnippet($terms);
$redirect = '';
- if( !is_null($redirectTitle) )
- $redirect = "<span class='searchalttitle'>"
- .wfMsg('search-redirect',$sk->makeKnownLinkObj( $redirectTitle, $redirectText))
- ."</span>";
+
+ if( !is_null($redirectTitle) ) {
+ if( $redirectText == '' )
+ $redirectText = null;
+
+ $redirect = "<span class='searchalttitle'>" .
+ wfMsg(
+ 'search-redirect',
+ $this->sk->linkKnown(
+ $redirectTitle,
+ $redirectText
+ )
+ ) .
+ "</span>";
+ }
+
$section = '';
- if( !is_null($sectionTitle) )
- $section = "<span class='searchalttitle'>"
- .wfMsg('search-section', $sk->makeKnownLinkObj( $sectionTitle, $sectionText))
- ."</span>";
+
+
+ if( !is_null($sectionTitle) ) {
+ if( $sectionText == '' )
+ $sectionText = null;
+
+ $section = "<span class='searchalttitle'>" .
+ wfMsg(
+ 'search-section', $this->sk->linkKnown(
+ $sectionTitle,
+ $sectionText
+ )
+ ) .
+ "</span>";
+ }
// format text extract
$extract = "<div class='searchresult'>".$result->getTextSnippet($terms)."</div>";
-
+
// format score
if( is_null( $result->getScore() ) ) {
// Search engine doesn't report scoring info
$byteSize = $result->getByteSize();
$wordCount = $result->getWordCount();
$timestamp = $result->getTimestamp();
- $size = wfMsgExt( 'search-result-size', array( 'parsemag', 'escape' ),
- $sk->formatSize( $byteSize ),
- $wordCount );
+ $size = wfMsgExt(
+ 'search-result-size',
+ array( 'parsemag', 'escape' ),
+ $this->sk->formatSize( $byteSize ),
+ $wgLang->formatNum( $wordCount )
+ );
$date = $wgLang->timeanddate( $timestamp );
// link to related articles if supported
$related = '';
- if( $result->hasRelated() ){
+ if( $result->hasRelated() ) {
$st = SpecialPage::getTitleFor( 'Search' );
- $stParams = wfArrayToCGI( $this->powerSearchOptions(),
- array('search' => wfMsgForContent('searchrelated').':'.$t->getPrefixedText(),
- 'fulltext' => wfMsg('search') ));
-
- $related = ' -- <a href="'.$st->escapeLocalURL($stParams).'">'.
- wfMsg('search-relatedarticle').'</a>';
+ $stParams = array_merge(
+ $this->powerSearchOptions(),
+ array(
+ 'search' => wfMsgForContent( 'searchrelated' ) . ':' . $t->getPrefixedText(),
+ 'fulltext' => wfMsg( 'search' )
+ )
+ );
+
+ $related = ' -- ' . $sk->linkKnown(
+ $st,
+ wfMsg('search-relatedarticle'),
+ array(),
+ $stParams
+ );
}
-
+
// Include a thumbnail for media files...
- if( $t->getNamespace() == NS_IMAGE ) {
+ if( $t->getNamespace() == NS_FILE ) {
$img = wfFindFile( $t );
if( $img ) {
$thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
if( $thumb ) {
$desc = $img->getShortDesc();
- wfProfileOut( $fname );
- // Ugly table. :D
+ wfProfileOut( __METHOD__ );
// Float doesn't seem to interact well with the bullets.
- // Table messes up vertical alignment of the bullet, but I'm
- // not sure what more I can do about that. :(
+ // Table messes up vertical alignment of the bullets.
+ // Bullets are therefore disabled (didn't look great anyway).
return "<li>" .
'<table class="searchResultImage">' .
'<tr>' .
- '<td width="120" align="center">' .
+ '<td width="120" align="center" valign="top">' .
$thumb->toHtml( array( 'desc-link' => true ) ) .
'</td>' .
'<td valign="top">' .
}
}
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return "<li>{$link} {$redirect} {$section} {$extract}\n" .
"<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
"</li>\n";
/**
* Show results from other wikis
- *
+ *
* @param SearchResultSet $matches
*/
- function showInterwiki( &$matches, $query ) {
- $fname = 'SpecialSearch::showInterwiki';
- wfProfileIn( $fname );
-
+ protected function showInterwiki( &$matches, $query ) {
global $wgContLang;
+ wfProfileIn( __METHOD__ );
$terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
- $out = "<div id='mw-search-interwiki'><div id='mw-search-interwiki-caption'>".wfMsg('search-interwiki-caption')."</div>\n";
+ $out = "<div id='mw-search-interwiki'><div id='mw-search-interwiki-caption'>".
+ wfMsg('search-interwiki-caption')."</div>\n";
$off = $this->offset + 1;
- $out .= "<ul start='{$off}' class='mw-search-iwresults'>\n";
+ $out .= "<ul class='mw-search-iwresults'>\n";
// work out custom project captions
$customCaptions = array();
$customLines = explode("\n",wfMsg('search-interwiki-custom')); // format per line <iwprefix>:<caption>
- foreach($customLines as $line){
+ foreach($customLines as $line) {
$parts = explode(":",$line,2);
if(count($parts) == 2) // validate line
- $customCaptions[$parts[0]] = $parts[1];
+ $customCaptions[$parts[0]] = $parts[1];
}
-
-
+
$prev = null;
while( $result = $matches->next() ) {
$out .= $this->showInterwikiHit( $result, $prev, $terms, $query, $customCaptions );
$prev = $result->getInterwikiPrefix();
}
- // FIXME: should support paging in a non-confusing way (not sure how though, maybe via ajax)..
+ // TODO: should support paging in a non-confusing way (not sure how though, maybe via ajax)..
$out .= "</ul></div>\n";
// convert the whole thing to desired language variant
- global $wgContLang;
$out = $wgContLang->convert( $out );
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return $out;
}
-
+
/**
* Show single interwiki link
*
* @param SearchResult $result
* @param string $lastInterwiki
* @param array $terms
- * @param string $query
+ * @param string $query
* @param array $customCaptions iw prefix -> caption
*/
- function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions){
- $fname = 'SpecialSearch::showInterwikiHit';
- wfProfileIn( $fname );
- global $wgUser, $wgContLang, $wgLang;
-
+ protected function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions) {
+ wfProfileIn( __METHOD__ );
+ global $wgContLang, $wgLang;
+
if( $result->isBrokenTitle() ) {
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return "<!-- Broken link in search result -->\n";
}
-
+
$t = $result->getTitle();
- $sk = $wgUser->getSkin();
-
- $link = $sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
-
+
+ $titleSnippet = $result->getTitleSnippet($terms);
+
+ if( $titleSnippet == '' )
+ $titleSnippet = null;
+
+ $link = $this->sk->linkKnown(
+ $t,
+ $titleSnippet
+ );
+
// format redirect if any
$redirectTitle = $result->getRedirectTitle();
$redirectText = $result->getRedirectSnippet($terms);
$redirect = '';
- if( !is_null($redirectTitle) )
- $redirect = "<span class='searchalttitle'>"
- .wfMsg('search-redirect',$sk->makeKnownLinkObj( $redirectTitle, $redirectText))
- ."</span>";
+ if( !is_null($redirectTitle) ) {
+ if( $redirectText == '' )
+ $redirectText = null;
+
+ $redirect = "<span class='searchalttitle'>" .
+ wfMsg(
+ 'search-redirect',
+ $this->sk->linkKnown(
+ $redirectTitle,
+ $redirectText
+ )
+ ) .
+ "</span>";
+ }
$out = "";
- // display project name
- if(is_null($lastInterwiki) || $lastInterwiki != $t->getInterwiki()){
+ // display project name
+ if(is_null($lastInterwiki) || $lastInterwiki != $t->getInterwiki()) {
if( key_exists($t->getInterwiki(),$customCaptions) )
// captions from 'search-interwiki-custom'
$caption = $customCaptions[$t->getInterwiki()];
else{
- // default is to show the hostname of the other wiki which might suck
+ // default is to show the hostname of the other wiki which might suck
// if there are many wikis on one hostname
$parsed = parse_url($t->getFullURL());
- $caption = wfMsg('search-interwiki-default', $parsed['host']);
- }
+ $caption = wfMsg('search-interwiki-default', $parsed['host']);
+ }
// "more results" link (special page stuff could be localized, but we might not know target lang)
- $searchTitle = Title::newFromText($t->getInterwiki().":Special:Search");
- $searchLink = $sk->makeKnownLinkObj( $searchTitle, wfMsg('search-interwiki-more'),
- wfArrayToCGI(array('search' => $query, 'fulltext' => 'Search')));
- $out .= "</ul><div class='mw-search-interwiki-project'><span class='mw-search-interwiki-more'>{$searchLink}</span>{$caption}</div>\n<ul>";
+ $searchTitle = Title::newFromText($t->getInterwiki().":Special:Search");
+ $searchLink = $this->sk->linkKnown(
+ $searchTitle,
+ wfMsg('search-interwiki-more'),
+ array(),
+ array(
+ 'search' => $query,
+ 'fulltext' => 'Search'
+ )
+ );
+ $out .= "</ul><div class='mw-search-interwiki-project'><span class='mw-search-interwiki-more'>
+ {$searchLink}</span>{$caption}</div>\n<ul>";
}
- $out .= "<li>{$link} {$redirect}</li>\n";
- wfProfileOut( $fname );
+ $out .= "<li>{$link} {$redirect}</li>\n";
+ wfProfileOut( __METHOD__ );
return $out;
}
-
+
/**
* Generates the power search box at bottom of [[Special:Search]]
* @param $term string: search term
* @return $out string: HTML form
*/
- function powerSearchBox( $term ) {
- global $wgScript;
-
- $namespaces = '';
- foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
+ protected function powerSearchBox( $term ) {
+ global $wgScript, $wgContLang;
+
+ // Groups namespaces into rows according to subject
+ $rows = array();
+ foreach( SearchEngine::searchableNamespaces() as $namespace => $name ) {
+ $subject = MWNamespace::getSubject( $namespace );
+ if( !array_key_exists( $subject, $rows ) ) {
+ $rows[$subject] = "";
+ }
$name = str_replace( '_', ' ', $name );
- if( '' == $name ) {
+ if( $name == '' ) {
$name = wfMsg( 'blanknamespace' );
}
- $namespaces .= Xml::openElement( 'span', array( 'style' => 'white-space: nowrap' ) ) .
- Xml::checkLabel( $name, "ns{$ns}", "mw-search-ns{$ns}", in_array( $ns, $this->namespaces ) ) .
- Xml::closeElement( 'span' ) . "\n";
+ $rows[$subject] .=
+ Xml::openElement(
+ 'td', array( 'style' => 'white-space: nowrap' )
+ ) .
+ Xml::checkLabel(
+ $name,
+ "ns{$namespace}",
+ "mw-search-ns{$namespace}",
+ in_array( $namespace, $this->namespaces )
+ ) .
+ Xml::closeElement( 'td' );
}
-
- $redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' ) );
- $redirectLabel = Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' );
- $searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) );
- $searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'fulltext' ) ) . "\n";
- $searchTitle = SpecialPage::getTitleFor( 'Search' );
+ $rows = array_values( $rows );
+ $numRows = count( $rows );
- $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) .
- Xml::fieldset( wfMsg( 'powersearch-legend' ),
- Xml::hidden( 'title', $searchTitle->getPrefixedText() ) .
- "<p>" .
- wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) .
- "<br />" .
- $namespaces .
- "</p>" .
- "<p>" .
- $redirect . " " . $redirectLabel .
- "</p>" .
- wfMsgExt( 'powersearch-field', array( 'parseinline' ) ) .
- " " .
- $searchField .
- " " .
- $searchButton ) .
- "</form>";
+ // Lays out namespaces in multiple floating two-column tables so they'll
+ // be arranged nicely while still accommodating different screen widths
+ $namespaceTables = '';
+ for( $i = 0; $i < $numRows; $i += 4 ) {
+ $namespaceTables .= Xml::openElement(
+ 'table',
+ array( 'cellpadding' => 0, 'cellspacing' => 0, 'border' => 0 )
+ );
+ for( $j = $i; $j < $i + 4 && $j < $numRows; $j++ ) {
+ $namespaceTables .= Xml::tags( 'tr', null, $rows[$j] );
+ }
+ $namespaceTables .= Xml::closeElement( 'table' );
+ }
+ // Show redirects check only if backend supports it
+ $redirects = '';
+ if( $this->searchEngine->acceptListRedirects() ) {
+ $redirects =
+ Xml::check(
+ 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' )
+ ) .
+ ' ' .
+ Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' );
+ }
+ // Return final output
+ return
+ Xml::openElement(
+ 'fieldset',
+ array( 'id' => 'mw-searchoptions', 'style' => 'margin:0em;' )
+ ) .
+ Xml::element( 'legend', null, wfMsg('powersearch-legend') ) .
+ Xml::tags( 'h4', null, wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) ) .
+ Xml::tags(
+ 'div',
+ array( 'id' => 'mw-search-togglebox' ),
+ Xml::label( wfMsg( 'powersearch-togglelabel' ), 'mw-search-togglelabel' ) .
+ Xml::element(
+ 'input',
+ array(
+ 'type'=>'button',
+ 'id' => 'mw-search-toggleall',
+ 'onclick' => 'mwToggleSearchCheckboxes("all");',
+ 'value' => wfMsg( 'powersearch-toggleall' )
+ )
+ ) .
+ Xml::element(
+ 'input',
+ array(
+ 'type'=>'button',
+ 'id' => 'mw-search-togglenone',
+ 'onclick' => 'mwToggleSearchCheckboxes("none");',
+ 'value' => wfMsg( 'powersearch-togglenone' )
+ )
+ )
+ ) .
+ Xml::element( 'div', array( 'class' => 'divider' ), '', false ) .
+ $namespaceTables .
+ Xml::element( 'div', array( 'class' => 'divider' ), '', false ) .
+ $redirects .
+ Xml::hidden( 'title', SpecialPage::getTitleFor( 'Search' )->getPrefixedText() ) .
+ Xml::hidden( 'advanced', $this->searchAdvanced ) .
+ Xml::hidden( 'fulltext', 'Advanced search' ) .
+ Xml::closeElement( 'fieldset' );
+ }
- return $out;
+ protected function searchFocus() {
+ return Html::inlineScript(
+ "hookEvent(\"load\", function() {" .
+ "document.getElementById('searchText').focus();" .
+ "});" );
}
+
+ protected function getSearchProfiles() {
+ // Builds list of Search Types (profiles)
+ $nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
+
+ $profiles = array(
+ 'default' => array(
+ 'message' => 'searchprofile-articles',
+ 'tooltip' => 'searchprofile-articles-tooltip',
+ 'namespaces' => SearchEngine::defaultNamespaces(),
+ 'namespace-messages' => SearchEngine::namespacesAsText(
+ SearchEngine::defaultNamespaces()
+ ),
+ ),
+ 'images' => array(
+ 'message' => 'searchprofile-images',
+ 'tooltip' => 'searchprofile-images-tooltip',
+ 'namespaces' => array( NS_FILE ),
+ ),
+ 'help' => array(
+ 'message' => 'searchprofile-project',
+ 'tooltip' => 'searchprofile-project-tooltip',
+ 'namespaces' => SearchEngine::helpNamespaces(),
+ 'namespace-messages' => SearchEngine::namespacesAsText(
+ SearchEngine::helpNamespaces()
+ ),
+ ),
+ 'all' => array(
+ 'message' => 'searchprofile-everything',
+ 'tooltip' => 'searchprofile-everything-tooltip',
+ 'namespaces' => $nsAllSet,
+ ),
+ 'advanced' => array(
+ 'message' => 'searchprofile-advanced',
+ 'tooltip' => 'searchprofile-advanced-tooltip',
+ 'namespaces' => $this->namespaces,
+ 'parameters' => array( 'advanced' => 1 ),
+ )
+ );
+
+ wfRunHooks( 'SpecialSearchProfiles', array( &$profiles ) );
- function powerSearchFocus() {
- global $wgJsMimeType;
- return "<script type=\"$wgJsMimeType\">" .
- "hookEvent(\"load\", function(){" .
- "document.getElementById('powerSearchText').focus();" .
- "});" .
- "</script>";
+ foreach( $profiles as $key => &$data ) {
+ sort($data['namespaces']);
+ }
+
+ return $profiles;
}
- function shortDialog($term) {
- global $wgScript;
+ protected function formHeader( $term, $resultsShown, $totalNum ) {
+ global $wgContLang, $wgLang;
+
+ $out = Xml::openElement('div', array( 'class' => 'mw-search-formheader' ) );
+
+ $bareterm = $term;
+ if( $this->startsWithImage( $term ) ) {
+ // Deletes prefixes
+ $bareterm = substr( $term, strpos( $term, ':' ) + 1 );
+ }
- $out = Xml::openElement( 'form', array(
- 'id' => 'search',
- 'method' => 'get',
- 'action' => $wgScript
- ));
- $searchTitle = SpecialPage::getTitleFor( 'Search' );
- $out .= Xml::hidden( 'title', $searchTitle->getPrefixedText() );
- $out .= Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'searchText' ) ) . ' ';
- foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
- if( in_array( $ns, $this->namespaces ) ) {
+
+ $profiles = $this->getSearchProfiles();
+
+ // Outputs XML for Search Types
+ $out .= Xml::openElement( 'div', array( 'class' => 'search-types' ) );
+ $out .= Xml::openElement( 'ul' );
+ foreach ( $profiles as $id => $profile ) {
+ $tooltipParam = isset( $profile['namespace-messages'] ) ?
+ $wgLang->commaList( $profile['namespace-messages'] ) : null;
+ $out .= Xml::tags(
+ 'li',
+ array(
+ 'class' => $this->active == $id ? 'current' : 'normal'
+ ),
+ $this->makeSearchLink(
+ $bareterm,
+ $profile['namespaces'],
+ wfMsg( $profile['message'] ),
+ wfMsg( $profile['tooltip'], $tooltipParam ),
+ isset( $profile['parameters'] ) ? $profile['parameters'] : array()
+ )
+ );
+ }
+ $out .= Xml::closeElement( 'ul' );
+ $out .= Xml::closeElement('div') ;
+
+ // Results-info
+ if ( $resultsShown > 0 ) {
+ if ( $totalNum > 0 ){
+ $top = wfMsgExt( 'showingresultsheader', array( 'parseinline' ),
+ $wgLang->formatNum( $this->offset + 1 ),
+ $wgLang->formatNum( $this->offset + $resultsShown ),
+ $wgLang->formatNum( $totalNum ),
+ wfEscapeWikiText( $term ),
+ $wgLang->formatNum( $resultsShown )
+ );
+ } elseif ( $resultsShown >= $this->limit ) {
+ $top = wfShowingResults( $this->offset, $this->limit );
+ } else {
+ $top = wfShowingResultsNum( $this->offset, $this->limit, $resultsShown );
+ }
+ $out .= Xml::tags( 'div', array( 'class' => 'results-info' ),
+ Xml::tags( 'ul', null, Xml::tags( 'li', null, $top ) )
+ );
+ }
+
+ $out .= Xml::element( 'div', array( 'style' => 'clear:both' ), '', false );
+ $out .= Xml::closeElement('div');
+
+ // Adds hidden namespace fields
+ if ( !$this->searchAdvanced ) {
+ foreach( $this->namespaces as $ns ) {
$out .= Xml::hidden( "ns{$ns}", '1' );
}
}
- $out .= Xml::submitButton( wfMsg( 'searchbutton' ), array( 'name' => 'fulltext' ) );
- $out .= Xml::closeElement( 'form' );
-
+
return $out;
}
+
+ protected function shortDialog( $term ) {
+ $searchTitle = SpecialPage::getTitleFor( 'Search' );
+ $searchable = SearchEngine::searchableNamespaces();
+ $out = Html::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n";
+ // Keep redirect setting
+ $out .= Html::hidden( "redirs", (int)$this->searchRedirects ) . "\n";
+ // Term box
+ $out .= Html::input( 'search', $term, 'search', array(
+ 'id' => 'searchText',
+ 'size' => '50',
+ 'autofocus'
+ ) ) . "\n";
+ $out .= Html::hidden( 'fulltext', 'Search' ) . "\n";
+ $out .= Xml::submitButton( wfMsg( 'searchbutton' ) ) . "\n";
+ return $out . $this->didYouMeanHtml;
+ }
+
+ /** Make a search link with some target namespaces */
+ protected function makeSearchLink( $term, $namespaces, $label, $tooltip, $params=array() ) {
+ $opt = $params;
+ foreach( $namespaces as $n ) {
+ $opt['ns' . $n] = 1;
+ }
+ $opt['redirs'] = $this->searchRedirects ? 1 : 0;
+
+ $st = SpecialPage::getTitleFor( 'Search' );
+ $stParams = array_merge(
+ array(
+ 'search' => $term,
+ 'fulltext' => wfMsg( 'search' )
+ ),
+ $opt
+ );
+
+ return Xml::element(
+ 'a',
+ array(
+ 'href' => $st->getLocalURL( $stParams ),
+ 'title' => $tooltip,
+ 'onmousedown' => 'mwSearchHeaderClick(this);',
+ 'onkeydown' => 'mwSearchHeaderClick(this);'),
+ $label
+ );
+ }
+
+ /** Check if query starts with image: prefix */
+ protected function startsWithImage( $term ) {
+ global $wgContLang;
+
+ $p = explode( ':', $term );
+ if( count( $p ) > 1 ) {
+ return $wgContLang->getNsIndex( $p[0] ) == NS_FILE;
+ }
+ return false;
+ }
+
+ /** Check if query starts with all: prefix */
+ protected function startsWithAll( $term ) {
+
+ $allkeyword = wfMsgForContent('searchall');
+
+ $p = explode( ':', $term );
+ if( count( $p ) > 1 ) {
+ return $p[0] == $allkeyword;
+ }
+ return false;
+ }
}
+
dépôts / lhc / web / wiklou.git / blobdiff