replace commit_on_success with atomic V03.00-rc.06
authorymh <ymh.work@gmail.com>
Fri, 20 Mar 2015 01:42:45 +0100
changeset 571 d9642be7c937
parent 570 c81cacab10af
child 572 12338bd21843
replace commit_on_success with atomic
src/hdalab/management/commands/import_hdabo_db.py
src/hdalab/management/commands/query_category_inclusion.py
src/hdalab/management/commands/query_dbpedia.py
src/hdalab/management/commands/query_wikipedia_category.py
--- a/src/hdalab/management/commands/import_hdabo_db.py	Fri Mar 20 01:16:43 2015 +0100
+++ b/src/hdalab/management/commands/import_hdabo_db.py	Fri Mar 20 01:42:45 2015 +0100
@@ -30,7 +30,7 @@
             data_path = args[0]
         
         print("===========  MIGRATE ===========")
-        call_command('syncdb', migrate=True)
+        call_command('migrate')
         if options.get('categories', False):
             print("===========  QUERY WIKIPEDIA CATEGORY ===========")
             call_command('query_wikipedia_category', interactive=False, force=True, all=True)
--- a/src/hdalab/management/commands/query_category_inclusion.py	Fri Mar 20 01:16:43 2015 +0100
+++ b/src/hdalab/management/commands/query_category_inclusion.py	Fri Mar 20 01:42:45 2015 +0100
@@ -162,6 +162,6 @@
             title = CATEGORY_PREFIX + category.label
             # query categories
 
-            with transaction.commit_on_success():
+            with transaction.atomic():
                 res = self.query_all_categories(title, site)
                 self.process_categories(res, category)
\ No newline at end of file
--- a/src/hdalab/management/commands/query_dbpedia.py	Fri Mar 20 01:16:43 2015 +0100
+++ b/src/hdalab/management/commands/query_dbpedia.py	Fri Mar 20 01:42:45 2015 +0100
@@ -152,7 +152,7 @@
                 abstracts = {}
                 labels = {}
                 thumbnail = None
-                with transaction.commit_on_success():
+                with transaction.atomic():
                     res_abstracts = self.query_dbpedia("select distinct ?y where {<%s>  <http://dbpedia.org/ontology/abstract> ?y}" % (tag.dbpedia_uri), 'n3')
                     for _,_,o in res_abstracts.triples((None, URIRef('http://www.w3.org/2005/sparql-results#value'), None)):
                         abstracts[o.language] = (unicode(o), True)
--- a/src/hdalab/management/commands/query_wikipedia_category.py	Fri Mar 20 01:16:43 2015 +0100
+++ b/src/hdalab/management/commands/query_wikipedia_category.py	Fri Mar 20 01:42:45 2015 +0100
@@ -381,7 +381,7 @@
             if tag.url_status == Tag.TAG_URL_STATUS_DICT['redirection'] and tag.alternative_wikipedia_pageid is not None :
                 wikipedia_pageid = tag.alternative_label if use_label else tag.alternative_wikipedia_pageid
 
-            with transaction.commit_on_success():
+            with transaction.atomic():
                 if types_mask & TYPES_MASK_DICT['visible']:
                     res = self.query_all_categories(False, site, wikipedia_pageid, use_label)
                     self.process_categories(res, False, tag)