Update app.py

app.py

@@ -25,7 +25,6 @@ def blob_to_base64_html(blob_data):
     try:
         if isinstance(blob_data, (bytes, bytearray)):
             encoded = base64.b64encode(blob_data).decode('utf-8')
-            # 핵심 수정: width를 100%로 주어 셀 가로너비에 꽉 차게 만들고, max-height를 600px로 넉넉하게 늘림
             return f'''
             <img src="data:image/png;base64,{encoded}"
                  style="width: 50%; max-height: 400px; object-fit: contain; 
@@ -102,33 +101,21 @@ def update_category_dd(standard, version):
             for _, r in df.iterrows():
                 choices.append(f"{str(r[ch]).strip()}.{str(r[ca]).strip()}")
 
-        # 2. 🚀 테이블 이름 깔끔하게 자르기 (대소문자 무시 방식)
-        # 예: "r171_00series_"
-        prefix = f"{standard}_{version}_".lower() 
-        prefix_no_under = f"{standard}_{version}".lower()
+        # 2. 🚀 테이블 이름 깔끔하게 자르기 (강력한 정규식 적용)
+        pattern = re.compile(f"^{standard}[_\\s-]*{version}[_\\s-]*", re.IGNORECASE)
 
         for t in tables:
             if t == main_t:
                 continue
             
-            t_lower = t.lower()
-            
-            # 테이블 이름이 prefix("r171_00series_")로 시작하면 그 길이만큼 앞부분을 싹둑 자름
-            if t_lower.startswith(prefix):
-                short_name = t[len(prefix):]
-            # 혹시 언더바(_) 없이 "r171_00seriesTableA" 처럼 붙어있을 경우 대비
-            elif t_lower.startswith(prefix_no_under):
-                short_name = t[len(prefix_no_under):]
-            else:
-                short_name = t
-                
-            choices.append(f"{short_name.strip()}")
+            # 대소문자, 언더바, 공백을 찰떡같이 무시하고 기준 접두사를 날려버림
+            short_name = pattern.sub("", t).strip(" _")
+            choices.append(short_name)
 
         conn.close()
 
     except Exception as e:
         print(f"[Error in update_category_dd] standard: {standard}, version: {version}")
-        import traceback
         traceback.print_exc()
 
     return gr.Dropdown(choices=choices)
@@ -197,12 +184,21 @@ def display_data(standard, version, selection):
         if main_t not in tables:
             main_t = tables[0]
 
-        if selection in tables:
-            full_table_name = selection
-        else:
-            full_table_name = f"{standard}_{version}_{selection}"
-
-        if full_table_name in tables:
+        # 🚀 잘린 short_name으로 원래 풀네임 테이블 찾기 (Reverse Lookup)
+        full_table_name = None
+        pattern = re.compile(f"^{standard}[_\\s-]*{version}[_\\s-]*", re.IGNORECASE)
+        
+        for t in tables:
+            if t == selection: # 풀네임이 그대로 매칭되는 경우
+                full_table_name = t
+                break
+            short = pattern.sub("", t).strip(" _")
+            if short == selection: # 드롭다운의 짧은 이름과 매칭되는 실제 DB 테이블 찾기
+                full_table_name = t
+                break
+
+        # 테이블(A4/1 등)을 선택한 경우
+        if full_table_name:
             df = pd.read_sql(f"SELECT * FROM [{full_table_name}]", conn)
             df.columns = [c.strip() for c in df.columns]
             df = df.drop(columns=[c for c in df.columns if c.lower() == "version"], errors="ignore")
@@ -214,6 +210,7 @@ def display_data(standard, version, selection):
             conn.close()
             return df
 
+        # ALL 또는 챕터.카테고리 선택한 경우
         cols = pd.read_sql(f"PRAGMA table_info([{main_t}])", conn)['name'].tolist()
         lower = [c.lower().strip() for c in cols]
 
@@ -392,13 +389,13 @@ table {
 }
 
 /* -------------------------- */
-/* 2컬럼                       */
+/* 2컬럼                        */
 /* -------------------------- */
 table th:nth-last-child(2):first-child, table td:nth-last-child(2):first-child { width: 15% !important; } 
 table th:nth-last-child(1), table td:nth-last-child(1) { width: 85% !important; }
 
 /* -------------------------- */
-/* 4컬럼                       */
+/* 4컬럼                        */
 /* -------------------------- */
 table th:nth-child(1):nth-last-child(4), table td:nth-child(1):nth-last-child(4) { width: 7% !important; } 
 table th:nth-child(2):nth-last-child(3), table td:nth-child(2):nth-last-child(3) { width: 43% !important; } 
@@ -406,7 +403,7 @@ table th:nth-child(3):nth-last-child(2), table td:nth-child(3):nth-last-child(2)
 table th:nth-child(4):nth-last-child(1), table td:nth-child(4):nth-last-child(1) { width: 43% !important; }
 
 /* -------------------------- */
-/* 5컬럼                       */
+/* 5컬럼                        */
 /* -------------------------- */
 table th:nth-child(1):nth-last-child(5), table td:nth-child(1):nth-last-child(5) { width: 15% !important; } 
 table th:nth-child(2):nth-last-child(4), table td:nth-child(2):nth-last-child(4) { width: 10% !important; } 
@@ -415,7 +412,7 @@ table th:nth-child(4):nth-last-child(2), table td:nth-child(4):nth-last-child(2)
 table th:nth-child(5):nth-last-child(1), table td:nth-child(5):nth-last-child(1) { width: 35% !important; }
 
 /* -------------------------- */
-/* 6컬럼                       */
+/* 6컬럼                        */
 /* -------------------------- */
 table th:nth-child(1):nth-last-child(6), table td:nth-child(1):nth-last-child(6) { width: 8% !important; } 
 table th:nth-child(2):nth-last-child(5), table td:nth-child(2):nth-last-child(5) { width: 25% !important; }