fixed some issues
This commit is contained in:
@@ -70,6 +70,12 @@ function checkForUnAttachedAnalysis($decoded_json_data,$pdo){
|
||||
foreach($part['analyses'] as $analysis){
|
||||
$result_TestName = $analysis['result_TestName'];
|
||||
$analysisgroupcode = $analysis['analysisgroupcode'];
|
||||
|
||||
// validation for analysisgroupcode
|
||||
if($analysisgroupcode == '' || $analysisgroupcode == null || $analysisgroupcode == 'N/A' || $analysisgroupcode == '-'){
|
||||
$analysisgroupcode = 'NO_ANALYSIS_CODE_PROVIDED';
|
||||
}
|
||||
|
||||
$analysis_id = checkForAnalysisId($analysisgroupcode, $result_TestName, $pdo);
|
||||
if(!$analysis_id){
|
||||
|
||||
@@ -99,6 +105,12 @@ function checkForUnAttachedCompounds($decoded_json_data, $pdo){
|
||||
foreach($analysis['results'] as $result){
|
||||
$cas = $result['cas'];
|
||||
$result_AnalytsName = $result['result_AnalytsName'];
|
||||
|
||||
// validation for cas
|
||||
if($cas == '' || $cas == null || $cas == 'N/A' || $cas == '-'){
|
||||
$cas = 'NO_CAS_PROVIDED';
|
||||
}
|
||||
|
||||
$compound_id = checkForCompoundId($cas, $result_AnalytsName, $pdo);
|
||||
if(!$compound_id){
|
||||
$arr_compoundkind_refdata = ("SELECT * FROM compundsvocabulary where preferred like 'Y'");
|
||||
@@ -120,6 +132,12 @@ function checkForUnAttachedCompounds($decoded_json_data, $pdo){
|
||||
}
|
||||
|
||||
function checkForAnalysisId($analysisgroupcode, $result_TestName, $pdo){
|
||||
|
||||
// analysisgroupcode check
|
||||
if($analysisgroupcode == '' || $analysisgroupcode == null || $analysisgroupcode == 'N/A' || $analysisgroupcode == '-'){
|
||||
$analysisgroupcode = 'NO_ANALYSIS_CODE_PROVIDED';
|
||||
}
|
||||
|
||||
$sql = "SELECT idanalysisvocabulary FROM analysisvocabulary WHERE analysiscode LIKE '$analysisgroupcode'";
|
||||
$stmt = $pdo->prepare($sql);
|
||||
$stmt->execute();
|
||||
@@ -144,6 +162,7 @@ function checkForCompoundId($cas, $result_AnalytsName, $pdo){
|
||||
if($cas == '' || $cas == null || $cas == 'N/A' || $cas == '-'){
|
||||
$cas = 'NO_CAS_PROVIDED';
|
||||
}
|
||||
|
||||
$sql = "SELECT idcompoundsvocabulary FROM compundsvocabulary WHERE cascompoundvocabulary LIKE '%$cas%'";
|
||||
$stmt = $pdo->prepare($sql);
|
||||
$stmt->execute();
|
||||
|
||||
Reference in New Issue
Block a user