|
|
|
|
@ -175,7 +175,7 @@ class Search(models.Model): |
|
|
|
|
continue |
|
|
|
|
|
|
|
|
|
try: |
|
|
|
|
tm = Trademark.objects.get(ext_id=int(trademark['id'])) |
|
|
|
|
tm = Trademark.objects.get(ext_id=trademark['id'].encode('utf-8')) |
|
|
|
|
result = SearchResult(search=self, trademark=tm, similarity=trademark['siml']) |
|
|
|
|
result.save() |
|
|
|
|
continue |
|
|
|
|
@ -195,7 +195,7 @@ class Search(models.Model): |
|
|
|
|
application_at=trademark['dateapp'], |
|
|
|
|
registration_at=trademark['datereg'], |
|
|
|
|
|
|
|
|
|
ext_id=trademark['id'], |
|
|
|
|
ext_id=trademark['id'].encode('utf-8'), |
|
|
|
|
access_key=trademark['access_key'] |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
@ -222,7 +222,7 @@ class Search(models.Model): |
|
|
|
|
details = TrademarkAPI.get_details(ids=trademark_ids, keys=trademark_keys) |
|
|
|
|
|
|
|
|
|
for key, trademark in details.iteritems(): |
|
|
|
|
instance = Trademark.objects.get(ext_id=trademark['id']) |
|
|
|
|
instance = Trademark.objects.get(ext_id=trademark['id'].encode('utf-8')) |
|
|
|
|
# instance.owner.name = trademark['owner'][0]['name'] |
|
|
|
|
instance.source_url = trademark.get('source', '') |
|
|
|
|
instance.expiration_at = trademark.get('dateexp', '') |
|
|
|
|
|