diff collect_issues.py @ 31:9aca070c86bd

Add the filter 'priority' for the search by status.
author Magnus Schieder <mschieder@intevation.de>
date Thu, 22 Nov 2018 19:34:53 +0100
parents 0d6504d02a6b
children 80bbd06fe8ec
line wrap: on
line diff
--- a/collect_issues.py	Thu Nov 22 14:07:55 2018 +0100
+++ b/collect_issues.py	Thu Nov 22 19:34:53 2018 +0100
@@ -34,7 +34,7 @@
 # Getting the priority of each issue with the filter status ,keywords ,priority
 SEARCH_ROUNDUP_PRIO = "issue?@action=export_csv&@columns=priority&@filter=status,keyword,priority&@pagesize=500&@startwith=0&status={status_values}&keyword={keyword_values}&priority={priority_values}"
 # Getting the status of each issue with the filter keywords, status
-SEARCH_ROUNDUP_STATUS = "issue?@action=export_csv&@columns=status&@filter=keyword,status&@pagesize=500&@startwith=0&keyword={keyword_values}&status={status_values}"
+SEARCH_ROUNDUP_STATUS = "issue?@action=export_csv&@columns=status&@filter=priority,keyword,status&@pagesize=500&@startwith=0&priority={priority_values}&keyword={keyword_values}&status={status_values}"
 
 
 def connect_to_server(params, baseurl):
@@ -146,27 +146,41 @@
             con.close()
 
 
-def save_stats_in_db(search, login_parmeters, baseurl, db_file, columns, sql_create_db, sql_insert_in_db, keywords, status, include_no_prio):
+def save_stats_in_db(search, login_parmeters, baseurl, db_file, columns, sql_create_db, sql_insert_in_db, keywords, search_parameters, include_no_prio):
     try:
 
         opener = connect_to_server(login_parmeters, baseurl)
 
-        keywords_ids_url, _ = get_ids(opener, baseurl, keywords, CHECK_KEYWORD_VALUES)
+        keywords_ids_url, _ = get_ids(opener, baseurl, keywords,
+                CHECK_KEYWORD_VALUES)
 
         if search == "prio":
-            status_ids_url, _ =  get_ids(opener, baseurl, status, CHECK_STATUS_VALUES, include_no_prio)
-            prio_ids_url, columns_ids  = get_ids(opener, baseurl, columns, CHECK_PRIO_VALUES, include_no_prio)
-            formated_search_url = SEARCH_ROUNDUP_PRIO.format(status_values=status_ids_url,
-                    keyword_values=keywords_ids_url, priority_values=prio_ids_url)
+            # search_parameters are statuses.
+            status_ids_url, _ =  get_ids(opener, baseurl,search_parameters ,
+                    CHECK_STATUS_VALUES, include_no_prio)
+            prio_ids_url, columns_ids  = get_ids(opener, baseurl, columns,
+                    CHECK_PRIO_VALUES, include_no_prio)
+            formated_search_url = SEARCH_ROUNDUP_PRIO.format(
+                    status_values=status_ids_url,
+                    keyword_values=keywords_ids_url,
+                    priority_values=prio_ids_url)
+
         elif search == "status":
-            status_ids_url, columns_ids = get_ids(opener, baseurl, columns, CHECK_STATUS_VALUES)
-            formated_search_url = SEARCH_ROUNDUP_STATUS.format(keyword_values=keywords_ids_url,
+            # search_parameters are priorities.
+            prio_ids_url, _ = get_ids(opener, baseurl, search_parameters,
+                    CHECK_PRIO_VALUES, include_no_prio)
+            status_ids_url, columns_ids = get_ids(opener, baseurl, columns,
+                    CHECK_STATUS_VALUES)
+            formated_search_url = SEARCH_ROUNDUP_STATUS.format(
+                    priority_values=prio_ids_url,
+                    keyword_values=keywords_ids_url,
                     status_values=status_ids_url)
 
-        current_issues_csv = get_csv_from_server(opener, baseurl, formated_search_url)
+        current_issues_csv = get_csv_from_server(opener, baseurl,
+                formated_search_url)
 
         opener.close()
-        #print(baseurl + formated_search_url)
+        print(baseurl + formated_search_url)
 
         quantities = issues_to_quantities(current_issues_csv, columns_ids)
 
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)