diff --git a/src/caosadvancedtools/crawler.py b/src/caosadvancedtools/crawler.py index 0159688c7c7d59e779d576aed54b176e802fca85..56198d1a4f274cfdfb5314a16c34f53b8e2839ed 100644 --- a/src/caosadvancedtools/crawler.py +++ b/src/caosadvancedtools/crawler.py @@ -428,8 +428,8 @@ class Crawler(object): # only done in SSS mode if "SHARED_DIR" in os.environ: - filename = self.save_form([el[3] - for el in pending_changes], path) + filename = Crawler.save_form([el[3] + for el in pending_changes], path, self.run_id) self.send_mail([el[3] for el in pending_changes], filename) for i, el in enumerate(pending_changes): @@ -465,7 +465,8 @@ ____________________\n""".format(i+1, len(pending_changes)) + str(el[3])) else: logger.info("Crawler terminated successfully!") - def save_form(self, changes, path): + @staticmethod + def save_form(changes, path, run_id): """ Saves an html website to a file that contains a form with a button to authorize the given changes. @@ -547,13 +548,13 @@ ____________________\n""".format(i+1, len(pending_changes)) + str(el[3])) </body> </html> """.format(url=db.configuration.get_config()["Connection"]["url"], - rid=self.run_id, + rid=run_id, changes=escape("\n".join(changes)), path=path) if "SHARED_DIR" in os.environ: directory = os.environ["SHARED_DIR"] - filename = str(self.run_id)+".html" + filename = str(run_id)+".html" randname = os.path.basename(os.path.abspath(directory)) filepath = os.path.abspath(os.path.join(directory, filename)) filename = os.path.join(randname, filename)