0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

geonames are not unique

Browse source
This commit is contained in:
j 2012-02-03 14:44:11 +00:00
parent 46996b0e54
commit 6e876c2b4d
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/place/models.py
View file

@ -32,8 +32,8 @@ class Place(models.Model):
name_sort = models.CharField(max_length=200)
name_find = models.TextField(default='', editable=False)
geoname = models.CharField(max_length=1024, unique=True, null=True)
geoname_sort = models.CharField(max_length=1024, unique=True, null=True)
geoname = models.CharField(max_length=1024, null=True)
geoname_sort = models.CharField(max_length=1024, null=True)
countryCode = models.CharField(max_length=16, default='')
wikipediaId = models.CharField(max_length=1000, blank=True)

4
pandora/place/views.py
View file

@ -46,11 +46,13 @@ def addPlace(request):
name_find__icontains=u'|%s|'%name).count() != 0:
exists = True
existing_names.append(name)
'''
if 'geoname' in data:
if models.Place.objects.filter(defined=True,
geoname=data['geoname']).count() > 0:
exists = True
existing_geoname = data['geoname']
'''
if not exists:
models.Place.objects.filter(defined=False, name__in=names).delete()
place = models.Place()
@ -103,11 +105,13 @@ def editPlace(request):
name_find__icontains=u'|%s|'%name).exclude(id=place.id).count() != 0:
conflict = True
conflict_names.append(name)
'''
if 'geoname' in data:
if models.Place.objects.filter(defined=True,
geoname=data['geoname']).exclude(id=place.id).count() != 0:
conflict = True
conflict_geoname = data['geoname']
'''
if not conflict:
models.Place.objects.filter(defined=False, name__in=names+alternative_names).delete()
for key in data:

9
static/js/pandora/infoView.js
View file

@ -241,10 +241,11 @@ pandora.ui.infoView = function(data) {
['country', 'year', 'language', 'runtime'].forEach(function(key) {
if (data[key]) {
html.push(
formatKey(key)
+ (key == 'runtime'
? Math.round(data[key] / 60) + ' min'
: formatValue(data[key], key))
formatKey(key) + (
key != 'runtime' ? formatValue(data[key], key)
: data[key] < 60 ? Math.round(data[key]) + ' sec'
: Math.round(data[key] / 60) + ' min'
)
)
}
});