calculate
/
calculate-utils-3-core
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix convert to core

Browse Source
master3.3
Хирецкий Михаил 12 years ago
parent 24137ceec4
commit 73cee7f09d
18 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File

2
core/server/api_types.py
Unescape View File

@ -372,7 +372,7 @@ class Frame(ClassSerializer):
from decorators import Dec from decorators import Dec
import pickle, os import pickle, os
# get and send client messages # get and send client messages
class ApiWsdl: class CoreWsdl:
perm_denied = [] perm_denied = []
perm_denied.append(Message (type = 'error', message = '403 Forbidden')) perm_denied.append(Message (type = 'error', message = '403 Forbidden'))

4
core/server/bootstrap.py
Unescape View File

@ -171,8 +171,8 @@ def get_certificate(cert_path, data_path, certbase, client_cert_path):
print 'OK. Certificate save. Your certificate id = %s' %req_id print 'OK. Certificate save. Your certificate id = %s' %req_id
if ca_root: if ca_root:
clVars = DataVarsApi() clVars = DataVarsCore()
clVars.importApi() clVars.importCore()
clVars.flIniFile() clVars.flIniFile()
system_ca_db = clVars.Get('cl_glob_root_cert') system_ca_db = clVars.Get('cl_glob_root_cert')
if os.path.exists(system_ca_db): if os.path.exists(system_ca_db):

18
core/server/certificate.py
Unescape View File

