Update Home.py
Browse files
Home.py
CHANGED
|
@@ -30,7 +30,7 @@ df = connect_gsheet()
|
|
| 30 |
df = df.replace("NaN", "Tidak tersedia")
|
| 31 |
|
| 32 |
#Title
|
| 33 |
-
st.title('TXTperpus:
|
| 34 |
|
| 35 |
# Intro text
|
| 36 |
st.caption(f"Eksplorasi dari **{df.shape[0]}** artikel yang dihimpun oleh TXTperpus.")
|
|
@@ -57,13 +57,13 @@ search_opt = c3.multiselect(
|
|
| 57 |
|
| 58 |
|
| 59 |
if keyword_list_j is not None:
|
| 60 |
-
|
| 61 |
-
|
| 62 |
|
| 63 |
-
|
| 64 |
-
|
| 65 |
-
|
| 66 |
-
|
| 67 |
|
| 68 |
# creating result
|
| 69 |
if text_search:
|
|
|
|
| 30 |
df = df.replace("NaN", "Tidak tersedia")
|
| 31 |
|
| 32 |
#Title
|
| 33 |
+
st.title('TXTperpus: Pencarian')
|
| 34 |
|
| 35 |
# Intro text
|
| 36 |
st.caption(f"Eksplorasi dari **{df.shape[0]}** artikel yang dihimpun oleh TXTperpus.")
|
|
|
|
| 57 |
|
| 58 |
|
| 59 |
if keyword_list_j is not None:
|
| 60 |
+
key_df_j = pd.DataFrame()
|
| 61 |
+
patterns = [r'\b{}\b'.format(re.escape(word)) for word in keyword_list_j]
|
| 62 |
|
| 63 |
+
for col in search_opt:
|
| 64 |
+
conditions = [df[col].str.contains(pattern, regex=True, flags=re.IGNORECASE) for pattern in patterns]
|
| 65 |
+
column_result = df[np.logical_and.reduce(conditions)]
|
| 66 |
+
key_df_j = pd.concat([key_df_j, column_result]).drop_duplicates()
|
| 67 |
|
| 68 |
# creating result
|
| 69 |
if text_search:
|