Ignore:
Timestamp:
07/05/08 10:31:35 (12 years ago)
Author:
domlowe
Message:

Adding security options back in to scanner

File:
1 edited

Legend:

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

    r3680 r3856  
    133133    SELECTION=None 
    134134    ROOTDIRECTORY=os.getcwd() 
     135    SEC_ALLOW=None 
     136    SEC_DENY=None 
    135137     
    136138    #... 
     
    173175        if conf: 
    174176            SPATIALSTORAGE=conf 
     177        conf=config.getConfigNoError('security', 'allow') 
     178        if conf: 
     179            SEC_ALLOW=conf 
     180        conf=config.getConfigNoError('security', 'deny') 
     181        if conf: 
     182            SEC_DENY=conf 
    175183     
    176184    else: #no config file, get command line args 
     
    234242        print '\n spatialaxes:spatialstorage = %s'%SPATIALSTORAGE 
    235243        print '\n values:valuestorage = %s'%VALUESTORAGE 
     244        print '\n security:allow = %s'%SEC_ALLOW 
     245        print '\n security:deny = %s'%SEC_DENY 
    236246        print '\n For more information on config options run the command "csmlscan --help"' 
    237247         
     
    245255         
    246256    #build CSML document 
    247     csmldataset=csmllibs.csmlbuilder.csmlBuilder(DATASETID,ROOTDIRECTORY,SELECTION,FEATURETYPE,MAPPING,TIMEDIMENSION, OUTPUTFILE, PRINTSCREEN,TIMESTORAGE,SPATIALSTORAGE,VALUESTORAGE, MINAXES) 
     257    csmldataset=csmllibs.csmlbuilder.csmlBuilder(DATASETID,ROOTDIRECTORY,SELECTION,FEATURETYPE,MAPPING,TIMEDIMENSION, OUTPUTFILE, PRINTSCREEN,TIMESTORAGE,SPATIALSTORAGE,VALUESTORAGE, MINAXES, SEC_ALLOW, SEC_DENY) 
    248258    csmldataset.build() 
    249259 
Note: See TracChangeset for help on using the changeset viewer.