Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/plugins/WebPage.py: media reference fixes

Browse Source 
* src/plugins/ReadGedcom.py: media reference fixes
* src/plugins/IndivSummary.py: media reference fixes
* src/plugins/IndivComplete.py: media reference fixes
* src/plugins/DetAncestralReport.py: media reference fixes
* src/plugins/DetDescendantReport.py: media reference fixes
* src/plugins/Check.py: media reference fixes
* src/gramps_main.py: media reference fixes
* src/Utils.py: gnome.vfs vs. grampslib
* src/RelLib.py: single db file, media reference fixes
* src/MediaView.py: media reference fixes


svn: r2911
This commit is contained in:
Don Allingham
2004-02-25 03:25:57 +00:00
parent bbe933fd73
commit ebed4e0f5f
11 changed files with 85 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/Check.py
View File

@@ -118,35 +118,34 @@ class CheckIntegrity:
#-------------------------------------------------------------------------
def remove_clicked():
# File is lost => remove all references and the object itself
mobj = ObjectMap[ObjectId]
for p in self.db.get_family_id_map().values():
nl = p.get_media_list()
for o in nl:
if o.get_reference() == mobj:
if o.get_reference_id() == ObjectId:
nl.remove(o)
p.set_media_list(nl)
for key in self.db.get_person_keys():
p = self.db.get_person(key)
nl = p.get_media_list()
for o in nl:
if o.get_reference() == mobj:
if o.get_reference_id() == ObjectId:
nl.remove(o)
p.set_media_list(nl)
for key in self.db.get_source_keys():
p = self.db.get_source(key)
nl = p.get_media_list()
for o in nl:
if o.get_reference() == mobj:
if o.get_reference_id() == ObjectId:
nl.remove(o)
p.set_media_list(nl)
for key in self.db.get_place_id_keys():
p = self.db.get_place_id(key)
nl = p.get_media_list()
for o in nl:
if o.get_reference() == mobj:
if o.get_reference_id() == ObjectId:
nl.remove(o)
p.set_media_list(nl)
self.removed_photo.append(ObjectMap[ObjectId])
self.removed_photo.append(ObjectId)
self.db.remove_object(ObjectId)
Utils.modified()

3
src/plugins/DetAncestralReport.py
View File

@@ -564,7 +564,8 @@ class DetAncestorReport(Report.Report):
photos = person.get_media_list()
for photo in photos :
object = photo.get_reference()
object_id = photo.get_reference_id()
object = self.database.find_object_from_id(object_id)
if object.get_mime_type()[0:5] == "image":
file = object.get_path()
self.doc.add_media_object(file,"row",4.0,4.0)

3
src/plugins/DetDescendantReport.py
View File

@@ -557,7 +557,8 @@ class DetDescendantReport(Report.Report):
photos = person.get_media_list()
for photo in photos :
object = photo.get_reference()
object_id = photo.get_reference_id()
object = self.find_object_from_id(object_id)
if object.get_mime_type()[0:5] == "image":
file = object.get_path()
self.doc.add_media_object(file,"row",4.0,4.0)

3
src/plugins/IndivComplete.py
View File

@@ -382,7 +382,8 @@ class IndivComplete(Report.Report):
self.d.end_paragraph()
if len(media_list) > 0:
object = media_list[0].get_reference()
object_id = media_list[0].get_reference_id()
object = self.database.find_object_from_id(object_id)
if object.get_mime_type()[0:5] == "image":
file = object.get_path()
self.d.start_paragraph("IDS-Normal")

3
src/plugins/IndivSummary.py
View File

@@ -220,7 +220,8 @@ class IndivSummary(Report.Report):
self.d.end_paragraph()
if len(media_list) > 0:
object = media_list[0].get_reference()
object_id = media_list[0].get_reference_id()
object = self.database.find_object_from_id(object_id)
if object.get_mime_type()[0:5] == "image":
file = object.get_path()
self.d.start_paragraph("IVS-Normal")

5
src/plugins/ReadGedcom.py
View File

@@ -504,7 +504,6 @@ class GedcomParser:
self.indi_count = self.indi_count + 1
id = matches[1]
id = id[1:-1]
print id
self.person = self.find_or_create_person(id)
self.added[self.person.get_id()] = self.person
self.parse_individual()
@@ -971,7 +970,7 @@ class GedcomParser:
photo.set_mime_type(Utils.get_mime_type(path))
self.db.add_object(photo)
oref = RelLib.MediaRef()
oref.set_reference(photo)
oref.set_reference_id(photo.get_id())
self.person.add_media_reference(oref)
def parse_family_object(self,level):
@@ -1009,7 +1008,7 @@ class GedcomParser:
photo.set_mime_type(Utils.get_mime_type(path))
self.db.add_object(photo)
oref = RelLib.MediaRef()
oref.set_reference(photo)
oref.set_reference_id(photo.get_id())
self.family.add_media_reference(photo)
self.db.commit_family(self.family)

11
src/plugins/WebPage.py
View File

@@ -312,7 +312,8 @@ class IndividualPage:
# into the document.
if self.photos and len(media_list) > 0:
object = media_list[0].get_reference()
object_id = media_list[0].get_reference_id()
object = self.database.find_object_from_id(object_id)
if object.get_mime_type()[0:5] == "image":
file = object.get_path()
if os.path.isfile(file):
@@ -394,8 +395,9 @@ class IndividualPage:
my_list = []
index = 0
for object in self.person.get_media_list():
if object.get_reference().get_mime_type()[0:5] == "image":
for object_ref in self.person.get_media_list():
object = self.database.find_object_from_id(object_ref.get_ref())
if object.get_mime_type()[0:5] == "image":
if object.get_privacy() == 0 and index != 0:
my_list.append(object)
index = 1
@@ -413,8 +415,9 @@ class IndividualPage:
self.doc.end_paragraph()
self.doc.start_table("gallery","IndTable")
for obj in my_list:
for obj_id in my_list:
try:
obj = self.database.find_object_from_id(obj_id)
src = obj.get_reference().get_path()
junk,ext = os.path.splitext(src)
base = '%s%s' % (obj.get_reference().get_id(),ext)