← All changes | classes/Visualizer/Source/Csv.php +8 -59 3.1.3 → 2.1.4 View file →

		@@ -61,23 +61,12 @@
61	61	*/
62	62	private function _fetchSeries( &$handle ) {
63	63	// read column titles
64	64	$labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
65		- $types = null;
	65	+ $labels = array_map( 'utf8_encode', $labels );
	66	+ // read series types
	67	+ $types = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
66	68
67		- if ( false !== strpos( $this->_filename, 'tqx=out:csv' ) ) {
68		- $attributes = $this->_fetchSeriesForGoogleQueryLanguage( $labels );
69		- if ( ! $attributes['abort'] ) {
70		- $labels = $attributes['labels'];
71		- $types = $attributes['types'];
72		- }
73		- }
74		-
75		- if ( is_null( $types ) ) {
76		- // read series types
77		- $types = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
78		- }
79		-
80	69	if ( ! $labels || ! $types ) {
81	70	return false;
82	71	}
83	72
		@@ -89,16 +78,14 @@
89	78	$handle = $this->_get_file_handle();
90	79
91	80	// re read the labels and empty types array
92	81	$labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
	82	+ $labels = array_map( 'utf8_encode', $labels );
93	83	$types = array();
94	84	}
95	85
96	86	for ( $i = 0, $len = count( $labels ); $i < $len; $i++ ) {
97	87	$default_type = $i == 0 ? 'string' : 'number';
98		-
99		- $labels[ $i ] = $this->toUTF8( $labels[ $i ] );
100		-
101	88	$this->_series[] = array(
102	89	'label' => $labels[ $i ],
103	90	'type' => isset( $types[ $i ] ) ? $types[ $i ] : $default_type,
104	91	);
		@@ -119,9 +106,12 @@
119	106	protected function _get_file_handle( $filename = false ) {
120	107	// set line endings auto detect mode
121	108	ini_set( 'auto_detect_line_endings', true );
122	109	// open file and return handle
123		- return fopen( $filename ? $filename : $this->_filename, 'rb' );
	110	+ $fc = iconv( 'ISO-8859-1', 'utf-8', file_get_contents( $filename ? $filename : $this->_filename ) );
	111	+ $tmp = tempnam( sys_get_temp_dir(), rand() );
	112	+ file_put_contents( $tmp, $fc );
	113	+ return fopen( $tmp, 'rb' );
124	114	}
125	115
126	116	/**
127	117	* Fetches information from source, parses it and builds series and data arrays.
		@@ -169,46 +159,5 @@
169	159	public function getSourceName() {
170	160	return __CLASS__;
171	161	}
172	162
173		- /**
174		- * Adds support for QueryLanguage https://developers.google.com/chart/interactive/docs/querylanguage
175		- * where the user can provide something like /gviz/tq?tq=select%20A%2C%20B%20&tqx=out:csv after the URL of the raw spreadsheet
176		- * to get the subset of data specified by the query
177		- * this will conflate the heading and the type into one value viz. for heading XXX and type string, the value will become "XXX string"
178		- * so we need to split them apart logically
179		- * also the $types variable now contains the first row because the header and the type got conflated
180		- */
181		- private function _fetchSeriesForGoogleQueryLanguage( $labels, $types = array() ) {
182		- $new_labels = array();
183		- $new_types = array();
184		- $abort = false;
185		- foreach ( $labels as $label ) {
186		- // get the index of the last space
187		- $index = strrpos( $label, ' ' );
188		- if ( $index === false ) {
189		- // no space here? something has gone wrong; abort the entire process.
190		- $abort = true;
191		- break;
192		- }
193		- $type = trim( substr( $label, $index + 1 ) );
194		- if ( ! self::_validateTypes( array( $type ) ) ) {
195		- // some other data type? abort the entire process.
196		- $abort = true;
197		- break;
198		- }
199		- $label = substr( $label, 0, $index );
200		- $new_labels[] = $label;
201		- $new_types[] = $type;
202		- }
203		- if ( ! $abort ) {
204		- $labels = $new_labels;
205		- $types = $new_types;
206		- }
207		-
208		- return array(
209		- 'abort' => $abort,
210		- 'labels' => $labels,
211		- 'types' => $types,
212		- );
213		- }
214	163	}