Update app.py

app.py

@@ -423,11 +423,10 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
                 if ra not in df_comp.columns: 
                     return pd.DataFrame({"Error": [f"비교 열(Anchor) '{ra}'이(가) 비교 데이터에 존재하지 않습니다. Table_Config를 확인하세요."]})
 
-            df_base['merge_key'] = df_base[real_anchors_b].apply(lambda row: '-'.join(row.values.astype(str)), axis=1).str.replace(" ", "")
-            df_comp['merge_key'] = df_comp[real_anchors_c].apply(lambda row: '-'.join(row.values.astype(str)), axis=1).str.replace(" ", "")
+            df_base['merge_key'] = df_base[real_anchors_b].apply(lambda row: '-'.join(row.values.astype(str)), axis=1).astype(str).str.replace(" ", "")
+            df_comp['merge_key'] = df_comp[real_anchors_c].apply(lambda row: '-'.join(row.values.astype(str)), axis=1).astype(str).str.replace(" ", "")
 
             conn_map = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
-
             map_cols = pd.read_sql("PRAGMA table_info(Mapping_table)", conn_map)['name'].tolist()
             
             if 'Base_Type' in map_cols and 'Comp_Type' in map_cols:
@@ -437,12 +436,10 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
                 q_rv = "SELECT Comp_section AS Base_section, Base_section AS Comp_section FROM Mapping_table WHERE TRIM(Comp_std)=? AND TRIM(Comp_ver)=? AND TRIM(Comp_Type)=? AND TRIM(Base_std)=? AND TRIM(Base_ver)=? AND TRIM(Base_Type)=?"
                 df_rv = pd.read_sql(q_rv, conn_map, params=[base_std.strip(), base_ver.strip(), type_b, comp_std.strip(), comp_ver.strip(), type_c])
             else:
-
                 q = "SELECT Base_section, Comp_section FROM Mapping_table WHERE TRIM(Base_std)=? AND TRIM(Base_ver)=? AND TRIM(Comp_std)=? AND TRIM(Comp_ver)=?"
                 df_fw = pd.read_sql(q, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
                 q_rv = "SELECT Comp_section AS Base_section, Base_section AS Comp_section FROM Mapping_table WHERE TRIM(Comp_std)=? AND TRIM(Comp_ver)=? AND TRIM(Base_std)=? AND TRIM(Base_ver)=?"
                 df_rv = pd.read_sql(q_rv, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
-            
             conn_map.close()
 
             df_mapping = pd.concat([df_fw, df_rv], ignore_index=True)
@@ -450,7 +447,7 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
                 df_mapping['Base_section'] = df_mapping['Base_section'].astype(str).str.replace('\n', ',').str.split(',')
                 df_mapping['Comp_section'] = df_mapping['Comp_section'].astype(str).str.replace('\n', ',').str.split(',')
                 df_mapping = df_mapping.explode('Base_section').explode('Comp_section')
-                df_mapping[['Base_section', 'Comp_section']] = df_mapping[['Base_section', 'Comp_section']].apply(lambda x: x.str.strip().str.replace(" ", ""))
+                df_mapping[['Base_section', 'Comp_section']] = df_mapping[['Base_section', 'Comp_section']].astype(str).apply(lambda x: x.str.strip().str.replace(" ", ""))
                 df_mapping = df_mapping.dropna().drop_duplicates()
             else:
                 df_mapping = pd.DataFrame(columns=['Base_section', 'Comp_section'])
@@ -460,7 +457,9 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
                                          'Comp_section': list(set(df_base['merge_key']) & set(df_comp['merge_key']))})
                 bridge = pd.concat([df_mapping, implicit], ignore_index=True).drop_duplicates()
             else:
-                bridge = df_mapping.copy() 
+                bridge = df_mapping.copy()
+
+            rename_b = {c: f"{c}_{base_ver}" for c in df_base.columns if c != 'merge_key'}
 
             rename_b = {c: f"{c}_{base_ver}" for c in df_base.columns if c != 'merge_key'}
             df_base = df_base.rename(columns=rename_b)