fix

trademark/models.py

@@ -9,7 +9,7 @@ from lib.poiskznakov import TrademarkSearchAPI, SearchResultsThread
 
 from unidecode import unidecode
 from django.template.defaultfilters import slugify
-from .cms_appconfig import TrademarkConfig
+# from .cms_appconfig import TrademarkConfig
 
 
 TrademarkAPI = TrademarkSearchAPI()
@@ -174,30 +174,26 @@ class Search(models.Model):
             if trademark['siml'] < 97 and self.similarity < 100:
                 continue
 
-            try:
-                tm = Trademark.objects.get(ext_id=trademark['id'])
-                result = SearchResult(search=self, trademark=tm, similarity=trademark['siml'])
-                result.save()
-                continue
-            except:
-                pass
+            instance, created = Trademark.objects.get_or_create(ext_id=trademark['id'])
+            
+            result = SearchResult(search=self, trademark=instance, similarity=trademark['siml'])
+            result.save()
 
-            # owner, created = Owner.objects.get_or_create(title=trademark['owner'][0]['name'].encode('utf-8'))
+            if not created:
+                continue
 
-            instance = Trademark(
-                title=trademark['wdesc'],
-                application_id=trademark['appnum'],
-                cert_id=trademark['certnum'],
-                owner=trademark['owner'][0]['name'].encode('utf-8'),
-                image_url=trademark.get('image', ''),
-                status=trademark['status'],
+            instance.title = trademark['wdesc']
+            instance.application_id = trademark['appnum']
+            instance.cert_id = trademark['certnum']
+            instance.owner = trademark['owner'][0]['name'].encode('utf-8')
+            instance.image_url = trademark.get('image', '')
+            instance.status = trademark['status']
 
-                application_at=trademark['dateapp'],
-                registration_at=trademark['datereg'],
+            instance.application_at = trademark['dateapp']
+            instance.registration_at = trademark['datereg']
 
-                ext_id=trademark['id'],
-                access_key=trademark['access_key']
-            )
+            instance.ext_id = trademark['id'],
+            instance.access_key = trademark['access_key']
 
             instance.save()
 
@@ -205,9 +201,6 @@ class Search(models.Model):
                 nice, created = Nice.objects.get_or_create(nice_id=nice_id)
                 instance.nices.add(nice)
 
-            result = SearchResult(search=self, trademark=instance, similarity=trademark['siml'])
-
-            result.save()
 
         trademark_ids = [ext_id for ext_id in self.results.values_list('ext_id', flat=True)]
         trademark_keys = [str(key) for key in self.results.values_list('access_key', flat=True)]
@@ -223,7 +216,6 @@ class Search(models.Model):
 
         for key, trademark in details.iteritems():
             instance = Trademark.objects.get(ext_id=trademark['id'])
-            # instance.owner.name = trademark['owner'][0]['name']
             instance.source_url = trademark.get('source', '')
             instance.expiration_at = trademark.get('dateexp', '')
             instance.renewed_at = trademark.get('renewed', '')