diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php index 2ba56fb..90d3233 100644 --- a/public/userarea/importify/check_vocabulary.php +++ b/public/userarea/importify/check_vocabulary.php @@ -64,7 +64,7 @@ if(isset($_FILES['f_csv'])) { foreach($arr_diff_anaysisvoc_words as $item) { $arr_analysis_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $trim_item = str_replace("'", "\'", $item); + $trim_item = str_replace("\n", "", str_replace("'", "\'", $item)); $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '$trim_item'"); $arr_analysis_refdata->execute(); $arr_analysis_ref = $arr_analysis_refdata->Results; @@ -103,7 +103,7 @@ if(isset($_FILES['f_csv'])) { foreach($arr_diff_compundsvoc_words as $item) { $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); $compund_word = $item['word']; - $trim_item = str_replace("'", "\'", $compund_word); + $trim_item = str_replace("\n", "", str_replace("'", "\'", $compund_word)); $arr_compunds_refdata->setQuery("SELECT * FROM compundsvocabulary where namecompoundsvocabulary like '$trim_item' or cascompoundvocabulary like '$trim_item'"); $arr_compunds_refdata->execute(); $arr_compunds_ref = $arr_compunds_refdata->Results; diff --git a/public/userarea/importify/importify_bg_script.php b/public/userarea/importify/importify_bg_script.php index 2d0a970..319338d 100644 --- a/public/userarea/importify/importify_bg_script.php +++ b/public/userarea/importify/importify_bg_script.php @@ -218,8 +218,9 @@ foreach($arr_total_products as $product) { if ($arr_associate[$i]->table_name == "result_project") { if($arr_associate[$i]->column_name == "result_TestName") { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; + $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc like '$tmp_val'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc like '$trim_item'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -231,7 +232,7 @@ foreach($arr_total_products as $product) { array_push($arr_result_project_need_idx, array($arr_associate[$i]->column_name, $ref_id, 1)); } else if($arr_associate[$i]->column_name == "result_AnalytsName") { $tmp_val = $result_project[array_search($arr_associate[$i]->headerfile, $arr_excel_columns)]; - + $trim_item = str_replace("\n", "", str_replace("'", "\'", $tmp_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary like '$tmp_val' or cascompoundvocabulary like '$tmp_val'"); $analysis_query->execute();