diff --git a/public/userarea/importify/check_vocabulary.php b/public/userarea/importify/check_vocabulary.php index 99c4faf..9a82092 100644 --- a/public/userarea/importify/check_vocabulary.php +++ b/public/userarea/importify/check_vocabulary.php @@ -82,13 +82,13 @@ 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("\n", "", str_replace("'", "\'", $item)); - $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '%$trim_item%'"); + $arr_analysis_refdata->setQuery("SELECT * FROM analysisvocabulary where nameanalysisvoc like '$trim_item'"); $arr_analysis_refdata->execute(); $arr_analysis_ref = $arr_analysis_refdata->Results; if(count($arr_analysis_ref) == 0) { //check kind $arr_analysiskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like '%Y%'"); + $arr_analysiskind_refdata->setQuery("SELECT * FROM analysisvocabulary where preferred like 'Y'"); $arr_analysiskind_refdata->execute(); $arr_analysiskind_ref = $arr_analysiskind_refdata->Results; array_push($arr_anaysisvoc_words, array( @@ -121,13 +121,13 @@ if(isset($_FILES['f_csv'])) { $arr_compunds_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); $compund_word = $item['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->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; if(count($arr_compunds_ref) == 0) { //check kind $arr_compundskind_refdata = new WA_MySQLi_RS("rsl", $repnew, 0); - $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like '%Y%'"); + $arr_compundskind_refdata->setQuery("SELECT * FROM compundsvocabulary where preferred like 'Y'"); $arr_compundskind_refdata->execute(); $arr_compundskind_ref = $arr_compundskind_refdata->Results; array_push($arr_compundsvoc_words, array( diff --git a/public/userarea/importify/columnlink.php b/public/userarea/importify/columnlink.php index 16bd610..0ecb85b 100644 --- a/public/userarea/importify/columnlink.php +++ b/public/userarea/importify/columnlink.php @@ -25,12 +25,12 @@ $arr_old_column_name = array(); $arr_old_headerfile = array(); $arr_old_db_headerfile = array(); - foreach($arr_exist_info->Results as $item) { + foreach($arr_exist_info->Results as $item) { array_push($arr_old_table_name, $item['table_name']); array_push($arr_old_column_name, $item['column_name']); array_push($arr_old_headerfile, $item['headerfile']); array_push($arr_old_db_headerfile, $item['db_headerfile']); - } + } ?> @@ -258,7 +258,7 @@ - + setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode like '%$trim_group_code%'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE analysiscode = '%$trim_group_code%'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -238,7 +238,7 @@ foreach ($arr_total_products as $product) { $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 '%$trim_item%'"); + $analysis_query->setQuery("SELECT * FROM analysisvocabulary WHERE nameanalysisvoc = '$trim_item'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -254,7 +254,7 @@ foreach ($arr_total_products as $product) { $trim_cas_val = str_replace("\n", "", str_replace("'", "\'", $cas_val)); $analysis_query = new WA_MySQLi_RS("getquery", $repnew, 0); - $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE cascompoundvocabulary like '%$trim_cas_val%'"); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE cascompoundvocabulary = '$trim_cas_val'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results; @@ -265,7 +265,7 @@ foreach ($arr_total_products as $product) { $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%'"); + $analysis_query->setQuery("SELECT * FROM compundsvocabulary WHERE namecompoundsvocabulary = '$tmp_val'"); $analysis_query->execute(); $analysis_data = $analysis_query->Results;