[Vtigercrm-commits] [vtiger-commits] r5712 - in /vtigercrm/trunk/modules/Import: ImportMap.php ImportStep4.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed May  3 06:47:10 2006
New Revision: 5712

Log:
* commented the function call retrieve_by_string_fields which is not used now for mapping

Modified:
    vtigercrm/trunk/modules/Import/ImportMap.php
    vtigercrm/trunk/modules/Import/ImportStep4.php

Modified: vtigercrm/trunk/modules/Import/ImportMap.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportMap.php (original)
+++ vtigercrm/trunk/modules/Import/ImportMap.php Wed May  3 06:47:10 2006
@@ -76,7 +76,7 @@
         {
 		$query_arr = array('assigned_user_id'=>$owner_id,'name'=>$name);
 
-		$this->retrieve_by_string_fields($query_arr, false);
+		//$this->retrieve_by_string_fields($query_arr, false);
 
                 $result = 1;
                 $this->assigned_user_id = $owner_id;

Modified: vtigercrm/trunk/modules/Import/ImportStep4.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep4.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep4.php Wed May  3 06:47:10 2006
@@ -153,7 +153,6 @@
 
 	}
 
-	
 	p("user_field=".$user_field." if=".$focus->importable_fields[$user_field]);
 	
 	// match up the "official" field to the user 
@@ -164,7 +163,6 @@
 		// now mark that we've seen this field
 		$field_to_pos[$user_field] = $pos;
 		$col_pos_to_field[$pos] = $user_field;
-		
 	}
 }
 
@@ -270,17 +268,18 @@
 
 if($totalnoofrows > $RECORDCOUNT && $START < $totalnoofrows)
 {
-		$rows1 = Array();
-		for($j=$START;$j<$START+$RECORDCOUNT;$j++)
-		{
-			$rows1[] = $datarows[$j];
-		}
-		$res = InsertImportRecords($datarows,$rows1,$focus,$ret_field_count,$col_pos_to_field,$START,$RECORDCOUNT,$_REQUEST['module'],$totalnoofrows,$skipped_record_count);
-
-if($START != 0)
-	echo '<b>'.$res.'</b>';
-
-		$count = $_REQUEST['count'];
+	$rows1 = Array();
+	for($j=$START;$j<$START+$RECORDCOUNT;$j++)
+	{
+		$rows1[] = $datarows[$j];
+	}
+
+	$res = InsertImportRecords($datarows,$rows1,$focus,$ret_field_count,$col_pos_to_field,$START,$RECORDCOUNT,$_REQUEST['module'],$totalnoofrows,$skipped_record_count);
+
+	if($START != 0)
+		echo '<b>'.$res.'</b>';
+
+	$count = $_REQUEST['count'];
 }
 else
 {
@@ -300,11 +299,8 @@
 
 	if( $has_header)
 	{
-
-
 		foreach($col_pos_to_field as $pos=>$field_name)
 		{
-	
 			if ( isset($firstrow[$pos]) &&  isset( $field_name))
 			{
 				$header_to_field[ $firstrow[$pos] ] = $field_name;
@@ -323,10 +319,8 @@
 
 	$mapping_file = new ImportMap();
 
-	$query_arr = array('assigned_user_id'=>$current_user->id,'name'=>$mapping_file_name);
-
-	
-	$mapping_file->retrieve_by_string_fields($query_arr, false);
+	//$query_arr = array('assigned_user_id'=>$current_user->id,'name'=>$mapping_file_name);
+	//$mapping_file->retrieve_by_string_fields($query_arr, false);
 
 	$result = $mapping_file->save_map( $current_user->id,
 					$mapping_file_name,