Taxonomy Upload debugging

- Verify map failed to preserve some of the selected field mapping - Remove imbedded taxon rank from unnitname3 input variable
BU-Spark · Sep 22, 2022 · 92d33f7 · 92d33f7
1 parent cec2983
commit 92d33f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/classes/TaxonomyUpload.php b/classes/TaxonomyUpload.php
@@ -198,6 +198,9 @@ public function loadFile($fieldMap){
 							foreach($sciArr as $sciKey => $sciValue){
 								if(!array_key_exists($sciKey, $inputArr) && $sciValue) $inputArr[$sciKey] = $sciValue;
 							}
+							if(isset($inputArr['unitind3']) && $inputArr['unitind3'] && isset($inputArr['unitname3']) && $inputArr['unitname3']){
+								if(stripos($inputArr['unitname3'], $inputArr['unitind3'].' ') === 0) $inputArr['unitname3'] = trim(substr($inputArr['unitname3'], strlen($inputArr['unitind3']) + 1));
+							}
 							unset($inputArr['identificationqualifier']);
 							if(isset($childParentArr[$inputArr['sciname']]['r']) && isset($inputArr['rankid']) && $childParentArr[$inputArr['sciname']]['r'] == $inputArr['rankid']) $childParentArr[$inputArr['sciname']]['s'] = 'skip';
 							$sql1 = ''; $sql2 = '';
@@ -931,12 +934,11 @@ private function getUploadTaxaFieldArr(){
 		$rs = $this->conn->query('SHOW COLUMNS FROM uploadtaxa');
 		while($row = $rs->fetch_object()){
 			$field = strtolower($row->Field);
-			if(strtolower($field) != 'tid' && strtolower($field) != 'tidaccepted' && strtolower($field) != 'parenttid'){
+			if($field != 'tid' && $field != 'tidaccepted' && $field != 'parenttid'){
 				$targetArr[$field] = $field;
 			}
 		}
 		$rs->free();
-
 		return $targetArr;
 	}
 

diff --git a/taxa/taxonomy/batchloader.php b/taxa/taxonomy/batchloader.php
@@ -236,24 +236,22 @@ function validateNodeLoaderForm(f){
 											<option value=""><?php echo (isset($LANG['FIELD_UNMAPPED'])?$LANG['FIELD_UNMAPPED']:'Field Unmapped'); ?></option>
 											<option value="">-------------------------</option>
 											<?php
+											$selStr = '';
 											$mappedTarget = (array_key_exists($sField,$fieldMap)?$fieldMap[$sField]:"");
-											$selStr = "";
-											if($mappedTarget=="unmapped") $selStr = "SELECTED";
-											echo "<option value='unmapped' ".$selStr.">".(isset($LANG['LEAVE_UNMAPPED'])?$LANG['LEAVE_UNMAPPED']:'Leave Field Unmapped')."</option>";
-											if($selStr){
-												$selStr = 0;
-											}
+											if($mappedTarget=='unmapped') $selStr = 'SELECTED';
+											echo '<option value="unmapped" '.$selStr.'>'.(isset($LANG['LEAVE_UNMAPPED'])?$LANG['LEAVE_UNMAPPED']:'Leave Field Unmapped').'</option>';
+											if($selStr) $selStr = 0;
 											foreach($tArr as $k => $tField){
 												if($selStr !== 0){
 													$sTestField = str_replace(array(' ','_'), '', $sField);
-													if($mappedTarget && $mappedTarget == $tField){
-														$selStr = "SELECTED";
+													if($mappedTarget && $mappedTarget == $k){
+														$selStr = 'SELECTED';
 													}
-													elseif($tField==$sTestField && $tField != "sciname"){
-														$selStr = "SELECTED";
+													elseif($tField==$sTestField && $tField != 'sciname'){
+														$selStr = 'SELECTED';
 													}
 													elseif(isset($translationMap[strtolower($sTestField)]) && $translationMap[strtolower($sTestField)] == $tField){
-														$selStr = "SELECTED";
+														$selStr = 'SELECTED';
 													}
 												}
 												echo '<option value="'.$k.'" '.($selStr?$selStr:'').'>'.$tField."</option>\n";