Fix: Modules Tab load

Fix: Modules Tab load

Author: vinnie87

Server/Application_py266/Main.py

@@ -45,6 +45,7 @@ class Root(object):
     seqsMap = SequencesDict()
     modsMap = ModulesDict()
     oumodsMap = OutputModulesDict()
+    allmodsMap = AllModulesDict()
 
     srvsMap = ServicesDict()
 
@@ -221,7 +222,7 @@ def allmodules(self, _dc=101, ver=-2, cnf=-2):
         cnf = int(cnf)
         ver = int(ver)
         cnf = self.cnfMap.get(cnf)
-        data = self.funcs.getAllModules(cnf,ver,self.modsMap,self.idgen,db, self.log)
+        data = self.funcs.getAllModules(cnf,ver,self.allmodsMap,self.idgen,db, self.log)
         if (data == None):
 #            print ("Exception - Error")
             self.log.error('ERROR: allmodules - data returned null object')

Server/Application_py266/exposed/exposed.py

@@ -939,7 +939,7 @@ def getAllModules(self, cnf = -2, ver = -2, modsMap = None, idgen = None, db = N
             if (templates_dict.has_key(m2t)):
                 temp = templates_dict.get(m2t) 
                 md = ModuleDetails(m.id, m.name, temp.id_mtype, "", temp.name)
-                md.gid = modsMap.putModule(idgen,md)                
+                md.gid = modsMap.put(idgen,md)                
 
             else:
                 log.error('ERROR: Module key error') #print "ERROR KEY"

Server/Application_py266/utils.py

@@ -53,6 +53,26 @@ def get(self,gid):
         else:
             return -2
 
+class AllModulesDict(object):
+    
+    def __init__(self):
+        self.allmodDict = {}
+    
+    def put(self, counter, module):
+        mid = module.id
+        if (mid in self.allmodDict.values()):
+            return [k for k, v in self.allmodDict.iteritems() if v == mid][0]
+        else:
+            gid = counter.getNext()
+            self.allmodDict[gid] = mid
+            return gid
+        
+    def get(self,gid):
+        if self.allmodDict.has_key(gid):
+            return self.allmodDict.get(gid)
+        else:
+            return -2        
+        
 class OutputModulesDict(object):
 
     def __init__(self):