Update app.py

app.py

@@ -80,26 +80,43 @@ def update_base_category_dropdown(standard, version):
 
     try:
         conn = sqlite3.connect(db_path)
-        # 1. DB 내의 물리적 테이블 목록 (TableA, TableB_C 등)
         tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", conn)['name'].tolist()
-        main_table = f"{standard}_{version}"
         
+        main_table = f"{standard}_{version}"
+        # [복원] 메인 테이블 이름 안전장치
+        if main_table not in tables:
+            main_table = tables[0] if tables else None
+
+        # 1. 부속 테이블(TableA 등) 리스트 가져오기
         pattern = re.compile(f"^{standard}[_\\s-]*{version}[_\\s-]*", re.IGNORECASE)
         for t in tables:
             if t == main_table or t.lower() in ['mapping_registry', 'mapping_table', 'table_config']: continue
             short_name = pattern.sub("", t).strip(" _")
-            choices.append(short_name)
-
-        # 2. 본문 내의 조항 번호 리스트 (2.1, 3.2 등)
-        cols = pd.read_sql(f"PRAGMA table_info([{main_table}])", conn)['name'].tolist()
-        lower_cols = [c.lower() for c in cols]
-        if 'chapter' in lower_cols and 'category' in lower_cols:
-            df = pd.read_sql(f"SELECT DISTINCT chapter, category FROM [{main_table}]", conn)
-            for _, row in df.iterrows():
-                if row['chapter'] and row['category']:
-                    choices.append(f"{row['chapter']}.{row['category']}")
+            if short_name and short_name not in choices:
+                choices.append(short_name)
+            elif t not in choices:
+                choices.append(t)
+
+        # 2. 본문 조항 리스트(1. Scope 등) 가져오기
+        if main_table:
+            cols = pd.read_sql(f"PRAGMA table_info([{main_table}])", conn)['name'].tolist()
+            lower_cols = [c.lower() for c in cols]
+            if 'chapter' in lower_cols and 'category' in lower_cols:
+                ch_col = cols[lower_cols.index('chapter')]
+                ca_col = cols[lower_cols.index('category')]
+                
+                df = pd.read_sql(f"SELECT DISTINCT [{ch_col}], [{ca_col}] FROM [{main_table}]", conn)
+                for _, row in df.iterrows():
+                    ch = str(row[ch_col]).strip()
+                    ca = str(row[ca_col]).strip()
+                    # [복원] None, nan 값 필터링
+                    if ch and ca and ch.lower() not in ['none', 'nan'] and ca.lower() not in ['none', 'nan']:
+                        choices.append(f"{ch}.{ca}")
         conn.close()
-    except Exception: traceback.print_exc()
+    except Exception: 
+        import traceback
+        traceback.print_exc()
+        
     return gr.update(choices=choices, value=None, interactive=True)
 
 def update_comp_standard_dropdown(base_std, base_ver):
@@ -157,23 +174,60 @@ def update_comp_category_dropdown(base_std, base_ver, base_cat, comp_std, comp_v
     if not all([base_std, base_ver, base_cat, comp_std, comp_ver]):
         return gr.update(choices=[], value=None, interactive=False)
 
-    # 현재 선택된 기준의 타입 판별
-    base_type = "Main" if base_cat == "ALL" or (base_cat and base_cat[0].isdigit()) else base_cat
+    # 기준 법규의 타입 판별
+    base_type = "Main" if base_cat == "ALL" or (base_cat and base_cat[0].isdigit() and "." in base_cat) else base_cat
 
     try:
         conn = sqlite3.connect(os.path.join(UPLOAD_DIR, "mapping.db"))
-        # Registry에서 허용된 Comp_Type만 쿼리
-        query = """
-        SELECT DISTINCT Comp_Type FROM Mapping_registry 
-        WHERE Base_std=? AND Base_ver=? AND Base_Type=? AND Comp_std=? AND Comp_ver=?
-        """
+        # Registry에서 허용된 Comp_Type 조회
+        query = "SELECT DISTINCT Comp_Type FROM Mapping_registry WHERE Base_std=? AND Base_ver=? AND Base_Type=? AND Comp_std=? AND Comp_ver=?"
         df = pd.read_sql(query, conn, params=[base_std, base_ver, base_type, comp_std, comp_ver])
         conn.close()
 
-        choices = df['Comp_Type'].tolist()
-        # 만약 Registry에 없다면 사용자가 당황하지 않게 안내 메시지나 빈 리스트 반환
-        return gr.update(choices=choices, value=choices[0] if choices else None, interactive=True)
-    except Exception:
+        allowed_types = df['Comp_Type'].dropna().tolist()
+        if not allowed_types:
+            return gr.update(choices=[], value=None)
+
+        final_choices = []
+        
+        # [핵심 수정] Comp_Type이 'Main'인 경우, 실제 DB를 열어서 ALL과 세부 조항을 가져옴!
+        if "Main" in allowed_types:
+            final_choices.append("ALL")
+            comp_db_path = os.path.join(UPLOAD_DIR, f"{comp_std}_{comp_ver}.db")
+            
+            if os.path.exists(comp_db_path):
+                c_conn = sqlite3.connect(comp_db_path)
+                c_tables = pd.read_sql("SELECT name FROM sqlite_master WHERE type='table';", c_conn)['name'].tolist()
+                
+                c_main_table = f"{comp_std}_{comp_ver}"
+                if c_main_table not in c_tables:
+                    c_main_table = c_tables[0] if c_tables else None
+                
+                if c_main_table:
+                    cols = pd.read_sql(f"PRAGMA table_info([{c_main_table}])", c_conn)['name'].tolist()
+                    lower_cols = [c.lower() for c in cols]
+                    if 'chapter' in lower_cols and 'category' in lower_cols:
+                        ch_col = cols[lower_cols.index('chapter')]
+                        ca_col = cols[lower_cols.index('category')]
+                        
+                        c_df = pd.read_sql(f"SELECT DISTINCT [{ch_col}], [{ca_col}] FROM [{c_main_table}]", c_conn)
+                        for _, row in c_df.iterrows():
+                            ch = str(row[ch_col]).strip()
+                            ca = str(row[ca_col]).strip()
+                            if ch and ca and ch.lower() not in ['none', 'nan'] and ca.lower() not in ['none', 'nan']:
+                                final_choices.append(f"{ch}.{ca}")
+                c_conn.close()
+        
+        # Main이 아닌 다른 타입(TableA 등)은 그대로 목록에 추가
+        for t in allowed_types:
+            if t != "Main":
+                final_choices.append(t)
+
+        return gr.update(choices=final_choices, value=final_choices[0] if final_choices else None, interactive=True)
+        
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
         return gr.update(choices=[], value=None)
 
 def reset_base_selections():