Update app.py

app.py

@@ -124,11 +124,6 @@ def fetch_database_records(std, ver, cat, table_type):
         
         real_anchors = [c for c in df.columns if any(a.lower() == c.lower() for a in anchors)]
         
-        # 💡 [핵심 로직] Status 열은 UI 상단에 표기되므로, 아래 표에서는 깔끔하게 삭제합니다!
-        status_cols = [c for c in df.columns if c.lower() == 'status']
-        if status_cols:
-            df = df.drop(columns=status_cols)
-        
         final_cols = []
         for d in displays:
             for c in df.columns:
@@ -415,6 +410,12 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
         if base_std and base_ver and base_cat and (not comp_std or not comp_ver or not comp_cat):
             df, _ = fetch_database_records(base_std, base_ver, base_cat, type_b)
             if "Error" in df.columns: return df
+            
+            # 💡 [요청 반영] 단일 조회 시 화면 하단 표에 Status 열이 나오지 않도록 처리합니다.
+            status_cols = [c for c in df.columns if c.lower() == 'status']
+            if status_cols:
+                df = df.drop(columns=status_cols)
+                
             return apply_visual_merge(df, df.columns)
 
         if all([base_std, base_ver, base_cat, comp_std, comp_ver, comp_cat]):
@@ -437,14 +438,9 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
                     s = s[:-2]
                 return s.replace(" ", "")
 
-            # 💡 [핵심 로직] 내부 처리용 임시 꼬리표를 달아 KeyError를 원천 차단합니다!
-            internal_rename_b = {c: f"{c}_INTERNAL_BASE" for c in df_base.columns if c != 'merge_key'}
-            internal_rename_c = {c: f"{c}_INTERNAL_COMP" for c in df_comp.columns if c != 'merge_key'}
-            
             df_base['merge_key'] = df_base[real_anchors_b].apply(lambda row: '-'.join([clean_key_val(x) for x in row]), axis=1)
             df_comp['merge_key'] = df_comp[real_anchors_c].apply(lambda row: '-'.join([clean_key_val(x) for x in row]), axis=1)
 
-            # 💡 [핵심 로직] 매핑 장부(Mapping_registry)를 무조건 최우선으로 검사합니다.
             conn_map = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
             registry_query = """
                 SELECT Target_Table FROM Mapping_registry 
@@ -512,14 +508,18 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
             else:
                 bridge = pd.DataFrame(columns=['Base_section', 'Comp_section'])
 
-            # 💡 [핵심 로직] 매핑 장부가 완벽하게 비어있을 때만(즉, 아무것도 안 썼을 때만) 최후의 수단으로 1:1 병합
-            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:
+            # 💡 [요청하신 딱 그 부분 수정!] 
+            # 1순위: 장부에 적힌 매핑(bridge)을 그대로 씁니다.
+            # 2순위: 장부가 비어있고 양쪽 법규/카테고리가 완벽히 같을 때만 양쪽 조항 전체(합집합)를 1:1로 묶습니다.
+            if bridge.empty and base_std.strip().upper() == comp_std.strip().upper() and type_b.strip().upper() == type_c.strip().upper():
                 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})
 
-            df_base = df_base.rename(columns=internal_rename_b)
-            df_comp = df_comp.rename(columns=internal_rename_c)
+            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)
+            
+            rename_c = {c: f"{c}_{comp_ver}" for c in df_comp.columns if c != 'merge_key'}
+            df_comp = df_comp.rename(columns=rename_c)
 
             df_base['base_idx'], df_comp['comp_idx'] = range(len(df_base)), range(len(df_comp))
             merged = pd.merge(bridge, df_base, left_on='Base_section', right_on='merge_key', how='outer')
@@ -535,21 +535,22 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
                 has_b = not pd.isna(row.get('base_idx')) and row.get('base_idx') != float('inf')
                 has_c = not pd.isna(row.get('comp_idx')) and row.get('comp_idx') != float('inf')
                 
-                for c in internal_rename_b.values(): row_dict[c] = str(row[c]) if has_b and not pd.isna(row[c]) else ""
-                for c in internal_rename_c.values(): row_dict[c] = str(row[c]) if has_c and not pd.isna(row[c]) else ""
+                for c in rename_b.values(): row_dict[c] = str(row[c]) if has_b and not pd.isna(row[c]) else ""
+                for c in rename_c.values(): row_dict[c] = str(row[c]) if has_c and not pd.isna(row[c]) else ""
                 
                 if mapped_only:
-                    b_has_val = any(str(row_dict[c]).strip() not in ["", "nan", "None", " "] for c in internal_rename_b.values())
-                    c_has_val = any(str(row_dict[c]).strip() not in ["", "nan", "None", " "] for c in internal_rename_c.values())
+                    b_has_val = any(str(row_dict[c]).strip() not in ["", "nan", "None", " "] for c in rename_b.values())
+                    c_has_val = any(str(row_dict[c]).strip() not in ["", "nan", "None", " "] for c in rename_c.values())
+                    
                     if not (b_has_val and c_has_val):
                         continue
                 
                 if has_b and has_c:
-                    for orig_col in internal_rename_b.keys():
-                        if ('description' in orig_col.lower() or '내용' in orig_col) and internal_rename_c.get(orig_col) in row_dict:
-                            b_v, c_v = row_dict[internal_rename_b[orig_col]], row_dict[internal_rename_c[orig_col]]
+                    for orig_col in rename_b.keys():
+                        if ('description' in orig_col.lower() or '내용' in orig_col) and rename_c.get(orig_col) in row_dict:
+                            b_v, c_v = row_dict[rename_b[orig_col]], row_dict[rename_c[orig_col]]
                             if b_v and c_v and "<img" not in b_v and "<img" not in c_v and b_v != c_v:
-                                row_dict[internal_rename_b[orig_col]], row_dict[internal_rename_c[orig_col]] = generate_html_diff(b_v, c_v)
+                                row_dict[rename_b[orig_col]], row_dict[rename_c[orig_col]] = generate_html_diff(b_v, c_v)
                 result_rows.append(row_dict)
 
             final_df = combine_code_desc(pd.DataFrame(result_rows))
@@ -563,16 +564,6 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
                 if final_df.empty:
                     return pd.DataFrame({"Info": ["💡 선택하신 조건 간에 변경된 내용이 없습니다. (100% 동일)"]})
             
-            # 💡 [핵심 로직] 화면 출력 직전에 지저분한 임시 꼬리표를 깔끔하게 떼어버립니다.
-            final_rename_map = {}
-            for col in final_df.columns:
-                if col.endswith("_INTERNAL_BASE"):
-                    final_rename_map[col] = f"{col.replace('_INTERNAL_BASE', '')}_{base_ver}"
-                elif col.endswith("_INTERNAL_COMP"):
-                    final_rename_map[col] = f"{col.replace('_INTERNAL_COMP', '')}_{comp_ver}"
-            
-            final_df = final_df.rename(columns=final_rename_map)
-
             b_cols_final = [c for c in final_df.columns if c.endswith(f"_{base_ver}")]
             c_cols_final = [c for c in final_df.columns if c.endswith(f"_{comp_ver}")]
 
@@ -583,8 +574,6 @@ def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, com
 
         return pd.DataFrame({"Info": ["조건을 선택하세요."]})
     except Exception as e:
-        import traceback
-        traceback.print_exc()
         error_msg = str(e)
         if "database is locked" in error_msg.lower():
             return pd.DataFrame({"Error": ["🚨 DB가 잠겨있습니다! 켜놓으신 'DB Browser' 프로그램을 완전히 종료한 뒤 다시 조회해 주세요."]})