diff --git a/listings-2 b/listings-2 index 68cc3bf..8df86b7 160000 --- a/listings-2 +++ b/listings-2 @@ -1 +1 @@ -Subproject commit 68cc3bfde06059f12d1f8a04479f6ce54fb42393 +Subproject commit 8df86b7140254bed991245eb5e03b78044cb8ec9 diff --git a/reader/src/listing.py b/reader/src/listing.py index ab91607..d249395 100755 --- a/reader/src/listing.py +++ b/reader/src/listing.py @@ -57,7 +57,7 @@ ] _parishes = '(Acadia|allen|ascension|assumption|avoyelles|beauregard|bienville|bossier|caddo|calcasieu|caldwell|cameron|catahoula|claiborne|concordia|de soto|east baton rouge|east carroll|east feliciana|evangeline|franklin|grant|iberia|iberville|jackson|jefferson|jefferson davis|lafayette|lafourche|lasalle|lincoln|livingston|madison|morehouse|natchitoches|orleans|ouachita|plaquemines|pointe coupee|rapides|red river|richland|sabine|saint bernard|saint charles|saint helena|saint james|saint john the baptist|saint landry|saint martin|saint mary|saint tammany|tangipahoa|tensas|terrebonne|union|vermilion|vernon|washington|webster|west baton rouge|west carroll|west feliciana|winn)' -_DESCRIPTION = re.compile(r'([0-9/]*): (.*) in ' + _parishes + ' Parish - ([^-]*)', flags = re.IGNORECASE) +_DESCRIPTION = re.compile(r'([0-9/]*): (.*) in ' + _parishes + ' Parish - ?([^-]*)', flags = re.IGNORECASE) def listing_parse(rawtext): html = lxml.html.fromstring(rawtext) @@ -136,6 +136,7 @@ def main(): if web: history = 'http://localhost:' + os.environ['PORT'] + '/applications/' + doc['permitApplicationNumber'] + '/history' + print history history_file = requests.get(history).text if len(filter(lambda line: ' bot {' in line, history_file.split('\n'))) > 2: print doc['permitApplicationNumber'] + "'s data have already been uploaded." diff --git a/server/settings-dev.coffee b/server/settings-dev.coffee index ac0126f..469fb34 100644 --- a/server/settings-dev.coffee +++ b/server/settings-dev.coffee @@ -1,6 +1,6 @@ module.exports = cache: 0 - port: 1419 + port: 8080 log: true dbfile: '/tmp/wetlands.db' logfile: '/tmp/scott.log'