Changeset 548

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:

• sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

@@ -363 +363 @@
 #else   // if( Exists("XmlOpenFile") )
         // No XMLutils XOP: provide dummy function so that IgorPro can compile dependent support code
-        FUNCTION LoadNISTXMLData(fileName)
+        FUNCTION LoadNISTXMLData(fileName,doPlot)
             String fileName
+            Variable doPlot
             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)"
             RETURN(-6)
@@ -384 +385 @@
         
         //Hopefully this will distinguish between other formats and the XML
-        return stringmatch(line, "*xml*")       
+        //Previous string match would match normal files that have a .xml file as their progenitor...
+        return GrepString(line, "(?iU).*\<.*xml.*")     
 
 end