Revision f95f8982 cloudcms/forms.py
b/cloudcms/forms.py | ||
---|---|---|
23 | 23 |
|
24 | 24 |
logger = logging.getLogger('cloudcms.rstimport') |
25 | 25 |
|
26 |
def slugify(title): |
|
27 |
return title[:90] |
|
28 |
|
|
26 | 29 |
# base filename to service slug map |
27 | 30 |
DEFAULT_SERVICE_MAP = { |
28 | 31 |
'cyclades':'cyclades', |
... | ... | |
145 | 148 |
logger.warning("Removing exising entries") |
146 | 149 |
self.clean_existing_data() |
147 | 150 |
except Exception, e: |
148 |
transaction.savepoint_rollback(sid) |
|
151 |
try: |
|
152 |
transaction.savepoint_rollback(sid) |
|
153 |
transaction.rollback() |
|
154 |
except Exception, e: |
|
155 |
logger.exception("Can not rollback") |
|
149 | 156 |
logger.exception("Failed to clean existing data") |
150 | 157 |
logger.removeHandler(stream_handler) |
151 | 158 |
logger.setLevel(old_level) |
... | ... | |
204 | 211 |
|
205 | 212 |
|
206 | 213 |
except Exception, e: |
207 |
print e |
|
214 |
print e, "EXCEPTION"
|
|
208 | 215 |
logger.exception("RST import failed") |
209 | 216 |
logger.removeHandler(stream_handler) |
210 | 217 |
logger.setLevel(old_level) |
211 |
transaction.savepoint_rollback(sid) |
|
218 |
try: |
|
219 |
transaction.savepoint_rollback(sid) |
|
220 |
transaction.rollback() |
|
221 |
except Exception, e: |
|
222 |
logger.exception("Can not rollback") |
|
223 |
|
|
212 | 224 |
return False, stream.getvalue() |
213 | 225 |
|
214 | 226 |
if dry_run: |
215 |
transaction.savepoint_rollback(sid) |
|
227 |
try: |
|
228 |
transaction.savepoint_rollback(sid) |
|
229 |
transaction.rollback() |
|
230 |
except Exception, e: |
|
231 |
logger.exception("Can not rollback") |
|
232 |
|
|
216 | 233 |
else: |
217 | 234 |
transaction.savepoint_commit(sid) |
218 | 235 |
|
... | ... | |
273 | 290 |
q.is_active = True |
274 | 291 |
q.category = category |
275 | 292 |
q.service = service |
276 |
q.slug = slug |
|
293 |
q.slug = slugify(slug)
|
|
277 | 294 |
q.title = unicode(title) |
278 | 295 |
q.save() |
296 |
|
|
279 | 297 |
q.application = [Application.current()] |
280 | 298 |
q.save() |
281 | 299 |
|
... | ... | |
303 | 321 |
guide.author = author |
304 | 322 |
guide.is_active = True |
305 | 323 |
guide.service = service |
306 |
guide.slug = slug |
|
324 |
guide.slug = slugify(slug)
|
|
307 | 325 |
guide.title = unicode(title) |
308 | 326 |
guide.save() |
309 | 327 |
|
Also available in: Unified diff