← All changes | classes/Visualizer/Source/Csv.php +22 -70 3.10.15 → 2.1.4 View file →

		@@ -46,10 +46,10 @@
46	46	*
47	47	* @access public
48	48	* @param string $filename The path to the file.
49	49	*/
50		- public function __construct( $filename = '' ) {
51		- $this->_filename = trim( (string) $filename );
	50	+ public function __construct( $filename = null ) {
	51	+ $this->_filename = trim( $filename );
52	52	}
53	53
54	54	/**
55	55	* Fetches series information.
		@@ -61,42 +61,31 @@
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		- $labels = array_filter( $labels );
81		- $types = array_filter( $types );
82		-
83	69	if ( ! $labels || ! $types ) {
84		- $this->_error = esc_html__( 'File should have a heading row (1st row) and a data type row (2nd row). Please try again.', 'visualizer' );
85	70	return false;
86	71	}
87	72
	73	+ // if no types were setup, re read labels and empty types array
88	74	$types = array_map( 'trim', $types );
89	75	if ( ! self::_validateTypes( $types ) ) {
90		- $this->_error = esc_html__( 'Invalid data types detected in the data type row (2nd row). Please try again.', 'visualizer' );
91		- return false;
	76	+ // re open the file
	77	+ fclose( $handle );
	78	+ $handle = $this->_get_file_handle();
	79	+
	80	+ // re read the labels and empty types array
	81	+ $labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
	82	+ $labels = array_map( 'utf8_encode', $labels );
	83	+ $types = array();
92	84	}
93	85
94	86	for ( $i = 0, $len = count( $labels ); $i < $len; $i++ ) {
95		- $default_type = $i === 0 ? 'string' : 'number';
96		-
97		- $labels[ $i ] = $this->toUTF8( $labels[ $i ] );
98		-
	87	+ $default_type = $i == 0 ? 'string' : 'number';
99	88	$this->_series[] = array(
100	89	'label' => $labels[ $i ],
101	90	'type' => isset( $types[ $i ] ) ? $types[ $i ] : $default_type,
102	91	);
		@@ -114,10 +103,15 @@
114	103	* @param string $filename Optional file name to get handle. If omitted, $_filename is used.
115	104	* @return resource File handle resource on success, otherwise FALSE.
116	105	*/
117	106	protected function _get_file_handle( $filename = false ) {
	107	+ // set line endings auto detect mode
	108	+ ini_set( 'auto_detect_line_endings', true );
118	109	// open file and return handle
119		- 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' );
120	114	}
121	115
122	116	/**
123	117	* Fetches information from source, parses it and builds series and data arrays.
		@@ -129,9 +123,8 @@
129	123	*/
130	124	public function fetch() {
131	125	// if filename is empty return false
132	126	if ( empty( $this->_filename ) ) {
133		- $this->_error = esc_html__( 'No file provided. Please try again.', 'visualizer' );
134	127	return false;
135	128	}
136	129
137	130	// read file and fill arrays
		@@ -142,10 +135,10 @@
142	135	return false;
143	136	}
144	137
145	138	// fetch data
146		- // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
147	139	while ( ( $data = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE ) ) !== false ) {
	140	+
148	141	$this->_data[] = $this->_normalizeData( $data );
149	142	}
150	143
151	144	// close file handle
		@@ -166,46 +159,5 @@
166	159	public function getSourceName() {
167	160	return __CLASS__;
168	161	}
169	162
170		- /**
171		- * Adds support for QueryLanguage https://developers.google.com/chart/interactive/docs/querylanguage
172		- * 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
173		- * to get the subset of data specified by the query
174		- * this will conflate the heading and the type into one value viz. for heading XXX and type string, the value will become "XXX string"
175		- * so we need to split them apart logically
176		- * also the $types variable now contains the first row because the header and the type got conflated
177		- */
178		- private function _fetchSeriesForGoogleQueryLanguage( $labels, $types = array() ) {
179		- $new_labels = array();
180		- $new_types = array();
181		- $abort = false;
182		- foreach ( $labels as $label ) {
183		- // get the index of the last space
184		- $index = strrpos( $label, ' ' );
185		- if ( $index === false ) {
186		- // no space here? something has gone wrong; abort the entire process.
187		- $abort = true;
188		- break;
189		- }
190		- $type = trim( substr( $label, $index + 1 ) );
191		- if ( ! self::_validateTypes( array( $type ) ) ) {
192		- // some other data type? abort the entire process.
193		- $abort = true;
194		- break;
195		- }
196		- $label = substr( $label, 0, $index );
197		- $new_labels[] = $label;
198		- $new_types[] = $type;
199		- }
200		- if ( ! $abort ) {
201		- $labels = $new_labels;
202		- $types = $new_types;
203		- }
204		-
205		- return array(
206		- 'abort' => $abort,
207		- 'labels' => $labels,
208		- 'types' => $types,
209		- );
210		- }
211	163	}