summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:19:31 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:19:31 +0100
commita9161e791a74c7770f69b462b6a21b64b643a89e (patch)
tree27fcb5d1529141bc914d5469bbc680bc4929581d
parent1f8f972b13a5d0de718ff76d300e36ced362e371 (diff)
downloadtroggle-a9161e791a74c7770f69b462b6a21b64b643a89e.tar.gz
troggle-a9161e791a74c7770f69b462b6a21b64b643a89e.tar.bz2
troggle-a9161e791a74c7770f69b462b6a21b64b643a89e.zip
[svn] remove nonasc
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8067 by julian @ 11/7/2008 2:25 AM
-rw-r--r--parsers/logbooks.py3
-rw-r--r--settings.py2
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("</p>", "", triptext)
ltriptext = re.sub("\s*?\n\s*", " ", ltriptext)
- ltriptext = re.sub("<p>", "\n\n", ltriptext).strip() ltriptext = re.sub("[^\s0-9a-zA-Z\-.,:;'!]", "NONASCII", ltriptext)
+ ltriptext = re.sub("<p>", "\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