Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/98687
Change subject: Removed #get_external_data parser function - it was time.
......................................................................
Removed #get_external_data parser function - it was time.
Change-Id: I493c1340c06482ca72f6f1dd873ef53d691c0c69
---
M ED_ParserFunctions.php
M ExternalData.i18n.magic.php
M ExternalData.php
M README
4 files changed, 7 insertions(+), 85 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExternalData
refs/changes/87/98687/1
diff --git a/ED_ParserFunctions.php b/ED_ParserFunctions.php
index fb6d839..adfde92 100644
--- a/ED_ParserFunctions.php
+++ b/ED_ParserFunctions.php
@@ -6,62 +6,7 @@
class EDParserFunctions {
/**
- * Render the #get_external_data parser function
- * @deprecated
- */
- static function doGetExternalData( &$parser ) {
- global $edgCurPageName, $edgValues;
-
- // if we're handling multiple pages, reset $edgValues
- // when we move from one page to another
- $cur_page_name = $parser->getTitle()->getText();
- if ( ! isset( $edgCurPageName ) || $edgCurPageName !=
$cur_page_name ) {
- $edgValues = array();
- $edgCurPageName = $cur_page_name;
- }
-
- $params = func_get_args();
- array_shift( $params ); // we already know the $parser ...
- $url = array_shift( $params );
- $url = str_replace( ' ', '%20', $url ); // do some minor
URL-encoding
- // if the URL isn't allowed (based on a whitelist), exit
- if ( ! EDUtils::isURLAllowed( $url ) ) {
- return;
- }
-
- $format = strtolower( array_shift( $params ) ); // make
case-insensitive
- $external_values = EDUtils::getDataFromURL( $url, $format, null
);
- if ( count( $external_values ) == 0 ) {
- return;
- }
-
- // Get set of filters and set of mappings, determining each
- // one by whether there's a double or single equals sign,
- // respectively.
- $filters = array();
- $mappings = array();
- foreach ( $params as $param ) {
- if ( strpos( $param, '==' ) ) {
- list( $external_var, $value ) = explode( '==',
$param );
- // set to all lowercase to avoid casing issues
- $external_var = strtolower( $external_var );
- $filters[$external_var] = $value;
- } elseif ( strpos( $param, '=' ) ) {
- list( $local_var, $external_var ) = explode(
'=', $param );
- // set to all lowercase to avoid casing issues
- $external_var = strtolower( $external_var );
- $mappings[$local_var] = $external_var;
- } else {
- // if the parameter contains no equals signs,
- // do nothing
- }
- }
- self::setGlobalValuesArray( $external_values, $filters,
$mappings );
- }
-
- /**
- * A helper function, since it's called by both doGetExternalData()
- * and doGetWebData() - the former is deprecated.
+ * A helper function, called by doGetWebData().
*/
static public function setGlobalValuesArray( $external_values,
$filters, $mappings ) {
global $edgValues;
@@ -113,7 +58,7 @@
}
/**
- * Render the #get_web_data parser function
+ * Render the #get_web_data parser function.
*/
static function doGetWebData( &$parser ) {
global $edgCurPageName, $edgValues, $edgCacheExpireTime;
@@ -305,7 +250,7 @@
/**
* Get the specified index of the array for the specified local
- * variable retrieved by #get_external_data
+ * variable retrieved by one of the #get... parser functions.
*/
static function getIndexedValue( $var, $i ) {
global $edgValues;
diff --git a/ExternalData.i18n.magic.php b/ExternalData.i18n.magic.php
index 8bdd43d..072f42f 100644
--- a/ExternalData.i18n.magic.php
+++ b/ExternalData.i18n.magic.php
@@ -7,7 +7,6 @@
/** English (English) */
$magicWords['en'] = array(
- 'get_external_data' => array( 0, 'get_external_data' ),
'get_web_data' => array( 0, 'get_web_data' ),
'get_ldap_data' => array( 0, 'get_ldap_data' ),
'get_db_data' => array( 0, 'get_db_data' ),
@@ -20,7 +19,6 @@
/** Arabic (العربية) */
$magicWords['ar'] = array(
- 'get_external_data' => array( 0, 'عرض_بيانات_خارجية' ),
'get_web_data' => array( 0, 'عرض_بيانات_الويب' ),
'get_ldap_data' => array( 0, 'عرض_بيانات_لداب' ),
'get_db_data' => array( 0, 'عرض_بيانات_قب' ),
@@ -33,7 +31,6 @@
/** Egyptian Spoken Arabic (مصرى) */
$magicWords['arz'] = array(
- 'get_external_data' => array( 0, 'عرض_بيانات_خارجية',
'get_external_data' ),
'get_ldap_data' => array( 0, 'عرض_بيانات_لداب', 'get_ldap_data' ),
'get_db_data' => array( 0, 'عرض_بيانات_قب', 'get_db_data' ),
'external_value' => array( 0, 'قيمة_خارجية', 'external_value' ),
@@ -43,7 +40,6 @@
/** Chechen (нохчийн) */
$magicWords['ce'] = array(
- 'get_external_data' => array( 0, 'схьаэца_архьара_хаамаш',
'получить_внешние_данные' ),
'get_ldap_data' => array( 0, 'схьаэца_хаамаш_ldap',
'получить_данные_ldap' ),
'get_db_data' => array( 0, 'схьаэца_хаамаш_db', 'получить_данные_db' ),
'external_value' => array( 0, 'архьара_дозалла', 'внешнее_значение' ),
@@ -52,7 +48,6 @@
/** German (Deutsch) */
$magicWords['de'] = array(
- 'get_external_data' => array( 0, 'hole_externe_daten' ),
'get_web_data' => array( 0, 'hole_webdaten' ),
'get_ldap_data' => array( 0, 'hole_ldapdaten' ),
'get_db_data' => array( 0, 'hole_dbdaten' ),
@@ -65,7 +60,6 @@
/** Greek (Ελληνικά) */
$magicWords['el'] = array(
- 'get_external_data' => array( 0, 'λήψη_εξωτερικών_δεδομένων' ),
'get_web_data' => array( 0, 'λήψη_δεδομένων_ιστού' ),
'get_ldap_data' => array( 0, 'λήψη_δεδομένων_ldap' ),
'get_db_data' => array( 0, 'λήψη_δεδομένων_βδ' ),
@@ -78,14 +72,12 @@
/** Spanish (español) */
$magicWords['es'] = array(
- 'get_external_data' => array( 0, 'obtener_datos_externos' ),
'get_db_data' => array( 0, 'obtener_datos_db' ),
'external_value' => array( 0, 'valor_externo' ),
);
/** Japanese (日本語) */
$magicWords['ja'] = array(
- 'get_external_data' => array( 0, '外部データ取得' ),
'get_ldap_data' => array( 0, 'ldapデータ取得' ),
'get_db_data' => array( 0, 'dbデータ取得' ),
'external_value' => array( 0, '外部値' ),
@@ -95,7 +87,6 @@
/** Korean (한국어) */
$magicWords['ko'] = array(
- 'get_external_data' => array( 0, '바깥_데이터_얻기' ),
'get_web_data' => array( 0, '웹_데이터_얻기' ),
'get_ldap_data' => array( 0, 'ldap_데이터_얻기' ),
'get_db_data' => array( 0, 'db_데이터_얻기' ),
@@ -108,7 +99,6 @@
/** Macedonian (македонски) */
$magicWords['mk'] = array(
- 'get_external_data' => array( 0, 'преземи_надворешни_податоци' ),
'get_web_data' => array( 0, 'преземи_мрежни_податоци' ),
'get_ldap_data' => array( 0, 'преземи_ldap_податоци' ),
'get_db_data' => array( 0, 'преземи_db_податоци' ),
@@ -121,21 +111,18 @@
/** Malayalam (മലയാളം) */
$magicWords['ml'] = array(
- 'get_external_data' => array( 0, 'ബാഹ്യ_വിവരങ്ങൾ_എടുക്കുക' ),
'get_web_data' => array( 0, 'വെബ്_വിവരങ്ങൾ_എടുക്കുക' ),
'external_value' => array( 0, 'ബാഹ്യ_മൂല്യം' ),
);
/** Marathi (मराठी) */
$magicWords['mr'] = array(
- 'get_external_data' => array( 0, 'मिळवा_बाह्य_विदा' ),
'get_ldap_data' => array( 0, 'मिळवा__एलडॅप_विदा' ),
'for_external_table' => array( 0, 'बाह्य_सारणी_करिता' ),
);
/** Low Saxon (Netherlands) (Nedersaksies) */
$magicWords['nds-nl'] = array(
- 'get_external_data' => array( 0, 'externe_gegevens_ophaolen' ),
'get_web_data' => array( 0, 'webgegevens_ophaolen' ),
'get_ldap_data' => array( 0, 'ldap-gegevens_ophaolen' ),
'get_db_data' => array( 0, 'db-gegevens_ophaolen' ),
@@ -146,7 +133,6 @@
/** Dutch (Nederlands) */
$magicWords['nl'] = array(
- 'get_external_data' => array( 0, 'externe_gegevens_ophalen' ),
'get_web_data' => array( 0, 'webgegevens_ophalen' ),
'get_ldap_data' => array( 0, 'ldap_gegevens_ophalen' ),
'get_db_data' => array( 0, 'db_gegevens_ophalen' ),
@@ -158,7 +144,6 @@
/** Russian (русский) */
$magicWords['ru'] = array(
- 'get_external_data' => array( 0, 'получить_внешние_данные' ),
'get_ldap_data' => array( 0, 'получить_данные_ldap' ),
'get_db_data' => array( 0, 'получить_данные_db' ),
'external_value' => array( 0, 'внешнее_значение' ),
@@ -168,7 +153,6 @@
/** Serbian (Cyrillic script) (српски (ћирилица)) */
$magicWords['sr-ec'] = array(
- 'get_external_data' => array( 0, 'добави_спољне_податке' ),
'get_web_data' => array( 0, 'добави_веб_податке' ),
'get_ldap_data' => array( 0, 'добави_лдап_податке' ),
'get_db_data' => array( 0, 'добави_податке_базе' ),
@@ -179,7 +163,6 @@
/** Serbian (Latin script) (srpski (latinica)) */
$magicWords['sr-el'] = array(
- 'get_external_data' => array( 0, 'dobavi_spoljne_podatke' ),
'get_web_data' => array( 0, 'dobavi_mrežne_podatke' ),
'get_ldap_data' => array( 0, 'dobavi_ldap_podatke' ),
'get_db_data' => array( 0, 'dobavi_podatke_baze' ),
@@ -191,10 +174,9 @@
/** Ukrainian (українська) */
$magicWords['uk'] = array(
- 'get_external_data' => array( 0, 'отримати_зовнішні_дані' ),
'get_ldap_data' => array( 0, 'отримати_дані_ldap' ),
'get_db_data' => array( 0, 'отримати_дані_db' ),
'external_value' => array( 0, 'зовнішнє_значення' ),
'for_external_table' => array( 0, 'для_зовнішньої_таблиці' ),
'store_external_table' => array( 0, 'зовнішня_таблиця_зберігання' ),
-);
\ No newline at end of file
+);
diff --git a/ExternalData.php b/ExternalData.php
index cb8b430..b36605a 100644
--- a/ExternalData.php
+++ b/ExternalData.php
@@ -47,7 +47,6 @@
$edgDBTablePrefix = array();
function edgRegisterParser( &$parser ) {
- $parser->setFunctionHook( 'get_external_data', array(
'EDParserFunctions', 'doGetExternalData' ) );
$parser->setFunctionHook( 'get_web_data', array( 'EDParserFunctions',
'doGetWebData' ) );
$parser->setFunctionHook( 'get_ldap_data', array( 'EDParserFunctions',
'doGetLDAPData' ) );
$parser->setFunctionHook( 'get_db_data', array( 'EDParserFunctions',
'doGetDBData' ) );
diff --git a/README b/README
index 6e06eb7..9edc044 100644
--- a/README
+++ b/README
@@ -13,17 +13,13 @@
from various sources: external URLs and local wiki pages (in CSV, GFF, JSON
and XML formats), database tables, and LDAP servers.
-The extension defines eight parser functions: #get_web_data,
-#get_external_data, #get_db_data, #get_ldap_data, #external_value,
-#for_external_table, #display_external_table, #store_external_table and
-#clear_external_data.
+The extension defines seven parser functions: #get_web_data,
+#get_db_data, #get_ldap_data, #external_value, #for_external_table,
+#display_external_table, #store_external_table and #clear_external_data.
They are described below:
* #get_web_data retrieves the data from a URL that holds CSV, GFF,
JSON or XML, and assigns it to local variables or arrays.
-
-* #get_external_data is an earlier version of #get_web_data that does
-the same thing; it is deprecated.
* #get_db_data retrieves data from a database, using (in most cases)
SQL-like syntax, and assigns it to local variables or arrays.
--
To view, visit https://gerrit.wikimedia.org/r/98687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I493c1340c06482ca72f6f1dd873ef53d691c0c69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExternalData
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
