Update app.py

app.py

@@ -219,6 +219,20 @@ def generate_html_diff(base_text, comp_text):
 
     return " ".join(b_result), " ".join(c_result)
 
+def get_table_config(table_type):
+    try:
+        conn = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
+        query = "SELECT Anchor_Column, Display_Columns FROM Table_Config WHERE Table_Type=?"
+        df = pd.read_sql(query, conn, params=[table_type])
+        conn.close()
+        
+        if not df.empty:
+            return df.iloc[0]['Anchor_Column'], df.iloc[0]['Display_Columns']
+    except Exception:
+        pass
+
+    return "Section", "Description"
+
 def fetch_database_records(standard, version, selection):
     if not all([standard, version, selection]):
         return pd.DataFrame({"Info": ["선택 필요"]})
@@ -282,8 +296,11 @@ def fetch_database_records(standard, version, selection):
         df = pd.DataFrame(cursor.fetchall(), columns=cols)
         df.columns = [c.lower().strip() for c in df.columns]
         
-        if 'section' in df.columns and 'description' in df.columns:
-            df = df[['section', 'description']]
+        if display_setting:
+            cols_to_show = [c.strip() for c in display_setting.split(',')]
+        if anchor_col not in cols_to_show:
+            cols_to_show.insert(0, anchor_col)
+            df = df[cols_to_show]
 
         for col in df.columns:
             df[col] = df[col].apply(convert_blob_to_html_img)
@@ -295,25 +312,27 @@ def fetch_database_records(standard, version, selection):
         return pd.DataFrame({"Error": [str(e)]})
 
 def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, comp_cat):
-    try:
-        # 단일 조회 
-        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)
-            if "Error" in df.columns or "Info" in df.columns:
-                return df
-            
-            rename_dict = {col: col.title() for col in df.columns if col.lower() in ['section', 'description']}
-            df = df.rename(columns=rename_dict)
-
-            if not df.empty and len(df.columns) > 1:
-                is_duplicate = pd.Series([True] * len(df), index=df.index)
-                for col in df.columns[:-1]:
-                    current_col_str = df[col].astype(str).str.strip()
-                    current_match = (current_col_str == current_col_str.shift(1)) & (~current_col_str.isin(["", "nan", "None", " "]))
-                    is_duplicate = is_duplicate & current_match
-                    df.loc[is_duplicate, col] = " "
-
-            return df
+    # 1. 테이블 타입 판별 (선택된 카테고리 명칭 등으로 판별)
+    table_type = "Main" if base_cat == "ALL" or "." in base_cat else base_cat
+    anchor_col, _ = get_table_config(table_type)
+
+    # 2. 양측 데이터 로드 (이제 6열씩 가득 차서 옵니다)
+    df_base = fetch_database_records(base_std, base_ver, base_cat, table_type)
+    df_comp = fetch_database_records(comp_std, comp_ver, comp_cat, table_type)
+
+    # 3. 컬럼명에 버전 접미사 붙여서 12열 준비
+    df_base = df_base.add_suffix(f'_{base_ver}')
+    df_comp = df_comp.add_suffix(f'_{comp_ver}')
+
+    # 4. Anchor Column을 기준으로 JOIN (이게 6+6 핵심)
+    final_df = pd.merge(
+        df_base, df_comp, 
+        left_on=f"{anchor_col}_{base_ver}", 
+        right_on=f"{anchor_col}_{comp_ver}", 
+        how='outer'
+    )
+    
+    return final_df
 
         # 비교 조회 
         if all([base_std, base_ver, base_cat, comp_std, comp_ver, comp_cat]):