Changeset 3006 for TI02-CSML


Ignore:
Timestamp:
12/11/07 09:06:10 (12 years ago)
Author:
domlowe
Message:

bug in filename aggregation fixed

Location:
TI02-CSML/trunk/csml
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TI02-CSML/trunk/csml/API/ops_FileExtract.py

    r2774 r3006  
    114114    try: 
    115115        for file in self.fileList.fileNames.CONTENT.split(): 
    116             filenames.append[file] 
     116            filenames.append(file) 
    117117    except: 
    118118        filenames.append(self.fileName.CONTENT) 
  • TI02-CSML/trunk/csml/csmllibs/csmlcrs.py

    r2913 r3006  
    115115        crs.timeAxis=3 
    116116         
     117        #define unknown 5D CRS: 
     118        crs=CRSystem(srsName='ndg:crs:undefined5d_lonlatzt', axes=['probAx','time','tba', 'latitude','longitude']) 
     119        self.pseudosystems['ndg:crs:undefined5d_lonlatzt']=crs 
     120        crs.lonAxis=4 
     121        crs.latAxis=3 
     122        crs.timeAxis=1 
     123         
    117124        #define unknown 1D CRS: 
    118125        crs=CRSystem(srsName='ndg:crs:unknown', axes=['unknown']) 
     
    130137        crs=CRSystem(srsName='ndg:crs:unknown4d', axes=['unknown','unknown','unknown','unknown']) 
    131138        self.systems['ndg:crs:unknown4d']=crs 
    132          
    133              
     139                     
    134140    def getCRS(self, srsName, labels=None): 
    135141        #given the name of a CRS e.g. 'ndg:crs:xypt' return the CRSystem object  
     
    178184        elif string.lower(unit) in ['degrees_east','degrees_west']: 
    179185            unittype='longitude' 
     186        elif string.lower(unit) in ['-']: 
     187            unittype='probAx' 
     188             
    180189        else: 
    181190            unittype = unit 
     
    213222                crsMap.append(unittype) 
    214223             
    215          
     224        match=1 
    216225        #now try and match up crsMap with known crsystems.         
    217226        #axisorder stores the order of the supplied axes against the known crs. 
Note: See TracChangeset for help on using the changeset viewer.