cubicweb: comparison server/ssplanner.py

equal deleted inserted replaced

-:dd9f2dd02f85
+:0e3460341023
 class RelationsStep(Step):
 """step consisting in adding attributes/relations to entity defs from a
 previous FetchStep
 relations values comes from the latest result, with one columns for
-each relation defined in self.r_defs
+each relation defined in self.rdefs
 for one entity definition, we'll construct N entity, where N is the
 number of the latest result
 """
 FINAL = 0
 RELATION = 1
 REVERSE_RELATION = 2
-def __init__(self, plan, e_def, r_defs):
+def __init__(self, plan, edef, rdefs):
 Step.__init__(self, plan)
 # partial entity definition to expand
-self.e_def = e_def
+self.edef = edef
 # definition of relations to complete
-self.r_defs = r_defs
+self.rdefs = rdefs
 def execute(self):
 """execute this step"""
-base_e_def = self.e_def
+base_edef = self.edef
-result = []
+edefs = []
-for row in self.execute_child():
+result = self.execute_child()
+for row in result:
 # get a new entity definition for this row
-e_def = copy(base_e_def)
+edef = copy(base_edef)
 # complete this entity def using row values
-for i in range(len(self.r_defs)):
+for i in range(len(self.rdefs)):
-rtype, rorder = self.r_defs[i]
+rtype, rorder = self.rdefs[i]
 if rorder == RelationsStep.FINAL:
-e_def[rtype] = row[i]
+edef[rtype] = row[i]
 elif rorder == RelationsStep.RELATION:
-self.plan.add_relation_def( (e_def, rtype, row[i]) )
+self.plan.add_relation_def( (edef, rtype, row[i]) )
-e_def.querier_pending_relations[(rtype, 'subject')] = row[i]
+edef.querier_pending_relations[(rtype, 'subject')] = row[i]
 else:
-self.plan.add_relation_def( (row[i], rtype, e_def) )
+self.plan.add_relation_def( (row[i], rtype, edef) )
-e_def.querier_pending_relations[(rtype, 'object')] = row[i]
+edef.querier_pending_relations[(rtype, 'object')] = row[i]
-result.append(e_def)
+edefs.append(edef)
-self.plan.substitute_entity_def(base_e_def, result)
+self.plan.substitute_entity_def(base_edef, edefs)
+return result
 class InsertStep(Step):
 """step consisting in inserting new entities / relations"""
 session = self.plan.session
 repo = session.repo
 edefs = {}
 # insert relations
 attributes = set([relation.r_type for relation in self.attribute_relations])
-for row in self.execute_child():
+result = self.execute_child()
+for row in result:
 for relation in self.attribute_relations:
 lhs, rhs = relation.get_variable_parts()
 eid = typed_eid(row[self.selected_index[str(lhs)]])
 try:
 edef = edefs[eid]
 for relation in self.relations:
 subj = row[self.selected_index[str(relation.children[0])]]
 obj = row[self.selected_index[str(relation.children[1])]]
 repo.glob_add_relation(session, subj, relation.r_type, obj)
 # update entities
-result = []
 for eid, edef in edefs.iteritems():
 repo.glob_update_entity(session, edef, attributes)
-result.append( (eid,) )
 return result

changeset 2968	0e3460341023
parent 2921	8e2544e78a5e
child 3437	a30b5b5138a4