From a9161e791a74c7770f69b462b6a21b64b643a89e Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Wed, 13 May 2009 05:19:31 +0100 Subject: [PATCH] [svn] remove nonasc Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8067 by julian @ 11/7/2008 2:25 AM --- parsers/logbooks.py | 3 ++- settings.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/parsers/logbooks.py b/parsers/logbooks.py index e4daa6c..bb7d009 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -213,7 +213,8 @@ def Parseloghtml01(year, expedition, txt): ltriptext = re.sub("

", "", triptext) ltriptext = re.sub("\s*?\n\s*", " ", ltriptext) - ltriptext = re.sub("

", "\n\n", ltriptext).strip() ltriptext = re.sub("[^\s0-9a-zA-Z\-.,:;'!]", "NONASCII", ltriptext) + ltriptext = re.sub("

", "\n\n", ltriptext).strip() + #ltriptext = re.sub("[^\s0-9a-zA-Z\-.,:;'!]", "NONASCII", ltriptext) #print ldate, trippeople.strip() # could includ the tripid (url link for cross referencing) diff --git a/settings.py b/settings.py index f6a9703..e255c97 100644 --- a/settings.py +++ b/settings.py @@ -1,4 +1,4 @@ -from localsettings import * +from localsettingsserver import * # Django settings for troggle2 project. DEBUG = True