Ignore:
Timestamp:
Aug 18, 2009 7:51:03 PM (13 years ago)
Author:
ajj
Message:

Fixing bug #226 : problem with mis-identification of ascii reduced files as xml where the original raw data was an xml file.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

    r508 r548  
    363363#else   // if( Exists("XmlOpenFile") ) 
    364364        // No XMLutils XOP: provide dummy function so that IgorPro can compile dependent support code 
    365         FUNCTION LoadNISTXMLData(fileName) 
     365        FUNCTION LoadNISTXMLData(fileName,doPlot) 
    366366            String fileName 
     367            Variable doPlot 
    367368            Abort  "XML function provided by XMLutils XOP is not available, get the XOP from : http://www.igorexchange.com/project/XMLutils (see http://www.smallangles.net/wgwiki/index.php/cansas1d_binding_IgorPro for details)" 
    368369            RETURN(-6) 
     
    384385         
    385386        //Hopefully this will distinguish between other formats and the XML 
    386         return stringmatch(line, "*xml*")        
     387        //Previous string match would match normal files that have a .xml file as their progenitor... 
     388        return GrepString(line, "(?iU).*\<.*xml.*")      
    387389 
    388390end 
Note: See TracChangeset for help on using the changeset viewer.