From 56136e1083991dde98b7740db09fce0fbeab1d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Sat, 16 Mar 2013 10:23:42 +0000 Subject: [PATCH] 6195: Import citation for pro-gen file format (patch by keestux) svn: r21658 --- gramps/plugins/importer/importprogen.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gramps/plugins/importer/importprogen.py b/gramps/plugins/importer/importprogen.py index a5baa90dd..16cea2034 100644 --- a/gramps/plugins/importer/importprogen.py +++ b/gramps/plugins/importer/importprogen.py @@ -54,7 +54,7 @@ from gramps.gui.utils import ProgressMeter from gramps.gen.lib import (Attribute, AttributeType, ChildRef, Date, Event, EventRef, EventType, Family, FamilyRelType, Name, NameType, Note, NoteType, Person, Place, Source, - Surname) + Surname, Citation) from gramps.gen.db import DbTxn class ProgenError(Exception): @@ -599,12 +599,11 @@ class ProgenParser(object): self.db.add_source(source, self.trans) self.db.commit_source(source, self.trans) self.skeys[source_name] = source.get_handle() - raise Error('Sourceref no longer exists, this piece must be converted to citation!') - sref = SourceRef() + sref = Citation() sref.set_reference_handle(source.get_handle()) return sref - def __create_event_and_ref(self, type_, desc=None, date=None, place=None, source=None): + def __create_event_and_ref(self, type_, desc=None, date=None, place=None, citation=None): event = Event() event.set_type(EventType(type_)) if desc: @@ -613,8 +612,8 @@ class ProgenParser(object): event.set_date_object(date) if place: event.set_place_handle(place.get_handle()) - if source: - event.add_source_reference(source) + if citation: + event.add_citation(citation.handle) self.db.add_event(event, self.trans) self.db.commit_event(event, self.trans) event_ref = EventRef()