Added ability to define custom delimiter, enclosure and escape variables for CSV parsing

Author: Eugene Manuilov

classes/Visualizer/Source/Csv.php

@@ -62,10 +62,10 @@ public function __construct( $filename = null ) {
 	 */
 	private function _fetchSeries( &$handle ) {
 		// read column titles
-		$labels = fgetcsv( $handle );
+		$labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE, VISUALIZER_CSV_ESCAPRE );
 
 		// read series types
-		$types = fgetcsv( $handle );
+		$types = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE, VISUALIZER_CSV_ESCAPRE );
 
 		if ( !$labels || !$types ) {
 			return false;
@@ -78,7 +78,7 @@ private function _fetchSeries( &$handle ) {
 			$handle = fopen( $this->_filename, 'rb' );
 
 			// re read the labels and empty types array
-			$labels = fgetcsv( $handle );
+			$labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE, VISUALIZER_CSV_ESCAPRE );
 			$types = array();
 		}
 
@@ -119,7 +119,7 @@ public function fetch() {
 			}
 
 			// fetch data
-			while ( ( $data = fgetcsv( $handle ) ) !== false ) {
+			while ( ( $data = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE, VISUALIZER_CSV_ESCAPRE ) ) !== false ) {
 				$this->_data[] = $this->_normalizeData( $data );
 			}
 

index.php

@@ -70,6 +70,18 @@ function visualizer_launch() {
 	define( 'VISUALIZER_ABSURL', plugins_url( '/', __FILE__ ) );
 	define( 'VISUALIZER_ABSPATH', dirname( __FILE__ ) );
 
+	if ( !defined( 'VISUALIZER_CSV_DELIMITER' ) ) {
+		define( 'VISUALIZER_CSV_DELIMITER', ',' );
+	}
+
+	if ( !defined( 'VISUALIZER_CSV_ENCLOSURE' ) ) {
+		define( 'VISUALIZER_CSV_ENCLOSURE', '"' );
+	}
+
+	if ( !defined( 'VISUALIZER_CSV_ESCAPRE' ) ) {
+		define( 'VISUALIZER_CSV_ESCAPRE', '\\' );
+	}
+
 	// don't load the plugin if cron job is running or doing autosave
 	$doing_autosave = defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE;
 	$doing_cron = defined( 'DOING_CRON' ) && DOING_CRON;

readme.txt

@@ -61,6 +61,7 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 = 1.4.1 =
 * Fixed issue which prevents the plugin working on SSL backend
 * Fixed issue with CSV file uploading in IE and other browsers
+* Added ability to define custom delimiter, enclosure and escape variables for CSV parsing
 
 = 1.4 =
 * Implemented aggregation target and selection mode options for candlestick chart