|
|
|
@ -214,6 +214,9 @@ class Search(models.Model): |
|
|
|
|
|
|
|
|
|
|
|
if results == {}: |
|
|
|
if results == {}: |
|
|
|
self.status = status['progress'] |
|
|
|
self.status = status['progress'] |
|
|
|
|
|
|
|
else: |
|
|
|
|
|
|
|
self.status = 'finished' |
|
|
|
|
|
|
|
self.save() |
|
|
|
|
|
|
|
|
|
|
|
for key, trademark in results.iteritems(): |
|
|
|
for key, trademark in results.iteritems(): |
|
|
|
if trademark['siml'] < 97 and self.similarity < 100: |
|
|
|
if trademark['siml'] < 97 and self.similarity < 100: |
|
|
|
@ -252,9 +255,6 @@ class Search(models.Model): |
|
|
|
if len(trademark_ids) == 0: |
|
|
|
if len(trademark_ids) == 0: |
|
|
|
return |
|
|
|
return |
|
|
|
|
|
|
|
|
|
|
|
self.status = 'finished' |
|
|
|
|
|
|
|
self.save() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
details = TrademarkAPI.get_details(ids=trademark_ids, keys=trademark_keys) |
|
|
|
details = TrademarkAPI.get_details(ids=trademark_ids, keys=trademark_keys) |
|
|
|
|
|
|
|
|
|
|
|
|