holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: skip empty lines, even if conversion fills (empty) record

Browse Source 
add: custom_strtotime in importexport_helper_functions
This commit is contained in:
Cornelius Weiß 2007-06-23 12:07:18 +00:00
parent 4268f2a356
commit d63a7d622d
2 changed files with 67 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
importexport/inc/class.import_csv.inc.php
View File

@ -93,10 +93,14 @@ class import_csv implements iface_import_record { //, Iterator {
* @return mixed array with data / false if no furtor records
*/
public function get_record( $_position = 'next' ) {
if ($this->get_raw_record( $_position ) === false) {
return false;
}
// skip empty records
if( count( array_unique( $this->record ) ) < 2 ) return $this->get_record( $_position );
if ( !empty( $this->conversion ) ) {
$this->do_conversions();
}
@ -108,6 +112,16 @@ class import_csv implements iface_import_record { //, Iterator {
return $this->record;
} // end of member function get_record
/**
* Skips $_numToSkip of records from current position on
*
* @param int $_numToSkip
*/
public function skip_records( $_numToSkip ) {
while ( (int)$_numToSkip-- !== 0 ) {
fgetcsv( $this->resource, self::csv_max_linelength, $this->csv_fieldsep);
}
}
/**
* updates $this->record

56
importexport/inc/class.import_export_helper_functions.inc.php
View File

@ -20,6 +20,50 @@ class import_export_helper_functions {
* nothing to construct here, only static functions!
*/
/**
* Converts a custom time string to to unix timestamp
* The format of the time string is given by the argument $_format
* which takes the same parameters as the php date() function.
*
* @abstract supportet formatstrings: d,m,y,Y,H,h,i,O,a,A
* If timestring is empty, php strtotime is used.
* @param string $_string time string to convert
* @param string $_format format of time string e.g.: d.m.Y H:i
*/
public static function custom_strtotime( $_string, $_format='' ) {
if ( empty( $_format ) ) return strtotime( $_string );
$fparams = explode( ',', chunk_split( $_format, 1, ',' ) );
$spos = 0;
foreach ( $fparams as $fparam ) {
switch ( $fparam ) {
case 'd': (int)$day = substr( $_string, $spos, 2 ); $spos += 2; break;
case 'm': (int)$mon = substr( $_string, $spos, 2 ); $spos += 2; break;
case 'y': (int)$year = substr( $_string, $spos, 2 ); $spos += 2; break;
case 'Y': (int)$year = substr( $_string, $spos, 4 ); $spos += 4; break;
case 'H': (int)$hour = substr( $_string, $spos, 2 ); $spos += 2; break;
case 'h': (int)$hour = substr( $_string, $spos, 2 ); $spos += 2; break;
case 'i': (int)$min = substr( $_string, $spos, 2 ); $spos += 2; break;
case 'O': (int)$offset = $year = substr( $_string, $spos, 5 ); $spos += 5; break;
case 'a': (int)$hour = $fparam == 'am' ? $hour : $hour + 12; break;
case 'A': (int)$hour = $fparam == 'AM' ? $hour : $hour + 12; break;
default: $spos++; // seperator
}
}
print_debug("hour:$hour; min:$min; sec:$sec; mon:$mon; day:$day; year:$year;\n");
$timestamp = mktime($hour, $min, $sec, $mon, $day, $year, 0);
// offset given?
if ( isset( $offset ) && strlen( $offset == 5 ) ) {
$operator = $offset{0};
$ohour = 60 * 60 * (int)substr( $offset, 1, 2 );
$omin = 60 * (int)substr( $offset, 3, 2 );
if ( $operator == '+' ) $timestamp += $ohour + $omin;
else $timestamp -= $ohour + $omin;
}
return $timestamp;
}
/**
* converts accound_lid to account_id
*
@ -168,7 +212,7 @@ class import_export_helper_functions {
);
}
$val = preg_replace_callback( "/(cat|account)\(([^)]+)\)/i", array( self, 'c2_dispatcher') , $val );
$val = preg_replace_callback( "/(cat|account|strtotime)\(([^)]+)\)/i", array( self, 'c2_dispatcher') , $val );
}
}
$values[$idx] = $val;
@ -187,8 +231,14 @@ class import_export_helper_functions {
$action = &$_matches[1]; // cat or account ...
$data = &$_matches[2]; // datas for action
$method = (string)$action. ( is_int( $data ) ? '_id2name' : '_name2id' );
return self::$method( $data );
switch ( $action ) {
case 'strtotime' :
list( $string, $format ) = explode( ',', $data );
return self::custom_strtotime( trim( $string ), trim( $format ) );
default :
$method = (string)$action. ( is_int( $data ) ? '_id2name' : '_name2id' );
return self::$method( $data );
}
}
/**