devtools/fill.py
branchstable
changeset 3673 9342e6783bd2
parent 3541 63ba0a669c4f
child 3689 deb13e88e037
equal deleted inserted replaced
3672:554a588ffaea 3673:9342e6783bd2
   402             objeids = oedict.get(obj, frozenset())
   402             objeids = oedict.get(obj, frozenset())
   403         if subjcard in '?1' or objcard in '?1':
   403         if subjcard in '?1' or objcard in '?1':
   404             for subjeid, objeid in used:
   404             for subjeid, objeid in used:
   405                 if subjcard in '?1' and subjeid in subjeids:
   405                 if subjcard in '?1' and subjeid in subjeids:
   406                     subjeids.remove(subjeid)
   406                     subjeids.remove(subjeid)
   407                     if objeid in objeids:
   407                     # XXX why?
   408                         objeids.remove(objeid)
   408                     #if objeid in objeids:
       
   409                     #    objeids.remove(objeid)
   409                 if objcard in '?1' and objeid in objeids:
   410                 if objcard in '?1' and objeid in objeids:
   410                     objeids.remove(objeid)
   411                     objeids.remove(objeid)
   411                     if subjeid in subjeids:
   412                     # XXX why?
   412                         subjeids.remove(subjeid)
   413                     #if subjeid in subjeids:
       
   414                     #    subjeids.remove(subjeid)
   413         if not subjeids:
   415         if not subjeids:
   414             check_card_satisfied(objcard, objeids, subj, rschema, obj)
   416             check_card_satisfied(objcard, objeids, subj, rschema, obj)
   415             return
   417             return
   416         if not objeids:
   418         if not objeids:
   417             check_card_satisfied(subjcard, subjeids, subj, rschema, obj)
   419             check_card_satisfied(subjcard, subjeids, subj, rschema, obj)