Изменен метод scanDirs класса filterProfiles

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

pym/cl_ldap.py

@@ -6736,19 +6736,19 @@ class filterProfiles(cl_profile.profile):
                 dirs = []
                 dirsRel = []
                 for dirName in obj.dirs:
-                    oldDir = dirName.split(obj.baseDir)[1]
+                    oldDir = dirName.partition(obj.baseDir)[2]
                     if not oldDir in self.dirsFilter:
                         dirs.append(dirName)
                         dirsRel.append(oldDir)
                 files = []
-                for fileName in obj.files:
-                    oldFile = fileName.split(obj.baseDir)[1]
+                for fullFileName in obj.files:
+                    oldFile = fullFileName.partition(obj.baseDir)[2]
                     dirName,fileName = os.path.split(oldFile)
                     if dirName in dirsRel:
                         fileName = fileName.split("?")[0]
                         oldFile = os.path.join(dirName, fileName)
-                        if not oldFile in self.fileFilter:
-                            files.append(fileName)
+                        if not oldFile in self.filesFilter:
+                            files.append(fullFileName)
                 obj.dirs = dirs
                 obj.files = files
         return rez