r34013 - /trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php

Old eGW-svn
1

Author: nathangray
New Revision: 34013

URL: http://www.egroupware.org/viewvc/egroupware?rev=34013&view=rev
Log:
Better handling of shifting to avoid deleted fields

Modified:
trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php

Modified: trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php?rev=34013&r1=34012&r2=34013&view=diff

— trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php (original)
+++ trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php Fri Mar 4 20:02:41 2011
@@ -227,20 +227,24 @@
for($i = 0; $i <= count($content[‘csv_fields’]); $i++) {
unset($content[$i]);
}

  •   	array_shift($content['csv_fields']);

  •   	if(!$content['csv_fields'][0]) {

  •   		array_shift($content['csv_fields']);

  •   	}
  	// Need to move everything down 1 to remove header, but shift will re-key

  •   	unset($content['field_mapping'][0]);

  •   	if(is_array($content['field_conversion'])) unset($content['field_conversion'][0]);

  •   	foreach(array('field_mapping', 'field_conversion') as $field) {

  •   		ksort($content[$field]);

  •   		foreach($content[$field] as $key => $value)

  •   		{

  •   			if($value && $value != '--NONE--') {

  •   				$content[$field][$key-1] = $content[$field][$key];

  •   	if(!$content['field_mapping'][0] || $content['field_mapping'][0] == $content['field_mapping'][1]) {

  •   		unset($content['field_mapping'][0]);

  •   		if(is_array($content['field_conversion'])) unset($content['field_conversion'][0]);

  •   		foreach(array('field_mapping', 'field_conversion') as $field) {

  •   			ksort($content[$field]);

  •   			foreach($content[$field] as $key => $value)

  •   			{

  •   				if($value && $value != '--NONE--') {

  •   					$content[$field][$key-1] = $content[$field][$key];

  •   				}

  •   				unset($content[$field][$key]);
  			}

  •   			unset($content[$field][$key]);

  •   			ksort($content[$field]);
  		}

  •   		ksort($content[$field]);
  	}
  	foreach($content['field_conversion'] as $field => $convert) {
  		if(!trim($convert)) unset($content['field_conversion'][$field]);

What You Don’t Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs