@@ -69,23 +69,23 @@ def datapath_match(_key):
6969def datapath_details (_key ):
7070match_form = forms .DataPathMatchForm ()
7171datapath_oses = set ()
72- datapath_models = set ()
7372for dp_graph in fetch_datapath_os_graph (_key ):
7473dp_os = dp_graph ['os_name' ]
7574if dp_os :
7675if dp_graph ['os_release' ]:
7776dp_os = '%s - %s' % (dp_os ,dp_graph ['os_release' ])
7877datapath_oses .add (dp_os )
79- dp_model = dp_graph ['datamodel_name' ]
80- if dp_model :
81- if dp_graph ['datamodel_revision' ]:
82- dp_model = '%s@%s' % (dp_model ,dp_graph ['datamodel_revision' ])
83- datapath_models .add (dp_model )
8478datapath_dmls = set ()
79+ datapath_models = {}
8580for dp_graph in fetch_datapath_dml_graph (_key ):
8681dml_name = dp_graph ['dml_name' ]
8782if dml_name :
8883datapath_dmls .add (dml_name )
84+ datamodel_name = dp_graph ['datamodel_name' ]
85+ if datamodel_name :
86+ if datamodel_name not in datapath_models .keys ():
87+ datapath_models [datamodel_name ]= []
88+ datapath_models [datamodel_name ].append ({'revision' :dp_graph ['datamodel_revision' ]or '' ,'dml' :dml_name })
8989return flask .render_template ('datapath.html' ,
9090datapath = fetch_datapath (_key ),
9191datapath_models = datapath_models ,
@@ -115,7 +115,7 @@ def fetch_datapath_os_graph(_key):
115115def fetch_datapath_dml_graph (_key ):
116116datapath_dml_graph_query = """
117117 LET datapath = DOCUMENT(CONCAT('DataPath/', @key))
118- FOR v, e, p IN1 ..2 INBOUND datapath DataPathFromDataModel, OfDataModelLanguage
118+ FOR v, e, p IN2 ..2 INBOUND datapath DataPathFromDataModel, OfDataModelLanguage
119119 RETURN {
120120 "datamodel_name": p.vertices[1].name,
121121 "datamodel_revision": p.vertices[1].revision,