499 if i != colidx] |
499 if i != colidx] |
500 row.insert(colidx, edef_) |
500 row.insert(colidx, edef_) |
501 self.e_defs.append(row) |
501 self.e_defs.append(row) |
502 # now, see if this entity def is referenced as subject in some relation |
502 # now, see if this entity def is referenced as subject in some relation |
503 # definition |
503 # definition |
504 if self._r_subj_index.has_key(edef): |
504 if edef in self._r_subj_index: |
505 for rdef in self._r_subj_index[edef]: |
505 for rdef in self._r_subj_index[edef]: |
506 expanded = self._expanded(rdef) |
506 expanded = self._expanded(rdef) |
507 result = [] |
507 result = [] |
508 for exp_rdef in expanded: |
508 for exp_rdef in expanded: |
509 for edef_ in edefs: |
509 for edef_ in edefs: |
510 result.append( (edef_, exp_rdef[1], exp_rdef[2]) ) |
510 result.append( (edef_, exp_rdef[1], exp_rdef[2]) ) |
511 self._expanded_r_defs[rdef] = result |
511 self._expanded_r_defs[rdef] = result |
512 # and finally, see if this entity def is referenced as object in some |
512 # and finally, see if this entity def is referenced as object in some |
513 # relation definition |
513 # relation definition |
514 if self._r_obj_index.has_key(edef): |
514 if edef in self._r_obj_index: |
515 for rdef in self._r_obj_index[edef]: |
515 for rdef in self._r_obj_index[edef]: |
516 expanded = self._expanded(rdef) |
516 expanded = self._expanded(rdef) |
517 result = [] |
517 result = [] |
518 for exp_rdef in expanded: |
518 for exp_rdef in expanded: |
519 for edef_ in edefs: |
519 for edef_ in edefs: |