Update app.py

app.py

@@ -245,9 +245,15 @@ def fetch_database_records(standard, version, selection):
         conn = sqlite3.connect(db_path)
         conn.text_factory = decode_sqlite_text 
 
+        # 1. 현재 어떤 종류의 테이블을 보려는지 판별 (TableA, TableB_C 또는 Main)
+        # selection이 "ALL"이거나 "2.12" 같은 형태면 "Main"으로 간주
+        table_type = "Main" if selection == "ALL" or (selection and selection[0].isdigit() and "." in selection) else selection
+        
+        # 2. Table_Config에서 설정 가져오기 (가장 중요한 부분!)
+        anchor_col, display_setting = get_table_config(table_type)
+
         tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", conn)['name'].tolist()
         main_table = f"{standard}_{version}"
-        
         if main_table not in tables:
             main_table = tables[0]
 
@@ -263,45 +269,46 @@ def fetch_database_records(standard, version, selection):
                 target_table = t
                 break
 
+        # 3. 데이터 로드 로직
         if target_table and target_table != main_table:
+            # 부속 테이블(TableA 등) 처리
             df = pd.read_sql(f"SELECT * FROM [{target_table}]", conn)
-            df = df.drop(columns=[c for c in df.columns if c.lower() == "version"], errors="ignore")
-            df.columns = [c.replace("_", " ").title() for c in df.columns]
-
-            for col in df.columns:
-                df[col] = df[col].apply(convert_blob_to_html_img)
-
-            conn.close()
-            return df
-
-        cursor = conn.cursor()
-        cursor.execute(f"PRAGMA table_info([{main_table}])")
-        cols = [c[1] for c in cursor.fetchall()]
-        lower_cols = [c.lower().strip() for c in cols]
-
-        real_ch, real_cat = None, None
-        for c, lc in zip(cols, lower_cols):
-            if lc == "chapter": real_ch = c
-            elif lc == "category": real_cat = c
-
-        if selection == "ALL":
-            cursor.execute(f"SELECT * FROM [{main_table}]")
-        elif "." in selection and real_ch and real_cat:
-            ch, ca = selection.split(".", 1)
-            query = f"SELECT * FROM [{main_table}] WHERE REPLACE(TRIM(CAST([{real_ch}] AS TEXT)), ' ', '') = ? AND REPLACE(TRIM(CAST([{real_cat}] AS TEXT)), ' ', '') = ?"
-            cursor.execute(query, (ch.replace(" ", ""), ca.replace(" ", "")))
         else:
-            cursor.execute(f"SELECT * FROM [{main_table}]")
+            # 메인 테이블 처리 (ALL 또는 카테고리 필터링)
+            cursor = conn.cursor()
+            cursor.execute(f"PRAGMA table_info([{main_table}])")
+            cols_info = cursor.fetchall()
+            cols = [c[1] for c in cols_info]
+            lower_cols = [c.lower().strip() for c in cols]
+
+            real_ch, real_cat = None, None
+            for c, lc in zip(cols, lower_cols):
+                if lc == "chapter": real_ch = c
+                elif lc == "category": real_cat = c
+
+            if selection == "ALL":
+                cursor.execute(f"SELECT * FROM [{main_table}]")
+            elif "." in selection and real_ch and real_cat:
+                ch, ca = selection.split(".", 1)
+                query = f"SELECT * FROM [{main_table}] WHERE REPLACE(TRIM(CAST([{real_ch}] AS TEXT)), ' ', '') = ? AND REPLACE(TRIM(CAST([{real_cat}] AS TEXT)), ' ', '') = ?"
+                cursor.execute(query, (ch.replace(" ", ""), ca.replace(" ", "")))
+            else:
+                cursor.execute(f"SELECT * FROM [{main_table}]")
+            
+            df = pd.DataFrame(cursor.fetchall(), columns=cols)
 
-        df = pd.DataFrame(cursor.fetchall(), columns=cols)
-        df.columns = [c.lower().strip() for c in df.columns]
+        # 4. [수정됨] 설정에 따른 컬럼 필터링 (하드코딩 제거)
+        df = df.drop(columns=[c for c in df.columns if c.lower() == "version"], errors="ignore")
         
         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]
+            # Anchor(기준열)가 데이터에 있다면 반드시 포함
+            if anchor_col in df.columns and anchor_col not in cols_to_show:
+                cols_to_show.insert(0, anchor_col)
+            # 존재하는 컬럼만 필터링
+            df = df[[c for c in cols_to_show if c in df.columns]]
 
+        # 5. 이미지 렌더링 및 정리
         for col in df.columns:
             df[col] = df[col].apply(convert_blob_to_html_img)
 
@@ -309,6 +316,8 @@ def fetch_database_records(standard, version, selection):
         return df
 
     except Exception as e:
+        import traceback
+        traceback.print_exc() # 에러 원인 추적을 위해 추가
         return pd.DataFrame({"Error": [str(e)]})
 
 def execute_unified_search(base_std, base_ver, base_cat, comp_std, comp_ver, comp_cat):