Candidate release 1.3.14

More fix for #39.

Author: vinnie87

Server/Application_py266/CmsConfigExplorer/app.js

@@ -40,26 +40,31 @@ def skipPathSequence(self, counter, items, level):
             counter = counter + 1
         return counter
 
-    def getPathSequenceChildren(self, counter, written_sequences, items, elements_dict, level, built_sequences, seqsMap):
+    def getPathSequenceChildren(self, counter, written_sequences, items, elements_dict, level, built_sequences, seqsMap, modsMap):
         children = []
         while(counter < len(items) and items[counter].lvl == level):
             elem = elements_dict[items[counter].id_pae]
             item = Pathitem(items[counter].id_pae, elem.name, items[counter].id_pathid, elem.paetype, items[counter].id_parent, items[counter].lvl, items[counter].order, items[counter].operator)
 
             # item.gid = seqsMap.put(idgen,elem,items[counter].id_pathid,items[counter].order,items[counter].lvl,items[counter].id)
-            item.gid = seqsMap.put(elem,items[counter].id_pathid,items[counter].order,items[counter].lvl)
+            # item.gid = seqsMap.put(elem,items[counter].id_pathid,items[counter].order,items[counter].lvl)
+            if elem.paetype == 1:
+                item.gid = modsMap.put(elem, items[counter].id_pathid, items[counter].order, items[counter].lvl)
+            elif elem.paetype == 2:        
+                item.gid = seqsMap.put(elem,items[counter].id_pathid,items[counter].order,items[counter].lvl)
+
             self.simple_counter = self.simple_counter + 1
             counter = counter + 1
             if item.paetype == 2:
                 if item.name in written_sequences:
                     item.expanded = False
-                    counter, new_children, written_sequences, built_sequences = self.getPathSequenceChildren(counter, written_sequences, items, elements_dict, item.lvl+1, built_sequences, seqsMap)
+                    counter, new_children, written_sequences, built_sequences = self.getPathSequenceChildren(counter, written_sequences, items, elements_dict, item.lvl+1, built_sequences, seqsMap, modsMap)
                     for child in new_children:
                         item.children.append(child)
 
                 else:
                     item.expanded = False
-                    counter, new_children, written_sequences, built_sequences = self.getPathSequenceChildren(counter, written_sequences, items, elements_dict, item.lvl+1, built_sequences, seqsMap)
+                    counter, new_children, written_sequences, built_sequences = self.getPathSequenceChildren(counter, written_sequences, items, elements_dict, item.lvl+1, built_sequences, seqsMap, modsMap)
                     for child in new_children:
                         item.children.append(child)
 
@@ -125,7 +130,12 @@ def getPathItems(self, patsMap, seqsMap, modsMap, gid, ver, db, log):
             elem = elements_dict[items[counter].id_pae]
             item = Pathitem(items[counter].id_pae, elem.name, items[counter].id_pathid, elem.paetype, items[counter].id_parent, items[counter].lvl, items[counter].order, items[counter].operator)
             # item.gid = seqsMap.put(idgen,elem,items[counter].id_pathid,items[counter].order,items[counter].lvl,items[counter].id)
-            item.gid = seqsMap.put(elem,items[counter].id_pathid,items[counter].order,items[counter].lvl)
+            # item.gid = seqsMap.put(elem,items[counter].id_pathid,items[counter].order,items[counter].lvl)
+
+            if elem.paetype == 1:
+                item.gid = modsMap.put(elem, items[counter].id_pathid, items[counter].order, items[counter].lvl)
+            elif elem.paetype == 2:        
+                item.gid = seqsMap.put(elem,items[counter].id_pathid,items[counter].order,items[counter].lvl)
 
             self.simple_counter = self.simple_counter + 1
             counter = counter + 1
@@ -138,7 +148,7 @@ def getPathItems(self, patsMap, seqsMap, modsMap, gid, ver, db, log):
                 if item.name in written_sequences:
                     counter = self.skipPathSequence(counter, items, item.lvl+1)
                 else:
-                    counter, new_children, written_sequences, built_sequences = self.getPathSequenceChildren(counter, written_sequences, items, elements_dict, item.lvl+1, built_sequences, seqsMap)
+                    counter, new_children, written_sequences, built_sequences = self.getPathSequenceChildren(counter, written_sequences, items, elements_dict, item.lvl+1, built_sequences, seqsMap, modsMap)
                     for child in new_children:
 
                         item.children.append(child)
@@ -248,7 +258,12 @@ def getEndPathItems(self, patsMap, seqsMap, modsMap, oumodsMap, gid, ver, db, lo
             elem = elements_dict[items[counter].id_pae]
             item = Pathitem(items[counter].id_pae, elem.name, items[counter].id_pathid, elem.paetype, items[counter].id_parent, items[counter].lvl, items[counter].order, items[counter].operator)
             # item.gid = seqsMap.put(idgen,elem,items[counter].id_pathid,items[counter].order,items[counter].lvl,items[counter].id)
-            item.gid = seqsMap.put(elem,items[counter].id_pathid,items[counter].order,items[counter].lvl)
+            # item.gid = seqsMap.put(elem,items[counter].id_pathid,items[counter].order,items[counter].lvl)
+
+            if elem.paetype == 1:
+                item.gid = modsMap.put(elem, items[counter].id_pathid, items[counter].order, items[counter].lvl)
+            elif elem.paetype == 2:        
+                item.gid = seqsMap.put(elem,items[counter].id_pathid,items[counter].order,items[counter].lvl)
 
             self.simple_counter = self.simple_counter + 1
             counter = counter + 1
@@ -261,7 +276,7 @@ def getEndPathItems(self, patsMap, seqsMap, modsMap, oumodsMap, gid, ver, db, lo
                 if item.name in written_sequences:
                     counter = self.skipPathSequence(counter, items, item.lvl+1)
                 else:
-                    counter, new_children, written_sequences, built_sequences = self.getPathSequenceChildren(counter, written_sequences, items, elements_dict, item.lvl+1, built_sequences, seqsMap)
+                    counter, new_children, written_sequences, built_sequences = self.getPathSequenceChildren(counter, written_sequences, items, elements_dict, item.lvl+1, built_sequences, seqsMap, modsMap)
                     for child in new_children:
 
                         item.children.append(child)