Merge pull request #735 from alonisser/master

Missing django-mailer MessageLog cleanup management command added to cron

deploy/crontab.txt

@@ -9,13 +9,17 @@
 59 04 * * * /oknesset_data/oknesset/Open-Knesset/manage.py send_email_to_editors 2>&1 | /usr/bin/logger -t open_knesset
 00 05 * * * /oknesset_data/oknesset/Open-Knesset/manage.py notify --daily 2>&1 | /usr/bin/logger -t open_knesset
 01 05 * * 5 /oknesset_data/oknesset/Open-Knesset/manage.py notify --weekly 2>&1 | /usr/bin/logger -t open_knesset
-02 01,05,09,13,17,21 * * * /oknesset_data/oknesset/Open-Knesset/manage.py send_mail 2>&1 | /usr/bin/logger -t open_knesset
 03 05 * * * /oknesset_data/oknesset/Open-Knesset/manage.py parse_future_committee_meetings 2>&1 | /usr/bin/logger -t open_knesset
 30 04 * * * /oknesset_data/oknesset/Open-Knesset/manage.py okscrape lobbyists --dblog 2>&1 | /usr/bin/logger -t open_knesset
 #20 05 * * 1,3,5 /oknesset_data/oknesset/Open-Knesset/manage.py update_sitemap 2>&1 | /usr/bin/logger -t open_knesset
 26 04 * * * /oknesset_data/oknesset/Open-Knesset/manage.py scrape_votes 2>&1 | /usr/bin/logger -t open_knesset
 43 04 * * * /oknesset_data/oknesset/Open-Knesset/manage.py update_links_from_kikar 2>&1 | /usr/bin/logger -t open_knesset
 53 03 * * * /oknesset_data/oknesset/Open-Knesset/manage.py okscrape events PersonsEventsScraper --dblog 2>&1 | /usr/bin/logger -t open_knesset
+# email handling
+02 01,05,09,13,17,21 * * * /oknesset_data/oknesset/Open-Knesset/manage.py send_mail 2>&1 | /usr/bin/logger -t open_knesset
+15 17,21 * * * /oknesset_data/oknesset/Open-Knesset/manage.py retry_deferred 2>&1 | /usr/bin/logger -t open_knesset
+0 0 * * * /oknesset_data/oknesset/Open-Knesset/manage.py purge_mail_log 30 2>&1 | /usr/bin/logger -t open_knesset
+
 
 # following is part of knesset-data project (https://github.com/hasadna/knesset-data)
 # you should set the github auth token here (but only on the server of course)

simple/parsers/utils/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*

simple/parsers/utils/laws_parser_utils.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*
+import re
+
+
+def normalize_correction_title_dashes(raw_title):
+    """returns s with normalized spaces before and after the dash"""
+    if not raw_title:
+        return None
+    m = re.match(r'(תיקון)( ?)(-)( ?)(.*)'.decode('utf8'), raw_title)
+    if not m:
+        return raw_title
+    return ' '.join(m.groups()[0:5:2])
+
+
+def parse_title(unparsed_title):
+    return re.match(u'הצעת ([^\(,]*)(.*?\((.*?)\))?(.*?\((.*?)\))?(.*?,(.*))?', unparsed_title)
+
+
+def clean_line(a_line_str):
+    return a_line_str.strip().replace('\n', '').replace(' ', ' ')