# HG changeset patch # User cavaliet # Date 1351261028 -7200 # Node ID 8fd46e270e23365c53c8544d604a4359157b7ab0 # Parent 509a27622632834577dd49368205272577818c62 correct segment tag parsing and remove useless import. diff -r 509a27622632 -r 8fd46e270e23 src/ldt/ldt/ldt_utils/segmentserializer.py --- a/src/ldt/ldt/ldt_utils/segmentserializer.py Fri Oct 26 15:52:17 2012 +0200 +++ b/src/ldt/ldt/ldt_utils/segmentserializer.py Fri Oct 26 16:17:08 2012 +0200 @@ -2,8 +2,10 @@ from ldt.ldt_utils.models import Project from ldt.ldt_utils.stat import get_string_from_buckets from ldt.security.utils import use_forbidden_url +from tagging.utils import parse_tag_input import lxml.etree import uuid +import logging DATE_FORMATS = ["%d/%m/%Y", "%Y-%m-%d"] @@ -138,7 +140,7 @@ for seg in self.segments: segment_tags = [] - for tag in seg.tags.split(';'): + for tag in parse_tag_input(seg.tags): if not self.tags.has_key(tag): new_tag = { "meta": { diff -r 509a27622632 -r 8fd46e270e23 src/ldt/ldt/ldt_utils/views/content.py --- a/src/ldt/ldt/ldt_utils/views/content.py Fri Oct 26 15:52:17 2012 +0200 +++ b/src/ldt/ldt/ldt_utils/views/content.py Fri Oct 26 16:17:08 2012 +0200 @@ -5,7 +5,6 @@ from django.forms.models import model_to_dict from django.core.files import File from django.db import transaction -#from django.core.files.temp import NamedTemporaryFile from django.forms.util import ErrorList from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response, redirect @@ -21,14 +20,13 @@ import ldt.utils.path as ldt_utils_path import logging import mimetypes -import os, stat +import os import urllib2 import subprocess import re import datetime import math import requests -import django.utils.simplejson as simplejson import urlparse import tempfile diff -r 509a27622632 -r 8fd46e270e23 src/ldt/ldt/ldt_utils/views/workspace.py --- a/src/ldt/ldt/ldt_utils/views/workspace.py Fri Oct 26 15:52:17 2012 +0200 +++ b/src/ldt/ldt/ldt_utils/views/workspace.py Fri Oct 26 16:17:08 2012 +0200 @@ -22,7 +22,6 @@ import base64 import django.core.urlresolvers import ldt.auth as ldt_auth -import lxml.etree from django.utils.safestring import mark_safe