Changeset 5358


Ignore:
Timestamp:
Oct 26, 2022 3:31:50 PM (5 months ago)
Author:
toby
Message:

fix Bruker import validator

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/imports/G2pwd_BrukerRAW.py

    r5351 r5358  
    239239                G2G.G2MessageBox(self,msg,'Install xmltodict Error')
    240240                return False
    241         import zipfile as ZF
    242        
    243         with ZF.ZipFile(filename, 'r') as zipObj:
    244             zipObj.extract('Experiment0/RawData0.xml')
    245         with open('Experiment0/RawData0.xml') as fd:
    246             self.data = dict(xml.parse(fd.read()))
    247             self.formatName = 'Bruker .brml file'
    248         os.remove('Experiment0/RawData0.xml')
    249         os.rmdir('Experiment0')
    250         self.idstring = ospath.basename(filename) + ' Bank 1'
    251         self.powderentry[0] = filename
    252         self.comments = []
    253         return True
     241        try:
     242            import zipfile as ZF       
     243            with ZF.ZipFile(filename, 'r') as zipObj:
     244                zipObj.extract('Experiment0/RawData0.xml')
     245            with open('Experiment0/RawData0.xml') as fd:
     246                self.data = dict(xml.parse(fd.read()))
     247                self.formatName = 'Bruker .brml file'
     248            os.remove('Experiment0/RawData0.xml')
     249            os.rmdir('Experiment0')
     250            self.idstring = ospath.basename(filename) + ' Bank 1'
     251            self.powderentry[0] = filename
     252            self.comments = []
     253            return True
     254        except:
     255            return False
    254256           
    255257    def Reader(self,filename, ParentFrame=None, **kwarg):
Note: See TracChangeset for help on using the changeset viewer.