code cleanup (see cms-sw#22)

  - move all ConfDB v2 code in a single package

Server/Application_py266/confdb_queries/confdb_queries.py → Server/Application_py266/confdb_v2/queries.py

@@ -1,4 +1,4 @@
-# File confdb_queries.py Description:
+# File confdb_v2/queries.py Description:
 # This files contains the implementations of the methods providing the query
 # to retrieve records from the ConfDb
 #
@@ -12,8 +12,8 @@
 from operator import attrgetter
 from sqlalchemy import Table, Column, Integer, String, MetaData, ForeignKey
 
-from confdb_tables.confdb_tables import *
-#from sqlalchemy_plugin.saplugin import Version, Pathidconf, Pathids, Paths, Pathitems, Pathelement, Modelement, Moduleitem, ModTelement, ModToTemp, ModTemplate, Directory, Configuration, Moduletypes,
+from .tables import *
+
 
 class ConfDbQueries(object):
 

Server/Application_py266/convert.py

@@ -26,9 +26,6 @@
 engine.start()
 session = None
 
-from utils import *
-#cnfMap = UniqueMapping()
-
 import logging
 # create console handler and set level to debug
 console = logging.StreamHandler()
@@ -51,7 +48,7 @@
 from converter.converter import Converter
 converter = Converter()
 
-from confdb_queries.confdb_queries import ConfDbQueries
+from confdb_v2.queries import ConfDbQueries
 queries = ConfDbQueries()
 ver = queries.getConfigurationByName(name, session, logger)
 cnf = -1

Server/Application_py266/converter/converter.py

@@ -2,7 +2,7 @@
 #
 # Class: Converter
 
-from confdb_queries.confdb_queries import ConfDbQueries
+from confdb_v2.queries import ConfDbQueries
 from item_wrappers.FolderItem import *
 from item_wrappers.ModuleDetails import *
 from item_wrappers.Pathitem import *

Server/Application_py266/converter/data_builder.py

@@ -4,7 +4,7 @@
 
 import itertools
 import re
-from confdb_queries.confdb_queries import ConfDbQueries
+from confdb_v2.queries import ConfDbQueries
 from item_wrappers.FolderItem import *
 from item_wrappers.ModuleDetails import *
 from item_wrappers.Pathitem import *

Server/Application_py266/converter/task.py

@@ -1,7 +1,7 @@
 from sqlalchemy.ext.automap import automap_base
 from sqlalchemy import create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker
-from confdb_tables.confdb_tables import Base
+from confdb_v2.tables import Base
 from data_builder import DataBuilder
 from utils import Timer
 from Config import *

Server/Application_py266/exposed/exposed.py

@@ -4,7 +4,7 @@
 #
 # Class: Exposed
 
-from confdb_queries.confdb_queries import ConfDbQueries
+from confdb_v2.queries import ConfDbQueries
 from item_wrappers.FolderItem import *
 from item_wrappers.ModuleDetails import *
 from item_wrappers.Pathitem import *
@@ -584,7 +584,7 @@ def getChildrenDirectories(self, id_parent, folMap, cnfMap, db, log):
             child_directories = queries.getChildDirectories(dir_id, db, log)
 
             #get Child configurations
-            configs = queries.getConfigsInDir(dir_id, db)
+            configs = queries.getConfigsInDir(dir_id, db, log)
 
         except Exception as e:
             msg = 'ERROR: Query getChildDirectories/getConfigsInDir Error: ' + e.args[0]
@@ -608,7 +608,7 @@ def getChildrenDirectories(self, id_parent, folMap, cnfMap, db, log):
                 dir_childs = queries.getChildDirectories(d.id, db, log)
 
                 #get Child configurations
-                cnf_childs = queries.getConfigsInDir(d.id, db)
+                cnf_childs = queries.getConfigsInDir(d.id, db, log)
 
             except Exception as e:
                 msg = 'ERROR: Query getChildDirectories/getConfigsInDir Error: ' + e.args[0]
@@ -689,7 +689,7 @@ def getRootDirectory(self, folMap, cnfMap, folMap_online, db, log):
             child_directories = queries.getChildDirectories(fRoot.id, db, log)
 
             #get Child configurations
-            configs = queries.getConfigsInDir(fRoot.id, db)
+            configs = queries.getConfigsInDir(fRoot.id, db, log)
 
         except Exception as e:
             msg = 'ERROR: Query getChildDirectories/getConfigsInDir Error: ' + e.args[0]
@@ -712,7 +712,7 @@ def getRootDirectory(self, folMap, cnfMap, folMap_online, db, log):
                 dir_childs = queries.getChildDirectories(d.id, db, log)
 
                 #get Child configurations
-                cnf_childs = queries.getConfigsInDir(d.id, db)
+                cnf_childs = queries.getConfigsInDir(d.id, db, log)
 
             except Exception as e:
                 msg = 'ERROR: Query getChildDirectories/getConfigsInDir Error: ' + e.args[0]

Server/Application_py266/exposed/parser_functions.py

@@ -1,6 +1,6 @@
 # Class: Parser_Functions
 
-from confdb_queries.confdb_queries import ConfDbQueries
+from confdb_v2.queries import ConfDbQueries
 from item_wrappers.FolderItem import *
 from item_wrappers.ModuleDetails import *
 from item_wrappers.Pathitem import *

Server/Application_py266/exposed/summary_builder.py

@@ -1,4 +1,4 @@
-from confdb_queries.confdb_queries import ConfDbQueries
+from confdb_v2.queries import ConfDbQueries
 from item_wrappers.FolderItem import *
 from item_wrappers.ModuleDetails import *
 from item_wrappers.Pathitem import *

Server/Application_py266/sqlalchemy_plugin/saengine.py

@@ -6,7 +6,7 @@
 from sqlalchemy.ext.automap import automap_base
 from sqlalchemy import Sequence
 from sqlalchemy import Table, Column, Integer, String, MetaData, ForeignKey
-from confdb_tables.confdb_tables import *
+from confdb_v2.tables import *
 
 __all__ = ['SAEngine']
 

Server/Application_py266/sqlalchemy_plugin/saplugin.py

@@ -6,7 +6,7 @@
 from sqlalchemy.ext.automap import automap_base
 from sqlalchemy import Sequence
 from sqlalchemy import Table, Column, Integer, String, MetaData, ForeignKey
-from confdb_tables.confdb_tables import *
+from confdb_v2.tables import *
 
 __all__ = ['SAEnginePlugin']