Return correct field types for media path, desc, and mime

svn: r21059
This commit is contained in:
Doug Blank 2013-01-11 13:22:07 +00:00
parent 31d2a7e3a0
commit fdc926d942

View File

@ -35,6 +35,7 @@ if sys.version_info[0] < 3:
else: else:
import pickle import pickle
import base64 import base64
import collections
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -52,7 +53,7 @@ from django.db import transaction
import gramps.webapp.grampsdb.models as models import gramps.webapp.grampsdb.models as models
from gramps.gen.lib import Name from gramps.gen.lib import Name
from gramps.gen.utils.id import create_id from gramps.gen.utils.id import create_id
import collections from gramps.gen.utils.file import fix_encoding
# To get a django person from a django database: # To get a django person from a django database:
# djperson = dji.Person.get(handle='djhgsdh324hjg234hj24') # djperson = dji.Person.get(handle='djhgsdh324hjg234hj24')
@ -432,9 +433,9 @@ class DjangoInterface(object):
date = self.get_date(media) date = self.get_date(media)
return (str(media.handle), return (str(media.handle),
media.gramps_id, media.gramps_id,
media.path, fix_encoding(media.path),
media.mime, str(media.mime),
media.desc, fix_encoding(media.desc),
attribute_list, attribute_list,
citation_list, citation_list,
note_list, note_list,