QIDNLF commited on
Commit
6b68ae5
ยท
verified ยท
1 Parent(s): 7003401

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +17 -7
app.py CHANGED
@@ -92,6 +92,7 @@ def update_category_dd(standard, version):
92
  cols = pd.read_sql(f"PRAGMA table_info([{main_t}])", conn)['name'].tolist()
93
  lower = [c.lower() for c in cols]
94
 
 
95
  if 'chapter' in lower and 'category' in lower:
96
  ch = cols[lower.index('chapter')]
97
  ca = cols[lower.index('category')]
@@ -101,18 +102,27 @@ def update_category_dd(standard, version):
101
  for _, r in df.iterrows():
102
  choices.append(f"{str(r[ch]).strip()}.{str(r[ca]).strip()}")
103
 
 
 
 
 
 
104
  for t in tables:
105
  if t == main_t:
106
  continue
107
 
108
- # ๐Ÿš€ ์ˆ˜์ •๋œ ๋ถ€๋ถ„: ์ •๊ทœ์‹์„ ์‚ฌ์šฉํ•ด ๋Œ€์†Œ๋ฌธ์ž, ์–ธ๋”๋ฐ”(_), ๊ณต๋ฐฑ ๋ฌด์‹œํ•˜๊ณ  ์ ‘๋‘์‚ฌ ๊น”๋”ํ•˜๊ฒŒ ์ œ๊ฑฐ
109
- prefix_pattern = f"^{standard}[_\\s-]*{version}[_\\s-]*"
110
- short_name = re.sub(prefix_pattern, "", t, flags=re.IGNORECASE)
111
-
112
- # ๋งŒ์•ฝ ํ…Œ์ด๋ธ” ์ด๋ฆ„์— ๋‚จ์€ ํŠน์ˆ˜๋ฌธ์ž๋‚˜ ๊ณต๋ฐฑ์ด ๋ณด๊ธฐ ์‹ซ๋‹ค๋ฉด ํ•œ ๋ฒˆ ๋” ์ •๋ฆฌ
113
- short_name = short_name.strip()
114
 
115
- choices.append(f"{short_name}")
 
 
 
 
 
 
 
 
 
116
 
117
  conn.close()
118
 
 
92
  cols = pd.read_sql(f"PRAGMA table_info([{main_t}])", conn)['name'].tolist()
93
  lower = [c.lower() for c in cols]
94
 
95
+ # 1. ์ฑ•ํ„ฐ/์นดํ…Œ๊ณ ๋ฆฌ ๊ธฐ์ค€ ๋กœ์ง (๊ธฐ์กด ์œ ์ง€)
96
  if 'chapter' in lower and 'category' in lower:
97
  ch = cols[lower.index('chapter')]
98
  ca = cols[lower.index('category')]
 
102
  for _, r in df.iterrows():
103
  choices.append(f"{str(r[ch]).strip()}.{str(r[ca]).strip()}")
104
 
105
+ # 2. ๐Ÿš€ ํ…Œ์ด๋ธ” ์ด๋ฆ„ ๊น”๋”ํ•˜๊ฒŒ ์ž๋ฅด๊ธฐ (๋Œ€์†Œ๋ฌธ์ž ๋ฌด์‹œ ๋ฐฉ์‹)
106
+ # ์˜ˆ: "r171_00series_"
107
+ prefix = f"{standard}_{version}_".lower()
108
+ prefix_no_under = f"{standard}_{version}".lower()
109
+
110
  for t in tables:
111
  if t == main_t:
112
  continue
113
 
114
+ t_lower = t.lower()
 
 
 
 
 
115
 
116
+ # ํ…Œ์ด๋ธ” ์ด๋ฆ„์ด prefix("r171_00series_")๋กœ ์‹œ์ž‘ํ•˜๋ฉด ๊ทธ ๊ธธ์ด๋งŒํผ ์•ž๋ถ€๋ถ„์„ ์‹น๋‘‘ ์ž๋ฆ„
117
+ if t_lower.startswith(prefix):
118
+ short_name = t[len(prefix):]
119
+ # ํ˜น์‹œ ์–ธ๋”๋ฐ”(_) ์—†์ด "r171_00seriesTableA" ์ฒ˜๋Ÿผ ๋ถ™์–ด์žˆ์„ ๊ฒฝ์šฐ ๋Œ€๋น„
120
+ elif t_lower.startswith(prefix_no_under):
121
+ short_name = t[len(prefix_no_under):]
122
+ else:
123
+ short_name = t
124
+
125
+ choices.append(f"{short_name.strip()}")
126
 
127
  conn.close()
128