Mercurial > roundup-cc > roundup-cc
diff roundup_cc.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 | e2864dabdb8c |
| children | 80bbd06fe8ec |
line wrap: on
line diff
--- a/roundup_cc.py Thu Nov 22 14:07:55 2018 +0100 +++ b/roundup_cc.py Thu Nov 22 19:34:53 2018 +0100 @@ -36,19 +36,22 @@ database_file = config.get("DB", "DatabaseFile") keywords = config.get("SEARCH", "Keywords", fallback="").split(", ") + include_no_prio = config.getboolean("SEARCH", "IncludeNoPrio", fallback= False) search = config.get("SEARCH", "Search", fallback="prio") if search == "prio": list_of_columns = config.get("SEARCH", "Priority", fallback=PRIO).split(", ") - status = config.get("SEARCH", "Status", fallback="").split(", ") - include_no_prio = config.getboolean("SEARCH", "IncludeNoPrio", fallback= False) + search_parameters = config.get("SEARCH", "Status", fallback="").split(", ") if include_no_prio: list_of_columns += ["None"] elif search == "status": list_of_columns = config.get("SEARCH", "Status", fallback=STATES).split(", ") - status = [""] - include_no_prio = False + # statsu = columns Must change + search_parameters = config.get("SEARCH", "Priority", fallback="").split(", ") + if include_no_prio: + search_parameters += ["None"] + else: print("Incorrect [SEARCH]Search parameter. (prio, status)") @@ -63,7 +66,7 @@ rcd.build_sql_commands(sql_list_of_columns) save_stats_in_db(search, login_parameters, base_url, database_file, - list_of_columns, create_db, insert_new, keywords, status, include_no_prio) + list_of_columns, create_db, insert_new, keywords, search_parameters, include_no_prio) if __name__ == '__main__': main()