load_data readability

This commit is contained in:
William Knauss
2014-05-09 21:57:17 -04:00
parent 531cc66a5e
commit af5d7cf70d

View File

@@ -836,26 +836,41 @@ class parseCSV {
* @param input local CSV file * @param input local CSV file
* @return true or false * @return true or false
*/ */
function load_data ($input = null) { public function load_data ($input = null) {
$data = null; $data = null;
$file = null; $file = null;
if ( $input === null ) { if ( $input === null ) {
$file = $this->file; $file = $this->file;
} elseif ( file_exists($input) ) { }
elseif ( file_exists($input) ) {
$file = $input; $file = $input;
} else { }
else {
$data = $input; $data = $input;
} }
if ( !empty($data) || $data = $this->_rfile($file) ) { if ( !empty($data) || $data = $this->_rfile($file) ) {
if ( $this->file != $file ) $this->file = $file; if ( $this->file != $file ) {
$this->file = $file;
}
if ( preg_match('/\.php$/i', $file) && preg_match('/<\?.*?\?>(.*)/ims', $data, $strip) ) { if ( preg_match('/\.php$/i', $file) && preg_match('/<\?.*?\?>(.*)/ims', $data, $strip) ) {
$data = ltrim($strip[1]); $data = ltrim($strip[1]);
} }
if ( $this->convert_encoding ) $data = iconv($this->input_encoding, $this->output_encoding, $data);
if ( substr($data, -1) != "\n" ) $data .= "\n"; if ( $this->convert_encoding ) {
$data = iconv($this->input_encoding, $this->output_encoding, $data);
}
if ( substr($data, -1) != "\n" ) {
$data .= "\n";
}
$this->file_data = &$data; $this->file_data = &$data;
return true; return true;
} }
return false; return false;
} }