Update app.py

app.py

@@ -446,69 +446,79 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
             """
             reg_df = pd.read_sql(registry_query, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
             
-            target_table_name = "Mapping_table"
+            target_table_name = None
             if not reg_df.empty and pd.notna(reg_df.iloc[0]['Target_Table']):
                 val = str(reg_df.iloc[0]['Target_Table']).strip()
                 if val and val.lower() not in ["none", "nan"]:
                     target_table_name = val
 
-            try:
-                q_fw = f"SELECT * FROM [{target_table_name}] WHERE TRIM(Base_std)=? AND TRIM(Base_ver)=? AND TRIM(Comp_std)=? AND TRIM(Comp_ver)=?"
-                df_fw = pd.read_sql(q_fw, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
-                
-                q_rv = f"SELECT * FROM [{target_table_name}] 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()])
-            except Exception as sql_e:
-                conn_map.close()
-                return pd.DataFrame({"Error": [f"매핑 '{target_table_name}'을 여는 데 실패했습니다. 테이블 이름을 확인하세요: {str(sql_e)}"]})
-            conn_map.close()
-
-            cols_fw_lower = {c.lower(): c for c in df_fw.columns}
-            
-            if 'base_type' in cols_fw_lower and 'comp_type' in cols_fw_lower:
-                b_col = cols_fw_lower['base_type']
-                c_col = cols_fw_lower['comp_type']
-                
-                df_fw[b_col] = df_fw[b_col].fillna('Main').astype(str).str.strip().str.upper()
-                df_fw[c_col] = df_fw[c_col].fillna('Main').astype(str).str.strip().str.upper()
-                df_fw = df_fw[(df_fw[b_col] == type_b.strip().upper()) & (df_fw[c_col] == type_c.strip().upper())]
-                
-                if not df_rv.empty:
-                    df_rv[b_col] = df_rv[b_col].fillna('Main').astype(str).str.strip().str.upper()
-                    df_rv[c_col] = df_rv[c_col].fillna('Main').astype(str).str.strip().str.upper()
-                    df_rv = df_rv[(df_rv[c_col] == type_b.strip().upper()) & (df_rv[b_col] == type_c.strip().upper())]
-
-            b_sec = cols_fw_lower.get('base_section', 'Base_section')
-            c_sec = cols_fw_lower.get('comp_section', 'Comp_section')
-            
-            if b_sec not in df_fw.columns or c_sec not in df_fw.columns:
-                return pd.DataFrame({"Error": [f"'{target_table_name}' 에 '{b_sec}' 또는 '{c_sec}' 열이 없습니다. 대소문자를 확인하세요."]})
+            # 💡 [핵심] 사용자님 시나리오 완벽 적용
+            is_same_std = (base_std.strip().upper() == comp_std.strip().upper() and type_b.strip().upper() == type_c.strip().upper())
+            df_mapping = pd.DataFrame()
             
-            df_fw = df_fw[[b_sec, c_sec]].rename(columns={b_sec: 'Base_section', c_sec: 'Comp_section'})
-            if not df_rv.empty:
-                df_rv = df_rv[[b_sec, c_sec]].rename(columns={b_sec: 'Comp_section', c_sec: 'Base_section'})
-            else:
-                df_rv = pd.DataFrame(columns=['Base_section', 'Comp_section'])
-
-            df_mapping = pd.concat([df_fw, df_rv], ignore_index=True)
-
-            if not df_mapping.empty:
-                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'] = df_mapping['Base_section'].apply(clean_key_val)
-                df_mapping['Comp_section'] = df_mapping['Comp_section'].apply(clean_key_val)
-                
-                df_mapping = df_mapping[(df_mapping['Base_section'] != "") & (df_mapping['Comp_section'] != "")]
-                bridge = df_mapping.dropna().drop_duplicates()
+            if target_table_name:
+                try:
+                    q_fw = f"SELECT * FROM [{target_table_name}] WHERE TRIM(Base_std)=? AND TRIM(Base_ver)=? AND TRIM(Comp_std)=? AND TRIM(Comp_ver)=?"
+                    df_fw = pd.read_sql(q_fw, conn_map, params=[base_std.strip(), base_ver.strip(), comp_std.strip(), comp_ver.strip()])
+                    
+                    q_rv = f"SELECT * FROM [{target_table_name}] 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()])
+                    
+                    cols_fw_lower = {c.lower(): c for c in df_fw.columns}
+                    
+                    if 'base_type' in cols_fw_lower and 'comp_type' in cols_fw_lower:
+                        b_col = cols_fw_lower['base_type']
+                        c_col = cols_fw_lower['comp_type']
+                        
+                        df_fw[b_col] = df_fw[b_col].fillna('Main').astype(str).str.strip().str.upper()
+                        df_fw[c_col] = df_fw[c_col].fillna('Main').astype(str).str.strip().str.upper()
+                        df_fw = df_fw[(df_fw[b_col] == type_b.strip().upper()) & (df_fw[c_col] == type_c.strip().upper())]
+                        
+                        if not df_rv.empty:
+                            df_rv[b_col] = df_rv[b_col].fillna('Main').astype(str).str.strip().str.upper()
+                            df_rv[c_col] = df_rv[c_col].fillna('Main').astype(str).str.strip().str.upper()
+                            df_rv = df_rv[(df_rv[c_col] == type_b.strip().upper()) & (df_rv[b_col] == type_c.strip().upper())]
+
+                    b_sec = cols_fw_lower.get('base_section', 'Base_section')
+                    c_sec = cols_fw_lower.get('comp_section', 'Comp_section')
+                    
+                    if b_sec not in df_fw.columns or c_sec not in df_fw.columns:
+                        conn_map.close()
+                        return pd.DataFrame({"Error": [f"'{target_table_name}' 에 '{b_sec}' 또는 '{c_sec}' 열이 없습니다. 대소문자를 확인하세요."]})
+                    
+                    df_fw = df_fw[[b_sec, c_sec]].rename(columns={b_sec: 'Base_section', c_sec: 'Comp_section'})
+                    if not df_rv.empty:
+                        df_rv = df_rv[[b_sec, c_sec]].rename(columns={b_sec: 'Comp_section', c_sec: 'Base_section'})
+                    else:
+                        df_rv = pd.DataFrame(columns=['Base_section', 'Comp_section'])
+
+                    df_mapping = pd.concat([df_fw, df_rv], ignore_index=True)
+
+                    if not df_mapping.empty:
+                        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'] = df_mapping['Base_section'].apply(clean_key_val)
+                        df_mapping['Comp_section'] = df_mapping['Comp_section'].apply(clean_key_val)
+                        
+                        df_mapping = df_mapping[(df_mapping['Base_section'] != "") & (df_mapping['Comp_section'] != "")]
+                        bridge = df_mapping.dropna().drop_duplicates()
+                    else:
+                        bridge = pd.DataFrame(columns=['Base_section', 'Comp_section'])
+                        
+                except Exception as sql_e:
+                    conn_map.close()
+                    return pd.DataFrame({"Error": [f"매핑 테이블 '{target_table_name}'을 여는 데 실패했습니다. 테이블 이름을 확인하세요: {str(sql_e)}"]})
             else:
-                bridge = pd.DataFrame(columns=['Base_section', 'Comp_section'])
-
-            is_same_std = (base_std.strip().upper() == comp_std.strip().upper() and type_b.strip().upper() == type_c.strip().upper())
-            if bridge.empty and is_same_std:
-                all_keys = list(set(df_base['merge_key']).union(set(df_comp['merge_key'])))
-                bridge = pd.DataFrame({'Base_section': all_keys, 'Comp_section': all_keys})
+                if is_same_std:
+                    all_keys = list(set(df_base['merge_key']).union(set(df_comp['merge_key'])))
+                    bridge = pd.DataFrame({'Base_section': all_keys, 'Comp_section': all_keys})
+                else:
+                    conn_map.close()
+                    return pd.DataFrame({"Error": ["매핑 테이블이 존재하지 않습니다."]})
+            
+            conn_map.close()
 
             df_base = df_base.rename(columns=internal_rename_b)
             df_comp = df_comp.rename(columns=internal_rename_c)