| @@ -61,23 +61,11 @@ | ||
| 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 | + // read series types | |
| 66 | + $types = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE ); | |
| 66 | 67 | |
| 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 | 68 | if ( ! $labels || ! $types ) { |
| 81 | 69 | return false; |
| 82 | 70 | } |
| 83 | 71 | |
| @@ -94,11 +82,8 @@ | ||
| 94 | 82 | } |
| 95 | 83 | |
| 96 | 84 | for ( $i = 0, $len = count( $labels ); $i < $len; $i++ ) { |
| 97 | 85 | $default_type = $i == 0 ? 'string' : 'number'; |
| 98 | - | |
| 99 | - $labels[ $i ] = $this->toUTF8( $labels[ $i ] ); | |
| 100 | - | |
| 101 | 86 | $this->_series[] = array( |
| 102 | 87 | 'label' => $labels[ $i ], |
| 103 | 88 | 'type' => isset( $types[ $i ] ) ? $types[ $i ] : $default_type, |
| 104 | 89 | ); |
| @@ -169,46 +154,5 @@ | ||
| 169 | 154 | public function getSourceName() { |
| 170 | 155 | return __CLASS__; |
| 171 | 156 | } |
| 172 | 157 | |
| 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 | 158 | } |
