Changeset 508

Timestamp:

May 14, 2009 4:24:39 PM (14 years ago)

Author:

ajj

Message:

• Move isXML() to outside of test for presence of XMLUtils.XOP

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

@@ -324 +324 @@
 end
 
-function isXML(filestr)
-        String filestr
-        
-        String line
-        Variable fileref
-        
-        Open/R fileref as filestr
-        FReadLine fileref,  line
-        Close fileref
-        
-        //Hopefully this will distinguish between other formats and the XML
-        return stringmatch(line, "*xml*")       
-
-end
 
 
@@ -382 +368 @@
             RETURN(-6)
         END
-#endif  // if( Exists("XmlOpenFile") )
+        
+
+        
+#endif  // if( Exists("XmlOpenFile") 
+//Needed to test whether file is XML. The load routine will then either give an error if XMLutils is not present or load the file if it is.
+function isXML(filestr)
+        String filestr
+        
+        String line
+        Variable fileref
+        
+        Open/R fileref as filestr
+        FReadLine fileref,  line
+        Close fileref
+        
+        //Hopefully this will distinguish between other formats and the XML
+        return stringmatch(line, "*xml*")       
+
+end