diff --git a/Script/Conf.cfg b/Script/Conf.cfg index 6206eb2410c44d16b9983d65239479c67fb71781..73f89401908aa223a8324f9901b8c117df80d11d 100755 --- a/Script/Conf.cfg +++ b/Script/Conf.cfg @@ -63,8 +63,8 @@ DirList: ['/data1', # Unix pathname pattern for file selection -# FilePattern: '*[.data,.out]' -DataFilePattern: '*.data' +# FilePattern: '[*.data, *.out]' +DataFilePattern: '[*.data,]' # Number of files to be deleted before to update the list of files to be copied nDel: 2 diff --git a/Script/ManagerThread.py b/Script/ManagerThread.py index b58558034230f688cc120f5bdc44bf8d33174306..f47e35690a622dc842ba86f2f02269f5198eea80 100755 --- a/Script/ManagerThread.py +++ b/Script/ManagerThread.py @@ -243,7 +243,7 @@ class ManagerThread(threading.Thread): #### new .data files from current run #### .data files from current run, locked when taken by CopyThread - files = glob.glob(os.path.join(folder, self.DataFilePattern)) + files = sum([glob.glob(os.path.join(folder,p)) for p in self.DataFilePattern],[]) self.logInfo = {'file':self.logger.findCaller()[0],'line':self.logger.findCaller()[1]} self.logger.debug('%d files found on folder %s' % (len(files), folder), extra = self.logInfo)