diff --git a/import_padma.py b/import_padma.py index d939ce5..b854b57 100755 --- a/import_padma.py +++ b/import_padma.py @@ -70,9 +70,9 @@ def html_parser(text): text = re.sub('\[(/.+?) (.+?)\]', '\\2', text) text = text.replace('__LINK__', 'http').replace('__DOT__', '.') - text = text.replace("\n\n", '

\n') - text = text.replace("\n", '
\n').replace('


\n', '

\n') - text = u'

%s

'%text + + text = text.replace('\n\n', '
\n').replace("\n", '
\n') + return text @@ -158,7 +158,7 @@ def import_layers(item, layers): annotation.end = float(layer['time_out'])/1000 username = layer['creator'].strip() annotation.user = User.objects.get(username=username) - annotation.value = html_parser(layer['value'], False) + annotation.value = html_parser(layer['value']) annotation.created = datetime.fromtimestamp(int(layer['created'])) annotation.modified = datetime.fromtimestamp(int(layer['modified'])) annotation.save()