Shutter Stock & Date Created Fix

app.py

@@ -85,6 +85,8 @@ def same_auth(username, password):
 
 
 
+
+
 def search_index(search_text, sd, ks, sort_by, max_results, user_num, search_title, increase = None):
     max_results_list = ['10', '25', '50', '75', '100', '250', '500', '1000', '5000', '10000', 'All']
     if increase:
@@ -108,7 +110,7 @@ def search_index(search_text, sd, ks, sort_by, max_results, user_num, search_tit
                 .first()
                 .reset_index()
                 .drop_duplicates())
-        
+        output_df['Date Created'] = pd.to_datetime(output_df['Date Created'], format = 'mixed')
         output_df['url'] = output_df['url'].str.replace("/u/0/", f"/u/{int(user_num)}/", regex = False)
         if len(sd) == 1:
             output_df = output_df[(output_df['filepath'].str.contains(str(sd[0]), regex = False))]
@@ -124,7 +126,11 @@ def search_index(search_text, sd, ks, sort_by, max_results, user_num, search_tit
             output_df2 = output_df2[(output_df2['post_filepath'].str.contains(keystage_filter, regex = True))]
             if output_df2.shape[0] == 0:
                 output_df2 = output_df[(output_df['post_filepath'].str.contains(keystage_filter, regex = True))]
-        
+        else:
+            output_df['abstract'] = output_df['abstract'].str.lower()
+            output_df['post_filepath'] = output_df['post_filepath'].str.lower()
+            output_df['missing_desc'] = np.where(output_df['abstract'].str.contains('eyfs|ks1|ks2', regex = True), 0, 1)
+            output_df2 = output_df
         output_df2['ind'] = output_df2.index
         if sort_by == 'Relevance':
             output_df2 = output_df2.sort_values(by = ['missing_desc', 'ind'], ascending = [True, True])
@@ -134,8 +140,7 @@ def search_index(search_text, sd, ks, sort_by, max_results, user_num, search_tit
             output_df2 = output_df2.sort_values(by = ['title'], ascending = True)
 
         total_returned = 'No. of Results to Return (Total: ' + str(output_df2.shape[0]) + ')'
-
-            
+        
         if max_results != 'All':
             if output_df2.shape[0] > int(max_results):
                 load_more_visible = True
@@ -247,7 +252,7 @@ with gr.Blocks(css=style) as app:
                 search_prompt = gr.Textbox(placeholder = 'search for an illustration', label = 'Search', elem_id = 'search_term')
                 title_search = gr.Checkbox(label = 'Search title only')
             # with gr.Row():
-                shared_drive = gr.Dropdown(choices = ['Illustrations - 01-10 to 07-22', 'Illustrations - Now'], multiselect = True, label = 'Shared Drive', value = ['Illustrations - 01-10 to 07-22', 'Illustrations - Now'])
+                shared_drive = gr.Dropdown(choices = ['Illustrations - 01-10 to 07-22', 'Illustrations - Now', 'Shutter Stock Images'], multiselect = True, label = 'Shared Drive', value = ['Illustrations - 01-10 to 07-22', 'Illustrations - Now'])
                 key_stage = gr.Dropdown(choices = ['EYFS', 'KS1', 'KS2'], multiselect = True, label = 'Key Stage', value = ['EYFS', 'KS1', 'KS2'])
                 sort_by = gr.Dropdown(choices = ['Relevance', 'Date Created', 'A-Z'], value = 'Relevance', multiselect = False, label = 'Sort By')
                 max_return = gr.Dropdown(choices = ['10', '25', '50', '75', '100', '250', '500', '1000', '5000', '10000', 'All'], value = '50', multiselect = False, label = 'No. of Results to Return (Total: 0)')