@ -61,7 +61,7 @@ def catchExcept():
return view return view
return wrapper return wrapper
class ApiWsdl: class CoreWsdl:
def view_cert_meth (self, dv): def view_cert_meth (self, dv):
""" rights for the selected certificate """ """ rights for the selected certificate """
try: try:
@ -229,8 +229,8 @@ class ApiWsdl:
dv = self.get_cache(sid,methodname,"vars") dv = self.get_cache(sid,methodname,"vars")
if not dv: if not dv:
#reload(cl_install) #reload(cl_install)
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
errors = self.check_cert_params(dv, info, errors = self.check_cert_params(dv, info,
ordered=['cl_cert_id'], ordered=['cl_cert_id'],
@ -238,7 +238,7 @@ class ApiWsdl:
if errors: if errors:
return errors return errors
certificate_meth = type("certificateCommon",(self.Common, certificate_meth = type("certificateCommon",(self.Common,
ApiWsdl, object), {}) CoreWsdl, object), {})
pid = self.startprocess(sid, target=certificate_meth, pid = self.startprocess(sid, target=certificate_meth,
method="view_cert_meth", method="view_cert_meth",
auto_delete = True, auto_delete = True,
@ -257,7 +257,7 @@ class ApiWsdl:
@rpc(Integer, CertificateInfo, _returns = Array(ReturnedMessage)) @rpc(Integer, CertificateInfo, _returns = Array(ReturnedMessage))
@Dec.check_permissions(["view_cert"]) @Dec.check_permissions(["view_cert"])
@Dec.console('view_cert') @Dec.console('view_cert')
@Dec.gui('Api', 'View Cert', 'certificate-server,application-certificate') @Dec.gui('Core', 'View Cert', 'certificate-server,application-certificate')
def view_cert ( self, sid, info): def view_cert ( self, sid, info):
if not info: if not info:
errors = [] errors = []
@ -265,8 +265,8 @@ class ApiWsdl:
errors.append(ReturnedMessage(type = 'error', field = 'cl_cert_id', errors.append(ReturnedMessage(type = 'error', field = 'cl_cert_id',
message = mess)) message = mess))
return errors return errors
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Set('cl_cert_id', info.cl_cert_id) dv.Set('cl_cert_id', info.cl_cert_id)
self.set_cache(sid, 'view_cert', "vars", dv, smart=False) self.set_cache(sid, 'view_cert', "vars", dv, smart=False)
@ -275,8 +275,8 @@ class ApiWsdl:
@rpc(Integer, ViewParams, _returns = ViewInfo) @rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept() @catchExcept()
def view_cert_view (self, sid, params): def view_cert_view (self, sid, params):
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.addGroup(_("Certificate View"), dv.addGroup(_("Certificate View"),
normal=('cl_cert_id',), normal=('cl_cert_id',),

2
core/server/check_rights.py
Unescape View File

@ -18,7 +18,7 @@ import soaplib
from soaplib.serializers.primitive import String, Integer from soaplib.serializers.primitive import String, Integer
# Check rights for a fixed method # Check rights for a fixed method
class ApiWsdl () : class CoreWsdl () :
def check_rights(self, cert, method_name): def check_rights(self, cert, method_name):
if cert == None: if cert == None:
return -3 return -3

4
core/server/cl_server.py
Unescape View File

@ -137,8 +137,8 @@ def main(*args, **keywords):
logger.setLevel(logging.DEBUG) logger.setLevel(logging.DEBUG)
port = args.port port = args.port
ob = DataVarsApi() ob = DataVarsCore()
ob.importApi() ob.importCore()
# set var env # set var env
ob.flIniFile() ob.flIniFile()

4
core/server/cl_template.py
Unescape View File

@ -31,7 +31,7 @@ from calculate.core.server.baseClass import Basic
class ClTemplate (ClassSerializer): class ClTemplate (ClassSerializer):
args = String args = String
class ApiWsdl: class CoreWsdl:
def cl_template_meth (self, args) : def cl_template_meth (self, args) :
try: try:
# create list for subprocess.Popen # create list for subprocess.Popen
@ -88,7 +88,7 @@ class ApiWsdl:
@Dec.gui(_('Utilities'),'Overlay Templates', 'tab-duplicate,edit-copy') @Dec.gui(_('Utilities'),'Overlay Templates', 'tab-duplicate,edit-copy')
def cl_template ( self, sid, cltemplate): def cl_template ( self, sid, cltemplate):
cl_template_meth = type("CommonInstall", cl_template_meth = type("CommonInstall",
(self.Common, ApiWsdl, object), {}) (self.Common, CoreWsdl, object), {})
try: try:
args = cltemplate.args args = cltemplate.args
except: except:

2
core/server/clean.py
Unescape View File

@ -36,7 +36,7 @@ def clean (SID_FILE, PID_FILE, SID_PID, SIDS_DIR, PIDS_DIR):
for filename in glob.glob(PIDS_DIR+"/*.pid"): for filename in glob.glob(PIDS_DIR+"/*.pid"):
os.unlink (filename) os.unlink (filename)
class ApiWsdl: class CoreWsdl:
# watch for process # watch for process
def watcher_pid_proc(self, pid): def watcher_pid_proc(self, pid):
period = 2 period = 2

6
core/server/client_class.py
Unescape View File

@ -194,9 +194,9 @@ class clientHTTPSConnection (httplib.HTTPSConnection):
self.sock = sock self.sock = sock
self._tunnel() self._tunnel()
from calculate.core.datavars import DataVarsApi from calculate.core.datavars import DataVarsCore
clVars = DataVarsApi() clVars = DataVarsCore()
clVars.importApi() clVars.importCore()
clVars.flIniFile() clVars.flIniFile()
user_root_cert = clVars.Get('cl_user_root_cert') user_root_cert = clVars.Get('cl_user_root_cert')
homePath = clVars.Get('ur_home_path') homePath = clVars.Get('ur_home_path')

56
core/server/edit_groups.py
Unescape View File

@ -72,7 +72,7 @@ def catchExcept():
return view return view
return wrapper return wrapper
class ApiWsdl: class CoreWsdl:
#def create_req_table(self, ) #def create_req_table(self, )
def show_groups_meth (self, dv) : def show_groups_meth (self, dv) :
try: try:
@ -172,8 +172,8 @@ class ApiWsdl:
dv = self.get_cache(sid,methodname,"vars") dv = self.get_cache(sid,methodname,"vars")
if not dv: if not dv:
#reload(cl_install) #reload(cl_install)
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
errors = self.check_req_params(dv, info, errors = self.check_req_params(dv, info,
ordered=['cl_page_count', ordered=['cl_page_count',
@ -182,7 +182,7 @@ class ApiWsdl:
if errors: if errors:
return errors return errors
request_meth = type("requestCommon",(self.Common, request_meth = type("requestCommon",(self.Common,
ApiWsdl, object), {}) CoreWsdl, object), {})
pid = self.startprocess(sid, target=request_meth, pid = self.startprocess(sid, target=request_meth,
method="show_groups_meth", method="show_groups_meth",
auto_delete = True, auto_delete = True,
@ -200,7 +200,7 @@ class ApiWsdl:
@rpc(Integer, GroupInfo, _returns = Array(ReturnedMessage)) @rpc(Integer, GroupInfo, _returns = Array(ReturnedMessage))
@Dec.check_permissions(["edit-group"]) @Dec.check_permissions(["edit-group"])
@Dec.console('cl-show-groups') @Dec.console('cl-show-groups')
@Dec.gui('Api', _('View Groups'), 'user-group-properties,' \ @Dec.gui('Core', _('View Groups'), 'user-group-properties,' \
'view-certificate-import,application-certificate') 'view-certificate-import,application-certificate')
def show_groups ( self, sid, info): def show_groups ( self, sid, info):
if not info: if not info:
@ -210,8 +210,8 @@ class ApiWsdl:
errors.append(ReturnedMessage(type = 'error', field = field, errors.append(ReturnedMessage(type = 'error', field = field,
message = mess, expert = True)) message = mess, expert = True))
return errors return errors
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Set('cl_page_count', info.cl_page_count) dv.Set('cl_page_count', info.cl_page_count)
dv.Set('cl_page_offset', info.cl_page_offset) dv.Set('cl_page_offset', info.cl_page_offset)
@ -221,8 +221,8 @@ class ApiWsdl:
@rpc(Integer, ViewParams,_returns = ViewInfo) @rpc(Integer, ViewParams,_returns = ViewInfo)
@catchExcept() @catchExcept()
def show_groups_view (self, sid, params): def show_groups_view (self, sid, params):
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.addGroup(_("Groups"), dv.addGroup(_("Groups"),
normal=('cl_page_count','cl_page_offset'), normal=('cl_page_count','cl_page_offset'),
@ -245,8 +245,8 @@ class ApiWsdl:
message = mess)) message = mess))
return errors return errors
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Set('cl_group_name', info.cl_group_name) dv.Set('cl_group_name', info.cl_group_name)
self.set_cache(sid, 'detail_request', 'dv', dv, smart = False) self.set_cache(sid, 'detail_request', 'dv', dv, smart = False)
@ -257,8 +257,8 @@ class ApiWsdl:
def detail_group_view (self, sid, params): def detail_group_view (self, sid, params):
dv = self.get_cache(sid, 'detail_request', 'dv') dv = self.get_cache(sid, 'detail_request', 'dv')
if not dv: if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Get('cl_group_name') dv.Get('cl_group_name')
@ -300,7 +300,7 @@ class ApiWsdl:
if errors: if errors:
return errors return errors
request_meth = type("delRequestCommon",(self.Common, request_meth = type("delRequestCommon",(self.Common,
ApiWsdl, object), {}) CoreWsdl, object), {})
pid = self.startprocess(sid, target=request_meth, pid = self.startprocess(sid, target=request_meth,
method="change_group_meth",\ method="change_group_meth",\
args_proc = (dv,)) args_proc = (dv,))
@ -364,8 +364,8 @@ class ApiWsdl:
def change_group ( self, sid, info): def change_group ( self, sid, info):
dv = self.get_cache(sid,'change_group',"vars") dv = self.get_cache(sid,'change_group',"vars")
if not dv: if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Set('cl_group_name', info.cl_group_name) dv.Set('cl_group_name', info.cl_group_name)
dv.Set('cl_group_rights', info.cl_group_rights) dv.Set('cl_group_rights', info.cl_group_rights)
@ -377,8 +377,8 @@ class ApiWsdl:
def change_group_view (self, sid, params): def change_group_view (self, sid, params):
dv = self.get_cache(sid, 'change_group', 'dv') dv = self.get_cache(sid, 'change_group', 'dv')
if not dv: if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Get('cl_group_name') dv.Get('cl_group_name')
@ -412,7 +412,7 @@ class ApiWsdl:
if errors: if errors:
return errors return errors
request_meth = type("delGroupCommon",(self.Common, request_meth = type("delGroupCommon",(self.Common,
ApiWsdl, object), {}) CoreWsdl, object), {})
pid = self.startprocess(sid, target=request_meth, pid = self.startprocess(sid, target=request_meth,
method="del_group_meth",\ method="del_group_meth",\
args_proc = (dv,)) args_proc = (dv,))
@ -476,8 +476,8 @@ class ApiWsdl:
def delete_group ( self, sid, info): def delete_group ( self, sid, info):
#dv = self.get_cache(sid,'delete_request',"vars") #dv = self.get_cache(sid,'delete_request',"vars")
#if not dv: #if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Set('cl_group_name', info.cl_group_name) dv.Set('cl_group_name', info.cl_group_name)
self.set_cache(sid, 'delete_group', "vars", dv, smart=False) self.set_cache(sid, 'delete_group', "vars", dv, smart=False)
@ -488,8 +488,8 @@ class ApiWsdl:
def delete_group_view (self, sid, params): def delete_group_view (self, sid, params):
dv = self.get_cache(sid, 'delete_group', 'dv') dv = self.get_cache(sid, 'delete_group', 'dv')
if not dv: if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Get('cl_group_name') dv.Get('cl_group_name')
@ -515,7 +515,7 @@ class ApiWsdl:
if errors: if errors:
return errors return errors
request_meth = type("delGroupCommon",(self.Common, request_meth = type("delGroupCommon",(self.Common,
ApiWsdl, object), {}) CoreWsdl, object), {})
pid = self.startprocess(sid, target=request_meth, pid = self.startprocess(sid, target=request_meth,
method="add_group_meth",\ method="add_group_meth",\
args_proc = (dv,)) args_proc = (dv,))
@ -582,8 +582,8 @@ class ApiWsdl:
def add_group ( self, sid, info): def add_group ( self, sid, info):
#dv = self.get_cache(sid,'delete_request',"vars") #dv = self.get_cache(sid,'delete_request',"vars")
#if not dv: #if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Set('cl_group_add', info.cl_group_add) dv.Set('cl_group_add', info.cl_group_add)
dv.Set('cl_group_rights', info.cl_group_rights) dv.Set('cl_group_rights', info.cl_group_rights)
@ -595,8 +595,8 @@ class ApiWsdl:
def add_group_view (self, sid, params): def add_group_view (self, sid, params):
dv = self.get_cache(sid, 'add_group', 'dv') dv = self.get_cache(sid, 'add_group', 'dv')
if not dv: if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Get('cl_group_name') dv.Get('cl_group_name')

2
core/server/func.py
Unescape View File

@ -29,7 +29,7 @@ import random, hashlib
from api_types import Message, ReturnProgress from api_types import Message, ReturnProgress
from decorators import Dec from decorators import Dec
class ApiWsdl () : class CoreWsdl () :
# client signals about presence # client signals about presence
def active_clients (self, sid): def active_clients (self, sid):

2
core/server/func_metaclass.py
Unescape View File

@ -47,7 +47,7 @@ imported_modules = []
pack = "calculate.core.server" pack = "calculate.core.server"
for module_name in list_module: for module_name in list_module:
imported_modules.append (importlib.import_module('%s.%s'\ imported_modules.append (importlib.import_module('%s.%s'\
%(pack, module_name)).ApiWsdl) %(pack, module_name)).CoreWsdl)
imported_modules.append(object) imported_modules.append(object)
imported = tuple (imported_modules) imported = tuple (imported_modules)

2
core/server/gen_pid.py
Unescape View File

@ -23,7 +23,7 @@ from soaplib.serializers.clazz import Array
from cert_cmd import find_cert_id from cert_cmd import find_cert_id
# process management # process management
class ApiWsdl () : class CoreWsdl () :
# delete process id from list process # delete process id from list process
def del_pid(self, pid): def del_pid(self, pid):

2
core/server/gen_sid.py
Unescape View File

@ -23,7 +23,7 @@ from soaplib.serializers.primitive import String, Integer
from soaplib.serializers.clazz import Array from soaplib.serializers.clazz import Array
# session management # session management
class ApiWsdl () : class CoreWsdl () :
# delete client session from file (close session) # delete client session from file (close session)
def del_sid_from_file(self, sid): def del_sid_from_file(self, sid):

52
core/server/request.py
Unescape View File

@ -66,7 +66,7 @@ def catchExcept():
return view return view
return wrapper return wrapper
class ApiWsdl: class CoreWsdl:
#def create_req_table(self, ) #def create_req_table(self, )
def show_request_meth (self, dv) : def show_request_meth (self, dv) :
try: try:
@ -174,8 +174,8 @@ class ApiWsdl:
dv = self.get_cache(sid,methodname,"vars") dv = self.get_cache(sid,methodname,"vars")
if not dv: if not dv:
#reload(cl_install) #reload(cl_install)
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
errors = self.check_req_params(dv, info, errors = self.check_req_params(dv, info,
ordered=['cl_page_count', ordered=['cl_page_count',
@ -184,7 +184,7 @@ class ApiWsdl:
if errors: if errors:
return errors return errors
request_meth = type("requestCommon",(self.Common, request_meth = type("requestCommon",(self.Common,
ApiWsdl, object), {}) CoreWsdl, object), {})
pid = self.startprocess(sid, target=request_meth, pid = self.startprocess(sid, target=request_meth,
method="show_request_meth", method="show_request_meth",
auto_delete = True, auto_delete = True,
@ -202,7 +202,7 @@ class ApiWsdl:
@rpc(Integer, RequestInfo, _returns = Array(ReturnedMessage)) @rpc(Integer, RequestInfo, _returns = Array(ReturnedMessage))
@Dec.check_permissions(["request"]) @Dec.check_permissions(["request"])
@Dec.console('cl-show-request') @Dec.console('cl-show-request')
@Dec.gui('Api',_('View Requests'),'view-certificate-import,'\ @Dec.gui('Core',_('View Requests'),'view-certificate-import,'\
'application-certificate') 'application-certificate')
def show_request ( self, sid, info): def show_request ( self, sid, info):
if not info: if not info:
@ -212,8 +212,8 @@ class ApiWsdl:
errors.append(ReturnedMessage(type = 'error', field = field, errors.append(ReturnedMessage(type = 'error', field = field,
message = mess, expert = True)) message = mess, expert = True))
return errors return errors
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Set('cl_page_count', info.cl_page_count) dv.Set('cl_page_count', info.cl_page_count)
dv.Set('cl_page_offset', info.cl_page_offset) dv.Set('cl_page_offset', info.cl_page_offset)
@ -223,8 +223,8 @@ class ApiWsdl:
@rpc(Integer, ViewParams, _returns = ViewInfo) @rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept() @catchExcept()
def show_request_view (self, sid, params): def show_request_view (self, sid, params):
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.addGroup(_("Requests"), dv.addGroup(_("Requests"),
normal=('cl_page_count','cl_page_offset'), normal=('cl_page_count','cl_page_offset'),
@ -238,7 +238,7 @@ class ApiWsdl:
@Dec.check_permissions(["request"]) @Dec.check_permissions(["request"])
@Dec.console('cl-show-request') @Dec.console('cl-show-request')
@Dec.gui(_('Detail Request')) @Dec.gui(_('Detail Request'))
#@Dec.gui(_('Api'),_('Detail Request'),'view-certificate-import') #@Dec.gui(_('Core'),_('Detail Request'),'view-certificate-import')
def detail_request ( self, sid, info): def detail_request ( self, sid, info):
if not info: if not info:
mess = 'Field must be int!' mess = 'Field must be int!'
@ -247,8 +247,8 @@ class ApiWsdl:
message = mess)) message = mess))
return errors return errors
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Set('cl_req_id', info.cl_req_id) dv.Set('cl_req_id', info.cl_req_id)
self.set_cache(sid, 'detail_request', 'dv', dv, smart = False) self.set_cache(sid, 'detail_request', 'dv', dv, smart = False)
@ -259,8 +259,8 @@ class ApiWsdl:
def detail_request_view (self, sid, params): def detail_request_view (self, sid, params):
dv = self.get_cache(sid, 'detail_request', 'dv') dv = self.get_cache(sid, 'detail_request', 'dv')
if not dv: if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Get('cl_req_id') dv.Get('cl_req_id')
@ -311,7 +311,7 @@ class ApiWsdl:
if errors: if errors:
return errors return errors
request_meth = type("delRequestCommon",(self.Common, request_meth = type("delRequestCommon",(self.Common,
ApiWsdl, object), {}) CoreWsdl, object), {})
pid = self.startprocess(sid, target=request_meth, pid = self.startprocess(sid, target=request_meth,
method="confirm_request_meth",\ method="confirm_request_meth",\
args_proc = (dv,)) args_proc = (dv,))
@ -390,8 +390,8 @@ class ApiWsdl:
def confirm_request ( self, sid, info): def confirm_request ( self, sid, info):
dv = self.get_cache(sid,'confirm_request',"vars") dv = self.get_cache(sid,'confirm_request',"vars")
if not dv: if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
try: try:
dv.Set('cl_req_id', info.cl_req_id) dv.Set('cl_req_id', info.cl_req_id)
@ -413,8 +413,8 @@ class ApiWsdl:
def confirm_request_view (self, sid, params): def confirm_request_view (self, sid, params):
dv = self.get_cache(sid, 'confirm_request', 'dv') dv = self.get_cache(sid, 'confirm_request', 'dv')
if not dv: if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Get('cl_req_id') dv.Get('cl_req_id')
@ -457,7 +457,7 @@ class ApiWsdl:
if errors: if errors:
return errors return errors
request_meth = type("delRequestCommon",(self.Common, request_meth = type("delRequestCommon",(self.Common,
ApiWsdl, object), {}) CoreWsdl, object), {})
pid = self.startprocess(sid, target=request_meth, pid = self.startprocess(sid, target=request_meth,
method="del_request_meth",\ method="del_request_meth",\
args_proc = (dv,)) args_proc = (dv,))
@ -472,8 +472,8 @@ class ApiWsdl:
return [] return []
def del_request_meth(self, dv): def del_request_meth(self, dv):
#ob = datavars.DataVarsApi() #ob = datavars.DataVarsCore()
#ob.importApi() #ob.importCore()
# set var env # set var env
#ob.flIniFile() #ob.flIniFile()
@ -550,8 +550,8 @@ class ApiWsdl:
def delete_request ( self, sid, info): def delete_request ( self, sid, info):
#dv = self.get_cache(sid,'delete_request',"vars") #dv = self.get_cache(sid,'delete_request',"vars")
#if not dv: #if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Set('cl_req_id', info.cl_req_id) dv.Set('cl_req_id', info.cl_req_id)
self.set_cache(sid, 'delete_request', "vars", dv, smart=False) self.set_cache(sid, 'delete_request', "vars", dv, smart=False)
@ -562,8 +562,8 @@ class ApiWsdl:
def delete_request_view (self, sid, params): def delete_request_view (self, sid, params):
dv = self.get_cache(sid, 'detail_request', 'dv') dv = self.get_cache(sid, 'detail_request', 'dv')
if not dv: if not dv:
dv = datavars.DataVarsApi() dv = datavars.DataVarsCore()
dv.importApi() dv.importCore()
dv.flIniFile() dv.flIniFile()
dv.Get('cl_req_id') dv.Get('cl_req_id')

2
core/server/sid_pid_file.py
Unescape View File

@ -22,7 +22,7 @@ import soaplib
from soaplib.serializers.primitive import String, Integer from soaplib.serializers.primitive import String, Integer
from soaplib.serializers.clazz import Array from soaplib.serializers.clazz import Array
class ApiWsdl () : class CoreWsdl () :
def del_sid_pid(self, sid): def del_sid_pid(self, sid):
# delete conformity pid and sid of sid_pid file # delete conformity pid and sid of sid_pid file

4
core/server/system_update.py
Unescape View File

@ -50,7 +50,7 @@ class SU (ClassSerializer):
# for check parameters without call method # for check parameters without call method
CheckOnly = Boolean CheckOnly = Boolean
class ApiWsdl: class CoreWsdl:
def system_update_meth (self) : def system_update_meth (self) :
try: try:
results = [] results = []
@ -86,7 +86,7 @@ class ApiWsdl:
@rpc(Integer, _returns = Array(ReturnedMessage)) @rpc(Integer, _returns = Array(ReturnedMessage))
def system_update_tray(self, sid): def system_update_tray(self, sid):
system_update_meth = type \ system_update_meth = type \
("CommonInstall",(self.Common, ApiWsdl, object), {}) ("CommonInstall",(self.Common, CoreWsdl, object), {})
pid = self.startprocess(sid, target=system_update_meth, \ pid = self.startprocess(sid, target=system_update_meth, \
method="system_update_meth",\ method="system_update_meth",\
method_name='System Update', \ method_name='System Update', \

8
core/server/test.py
Unescape View File

@ -51,7 +51,7 @@ class SH (ClassSerializer):
CheckOnly = Boolean CheckOnly = Boolean
Default = Array(String) Default = Array(String)
class ApiWsdl: class CoreWsdl:
def say_hello_meth (self, name, times, town) : def say_hello_meth (self, name, times, town) :
print 'name = ', name, 'times = ', times, 'town = ',town print 'name = ', name, 'times = ', times, 'town = ',town
try: try:
@ -169,7 +169,7 @@ class ApiWsdl:
@rpc(Integer, SH, _returns = Array(ReturnedMessage)) @rpc(Integer, SH, _returns = Array(ReturnedMessage))
@Dec.check_permissions(["test"]) @Dec.check_permissions(["test"])
@Dec.console('cl-test') @Dec.console('cl-test')
@Dec.gui('Api.Test', 'First Test', \ @Dec.gui('Core.Test', 'First Test', \
'/usr/share/wallpapers/Horos/contents/screenshot.png,system-log-out') '/usr/share/wallpapers/Horos/contents/screenshot.png,system-log-out')
def test ( self, sid, rrr): def test ( self, sid, rrr):
#print '>>>>>>>', sid, rrr #print '>>>>>>>', sid, rrr
@ -226,7 +226,7 @@ class ApiWsdl:
town = sh.combovariable town = sh.combovariable
#print "------->>>", name, times, town #print "------->>>", name, times, town
self.set_cache(sid, name_meth, 'object', rrr) self.set_cache(sid, name_meth, 'object', rrr)
say_hello_meth = type("CommonInstall",(self.Common, ApiWsdl, object), {}) say_hello_meth = type("CommonInstall",(self.Common, CoreWsdl, object), {})
name = sh.name name = sh.name
pid = self.startprocess(sid, target=say_hello_meth, method="say_hello_meth",\ pid = self.startprocess(sid, target=say_hello_meth, method="say_hello_meth",\
method_name='test', \ method_name='test', \
@ -600,7 +600,7 @@ class ApiWsdl:
#@rpc(Array(String), Array(Array(String)), _returns = Integer) #@rpc(Array(String), Array(Array(String)), _returns = Integer)
#@Dec.check_permissions(["test"]) #@Dec.check_permissions(["test"])
#@Dec.console('cl-test') #@Dec.console('cl-test')
#@Dec.gui('Api', 'APITEST', \ #@Dec.gui('Core', 'APITEST', \
#'/usr/share/wallpapers/Horos/contents/screenshot.png,system-log-out') #'/usr/share/wallpapers/Horos/contents/screenshot.png,system-log-out')
#def apitest ( self, l, t): #def apitest ( self, l, t):
#print '==>', l #print '==>', l

4
core/server/test2.py
Unescape View File

@ -61,7 +61,7 @@ class SH2 (ClassSerializer):
#CheckOnly = Boolean #CheckOnly = Boolean
class ApiWsdl: class CoreWsdl:
def test2_meth (self, name, times, town) : def test2_meth (self, name, times, town) :
print 'name = ', name, 'times = ', times, 'town = ',town print 'name = ', name, 'times = ', times, 'town = ',town
try: try:
@ -187,7 +187,7 @@ class ApiWsdl:
#print "------->>>", name, times, town #print "------->>>", name, times, town
#self.set_cache(sid, name_meth, sh) #self.set_cache(sid, name_meth, sh)
test2_meth = type("CommonInstall",(self.Common, ApiWsdl, object), {}) test2_meth = type("CommonInstall",(self.Common, CoreWsdl, object), {})
name = sh.name name = sh.name
pid = self.startprocess(sid, target=test2_meth, method="test2_meth",\ pid = self.startprocess(sid, target=test2_meth, method="test2_meth",\

Write Preview
Loading…
Cancel
Save