Update
This commit is contained in:
+2
-3
@@ -1,6 +1,6 @@
|
||||
import csv, io, re
|
||||
from dateutil import parser as dateparser
|
||||
from datetime import date, timedelta
|
||||
from datetime import date
|
||||
from .models import Entry, ScriptureRef
|
||||
|
||||
SCR_REF_RE = re.compile(r"""^\s*([1-3]?\s*[A-Za-z\.]+)\s+(\d+)(?::(\d+))?(?:\s*[-–—]\s*(\d+)(?::(\d+))?)?\s*$""", re.VERBOSE)
|
||||
@@ -11,7 +11,7 @@ def normalize_book(s):
|
||||
return BOOK_ALIASES.get(b, s.strip())
|
||||
|
||||
def parse_scripture(s):
|
||||
items=[];
|
||||
items=[]
|
||||
for p in [x.strip() for x in (s or '').split(';') if x.strip()]:
|
||||
m = SCR_REF_RE.match(p)
|
||||
if not m: items.append(None); continue
|
||||
@@ -69,7 +69,6 @@ def import_csv_bytes(b: bytes, dry_run=True):
|
||||
obj.save(); obj.scripture_refs.all().delete(); report["updated"]+=1
|
||||
else:
|
||||
obj=Entry.objects.create(**data); report["inserted"]+=1
|
||||
from .models import ScriptureRef
|
||||
for it in parsed:
|
||||
if it: ScriptureRef.objects.create(entry=obj, **it)
|
||||
except Exception as e:
|
||||
|
||||
Reference in New Issue
Block a user