git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@163 c91db197-33c1-4113-bf15-f8a5c547ca64

scripts/cl-usermod

@@ -25,59 +25,12 @@ tr.setGlobalDomain('cl_server')
 tr.setLanguage(sys.modules[__name__])
 import cl_ldap
 
-class tsOpt(cl_base.opt):
-    def __init__(self, obj):
-        self.obj =obj
-        self.shortOpt = self.obj.getAllOpt('short')
-        self.longOpt = self.obj.getAllOpt('long')
-        self.opt = {}
-        self.sysArgv = sys.argv[1:]
-        self.__iter = 0
-        self.params = {}
-        cl_base.opt.__init__(self, self.shortOpt, self.longOpt)
-        if "h" in self.opt or (not (self.params.has_key('user') and\
-            self.params.has_key('service')) and\
-            not self.opt):
-            print self.obj.getHelp()
-        else:
-            if self.params.has_key('service'):
-                if not (self.params['service'] in self.obj.allServ):
-                    self.handlerErrOpt()
-            else:
-                self.handlerErrOpt()
-
-    def handlerOpt(self,option,value):
-        # Обработчик (опция значение)
-        #print option, value
-        shortOpt = self.obj.getShortOpt(option)
-        if not self.opt.has_key(shortOpt):
-            self.opt[shortOpt] = value
-
-
-    def handlerErrOpt(self):
-        # Обработчик ошибок
-        argv = " ".join(sys.argv[1:])
-        print _("Unrecognized option") + ' "' + argv + '"\n' + \
-_("Try") + ' "' + sys.argv[0].split("/")[-1] + ' --help" ' +\
-_("for more information.")
-
-
-    def handlerParam(self,param):
-        # Обработчик хвостов (значение)
-        self.__iter += 1
-        # Достаем название пользователя
-        if self.__iter == 1:
-            self.params['user'] = param
-        # Достаем название сервиса
-        if self.__iter == 2:
-            self.params['service'] = param
-
 
 if __name__ == "__main__":
     ldapObj = cl_ldap.cl_ldap("cl-usermod")
-    optObj = tsOpt(ldapObj)
+    optObj = cl_ldap.tsOpt(ldapObj,['user'])
     flagError = False
-    if optObj.params.has_key('service') and\
+    if not optObj.flagHelp and optObj.params.has_key('service') and\
         optObj.params.has_key('user'):
         flagError = True
         if optObj.params['service'] == "ldap":