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

2006-09-23 Don Allingham <don@gramps-project.org>

Browse Source 
* src/images/sources.svg: new icon
	* src/images/reports.svg: new icon
	* src/images/tools.svg: new icon
	* src/images/events.svg: new icon
	* src/images/place.svg: new icon
	* src/images/tools.svg: new icon
	* src/ViewManager.py: use new icons
	* src/gramps_main.py: register new icons

2006-09-22  Don Allingham  <don@gramps-project.org>
	* src/GrampsDb/_GrampsGEDDB.py: support for disabling transactions
	* src/GrampsDb/_GrampsXMLDB.py: support for disabling transactions
	* src/GrampsDb/_GrampsBSDDB.py: support for disabling transactions
	* src/GrampsDb/_GrampsDbBase.py: support for disabling transactions
	* src/GrampsDb/_ReadGedcom.py: check for IO Eror
	* src/ViewManager.py: display message if a portability problem is 
	detected
	* src/QuestionDialog.py: Add Warning dialog that can be disabled
	* src/DbLoader.py: Detect missing database problem
	* src/ArgHandler.py: support for disabling transactions
	* src/GrampsCfg.py: new config keys for transactions
	* src/Config/_GrampsConfigKeys.py: new config keys for transactions

2006-09-17  Don Allingham  <don@gramps-project.org>
	* src/ViewManager.py: handle missing database on autoload (#447)
	* src/ArgHandler.py: handle missing database on autoload (#447)
	* src/DbLoader.py: handle missing database on autoload (#447)
	* src/Makefile.am: remove uninstalled packages from makefile
	* src/GrampsDb/_ReadXML.py: place vs. address changes
	* src/GrampsDb/_WriteXML.py: place vs. address changes
	* src/GrampsDb/_EditPlace.py: place vs. address changes
	* src/Editors/_EditPlace.py: place vs. address changes
	* src/Editors/_EditLocation.py: place vs. address changes
	* src/RelLib/_Address.py: place vs. address changes
	* src/RelLib/_LocationBase.py: place vs. address changes
	* src/RelLib/_Location.py: place vs. address changes
	* src/DisplayTabs/_LocationModel.py: place vs. address changes
	* src/DisplayTabs/_LocationEmbedList.py: place vs. address changes
	* src/glade/gramps.glade: place vs. address changes



svn: r7325
This commit is contained in:
Don Allingham
2006-09-24 04:37:59 +00:00
parent bc78ab8087
commit fe8b4e1839
39 changed files with 3539 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/GrampsDb/_GrampsBSDDB.py
View File

@@ -59,7 +59,7 @@ import Errors
from BasicUtils import UpdateCallback
_MINVERSION = 5
_DBVERSION = 10
_DBVERSION = 11
def find_surname(key,data):
return str(data[3][5])
@@ -143,13 +143,13 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
"""GRAMPS database object. This object is a base class for other
objects."""
UseTXN = True
def __init__(self):
def __init__(self, use_txn = True):
"""creates a new GrampsDB"""
GrampsDbBase.__init__(self)
self.txn = None
self.secondary_connected = False
self.UseTXN = use_txn
def open_flags(self):
if self.UseTXN:
@@ -369,7 +369,7 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
# it makes no sense to go further
if not self.version_supported:
self._close_early()
self.family_map = self.open_table(self.full_name, "family")
self.place_map = self.open_table(self.full_name, "places")
self.source_map = self.open_table(self.full_name, "sources")
@@ -411,6 +411,7 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
# If secondary indices change, then they should removed
# or rebuilt by upgrade as well. In any case, the
# self.secondary_connected flag should be set accordingly.
if self.need_upgrade():
self.gramps_upgrade(callback)
@@ -1011,9 +1012,7 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
try:
self.env.lsn_reset(self.full_name)
except AttributeError:
print "Your grdb database is not portable!"
print "It will not work if you move the file to another machine."
print "Export to XML for portability."
pass
self.env.close()
@@ -1394,6 +1393,7 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
"Sponsored", "Foster", "Unknown", "Other", ]
version = self.metadata.get('version',default=_MINVERSION)
t = time.time()
if version < 6:
self.gramps_upgrade_6()
@@ -1405,6 +1405,8 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
self.gramps_upgrade_9()
elif version < 10:
self.gramps_upgrade_10()
elif version < 11:
self.gramps_upgrade_11()
print "Upgrade time:", int(time.time()-t), "seconds"
def gramps_upgrade_6(self):
@@ -2019,6 +2021,96 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
print "Done upgrading to DB version 10"
def gramps_upgrade_11(self):
print "Upgrading to DB version 11 -- this may take a while"
table_flags = self.open_flags()
self.reference_map_primary_map = db.DB(self.env)
self.reference_map_primary_map.set_flags(db.DB_DUP)
self.reference_map_primary_map.open(self.full_name,
"reference_map_primary_map",
db.DB_BTREE, flags=table_flags)
self.reference_map.associate(self.reference_map_primary_map,
find_primary_handle,
table_flags)
# This upgrade adds attribute lists to Event and EventRef objects
length = len(self.person_map) + len(self.place_map)
self.set_total(length)
# so starting (batch) transaction here.
trans = self.transaction_begin("",True)
# Personal event references
for handle in self.person_map.keys():
info = self.person_map[handle]
new_address_list = []
for addr in info[11]:
loc = ( addr[9], addr[4], u'', addr[5], addr[6],
addr[7], addr[8])
addr = (addr[0],addr[1],addr[2],addr[3], loc)
new_address_list.append(addr)
new_info = info[0:11] + (new_address_list,) + info[12:]
person = Person()
person.unserialize(new_info)
self.commit_person(person,trans)
self.update()
# Personal event references
for handle in self.place_map.keys():
info = self.place_map[handle]
(h, gramps_id, title, long, lat, main_loc, alt_loc, urls,
media_list, source_list, note, change, marker, private) = info
if main_loc:
m, p, c = main_loc
m = ((u'', m[0], c, m[1], m[2], m[3], m[4]))
main_loc = (m, p)
loc_list = []
for l in alt_loc:
m, p, c = l
m = ((u'', m[0], c, m[1], m[2], m[3], m[4]))
l = (m, p)
loc_list.append(l)
info = (h, gramps_id, title, long, lat, main_loc, loc_list, urls,
media_list, source_list, note, change, marker, private)
place = Place()
place.unserialize(info)
self.commit_place(place,trans)
self.update()
self.reset()
self.transaction_commit(trans,"Upgrade to DB version 10")
self.reference_map_primary_map.close()
if self.UseTXN:
# Separate transaction to save metadata
the_txn = self.env.txn_begin()
else:
the_txn = None
self.metadata.put('version', 11, txn=the_txn)
if self.UseTXN:
the_txn.commit()
else:
self.metadata.sync()
print "Done upgrading to DB version 11"
class BdbTransaction(Transaction):
def __init__(self,msg,db,batch=False,no_magic=False):
Transaction.__init__(self,msg,db,batch,no_magic)

1
src/GrampsDb/_GrampsDbBase.py
View File

@@ -207,7 +207,6 @@ class GrampsDbBase(GrampsDBCallback):
"""
GrampsDBCallback.__init__(self)
self.readonly = False
self.rand = random.Random(time.time())
self.smap_index = 0

2
src/GrampsDb/_GrampsGEDDB.py
View File

@@ -41,7 +41,7 @@ class GrampsGEDDB(GrampsInMemDB):
"""GRAMPS database object. This object is a base class for other
objects."""
def __init__(self):
def __init__(self, use_txn = False):
"""creates a new GrampsDB"""
GrampsInMemDB.__init__(self)

14
src/GrampsDb/_GrampsXMLDB.py
View File

@@ -41,17 +41,21 @@ class GrampsXMLDB(GrampsInMemDB):
"""GRAMPS database object. This object is a base class for other
objects."""
def __init__(self):
def __init__(self, use_txn = True):
"""creates a new GrampsDB"""
GrampsInMemDB.__init__(self)
def load(self,name,callback,mode="w"):
def load(self, name, callback, mode="w"):
if self.db_is_open:
self.close()
GrampsInMemDB.load(self,name,callback,mode)
GrampsInMemDB.load(self, name, callback, mode)
self.id_trans = {}
importData(self,name,callback,use_trans=False)
try:
importData(self, name, callback, use_trans=False)
except OSError, IOError:
return 1
self.bookmarks = self.metadata.get('bookmarks')
if self.bookmarks == None:

5
src/GrampsDb/_ReadGedcom.py
View File

@@ -192,7 +192,10 @@ intRegexp = re.compile(r"\s*INT\s+([^(]+)\((.*)\)$")
#-------------------------------------------------------------------------
def importData(database, filename, callback=None, use_trans=False):
f = open(filename,"r")
try:
f = open(filename,"r")
except IOError:
return
ansel = False
gramps = False

3
src/GrampsDb/_ReadXML.py
View File

@@ -105,7 +105,7 @@ def importData(database, filename, callback=None,cl=0,use_trans=False):
ro = database.readonly
database.readonly = False
if gzip_ok:
use_gzip = 1
try:
@@ -698,6 +698,7 @@ class GrampsParser(UpdateCallback):
loc.phone = attrs.get('phone','')
loc.postal = attrs.get('postal','')
loc.city = attrs.get('city','')
loc.street = attrs.get('street','')
loc.parish = attrs.get('parish','')
loc.state = attrs.get('state','')
loc.county = attrs.get('county','')

10
src/GrampsDb/_WriteXML.py
View File

@@ -812,6 +812,7 @@ class XmlWriter(UpdateCallback):
def build_place_title(self,loc):
"Builds a title from a location"
city = self.fix(loc.get_city())
street = self.fix(loc.get_street())
parish = self.fix(loc.get_parish())
state = self.fix(loc.get_state())
country = self.fix(loc.get_country())
@@ -819,8 +820,10 @@ class XmlWriter(UpdateCallback):
value = ""
if street:
value = street
if city:
value = city
value = self.append_value(value,city)
if parish:
value = self.append_value(value,parish)
if county:
@@ -842,8 +845,13 @@ class XmlWriter(UpdateCallback):
county = self.fix(loc.get_county())
zip_code = self.fix(loc.get_postal_code())
phone = self.fix(loc.get_phone())
street = self.fix(loc.get_street())
print "*", street
self.g.write(' <location')
if street:
self.g.write(' street="%s"' % street)
if city:
self.g.write(' city="%s"' % city)
if parish: