diff --git a/scom/models/Core.xml b/scom/models/Core.xml index 898cd577f1ef38ebca396d3d992b0694b166a6be..3947456133672dd6c581065d9ae58afc5ce874a9 100644 --- a/scom/models/Core.xml +++ b/scom/models/Core.xml @@ -1,12 +1,12 @@ - + - + diff --git a/scom/modules/core.py b/scom/modules/core.py index 447377c7a1b0130a2aacd3d3e3cbbc92b22102aa..497d79c506378be075d70ca3c4286bea6f1e01ed 100644 --- a/scom/modules/core.py +++ b/scom/modules/core.py @@ -25,7 +25,7 @@ def listApplicationModels(app): return models def register(app, model, filename): - scriptDir = os.path.join('/var/db/comar3/', "scripts", model) + scriptDir = os.path.join('/var/db/scom3/', "scripts", model) scriptFile = os.path.join(scriptDir, "%s.py" % app) try: os.mkdir(scriptDir) @@ -33,26 +33,26 @@ def register(app, model, filename): pass shutil.copy(filename, scriptFile) - scriptDir = os.path.join('/var/db/comar3/', "apps", app) + scriptDir = os.path.join('/var/db/scom3/', "apps", app) scriptFile = os.path.join(scriptDir, model) try: os.mkdir(scriptDir) except: pass try: - file(scriptFile, "w").write("") + open(scriptFile, "w").write("") except: pass return True def remove(app): - scriptDir = os.path.join('/var/db/comar3/', "apps", app) + scriptDir = os.path.join('/var/db/scom3/', "apps", app) if not os.path.exists(scriptDir): return for i in os.listdir(scriptDir): if not i.startswith("."): - scriptFile = os.path.join('/var/db/comar3/', "scripts", i, "%s.py" % app) + scriptFile = os.path.join('/var/db/scom3/', "scripts", i, "%s.py" % app) try: os.unlink(scriptFile) except: