@@ -152,7 +152,9 @@ def display_pages(self, the_lang, the_title):
152
152
plc_dict = (p_fname , place_name , place .gramps_id , None )
153
153
self .report .obj_dict [Place ][place_ref ] = plc_dict
154
154
p_name = _pd .display (self .r_db , place , fmt = 0 )
155
- cplace_name = p_name .split ()[- 1 ]
155
+ cplace_name = ""
156
+ if p_name :
157
+ cplace_name = p_name .split ()[- 1 ]
156
158
if len (place_name .split ()) > 1 :
157
159
splace_name = place_name .split ()[- 2 ]
158
160
else :
@@ -165,20 +167,20 @@ def display_pages(self, the_lang, the_title):
165
167
place .gramps_id ,
166
168
None ,
167
169
)
168
- self .report .obj_dict [PlaceName ][p_name ] = plc_dict
170
+ plc_name = p_name + ":" + place .get_gramps_id ()
171
+ self .report .obj_dict [PlaceName ][plc_name ] = plc_dict
169
172
170
173
with self .r_user .progress (
171
174
progress_title , message , len (self .report .obj_dict [Place ]) + 1
172
175
) as step :
173
176
index = 1
174
177
for place_name in self .report .obj_dict [PlaceName ].keys ():
178
+ pname = place_name .split (":" )[0 ]
175
179
step ()
176
180
p_handle = self .report .obj_dict [PlaceName ][place_name ]
177
181
index += 1
178
182
if isinstance (p_handle , tuple ):
179
- self .placepage (
180
- self .report , the_lang , the_title , p_handle [0 ], place_name
181
- )
183
+ self .placepage (self .report , the_lang , the_title , p_handle [0 ], pname )
182
184
step ()
183
185
self .placelistpage (self .report , the_lang , the_title )
184
186
@@ -363,7 +365,8 @@ def part_placelistpage(
363
365
364
366
# begin table body
365
367
for place_handle , pname in places_handle_list :
366
- val = self .report .obj_dict [PlaceName ][pname ]
368
+ gid = self .report .obj_dict [Place ][place_handle ][2 ]
369
+ val = self .report .obj_dict [PlaceName ][pname + ":" + gid ]
367
370
nbelem = len (val )
368
371
if val and nbelem > 3 :
369
372
if isinstance (place_handle , tuple ):
@@ -416,7 +419,9 @@ def placelistpage(self, report, the_lang, the_title):
416
419
# self.report.obj_dict[PlaceName] is a dict with key place_name and
417
420
# values (place_fname, place_name, place.gramps_id, event)
418
421
for place_name , value in self .report .obj_dict [PlaceName ].items ():
419
- index .addRecord (place_name , [(value [0 ], value [1 ])])
422
+ gid = self .report .obj_dict [Place ][value [0 ]][2 ]
423
+ p_name = place_name + ":" + gid
424
+ index .addRecord (p_name , [(value [0 ], value [1 ])])
420
425
421
426
# Extract the buckets from the index
422
427
index_list = []
0 commit comments