Changeset 59 for 1dwg

Timestamp:

Sep 2, 2008 11:09:17 AM (12 years ago)

Author:

prjemian

Message:

test for XMLutils XOP presence at outermost level and provide alternate CS_XmlReader() or code will not compile when XMLutils routines are identified in the code but not found at compile time (before run time)

File:

• 1dwg/trunk/IgorPro/cansasXML.ipf (modified) (5 diffs)

1dwg/trunk/IgorPro/cansasXML.ipf

@@ -26 +26 @@
 
 
+        // BEFORE we do anything else, check that XMLutils XOP is available.
+        #if( Exists("XmlOpenFile") == 0 )
+
+
 FUNCTION CS_XmlReader(fileName)
         //
@@ -35 +39 @@
         //              -3: <SASroot> version  is not 1.0
         //              -4: no <SASentry> elements
-        //              -5: XOPutils needs upgrade
+        //              -5: XMLutils XOP needs upgrade
+        //              -6: XMLutils XOP not found
         //
         STRING fileName
@@ -41 +46 @@
         STRING workingFolder = "root:Packages:CS_XMLreader"
         VARIABLE returnCode
-
-        // BEFORE we do anything else, check that XMLutils XOP is available.
-        #if( Exists("XmlOpenFile") == 0 )
-    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)"
-        #endif
 
 
@@ -80 +80 @@
 
         //
-        //      test to see if XOPutils has the needed upgrade
+        //      test to see if XMLutils has the needed upgrade
         //
         XMLlistXpath(fileID, "/*", "")  
         IF ( EXISTS( "M_listXPath" ) == 0 )
                 XmlCloseFile(fileID,0)
-                errorMsg = "XOPutils needs an upgrade:  http://www.igorexchange.com/project/XMLutils"
+                errorMsg = "XMLutils needs an upgrade:  http://www.igorexchange.com/project/XMLutils"
                 PRINT errorMsg
                 SetDataFolder $origFolder
@@ -808 +808 @@
         SetDataFolder root:
 END
+
+        #else   // if( Exists("XmlOpenFile") == 0 )
+        FUNCTION CS_XmlReader(fileName)
+            String fileName
+            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)
+        END
+        #endif  // if( Exists("XmlOpenFile") == 0 )