[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtendedSearch: ApiFeed - Fixed query and made sure there ...

[Pwirth (Code Review)]

Pwirth has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357987 )

Change subject: BSExtendedSearch: ApiFeed - Fixed query and made sure there is 
valid rss when solr is not available
......................................................................

BSExtendedSearch: ApiFeed - Fixed query and made sure there is valid rss when 
solr is not available

=> Needs cherry-pcik to REL1_27

Change-Id: Ia3a17eeede94d093637fdb23b8ce5358eb51cfd7
---
M ExtendedSearch/api/ApiFeedExtendedSearch.php
1 file changed, 20 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/87/357987/1

diff --git a/ExtendedSearch/api/ApiFeedExtendedSearch.php 
b/ExtendedSearch/api/ApiFeedExtendedSearch.php
index 68ee98f..3d24e67 100644
--- a/ExtendedSearch/api/ApiFeedExtendedSearch.php
+++ b/ExtendedSearch/api/ApiFeedExtendedSearch.php
@@ -15,8 +15,7 @@
 
                //HINT: includes/api/ApiFeedContributions.php
                //HINT: includes/api/ApiFeedWatchlist.php
-               global $wgSitename, $wgLanguageCode, $wgEnableOpenSearchSuggest,
-                               $wgSearchSuggestCacheExpiry, $wgFeed, 
$wgFeedClasses;
+               global $wgSitename, $wgLanguageCode, $wgFeed, $wgFeedClasses;
 
                if( !$wgFeed ) {
                        $this->dieUsage( 'Syndication feeds are not available', 
'feed-unavailable' );
@@ -43,8 +42,20 @@
                        // Prepare search input
                        $sSearchString = $params['q'];
                        $sSearchString = urldecode( $sSearchString );
-                       $sSearchString = 
ExtendedSearchBase::preprocessSearchInput( $sSearchString );
-                       $sSearchString = 
ExtendedSearchBase::sanitzeSearchString( $sSearchString );
+                       $sSearchString = 
ExtendedSearchBase::preprocessSearchInput(
+                               $sSearchString
+                       );
+                       $sSearchString = 
ExtendedSearchBase::sanitzeSearchString(
+                               $sSearchString
+                       );
+                       $sWildcardedSearchString = 
SearchService::wildcardSearchstring(
+                               $sSearchString
+                       );
+                       $sSearchString =
+                               "titleEdge:($sWildcardedSearchString OR 
$sSearchString )"
+                               ." OR title:($sWildcardedSearchString OR 
$sSearchString)"
+                               ." OR textWord:($sWildcardedSearchString OR 
$sSearchString)"
+                       ;
 
                        $oSearchOptions->setOption('searchString', 
$oSearchOptions);
 
@@ -59,7 +70,6 @@
 
                        // params are query, offset, limit, params
                        $aHits = $oSearchService->search( $sSearchString, 0, 
25, $aSearchOptions );
-
                        foreach( $aHits->response->docs as $doc ) {
                                if ( $doc->namespace != '999' ) {
                                        $oTitle = Title::makeTitle( 
$doc->namespace, $doc->title );
@@ -91,7 +101,11 @@
                        }
                }
                catch ( Exception $e ) {
-                       $this->dieUsage( $e->getMessage(), 'feed-invalid' );
+                       $feedItems[] = new FeedItem(
+                               'feed-invalid',
+                               $e->getMessage(),
+                               $this->getTitle()->getFullURL()
+                       );
                }
 
                ApiFormatFeedWrapper::setResult( $this->getResult(), $feed, 
$feedItems );

-- 
To view, visit https://gerrit.wikimedia.org/r/357987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3a17eeede94d093637fdb23b8ce5358eb51cfd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth <wi...@hallowelt.biz>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits