From be1eaf0dc447ae7a0633f1d1ba474bd4e5d28d5b Mon Sep 17 00:00:00 2001 From: Terrtia Date: Wed, 16 Feb 2022 10:19:53 +0100 Subject: [PATCH] fix: [Term tracker] fix item date --- bin/trackers/Tracker_Regex.py | 5 ++--- bin/trackers/Tracker_Term.py | 12 +++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/trackers/Tracker_Regex.py b/bin/trackers/Tracker_Regex.py index 8134c67b..a5d4b4e9 100755 --- a/bin/trackers/Tracker_Regex.py +++ b/bin/trackers/Tracker_Regex.py @@ -71,13 +71,12 @@ class Tracker_Regex(AbstractModule): uuid_list = Tracker.get_tracker_uuid_list(tracker, tracker_type) item_id = item.get_id() + item_date = item.get_date() + item_source = item.get_source() print(f'new tracked regex found: {tracker} in {item_id}') for tracker_uuid in uuid_list: # Source Filtering - item_source = item.get_source() - item_date = item.get_date() - tracker_sources = Tracker.get_tracker_uuid_sources(tracker_uuid) if tracker_sources and item_source not in tracker_sources: continue diff --git a/bin/trackers/Tracker_Term.py b/bin/trackers/Tracker_Term.py index fd90224a..c23b1077 100755 --- a/bin/trackers/Tracker_Term.py +++ b/bin/trackers/Tracker_Term.py @@ -94,13 +94,12 @@ class Tracker_Term(AbstractModule): # create token statistics # for word in dict_words_freq: # Term.create_token_statistics(item_date, word, dict_words_freq[word]) - item_source = item.get_source() # check solo words ####### # TODO: check if source needed ####### for word in self.list_tracked_words: if word in dict_words_freq: - self.new_term_found(word, 'word', item.get_id(), item_source) + self.new_term_found(word, 'word', item) # check words set for elem in self.set_tracked_words_list: @@ -113,13 +112,16 @@ class Tracker_Term(AbstractModule): if word in dict_words_freq: nb_uniq_word += 1 if nb_uniq_word >= nb_words_threshold: - self.new_term_found(word_set, 'set', item.get_id(), item_source) + self.new_term_found(word_set, 'set', item) - def new_term_found(self, term, term_type, item_id, item_source): + def new_term_found(self, term, term_type, item): uuid_list = Term.get_term_uuid_list(term, term_type) + + item_id = item.get_id() + item_date = item.get_date() + item_source = item.get_source() self.redis_logger.info(f'new tracked term found: {term} in {item_id}') print(f'new tracked term found: {term} in {item_id}') - item_date = Item.get_date() for term_uuid in uuid_list: tracker_sources = Tracker.get_tracker_uuid_sources(term_uuid) if not tracker_sources or item_source in tracker_sources: