Changeset 44

Timestamp:

May 19, 2008 10:18:11 PM (13 years ago)

Author:

prjemian

Message:

revised cansasXML.ipf so that it does not use the XPathStr returned from XMLlistXpath() in M_listXPath.
Things work fine on Windows. On the Mac, however, the default libxml2 library complicates things a bit.

Location:

1dwg/trunk/IgorPro

Files:

• cansasXML.ipf (modified) (11 diffs)
• test-cansasXML.pxp (modified) (previous)

1dwg/trunk/IgorPro/cansasXML.ipf

@@ -183 +183 @@
 
         FOR (i=0; i < DimSize(SASentryList, 0); i += 1)
-                SASentryPath = SASentryList[i][0]
+                SASentryPath = "/cs:SASroot/cs:SASentry["+num2str(i+1)+"]"
                 SetDataFolder root:Packages:CS_XMLreader
                 
@@ -193 +193 @@
                 WAVE/T  M_listXPath
                 IF ( DimSize(M_listXPath, 0) == 1)
-                        CS_1i_getOneSASdata(fileID, Title, M_listXPath[0][0])
+                        CS_1i_getOneSASdata(fileID, Title, SASentryPath+"/cs:SASdata")
                         CS_1i_collectMetadata(fileID, SASentryPath)
                 ELSE
@@ -199 +199 @@
                                 STRING SASdataFolder = CS_cleanFolderName("SASdata_" + num2str(j))
                                 NewDataFolder/O/S  $SASdataFolder
-                                CS_1i_getOneSASdata(fileID, Title, M_listXPath[j][0])
+                                CS_1i_getOneSASdata(fileID, Title, SASentryPath+"/cs:SASdata["+num2str(j+1)+"]")
                                 CS_1i_collectMetadata(fileID, SASentryPath)
                                 SetDataFolder ::                        // back up to parent directory
@@ -253 +253 @@
                         suffix = "_" + num2str(i)
                 ENDIF
-                CS_appendMetaData(fileID, "Run" + suffix,  M_listXPath[i][0], "")
-                CS_appendMetaData(fileID, "Run/@name" + suffix,  M_listXPath[i][0] + "/@name", "")
+                CS_appendMetaData(fileID, "Run" + suffix,  SASdataPath + "/../cs:Run["+num2str(i+1)+"]", "")
+                CS_appendMetaData(fileID, "Run/@name" + suffix,  SASdataPath + "/../cs:Run["+num2str(i+1)+"]/@name", "")
         ENDFOR
 
@@ -326 +326 @@
                                         igorWave = xmlElement           // can we trust this one?
                         ENDSWITCH
-                        xPathStr = M_listXPath[j][0]                                                    // clear name reference
-                        pos = strsearch(xPathStr, "/", Inf, 3)                                  // peel off the tail of the string and reform
-                        xmlElement = xPathStr[pos,Inf]                                          // find last element on the path
-                        prefix = xPathStr[0, pos-1-4]+"/*"                                              // ALL Idata elements
+                        //
+//                      // This will need some work to support foreign namespaces here
+//                      //
+//                      //
+//                      xPathStr = M_listXPath[j][0]                                                    // clear name reference
+//                      pos = strsearch(xPathStr, "/", Inf, 3)                                  // peel off the tail of the string and reform
+//                      xmlElement = xPathStr[pos,Inf]                                          // find last element on the path
+//                      prefix = xPathStr[0, pos-1-4]+"/*"                                              // ALL Idata elements
+//                      CS_1i_getOneVector(fileID,prefix, xmlElement, igorWave)         // loads ALL rows (Idata) of the column at the same time
+                        //
+                        //  Could there be a problem with a foreign namespace here?
+                        prefix = SASdataPath+"//cs:Idata"                                               // ALL Idata elements
+                        xmlElement = "cs:" + M_listXPath[j][1]                                  // just this column
                         CS_1i_getOneVector(fileID,prefix, xmlElement, igorWave)         // loads ALL rows (Idata) of the column at the same time
                 ENDFOR
@@ -384 +393 @@
                         suffix = "_" + num2str(i)
                 ENDIF
