Gerharddiller85 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305204
Change subject: ExtendedSearch: using extension.json
......................................................................
ExtendedSearch: using extension.json
Change-Id: I22c2796f0596697aa2463917eb8298345973055e
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/ExtendedSearch.setup.php
A ExtendedSearch/extension.json
3 files changed, 121 insertions(+), 148 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/04/305204/1
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index ae7f576..d6574c0 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -42,37 +42,6 @@
* Unique wiki id
*/
private $sWikiID = '';
-
- /**
- * Constructor of ExtendedSearch class
- */
- public function __construct() {
- wfProfileIn( 'BS::'.__METHOD__ );
-
- // Base settings
- $this->mExtensionFile = __FILE__;
- $this->mExtensionType = EXTTYPE::VARIABLE;
//SPECIALPAGE/OTHER/VARIABLE/PARSERHOOK
- $this->mInfo = array(
- EXTINFO::NAME => 'ExtendedSearch',
- EXTINFO::DESCRIPTION => 'bs-extendedsearch-desc',
- EXTINFO::AUTHOR => 'Stephan Muggli, Mathias Scheer,
Markus Glaser',
- EXTINFO::VERSION => 'default',
- EXTINFO::STATUS => 'default',
- EXTINFO::PACKAGE => 'default',
- EXTINFO::URL =>
'https://help.bluespice.com/index.php/ExtendedSearch',
- EXTINFO::DEPS => array( 'bluespice' => '2.22.0' )
- );
- $this->mExtensionKey = 'MW::ExtendedSearch';
-
- WikiAdmin::registerModuleClass( 'ExtendedSearchAdmin', array(
- 'image' =>
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_suche_v1.png',
- 'level' => 'wikiadmin',
- 'message' => 'bs-extendedsearchadmin-label'
- ) );
-
- wfProfileOut( 'BS::'.__METHOD__ );
- }
-
/**
* Initialization of ExtendedSearch extension
*/
diff --git a/ExtendedSearch/ExtendedSearch.setup.php
b/ExtendedSearch/ExtendedSearch.setup.php
index a03a93f..3f6ddc7 100644
--- a/ExtendedSearch/ExtendedSearch.setup.php
+++ b/ExtendedSearch/ExtendedSearch.setup.php
@@ -1,118 +1,2 @@
<?php
-
-BsExtensionManager::registerExtension( 'ExtendedSearch',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE );
-
-$wgMessagesDirs['ExtendedSearch'] = __DIR__ . '/i18n';
-
-$aResourceModuleTemplate = array(
- 'localBasePath' =>
'extensions/BlueSpiceExtensions/ExtendedSearch/resources/',
- 'remoteExtPath' => 'BlueSpiceExtensions/ExtendedSearch/resources'
-);
-
-$wgResourceModules['ext.bluespice.extendedsearch.focus'] = array(
- 'scripts' => 'bluespice.extendedSearch.focus.js',
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.extendedsearch.form'] = array(
- 'scripts' => 'bluespice.extendedSearch.form.js',
- 'styles' => 'bluespice.extendedSearch.form.css'
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.extendedsearch.autocomplete.style'] = array(
- 'styles' => 'bluespice.extendedSearch.autocomplete.css',
- 'position' => 'bottom'
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.extendedsearch.autocomplete'] = array(
- 'scripts' => 'bluespice.extendedSearch.autocomplete.js',
- 'dependencies' => array(
- 'jquery.ui.autocomplete'
- ),
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.extendedsearch.admin'] = array(
- 'scripts' => 'bluespice.extendedSearch.admin.js'
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.extendedsearch.specialpage.style'] = array(
- 'styles' => 'bluespice.extendedSearch.specialpage.css',
- 'position' => 'top'
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.extendedsearch.specialpage'] = array(
- 'scripts' => array(
- 'bluespice.extendedSearch.specialpage.js',
- 'bluespice.facetsettings.js'
- ),
- 'messages' => array(
- 'bs-extendedsearch-more',
- 'bs-extendedsearch-fewer',
- 'bs-extendedsearch-facetsetting-op-and',
- 'bs-extendedsearch-facetsetting-op-or'
- )
-) + $aResourceModuleTemplate;
-
-unset( $aResourceModuleTemplate );
-
-$wgAjaxExportList[] = 'ExtendedSearch::getRequestJson';
-$wgAjaxExportList[] = 'ExtendedSearchBase::getAutocompleteData';
-$wgAjaxExportList[] = 'ExtendedSearchBase::getRecentSearchTerms';
-
-$wgAjaxExportList[] = 'ExtendedSearchAdmin::getProgressBar';
-
-$wgAPIModules['feedextendedsearch'] = 'ApiFeedExtendedSearch';
-$wgAutoloadClasses['ApiFeedExtendedSearch'] = __DIR__ .
'/api/ApiFeedExtendedSearch.php';
-
-$wgAutoloadClasses['ExtendedSearch'] = __DIR__ . '/ExtendedSearch.class.php';
-$wgAutoloadClasses['Apache_Solr_Service'] = __DIR__ .
'/includes/SolrPhpClient/Service.php';
-$wgAutoloadClasses['Apache_Solr_Document'] = __DIR__ .
'/includes/SolrPhpClient/Document.php';
-$wgAutoloadClasses['Apache_Solr_Response'] = __DIR__ .
'/includes/SolrPhpClient/Response.php';
-$wgAutoloadClasses['SearchService'] = __DIR__ .
'/includes/SearchService.class.php';
-$wgAutoloadClasses['SolrServiceAdapter'] = __DIR__ .
'/includes/SolrServiceAdapter.class.php';
-$wgAutoloadClasses['AbstractBuildIndexAll'] = __DIR__ .
'/includes/BuildIndex/AbstractBuildIndexAll.class.php';
-$wgAutoloadClasses['AbstractBuildIndexFile'] = __DIR__ .
'/includes/BuildIndex/AbstractBuildIndexFile.class.php';
-$wgAutoloadClasses['AbstractBuildIndexLinked'] = __DIR__ .
'/includes/BuildIndex/AbstractBuildIndexLinked.class.php';
-$wgAutoloadClasses['BuildIndexMainControl'] = __DIR__ .
'/includes/BuildIndex/BuildIndexMainControl.class.php';
-$wgAutoloadClasses['BuildIndexMwArticles'] = __DIR__ .
'/includes/BuildIndex/BuildIndexMwArticles.class.php';
-$wgAutoloadClasses['BuildIndexMwSpecial'] = __DIR__ .
'/includes/BuildIndex/BuildIndexMwSpecial.class.php';
-$wgAutoloadClasses['BuildIndexMwRepository'] = __DIR__ .
'/includes/BuildIndex/BuildIndexMwRepository.class.php';
-$wgAutoloadClasses['BuildIndexMwExternalRepository'] = __DIR__ .
'/includes/BuildIndex/BuildIndexMwExternalRepository.class.php';
-$wgAutoloadClasses['BuildIndexMwSingleFile'] = __DIR__ .
'/includes/BuildIndex/BuildIndexMwSingleFile.class.php';
-$wgAutoloadClasses['BuildIndexMwSpecialLinked'] = __DIR__ .
'/includes/BuildIndex/BuildIndexMwSpecialLinked.class.php';
-$wgAutoloadClasses['BuildIndexMwLinked'] = __DIR__ .
'/includes/BuildIndex/BuildIndexMwLinked.class.php';
-$wgAutoloadClasses['ExtendedSearchAdmin'] = __DIR__ .
'/includes/ExtendedSearchAdmin.class.php';
-$wgAutoloadClasses['ExtendedSearchBase'] = __DIR__ .
'/includes/ExtendedSearchBase.class.php';
-$wgAutoloadClasses['SearchIndex'] = __DIR__ .
'/includes/SearchIndex/SearchIndex.class.php';
-$wgAutoloadClasses['SearchOptions'] = __DIR__ .
'/includes/SearchIndex/SearchOptions.class.php';
-$wgAutoloadClasses['SearchRequest'] = __DIR__ .
'/includes/SearchIndex/SearchRequest.class.php';
-$wgAutoloadClasses['SearchUriBuilder'] = __DIR__ .
'/includes/SearchIndex/SearchUriBuilder.class.php';
-$wgAutoloadClasses['BsSearchResult'] = __DIR__ .
'/includes/SearchIndex/SearchResult.class.php';
-
-$wgAutoloadClasses['ViewSearchExtendedOptionsForm'] = __DIR__ .
'/views/view.SearchExtendedOptionsForm.php';
-$wgAutoloadClasses['ViewSearchResult'] = __DIR__ .
'/views/view.SearchResult.php';
-$wgAutoloadClasses['ViewNoOfResultsFound'] = __DIR__ .
'/views/view.NoOfResultsFound.php';
-$wgAutoloadClasses['ViewExtendedSearchFormPage'] = __DIR__ .
'/views/view.ExtendedSearchFormPage.php';
-$wgAutoloadClasses['ViewSearchMultivalueField'] = __DIR__ .
'/views/view.SearchMultivalueField.php';
-$wgAutoloadClasses['ViewSearchFacet'] = __DIR__ .
'/views/view.ExtendedSearchFacetBox.php';
-$wgAutoloadClasses['ViewSearchSuggest'] = __DIR__ .
'/views/view.SearchSuggest.php';
-$wgAutoloadClasses['ViewSpell'] = __DIR__ . '/views/view.Spell.php';
-$wgAutoloadClasses['ViewMoreLikeThis'] = __DIR__ .
'/views/view.MoreLikeThis.php';
-$wgAutoloadClasses['ViewExtendedSearchResultEntry'] = __DIR__ .
'/views/view.ExtendedSearchResultEntry.php';
-
-// Specialpage and messages
-$wgAutoloadClasses['SpecialExtendedSearch'] = __DIR__ .
'/includes/specials/SpecialExtendedSearch.class.php';
-$wgExtensionMessagesFiles['ExtendedSearchAlias'] = __DIR__ .
'/languages/SpecialExtendedSearch.alias.php';
-$wgSpecialPages['SpecialExtendedSearch'] = 'SpecialExtendedSearch';
-
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'ExtendedSearch::getSchemaUpdates';
-$GLOBALS['wgHooks']['OpenSearchUrls'][] = 'ExtendedSearch::onOpenSearchUrls';
-
-//Allows for changes in the 'bq' parameter that gets send to solr.
-$bsgExtendedSearchBoostQuerySettings = array(
- 'namespace' => array(
- //This is for every MediaWiki content namespace;
- //Concrete values will be calculated at runtime
- '*' => 2,
- 999 => 2 // Pseudo namespace for files
- )
-);
+wfLoadExtension( 'BlueSpiceExtensions/ExtendedSearch' );
\ No newline at end of file
diff --git a/ExtendedSearch/extension.json b/ExtendedSearch/extension.json
new file mode 100644
index 0000000..8a171f7
--- /dev/null
+++ b/ExtendedSearch/extension.json
@@ -0,0 +1,120 @@
+{
+ "name": "ExtendedSearch",
+ "version": "2.27.0",
+ "url": "https://help.bluespice.com/index.php/ExtendedSearch";,
+ "author": "Stephan Muggli, Mathias Scheer, Markus Glaser",
+ "descriptionmsg": "bs-extendedsearch-desc",
+ "type": "bluespice",
+ "bsgExtensions": {
+ "ExtendedSearch": {
+ "className": "ExtendedSearch",
+ "extPath": "/BlueSpiceExtensions/ExtendedSearch"
+ }
+ },
+ "SpecialPages": {
+ "SpecialExtendedSearch": "SpecialExtendedSearch"
+ },
+ "APIModules": {
+ "feedextendedsearch": "ApiFeedExtendedSearch"
+ },
+ "MessagesDirs": {
+ "ExtendedSearch": [
+ "i18n"
+ ]
+ },
+ "ExtensionMessagesFiles": {
+ "ExtendedSearchAlias":
"languages/SpecialExtendedSearch.alias.php"
+ },
+ "AutoloadClasses": {
+ "ApiFeedExtendedSearch": "api/ApiFeedExtendedSearch.php",
+ "ExtendedSearch": "ExtendedSearch.class.php",
+ "Apache_Solr_Service": "includes/SolrPhpClient/Service.php",
+ "Apache_Solr_Document": "includes/SolrPhpClient/Document.php",
+ "Apache_Solr_Response": "includes/SolrPhpClient/Response.php",
+ "SearchService": "includes/SearchService.class.php",
+ "SolrServiceAdapter": "includes/SolrServiceAdapter.class.php",
+ "AbstractBuildIndexAll":
"includes/BuildIndex/AbstractBuildIndexAll.class.php",
+ "AbstractBuildIndexFile":
"includes/BuildIndex/AbstractBuildIndexFile.class.php",
+ "AbstractBuildIndexLinked":
"includes/BuildIndex/AbstractBuildIndexLinked.class.php",
+ "BuildIndexMainControl":
"includes/BuildIndex/BuildIndexMainControl.class.php",
+ "BuildIndexMwArticles":
"includes/BuildIndex/BuildIndexMwArticles.class.php",
+ "BuildIndexMwSpecial":
"includes/BuildIndex/BuildIndexMwSpecial.class.php",
+ "BuildIndexMwRepository":
"includes/BuildIndex/BuildIndexMwRepository.class.php",
+ "BuildIndexMwExternalRepository":
"includes/BuildIndex/BuildIndexMwExternalRepository.class.php",
+ "BuildIndexMwSingleFile":
"includes/BuildIndex/BuildIndexMwSingleFile.class.php",
+ "BuildIndexMwSpecialLinked":
"includes/BuildIndex/BuildIndexMwSpecialLinked.class.php",
+ "BuildIndexMwLinked":
"includes/BuildIndex/BuildIndexMwLinked.class.php",
+ "ExtendedSearchAdmin": "includes/ExtendedSearchAdmin.class.php",
+ "ExtendedSearchBase": "includes/ExtendedSearchBase.class.php",
+ "SearchIndex": "includes/SearchIndex/SearchIndex.class.php",
+ "SearchOptions": "includes/SearchIndex/SearchOptions.class.php",
+ "SearchRequest": "includes/SearchIndex/SearchRequest.class.php",
+ "SearchUriBuilder":
"includes/SearchIndex/SearchUriBuilder.class.php",
+ "BsSearchResult": "includes/SearchIndex/SearchResult.class.php",
+ "ViewSearchExtendedOptionsForm":
"views/view.SearchExtendedOptionsForm.php",
+ "ViewSearchResult": "views/view.SearchResult.php",
+ "ViewNoOfResultsFound": "views/view.NoOfResultsFound.php",
+ "ViewExtendedSearchFormPage":
"views/view.ExtendedSearchFormPage.php",
+ "ViewSearchMultivalueField":
"views/view.SearchMultivalueField.php",
+ "ViewSearchFacet": "views/view.ExtendedSearchFacetBox.php",
+ "ViewSearchSuggest": "views/view.SearchSuggest.php",
+ "ViewSpell": "views/view.Spell.php",
+ "ViewMoreLikeThis": "views/view.MoreLikeThis.php",
+ "ViewExtendedSearchResultEntry":
"views/view.ExtendedSearchResultEntry.php",
+ "SpecialExtendedSearch":
"includes/specials/SpecialExtendedSearch.class.php"
+ },
+ "ResourceModules": {
+ "ext.bluespice.extendedsearch.focus": {
+ "scripts": "bluespice.extendedSearch.focus.js"
+ },
+ "ext.bluespice.extendedsearch.form": {
+ "scripts": "bluespice.extendedSearch.form.js",
+ "styles": "bluespice.extendedSearch.form.css"
+ },
+ "ext.bluespice.extendedsearch.autocomplete.style": {
+ "styles": "bluespice.extendedSearch.autocomplete.css",
+ "position": "bottom"
+ },
+ "ext.bluespice.extendedsearch.autocomplete": {
+ "scripts": "bluespice.extendedSearch.autocomplete.js",
+ "dependencies": [
+ "jquery.ui.autocomplete"
+ ]
+ },
+ "ext.bluespice.extendedsearch.admin": {
+ "scripts": "bluespice.extendedSearch.admin.js"
+ },
+ "ext.bluespice.extendedsearch.specialpage.style": {
+ "styles": "bluespice.extendedSearch.specialpage.css",
+ "position": "top"
+ },
+ "ext.bluespice.extendedsearch.specialpage": {
+ "scripts": [
+ "bluespice.extendedSearch.specialpage.js",
+ "bluespice.facetsettings.js"
+ ],
+ "messages": [
+ "bs-extendedsearch-more",
+ "bs-extendedsearch-fewer",
+ "bs-extendedsearch-facetsetting-op-and",
+ "bs-extendedsearch-facetsetting-op-or"
+ ]
+ }
+ },
+ "ResourceFileModulePaths": {
+ "localBasePath":
"extensions/BlueSpiceExtensions/ExtendedSearch/resources/",
+ "remoteExtPath": "BlueSpiceExtensions/ExtendedSearch/resources"
+ },
+ "Hooks": {
+ "LoadExtensionSchemaUpdates": "ExtendedSearch::getSchemaUpdates"
+ },
+ "config": {
+ "AjaxExportList": [
+ "ExtendedSearch::getRequestJson",
+ "ExtendedSearchBase::getAutocompleteData",
+ "ExtendedSearchBase::getRecentSearchTerms",
+ "ExtendedSearchAdmin::getProgressBar"
+ ]
+ },
+ "manifest_version": 1
+}
--
To view, visit https://gerrit.wikimedia.org/r/305204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22c2796f0596697aa2463917eb8298345973055e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Gerharddiller85 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
