https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114444
Revision: 114444
Author: yaron
Date: 2012-03-23 12:47:29 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Added trimming of CSV values, and an error message for invalid formats for
#get_web_data
Modified Paths:
--------------
trunk/extensions/ExternalData/ED_Utils.php
Modified: trunk/extensions/ExternalData/ED_Utils.php
===================================================================
--- trunk/extensions/ExternalData/ED_Utils.php 2012-03-23 12:45:19 UTC (rev
114443)
+++ trunk/extensions/ExternalData/ED_Utils.php 2012-03-23 12:47:29 UTC (rev
114444)
@@ -370,11 +370,12 @@
foreach ( $table as $line ) {
foreach ( $line as $i => $row_val ) {
if ( $has_header ) {
- $column = strtolower( $header_vals[$i]
);
+ $column = strtolower( trim(
$header_vals[$i] ) );
} else {
// start with an index of 1 instead of 0
$column = $i + 1;
}
+ $row_val = trim( $row_val );
if ( array_key_exists( $column, $values ) )
$values[$column][] = $row_val;
else
@@ -597,6 +598,8 @@
return self::getJSONData( $url_contents );
} elseif ( $format == 'gff' ) {
return self::getGFFData( $url_contents );
+ } else {
+ return wfMsg( 'externaldata-web-invalid-format',
$format );
}
return array();
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