-                detailsPath = detailsList[i][0]
+                detailsPath = sasEntryPath+"/cs:SASsample/cs:details["+num2str(i+1)+"]"
                 CS_appendMetaData(fileID, "SASsample/details"+suffix+"/@name",  detailsPath + "/@name", "")
                 CS_appendMetaData(fileID, "SASsample/details"+suffix,           detailsPath, "")
@@ -426 +435 @@
                         preMeta += "_" + num2str(i)
                 ENDIF
-                collimationPath = SAScollimationList[i][0]
+                collimationPath = sasEntryPath+"/cs:SASinstrument/cs:SAScollimation["+num2str(i+1)+"]"
                 CS_appendMetaData(fileID, preMeta + "/@name",               collimationPath + "/@name", "")
                 CS_appendMetaData(fileID, preMeta + "/length",              collimationPath + "/cs:length", "")
@@ -460 +469 @@
                         preMeta += "_" + num2str(i)
                 ENDIF
-                detectorPath = SASdetectorList[i][0]
+                detectorPath = sasEntryPath+"/cs:SASinstrument/cs:SASdetector["+num2str(i+1)+"]"
                 CS_appendMetaData(fileID, preMeta + "/@name",                    detectorPath + "/cs:name", "")
                 CS_appendMetaData(fileID, preMeta + "/SDD",                              detectorPath + "/cs:SDD", "")
@@ -504 +513 @@
         WAVE/T  M_listXPath
         DUPLICATE/O/T   M_listXPath, SASprocessList
-        STRING SASprocessPath
+        STRING SASprocessPath, prefix
         FOR (i = 0; i < DimSize(SASprocessList, 0); i += 1)
                 preMeta = "SASprocess"
@@ -510 +519 @@
                         preMeta += "_" + num2str(i)
                 ENDIF
-                SASprocessPath = SASprocessList[i][0]
+                SASprocessPath = sasEntryPath+"/cs:SASprocess["+num2str(i+1)+"]"
                 CS_appendMetaData(fileID, preMeta+"/@name",        SASprocessPath + "/@name", "")
                 CS_appendMetaData(fileID, preMeta+"/name",         SASprocessPath + "/cs:name", "")
                 CS_appendMetaData(fileID, preMeta+"/date",                 SASprocessPath + "/cs:date", "")
                 CS_appendMetaData(fileID, preMeta+"/description",   SASprocessPath + "/cs:description", "")
-                XmlListXpath(fileID, SASprocessList[i][0]+"//cs:term", nsStr)
+                XmlListXpath(fileID, SASprocessPath+"//cs:term", nsStr)
                 FOR (j = 0; j < DimSize(M_listXPath, 0); j += 1)
-                        CS_appendMetaData(fileID, preMeta+"/term_"+num2str(j)+"/@name",     M_listXPath[j][0] + "/@name", "")
-                        CS_appendMetaData(fileID, preMeta+"/term_"+num2str(j)+"/@unit",            M_listXPath[j][0] + "/@unit", "")
-                        CS_appendMetaData(fileID, preMeta+"/term_"+num2str(j),                             M_listXPath[j][0], "")
+                        prefix = SASprocessPath + "/cs:term[" + num2str(j+1) + "]"
+                        CS_appendMetaData(fileID, preMeta+"/term_"+num2str(j)+"/@name",     prefix + "/@name", "")
+                        CS_appendMetaData(fileID, preMeta+"/term_"+num2str(j)+"/@unit",           prefix + "/@unit", "")
+                        CS_appendMetaData(fileID, preMeta+"/term_"+num2str(j),                            prefix, "")
                 ENDFOR
                 // ignore <SASprocessnote>
@@ -533 +543 @@
                         preMeta += "_" + num2str(i)
                 ENDIF
-                notePath = SASnoteList[i][0]
+                notePath = sasEntryPath+"//cs:SASnote["+num2str(i+1)+"]"
                 CS_appendMetaData(fileID, preMeta+"/@name",     notePath + "/@name", "")
                 CS_appendMetaData(fileID, preMeta,              notePath, "")