diff options
| author | martin speleo <martin.speleo@gmail.com> | 2009-07-03 23:56:39 +0100 |
|---|---|---|
| committer | martin speleo <martin.speleo@gmail.com> | 2009-07-03 23:56:39 +0100 |
| commit | 65ef255b99fdb92fefe6c25c2aa3c3ab43040b53 (patch) | |
| tree | 9ad6ebd62e2b56d920312b1fabdc47f215943d88 | |
| parent | 854fe85132fb4fe9642f74eef13812744ba02c98 (diff) | |
| download | troggle-65ef255b99fdb92fefe6c25c2aa3c3ab43040b53.tar.gz troggle-65ef255b99fdb92fefe6c25c2aa3c3ab43040b53.tar.bz2 troggle-65ef255b99fdb92fefe6c25c2aa3c3ab43040b53.zip | |
[svn] Fixed the following of *includes by adding white space to the end of the regex.
| -rw-r--r-- | parsers/survex.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/parsers/survex.py b/parsers/survex.py index 2360300..dad081b 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -23,8 +23,8 @@ roles = {"Insts": "Insts", "Tape": "Tape", "tape": "Tape"} -re_include_extension = re.compile(r"^\s*\*include\s+([^\s]*).svx$", re.IGNORECASE) -re_include_no_extension = re.compile(r"^\s*\*include\s+([^\s]*)$", re.IGNORECASE) +re_include_extension = re.compile(r"^\s*\*include\s+([^\s]*).svx\s*$", re.IGNORECASE) +re_include_no_extension = re.compile(r"^\s*\*include\s+([^\s]*)\s*$", re.IGNORECASE) flags = {"begin": re.compile(r"^\s*\*begin\s+(.*?)\s*$", re.IGNORECASE), "end": re.compile(r"^\s*\*end\s+(.*?)\s*$", re.IGNORECASE), "date": re.compile(r"^\s*\*date\s+(.*?)\s*$", re.IGNORECASE), @@ -94,12 +94,12 @@ def make_model(name, parent, iter_lines, sf, c, l): m.end_file = survex_file m.end_char = count - + if m.start_day: m.date = "%04d-%02d-%02d" % (int(m.start_year), int(m.start_month), int(m.start_day)) - + m.save() - + team = [] file_year = None for survex_file, count, line in iter_lines: |