← All changes | classes/Visualizer/Source/Csv.php +23 -95 3.10.2 → 1.1.2 View file →

		@@ -18,8 +18,9 @@
18	18	// | MA 02110-1301 USA |
19	19	// +----------------------------------------------------------------------+
20	20	// | Author: Eugene Manuilov <eugene@manuilov.org> |
21	21	// +----------------------------------------------------------------------+
	22	+
22	23	/**
23	24	* Source manager for local CSV files.
24	25	*
25	26	* @category Visualizer
		@@ -46,10 +47,10 @@
46	47	*
47	48	* @access public
48	49	* @param string $filename The path to the file.
49	50	*/
50		- public function __construct( $filename = '' ) {
51		- $this->_filename = trim( (string) $filename );
	51	+ public function __construct( $filename = null ) {
	52	+ $this->_filename = trim( $filename );
52	53	}
53	54
54	55	/**
55	56	* Fetches series information.
		@@ -58,48 +59,31 @@
58	59	*
59	60	* @access private
60	61	* @param resource $handle The file handle resource.
61	62	*/
62		- private function _fetchSeries( &$handle ) {
	63	+ private function _fetchSeries( $handle ) {
63	64	// read column titles
64		- $labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
65		- $types = null;
	65	+ $labels = fgetcsv( $handle );
66	66
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		- }
	67	+ // read series types
	68	+ $types = fgetcsv( $handle );
74	69
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		- 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' );
	70	+ if ( !$labels || !$types ) {
85	71	return false;
86	72	}
87	73
88		- $types = array_map( 'trim', $types );
89		- 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;
	74	+ // if no types were setup, re read labels and empty types array
	75	+ if ( !self::_validateTypes( $types ) ) {
	76	+ fseek( $handle, 0 );
	77	+ $labels = fgetcsv( $handle );
	78	+ $types = array();
92	79	}
93	80
94	81	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		-
	82	+ $default_type = $i == 0 ? 'string' : 'number';
99	83	$this->_series[] = array(
100		- 'label' => $labels[ $i ],
101		- 'type' => isset( $types[ $i ] ) ? $types[ $i ] : $default_type,
	84	+ 'label' => $labels[$i],
	85	+ 'type' => isset( $types[$i] ) ? $types[$i] : $default_type,
102	86	);
103	87	}
104	88
105	89	return true;
		@@ -105,24 +89,8 @@
105	89	return true;
106	90	}
107	91
108	92	/**
109		- * Returns file handle to fetch data from.
110		- *
111		- * @since 1.4.2
112		- *
113		- * @access protected
114		- * @param string $filename Optional file name to get handle. If omitted, $_filename is used.
115		- * @return resource File handle resource on success, otherwise FALSE.
116		- */
117		- protected function _get_file_handle( $filename = false ) {
118		- // set line endings auto detect mode
119		- ini_set( 'auto_detect_line_endings', true );
120		- // open file and return handle
121		- return fopen( $filename ? $filename : $this->_filename, 'rb' );
122		- }
123		-
124		- /**
125	93	* Fetches information from source, parses it and builds series and data arrays.
126	94	*
127	95	* @since 1.0.0
128	96	*
		@@ -131,23 +99,24 @@
131	99	*/
132	100	public function fetch() {
133	101	// if filename is empty return false
134	102	if ( empty( $this->_filename ) ) {
135		- $this->_error = esc_html__( 'No file provided. Please try again.', 'visualizer' );
136	103	return false;
137	104	}
138	105
	106	+ // set line endings auto detect mode
	107	+ @ini_set( 'auto_detect_line_endings', true );
	108	+
139	109	// read file and fill arrays
140		- $handle = $this->_get_file_handle();
	110	+ $handle = fopen( $this->_filename, 'rb' );
141	111	if ( $handle ) {
142	112	// fetch series
143		- if ( ! $this->_fetchSeries( $handle ) ) {
	113	+ if ( !$this->_fetchSeries( $handle ) ) {
144	114	return false;
145	115	}
146	116
147	117	// fetch data
148		- // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
149		- while ( ( $data = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE ) ) !== false ) {
	118	+ while ( ( $data = fgetcsv( $handle ) ) !== false ) {
150	119	$this->_data[] = $this->_normalizeData( $data );
151	120	}
152	121
153	122	// close file handle
		@@ -168,46 +137,5 @@
168	137	public function getSourceName() {
169	138	return __CLASS__;
170	139	}
171	140
172		- /**
173		- * Adds support for QueryLanguage https://developers.google.com/chart/interactive/docs/querylanguage
174		- * 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
175		- * to get the subset of data specified by the query
176		- * this will conflate the heading and the type into one value viz. for heading XXX and type string, the value will become "XXX string"
177		- * so we need to split them apart logically
178		- * also the $types variable now contains the first row because the header and the type got conflated
179		- */
180		- private function _fetchSeriesForGoogleQueryLanguage( $labels, $types = array() ) {
181		- $new_labels = array();
182		- $new_types = array();
183		- $abort = false;
184		- foreach ( $labels as $label ) {
185		- // get the index of the last space
186		- $index = strrpos( $label, ' ' );
187		- if ( $index === false ) {
188		- // no space here? something has gone wrong; abort the entire process.
189		- $abort = true;
190		- break;
191		- }
192		- $type = trim( substr( $label, $index + 1 ) );
193		- if ( ! self::_validateTypes( array( $type ) ) ) {
194		- // some other data type? abort the entire process.
195		- $abort = true;
196		- break;
197		- }
198		- $label = substr( $label, 0, $index );
199		- $new_labels[] = $label;
200		- $new_types[] = $type;
201		- }
202		- if ( ! $abort ) {
203		- $labels = $new_labels;
204		- $types = $new_types;
205		- }
206		-
207		- return array(
208		- 'abort' => $abort,
209		- 'labels' => $labels,
210		- 'types' => $types,
211		- );
212		- }
213		-}
	141	+}