XML: rename xmlClose in xmlDelete and xmlGetOpenStreams in xmlGetOpenDocs 36/5736/2
Calixte DENIZET [Fri, 23 Dec 2011 11:49:56 +0000 (12:49 +0100)]
Change-Id: Iea401b5cf94a7d43dfa6f7153d181424d4b65c12

58 files changed:
scilab/CHANGES_5.4.X
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/help/en_US/XMLObjects.xml
scilab/modules/xml/help/en_US/xmlAddNs.xml
scilab/modules/xml/help/en_US/xmlAsNumber.xml
scilab/modules/xml/help/en_US/xmlAsText.xml
scilab/modules/xml/help/en_US/xmlDTD.xml
scilab/modules/xml/help/en_US/xmlDelete.xml [moved from scilab/modules/xml/help/en_US/xmlClose.xml with 79% similarity]
scilab/modules/xml/help/en_US/xmlDocument.xml
scilab/modules/xml/help/en_US/xmlDump.xml
scilab/modules/xml/help/en_US/xmlElement.xml
scilab/modules/xml/help/en_US/xmlFormat.xml
scilab/modules/xml/help/en_US/xmlGetNsByHref.xml
scilab/modules/xml/help/en_US/xmlGetNsByPrefix.xml
scilab/modules/xml/help/en_US/xmlGetOpenDocs.xml [moved from scilab/modules/xml/help/en_US/xmlGetOpenStreams.xml with 86% similarity]
scilab/modules/xml/help/en_US/xmlIsValidObject.xml
scilab/modules/xml/help/en_US/xmlNs.xml
scilab/modules/xml/help/en_US/xmlRead.xml
scilab/modules/xml/help/en_US/xmlReadStr.xml
scilab/modules/xml/help/en_US/xmlRelaxNG.xml
scilab/modules/xml/help/en_US/xmlRemove.xml
scilab/modules/xml/help/en_US/xmlSchema.xml
scilab/modules/xml/help/en_US/xmlSetAttributes.xml
scilab/modules/xml/help/en_US/xmlValidate.xml
scilab/modules/xml/help/en_US/xmlWrite.xml
scilab/modules/xml/help/en_US/xmlXPath.xml
scilab/modules/xml/includes/gw_xml.h
scilab/modules/xml/sci_gateway/c/gw_xml.c
scilab/modules/xml/sci_gateway/cpp/sci_xmlDelete.cpp [moved from scilab/modules/xml/sci_gateway/cpp/sci_xmlClose.cpp with 98% similarity]
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetOpenDocs.cpp [moved from scilab/modules/xml/sci_gateway/cpp/sci_xmlGetOpenStreams.cpp with 96% similarity]
scilab/modules/xml/sci_gateway/xml_gateway.xml
scilab/modules/xml/tests/nonreg_tests/bug_10295.dia.ref
scilab/modules/xml/tests/nonreg_tests/bug_10295.tst
scilab/modules/xml/tests/unit_tests/xmlAddNs.dia.ref
scilab/modules/xml/tests/unit_tests/xmlAddNs.tst
scilab/modules/xml/tests/unit_tests/xmlAttributes.dia.ref
scilab/modules/xml/tests/unit_tests/xmlAttributes.tst
scilab/modules/xml/tests/unit_tests/xmlDocument.dia.ref
scilab/modules/xml/tests/unit_tests/xmlDocument.tst
scilab/modules/xml/tests/unit_tests/xmlFormat.dia.ref
scilab/modules/xml/tests/unit_tests/xmlFormat.tst
scilab/modules/xml/tests/unit_tests/xmlLine.dia.ref
scilab/modules/xml/tests/unit_tests/xmlLine.tst
scilab/modules/xml/tests/unit_tests/xmlRead.dia.ref
scilab/modules/xml/tests/unit_tests/xmlRead.tst
scilab/modules/xml/tests/unit_tests/xmlRemove.dia.ref
scilab/modules/xml/tests/unit_tests/xmlRemove.tst
scilab/modules/xml/tests/unit_tests/xmlSetAttributes.dia.ref
scilab/modules/xml/tests/unit_tests/xmlSetAttributes.tst
scilab/modules/xml/tests/unit_tests/xmlValidate.dia.ref
scilab/modules/xml/tests/unit_tests/xmlValidate.tst
scilab/modules/xml/tests/unit_tests/xmlWrite.dia.ref
scilab/modules/xml/tests/unit_tests/xmlWrite.tst
scilab/modules/xml/tests/unit_tests/xmlXPath.dia.ref
scilab/modules/xml/tests/unit_tests/xmlXPath.tst
scilab/modules/xml/xml.vcxproj
scilab/modules/xml/xml.vcxproj.filters

index bf57525..1ab2b4b 100644 (file)
@@ -2,6 +2,11 @@
             =========================================================
 
 
+XML
+===
+
+* Rename xmlClose in xmlDelete and xmlGetOpenStreams in xmlGetOpenDocs.
+
 Unitary testing
 ===============
 
index 7c6daa5..ce0d4a2 100644 (file)
@@ -52,8 +52,8 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
                      sci_gateway/cpp/sci_extraction.cpp \
                      sci_gateway/cpp/sci_insertion.cpp \
                      sci_gateway/cpp/sci_print.cpp \
-                     sci_gateway/cpp/sci_xmlGetOpenStreams.cpp \
-                     sci_gateway/cpp/sci_xmlClose.cpp \
+                     sci_gateway/cpp/sci_xmlGetOpenDocs.cpp \
+                     sci_gateway/cpp/sci_xmlDelete.cpp \
                      sci_gateway/cpp/sci_xmlDump.cpp \
                      sci_gateway/cpp/sci_xmlReadStr.cpp \
                      sci_gateway/cpp/sci_xmlFormat.cpp \
index d2022f0..416e35e 100644 (file)
@@ -138,8 +138,8 @@ am__objects_4 = libscixml_la-gw_xml.lo
 am__objects_5 = libscixml_la-sci_xmlRead.lo \
        libscixml_la-sci_xmlXPath.lo libscixml_la-sci_extraction.lo \
        libscixml_la-sci_insertion.lo libscixml_la-sci_print.lo \
-       libscixml_la-sci_xmlGetOpenStreams.lo \
-       libscixml_la-sci_xmlClose.lo libscixml_la-sci_xmlDump.lo \
+       libscixml_la-sci_xmlGetOpenDocs.lo \
+       libscixml_la-sci_xmlDelete.lo libscixml_la-sci_xmlDump.lo \
        libscixml_la-sci_xmlReadStr.lo libscixml_la-sci_xmlFormat.lo \
        libscixml_la-sci_percent_XMLList_e.lo \
        libscixml_la-sci_percent_XMLAttr_e.lo \
@@ -545,8 +545,8 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
                      sci_gateway/cpp/sci_extraction.cpp \
                      sci_gateway/cpp/sci_insertion.cpp \
                      sci_gateway/cpp/sci_print.cpp \
-                     sci_gateway/cpp/sci_xmlGetOpenStreams.cpp \
-                     sci_gateway/cpp/sci_xmlClose.cpp \
+                     sci_gateway/cpp/sci_xmlGetOpenDocs.cpp \
+                     sci_gateway/cpp/sci_xmlDelete.cpp \
                      sci_gateway/cpp/sci_xmlDump.cpp \
                      sci_gateway/cpp/sci_xmlReadStr.cpp \
                      sci_gateway/cpp/sci_xmlFormat.cpp \
@@ -727,14 +727,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlAddNs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlAsNumber.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlAsText.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlClose.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlDelete.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlDocument.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlDump.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlElement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlFormat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlGetNsByHref.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlGetNsByPrefix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlGetOpenStreams.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlGetOpenDocs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlIsValidObject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlNs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixml_la-sci_xmlRead.Plo@am__quote@
@@ -942,19 +942,19 @@ libscixml_la-sci_print.lo: sci_gateway/cpp/sci_print.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixml_la-sci_print.lo `test -f 'sci_gateway/cpp/sci_print.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_print.cpp
 
-libscixml_la-sci_xmlGetOpenStreams.lo: sci_gateway/cpp/sci_xmlGetOpenStreams.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixml_la-sci_xmlGetOpenStreams.lo -MD -MP -MF $(DEPDIR)/libscixml_la-sci_xmlGetOpenStreams.Tpo -c -o libscixml_la-sci_xmlGetOpenStreams.lo `test -f 'sci_gateway/cpp/sci_xmlGetOpenStreams.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xmlGetOpenStreams.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscixml_la-sci_xmlGetOpenStreams.Tpo $(DEPDIR)/libscixml_la-sci_xmlGetOpenStreams.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_xmlGetOpenStreams.cpp' object='libscixml_la-sci_xmlGetOpenStreams.lo' libtool=yes @AMDEPBACKSLASH@
+libscixml_la-sci_xmlGetOpenDocs.lo: sci_gateway/cpp/sci_xmlGetOpenDocs.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixml_la-sci_xmlGetOpenDocs.lo -MD -MP -MF $(DEPDIR)/libscixml_la-sci_xmlGetOpenDocs.Tpo -c -o libscixml_la-sci_xmlGetOpenDocs.lo `test -f 'sci_gateway/cpp/sci_xmlGetOpenDocs.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xmlGetOpenDocs.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscixml_la-sci_xmlGetOpenDocs.Tpo $(DEPDIR)/libscixml_la-sci_xmlGetOpenDocs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_xmlGetOpenDocs.cpp' object='libscixml_la-sci_xmlGetOpenDocs.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixml_la-sci_xmlGetOpenStreams.lo `test -f 'sci_gateway/cpp/sci_xmlGetOpenStreams.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xmlGetOpenStreams.cpp
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixml_la-sci_xmlGetOpenDocs.lo `test -f 'sci_gateway/cpp/sci_xmlGetOpenDocs.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xmlGetOpenDocs.cpp
 
-libscixml_la-sci_xmlClose.lo: sci_gateway/cpp/sci_xmlClose.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixml_la-sci_xmlClose.lo -MD -MP -MF $(DEPDIR)/libscixml_la-sci_xmlClose.Tpo -c -o libscixml_la-sci_xmlClose.lo `test -f 'sci_gateway/cpp/sci_xmlClose.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xmlClose.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscixml_la-sci_xmlClose.Tpo $(DEPDIR)/libscixml_la-sci_xmlClose.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_xmlClose.cpp' object='libscixml_la-sci_xmlClose.lo' libtool=yes @AMDEPBACKSLASH@
+libscixml_la-sci_xmlDelete.lo: sci_gateway/cpp/sci_xmlDelete.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixml_la-sci_xmlDelete.lo -MD -MP -MF $(DEPDIR)/libscixml_la-sci_xmlDelete.Tpo -c -o libscixml_la-sci_xmlDelete.lo `test -f 'sci_gateway/cpp/sci_xmlDelete.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xmlDelete.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscixml_la-sci_xmlDelete.Tpo $(DEPDIR)/libscixml_la-sci_xmlDelete.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_xmlDelete.cpp' object='libscixml_la-sci_xmlDelete.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixml_la-sci_xmlClose.lo `test -f 'sci_gateway/cpp/sci_xmlClose.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xmlClose.cpp
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixml_la-sci_xmlDelete.lo `test -f 'sci_gateway/cpp/sci_xmlDelete.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xmlDelete.cpp
 
 libscixml_la-sci_xmlDump.lo: sci_gateway/cpp/sci_xmlDump.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixml_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixml_la-sci_xmlDump.lo -MD -MP -MF $(DEPDIR)/libscixml_la-sci_xmlDump.Tpo -c -o libscixml_la-sci_xmlDump.lo `test -f 'sci_gateway/cpp/sci_xmlDump.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xmlDump.cpp
index 9f95f77..f5a7f28 100644 (file)
@@ -76,7 +76,7 @@
     doc.url = TMPDIR+"/foo.xml";
     doc
     xmlWrite(doc);
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection id="XMLElement">
     b.line
 
     xmlDump(first)
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
     </para>
   </refsection>
     first.attributes(1)
 
     xmlDump(first)
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection id="XMLNamespace">
     ns.href
     ns.prefix
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection id="XMLNodeList">
     // Get the nodes contents
     c.content
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection id="XMLNodeSet">
     // Or ...
     s.content
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection id="XMLValid">
     xmlValidate(doc, rng);
     xmlValidate(doc, schema);
 
-    xmlClose("all");
+    xmlDelete("all");
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index 006dee4..e1e707a 100644 (file)
@@ -60,7 +60,7 @@
     doc.root.children(2) = b;
     xmlDump(doc)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index 813a8a2..cfc614d 100644 (file)
@@ -56,7 +56,7 @@
     // convert the result into doubles
     data = xmlAsNumber(xp)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index 186d2b8..989c2c3 100644 (file)
@@ -56,7 +56,7 @@
     // convert the result into a row of strings
     data = xmlAsText(xp)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index 2447a44..f0b734c 100644 (file)
@@ -56,7 +56,7 @@
 
     xmlValidate(doc, dtd);
 
-    xmlClose(doc, dtd);
+    xmlDelete(doc, dtd);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
similarity index 79%
rename from scilab/modules/xml/help/en_US/xmlClose.xml
rename to scilab/modules/xml/help/en_US/xmlDelete.xml
index 0272331..9958ba2 100644 (file)
 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 *
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:id="xmlClose" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:id="xmlDelete" xml:lang="en">
   <info>
     <pubdate>$LastChangedDate$</pubdate>
   </info>
   <refnamediv>
-    <refname>xmlClose</refname>
-    <refpurpose>Close a XML document</refpurpose>
+    <refname>xmlDelete</refname>
+    <refpurpose>Delete a XML document</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
     <synopsis>
-      xmlClose(obj1 [, obj2, [...]])
-      xmlClose("all")
+      xmlDelete(obj1 [, obj2, [...]])
+      xmlDelete("all")
     </synopsis>
   </refsynopsisdiv>
   <refsection>
       <varlistentry>
         <term>obji</term>
         <listitem>
-          <para>a mlist type XMLDoc or XMLValid, the document to close</para>
+          <para>a mlist type XMLDoc or XMLValid, the document to delete</para>
         </listitem>
       </varlistentry>
     </variablelist>
   </refsection>
   <refsection>
     <title>Description</title>
-    <para>Close a document or a validation file (in fact free all the memory associated with this object).</para>
-    <para>When the syntax xmlClose("all") is used, all the open streams will be closed.</para>
+    <para>Delete a document or a validation file (in fact free all the memory associated with this object).</para>
+    <para>When the syntax xmlDelete("all") is used, all the open documents will be deleted.</para>
   </refsection>
   <refsection>
     <title>Examples</title>
     <programlisting role="example"><![CDATA[
     doc = xmlRead("http://www.w3.org/TR/2009/REC-xml-names-20091208/xml-names-10-3e.xml");
     root = doc.root
-    xmlClose(doc);
+    xmlDelete(doc);
 
     // root is no more valid... so try to access it, will lead to an error
     root
@@ -56,7 +56,7 @@
     <title>See Also</title>
     <simplelist type="inline">
       <member>
-        <link linkend="xmlGetOpenStreams">xmlGetOpenStreams</link>
+        <link linkend="xmlGetOpenDocs">xmlGetOpenDocs</link>
       </member>
     </simplelist>
   </refsection>
index d710a52..e08649e 100644 (file)
@@ -66,7 +66,7 @@
     doc.root = root;
     xmlDump(doc)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index 2b38d90..4386e86 100644 (file)
@@ -67,7 +67,7 @@
     //Dump an element
     xmlDump(doc.root.children(1))
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index b4a28f8..0bc44fa 100644 (file)
@@ -61,7 +61,7 @@
     doc.root.children(3) = e;
     xmlDump(doc)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index c7e1924..17d30f8 100644 (file)
@@ -61,7 +61,7 @@
     doc.root.children(1.5) = 1.23456;
     xmlDump(doc)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection>
index 450bdee..ecb2b23 100644 (file)
@@ -58,7 +58,7 @@
     c = doc.root.children(1).children(2);
     xmlGetNsByHref(c, "http://www.scilab.org")
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index 89c96c5..519ee46 100644 (file)
@@ -58,7 +58,7 @@
     c = doc.root.children(1).children(2);
     xmlGetNsByPrefix(c, "scilab")
     
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 *
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:id="xmlGetOpenStreams" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:id="xmlGetOpenDocs" xml:lang="en">
   <info>
     <pubdate>$LastChangedDate$</pubdate>
   </info>
   <refnamediv>
-    <refname>xmlGetOpenStreams</refname>
+    <refname>xmlGetOpenDocs</refname>
     <refpurpose>Get all open XML documents or all open XML Validation files.</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <title>Calling Sequence</title>
     <synopsis>
-      list = xmlGetOpenStreams()
+      list = xmlGetOpenDocs()
     </synopsis>
   </refsynopsisdiv>
   <refsection>
   </refsection>
   <refsection>
     <title>Description</title>
-    <para>This function is useful to close open streams (and essentially to free the memory).</para>
+    <para>This function is useful to delete open documents (and essentially to free the memory).</para>
   </refsection>
   <refsection>
     <title>Examples</title>
     <programlisting role="example"><![CDATA[
     doc = xmlRead("http://www.w3.org/TR/2009/REC-xml-names-20091208/xml-names-10-3e.xml");
     doc = xmlReadStr("<root><a att=""foo"" rib=""bar""><b>Hello</b></a></root>");
-    l = xmlGetOpenStreams()
-    xmlClose("all");
+    l = xmlGetOpenDocs()
+    xmlDelete("all");
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
     <title>See Also</title>
     <simplelist type="inline">
       <member>
-        <link linkend="xmlClose">xmlClose</link>
+        <link linkend="xmlDelete">xmlDelete</link>
       </member>
     </simplelist>
   </refsection>
index 686e0df..f3c0854 100644 (file)
@@ -43,7 +43,7 @@
   </refsection>
   <refsection>
     <title>Description</title>
-    <para>When a XML stream has been closed all the attached objects are destroyed, but on the Scilab side the objects are still alive. So this function is useful to know if an object on the Scilab side is valid or not.</para>
+    <para>When a XML document has been deleted all the attached objects are destroyed, but on the Scilab side the objects are still alive. So this function is useful to know if an object on the Scilab side is valid or not.</para>
   </refsection>
   <refsection>
     <title>Examples</title>
@@ -53,8 +53,8 @@
     // must return %T
     xmlIsValidObject(r)
 
-    // We close the doc
-    xmlClose(doc);
+    // We delete the doc
+    xmlDelete(doc);
 
     // must return [%F %F]
     xmlIsValidObject(["doc" "r"])
@@ -67,7 +67,7 @@
         <link linkend="XMLObjects">XML Objects</link>
       </member>
       <member>
-        <link linkend="xmlClose">xmlClose</link>
+        <link linkend="xmlDelete">xmlDelete</link>
       </member>
     </simplelist>
   </refsection>
index bd14e56..3a8cd35 100644 (file)
@@ -61,7 +61,7 @@
     doc.root.children(1).namespace = ns;
     xmlDump(doc)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index ca00ca3..7f1a117 100644 (file)
@@ -51,7 +51,7 @@
     <title>Description</title>
     <para>Read and parse a XML file. The returned document allows to access to the DOM tree which is kept in memory.</para>
     <para>If validateDTD is set to true, the document will be validated or not during the parsing operation.</para>
-    <para>It is important to notice that the tree must be freed (to avoid memory leaks) with the function <link linkend="xmlClose">xmlClose</link>.</para>
+    <para>It is important to notice that the tree must be freed (to avoid memory leaks) with the function <link linkend="xmlDelete">xmlDelete</link>.</para>
   </refsection>
   <refsection>
     <title>Examples</title>
@@ -66,8 +66,8 @@
     q = xmlXPath(doc, "//*[@href]");
     q(1).attributes.href
 
-    // We close the doc
-    xmlClose(doc);
+    // We delete the doc
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
         <link linkend="xmlReadStr">xmlReadStr</link>
       </member>
       <member>
-        <link linkend="xmlGetOpenStreams">xmlGetOpenStreams</link>
+        <link linkend="xmlGetOpenDocs">xmlGetOpenDocs</link>
       </member>
       <member>
-        <link linkend="xmlClose">xmlClose</link>
+        <link linkend="xmlDelete">xmlDelete</link>
       </member>
       <member>
         <link linkend="xmlDocument">xmlDocument</link>
index 497a914..bd4c00b 100644 (file)
@@ -51,7 +51,7 @@
     <title>Description</title>
     <para>Read and parse a XML string. The returned document allows to access to the DOM tree which is kept in memory.</para>
     <para>If validateDTD is set to true, the document will be validated or not during the parsing operation.</para>
-    <para>It is important to notice that the tree must be freed (to avoid memory leaks) with the function <link linkend="xmlClose">xmlClose</link>.</para>
+    <para>It is important to notice that the tree must be freed (to avoid memory leaks) with the function <link linkend="xmlDelete">xmlDelete</link>.</para>
   </refsection>
   <refsection>
     <title>Examples</title>
@@ -69,8 +69,8 @@
     doc.root.children(1).attributes.rib = "machin"
     xmlDump(doc.root.children(1))
 
-    // We close the doc
-    xmlClose(doc);
+    // We delete the doc
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
         <link linkend="xmlRead">xmlRead</link>
       </member>
       <member>
-        <link linkend="xmlGetOpenStreams">xmlGetOpenStreams</link>
+        <link linkend="xmlGetOpenDocs">xmlGetOpenDocs</link>
       </member>
       <member>
-        <link linkend="xmlClose">xmlClose</link>
+        <link linkend="xmlDelete">xmlDelete</link>
       </member>
       <member>
         <link linkend="xmlDocument">xmlDocument</link>
index 62b2dbd..06a83c1 100644 (file)
@@ -56,7 +56,7 @@
 
     xmlValidate(doc, rng);
 
-    xmlClose(doc, rng);
+    xmlDelete(doc, rng);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index e4f0905..e502647 100644 (file)
@@ -48,7 +48,7 @@
     xp = xmlXPath(doc, "//a");
     xmlRemove(xp);
     xmlDump(doc)
-    xmlClose(doc);
+    xmlDelete(doc);
 
     // Remove the first element
     doc = xmlReadStr("<root><a>Hello</a><b>Scilab</b><a>World</a></root>");
@@ -59,7 +59,7 @@
     xmlRemove(doc.root.children);
     xmlDump(doc)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index fd4d599..5132c81 100644 (file)
@@ -56,7 +56,7 @@
 
     xmlValidate(doc, schema);
 
-    xmlClose(doc, schema);
+    xmlDelete(doc, schema);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index e1e74ed..bad7e85 100644 (file)
@@ -68,7 +68,7 @@
     xmlSetAttributes(doc.root.children(2).attributes, ["truc" "machin"]);
     xmlDump(doc)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index 0b647ec..a1c6d4d 100644 (file)
@@ -88,8 +88,8 @@
     xmlValidate("SCI/modules/xml/tests/unit_tests/library.xml", schema)
     xmlValidate("SCI/modules/xml/tests/unit_tests/invalid_library.xml", rng)
 
-    // We close the all the open streams
-    xmlClose(doc, dtd, schema, rng);
+    // We delete the all the open documents
+    xmlDelete(doc, dtd, schema, rng);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index e091b3b..e1b0b9e 100644 (file)
@@ -67,7 +67,7 @@
     doc2 = xmlRead(TMPDIR+"/foo.xml");
     doc2.root.children(1).name
 
-    xmlClose("all");
+    xmlDelete("all");
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index b89ae7d..047f7ac 100644 (file)
@@ -92,7 +92,7 @@
     xp.name
     xp.content
 
-    xmlClose(doc);
+    xmlDelete(doc);
 
     // Query using namespaces
     doc = xmlReadStr("<root xmlns:scilab=""http://www.scilab.org""><scilab:a att=""foo"" rib=""bar""><b>Hello</b></scilab:a></root>");
     xmlXPath(doc, "//scilab:a") // => error
     xmlXPath(doc, "//scilab:a", ["scilab" "http://www.scilab.org"]) // => OK
 
-    xmlClose(doc);
+    xmlDelete(doc);
 
     // Query starting on an element
     doc = xmlReadStr("<root att=""attribute""><a a1=""A1"" a2=""A2"" a3=""A3""><b>Hello</b><c>Scilab</c><b>World</b></a><b>Nothing</b></root>");
     xp = xmlXPath(e, "b");
     xmlAsText(xp)
 
-    xmlClose(doc);
+    xmlDelete(doc);
     ]]></programlisting>
   </refsection>
   <refsection role="see also">
index 19baa71..2025e02 100644 (file)
@@ -18,9 +18,9 @@
 XML_SCILAB_IMPEXP int gw_xml(void);
 /*--------------------------------------------------------------------------*/
 int sci_xmlRead(char *fname, unsigned long fname_len);
-int sci_xmlClose(char *fname, unsigned long fname_len);
+int sci_xmlDelete(char *fname, unsigned long fname_len);
 int sci_xmlDump(char *fname, unsigned long fname_len);
-int sci_xmlGetOpenStreams(char *fname, unsigned long fname_len);
+int sci_xmlGetOpenDocs(char *fname, unsigned long fname_len);
 int sci_xmlXPath(char *fname, unsigned long fname_len);
 int sci_percent_XMLDoc_e(char *fname, unsigned long fname_len);
 int sci_percent_XMLElem_e(char *fname, unsigned long fname_len);
index f493f46..bcb2ae4 100644 (file)
@@ -21,9 +21,9 @@
 static gw_generic_table Tab[] =
 {
     {sci_xmlRead, "xmlRead"},
-    {sci_xmlClose, "xmlClose"},
+    {sci_xmlDelete, "xmlDelete"},
     {sci_xmlDump, "xmlDump"},
-    {sci_xmlGetOpenStreams, "xmlGetOpenStreams"},
+    {sci_xmlGetOpenDocs, "xmlGetOpenDocs"},
     {sci_xmlXPath, "xmlXPath"},
     {sci_percent_XMLDoc_e, "%XMLDoc_e"},
     {sci_percent_XMLElem_e, "%XMLElem_e"},
@@ -27,7 +27,7 @@ extern "C"
 using namespace org_modules_xml;
 
 /*--------------------------------------------------------------------------*/
-int sci_xmlClose(char * fname, unsigned long fname_len)
+int sci_xmlDelete(char * fname, unsigned long fname_len)
 {
     int id;
     SciErr err;
@@ -26,7 +26,7 @@ extern "C"
 using namespace org_modules_xml;
 
 /*--------------------------------------------------------------------------*/
-int sci_xmlGetOpenStreams(char *fname, unsigned long fname_len)
+int sci_xmlGetOpenDocs(char *fname, unsigned long fname_len)
 {
     int j = 1;
     SciErr err;
index 8237d1e..432bbc9 100644 (file)
@@ -30,9 +30,9 @@
 
 -->
 <PRIMITIVE gatewayId="68" primitiveId="1" primitiveName="xmlRead" />
-<PRIMITIVE gatewayId="68" primitiveId="2" primitiveName="xmlClose" />
+<PRIMITIVE gatewayId="68" primitiveId="2" primitiveName="xmlDelete" />
 <PRIMITIVE gatewayId="68" primitiveId="3" primitiveName="xmlDump" />
-<PRIMITIVE gatewayId="68" primitiveId="4" primitiveName="xmlGetOpenStreams" />
+<PRIMITIVE gatewayId="68" primitiveId="4" primitiveName="xmlGetOpenDocs" />
 <PRIMITIVE gatewayId="68" primitiveId="5" primitiveName="xmlXPath" />
 <PRIMITIVE gatewayId="68" primitiveId="6" primitiveName="%XMLDoc_e" />
 <PRIMITIVE gatewayId="68" primitiveId="7" primitiveName="%XMLElem_e" />
index ee08563..34c3a9d 100644 (file)
@@ -17,4 +17,4 @@
 //
 doc = xmlReadStr("<root><a att=""foo"" rib=""bar""><b>Hello</b></a></root>");
 assert_checkequal(execstr("xmlWrite(doc, TMPDIR+''/A/B.xml'', %f)","errcatch"), 999);
-xmlClose(doc);
+xmlDelete(doc);
index df9376d..6fe39a0 100644 (file)
@@ -18,4 +18,4 @@
 
 doc = xmlReadStr("<root><a att=""foo"" rib=""bar""><b>Hello</b></a></root>");
 assert_checkequal(execstr("xmlWrite(doc, TMPDIR+''/A/B.xml'', %f)","errcatch"), 999);
-xmlClose(doc);
\ No newline at end of file
+xmlDelete(doc);
\ No newline at end of file
index b11b57e..b69137f 100644 (file)
@@ -33,4 +33,4 @@ assert_checktrue(grep(xmlDump(doc),"http://gro.ba")<>[])
  ans  =
  
   T  
-xmlClose(doc);
+xmlDelete(doc);
index 82b897f..c8638c6 100644 (file)
@@ -34,4 +34,4 @@ assert_checktrue(tmp.href=="http://gro.balics.www");
 assert_checktrue(grep(xmlDump(doc),"http://www.scilab.")<>[])
 assert_checktrue(grep(xmlDump(doc),"http://gro.ba")<>[])
 
-xmlClose(doc);
+xmlDelete(doc);
index 8285dac..835f840 100644 (file)
@@ -29,17 +29,17 @@ doc2 = xmlRead("TMPDIR/plop.xml");
 a2 = doc2.root.children(2).attributes;
 assert_checkequal(a2(1),"123");
 assert_checkequal(a2(2),[]);
-xmlClose(doc2);
+xmlDelete(doc2);
 doc2 = xmlRead("TMPDIR/plop.xml");
 doc2.root.children(2).attributes.id="";
 a2 = doc2.root.children(2).attributes;
 assert_checkequal(a2(1),"");
 assert_checkequal(doc2.root.children(2).attributes.id,"");
 assert_checkequal(a2(2),[]);
-xmlClose(doc2);
+xmlDelete(doc2);
 doc2 = xmlRead("TMPDIR/plop.xml");
 a2 = doc2.root.children(2).attributes;
 a2.id="";
 doc2.root.children(2).attributes=a2;
 assert_checkequal(doc2.root.children(2).attributes.id,"");
-xmlClose(doc2);
+xmlDelete(doc2);
index 761a14f..377488f 100644 (file)
@@ -36,7 +36,7 @@ doc2 = xmlRead("TMPDIR/plop.xml");
 a2 = doc2.root.children(2).attributes;
 assert_checkequal(a2(1),"123");
 assert_checkequal(a2(2),[]);
-xmlClose(doc2);
+xmlDelete(doc2);
 
 doc2 = xmlRead("TMPDIR/plop.xml");
 doc2.root.children(2).attributes.id="";
@@ -44,14 +44,14 @@ a2 = doc2.root.children(2).attributes;
 assert_checkequal(a2(1),"");
 assert_checkequal(doc2.root.children(2).attributes.id,"");
 assert_checkequal(a2(2),[]);
-xmlClose(doc2);
+xmlDelete(doc2);
 
 doc2 = xmlRead("TMPDIR/plop.xml");
 a2 = doc2.root.children(2).attributes;
 a2.id="";
 doc2.root.children(2).attributes=a2;
 assert_checkequal(doc2.root.children(2).attributes.id,"");
-xmlClose(doc2);
+xmlDelete(doc2);
 
 
 
index 414f095..688d56b 100644 (file)
@@ -19,9 +19,9 @@ assert_checkequal(doc.root.children(1).content,"hello");
 assert_checkequal(doc.root.children(2).name,"b");
 assert_checkequal(doc.root.children(2).content," world");
 xmlWrite(doc);
-xmlClose(doc);
+xmlDelete(doc);
 doc2 = xmlRead("TMPDIR/foo.xml");
 assert_checkfalse(execstr("doc2.line","errcatch") == 0);
 assert_checkequal(doc2.root.line,2);
 assert_checkequal(doc2.root.children(1).line,3);
-xmlClose(doc2);
+xmlDelete(doc2);
index 218eb5a..938905d 100644 (file)
@@ -25,10 +25,10 @@ assert_checkequal(doc.root.children(1).content,"hello");
 assert_checkequal(doc.root.children(2).name,"b");
 assert_checkequal(doc.root.children(2).content," world");
 xmlWrite(doc);
-xmlClose(doc);
+xmlDelete(doc);
 
 doc2 = xmlRead("TMPDIR/foo.xml");
 assert_checkfalse(execstr("doc2.line","errcatch") == 0);
 assert_checkequal(doc2.root.line,2);
 assert_checkequal(doc2.root.children(1).line,3);
-xmlClose(doc2);
+xmlDelete(doc2);
index f687348..36c4110 100644 (file)
@@ -18,4 +18,4 @@ doc.root.children(1.5) = "plop";
 assert_checkequal(doc.root.children(2).content,"plop");
 assert_checkequal(doc.root.children(3).content,"1.23456");
 assert_checkequal(evstr(doc.root.children(3).content),1.23456);
-xmlClose(doc);
+xmlDelete(doc);
index 48b7167..7679442 100644 (file)
@@ -21,5 +21,5 @@ doc.root.children(1.5) = "plop";
 assert_checkequal(doc.root.children(2).content,"plop");
 assert_checkequal(doc.root.children(3).content,"1.23456");
 assert_checkequal(evstr(doc.root.children(3).content),1.23456);
-xmlClose(doc);
+xmlDelete(doc);
 
index 6dd46f6..9195430 100644 (file)
@@ -14,7 +14,7 @@ doc2 = xmlRead("TMPDIR/plop.xml");
 assert_checkequal(doc2.root.line,1);
 assert_checkequal(doc2.root.children(1).line,1);
 assert_checkequal(doc2.root.children(2).line,1);
-xmlClose(doc2);
+xmlDelete(doc2);
 doc3 = xmlRead(SCI+"/modules/xml/tests/unit_tests/w3cExample.xml");
 assert_checkequal(doc3.root.line,3);
 assert_checkequal(doc3.root.children(1).line,4);
@@ -22,4 +22,4 @@ assert_checkequal(doc3.root.children(2).line,10);
 assert_checkequal(doc3.root.children(3).line,16);
 assert_checkequal(doc3.root.children(3).children(1).line,17);
 assert_checkequal(doc3.root.children(3).children(2).line,18);
-xmlClose(doc3);
+xmlDelete(doc3);
index ab64dab..07a044f 100644 (file)
@@ -17,7 +17,7 @@ doc2 = xmlRead("TMPDIR/plop.xml");
 assert_checkequal(doc2.root.line,1);
 assert_checkequal(doc2.root.children(1).line,1);
 assert_checkequal(doc2.root.children(2).line,1);
-xmlClose(doc2);
+xmlDelete(doc2);
 
 doc3 = xmlRead(SCI+"/modules/xml/tests/unit_tests/w3cExample.xml");
 assert_checkequal(doc3.root.line,3);
@@ -26,4 +26,4 @@ assert_checkequal(doc3.root.children(2).line,10);
 assert_checkequal(doc3.root.children(3).line,16);
 assert_checkequal(doc3.root.children(3).children(1).line,17);
 assert_checkequal(doc3.root.children(3).children(2).line,18);
-xmlClose(doc3);
+xmlDelete(doc3);
index 99da6ce..2ba41a8 100644 (file)
@@ -8,9 +8,9 @@ xmlFile=xmlRead(SCI+"/etc/modules.xml");
 content=xmlDump(xmlFile);
 assert_checktrue(length(content)>0);
 assert_checktrue(size(content)>=[20,1]);
-xmlClose(xmlFile);
-// Close the file a second time
-assert_checkerror("xmlClose(xmlFile)","xmlClose: XML document does not exist.");
+xmlDelete(xmlFile);
+// Delete the file a second time
+assert_checkerror("xmlDelete(xmlFile)","xmlDelete: XML document does not exist.");
 xmlFile=xmlRead(SCI+"/etc/modules.xml");
 xmlFile2=xmlRead(SCI+"/etc/classpath.xml");
 content=xmlDump(xmlFile);
@@ -20,10 +20,10 @@ assert_checktrue(length(content)>0);
 assert_checktrue(size(content)>=[20,1]);
 assert_checktrue(length(content2)>0);
 assert_checktrue(size(content2)>=[20,1]);
-xmlClose(xmlFile);
-xmlClose(xmlFile2);
-// Close the file a second time
-assert_checkerror("xmlClose(xmlFile)","xmlClose: XML document does not exist.");
+xmlDelete(xmlFile);
+xmlDelete(xmlFile2);
+// Delete the file a second time
+assert_checkerror("xmlDelete(xmlFile)","xmlDelete: XML document does not exist.");
 // Work with the structure
 xmlFile=xmlRead(SCI+"/etc/modules.xml");
 assert_checkequal(xmlFile.root.name,"modules");       
@@ -40,4 +40,4 @@ for (i=1:length(elements))
     assert_checkequal(length(xmlFile.root.children(i).attributes),0);
   end
 end
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
index f20fd7b..89c504f 100644 (file)
@@ -11,9 +11,9 @@ xmlFile=xmlRead(SCI+"/etc/modules.xml");
 content=xmlDump(xmlFile);
 assert_checktrue(length(content)>0);
 assert_checktrue(size(content)>=[20,1]);
-xmlClose(xmlFile);
-// Close the file a second time
-assert_checkerror("xmlClose(xmlFile)","xmlClose: XML document does not exist.");
+xmlDelete(xmlFile);
+// Delete the file a second time
+assert_checkerror("xmlDelete(xmlFile)","xmlDelete: XML document does not exist.");
 
 
 xmlFile=xmlRead(SCI+"/etc/modules.xml");
@@ -25,10 +25,10 @@ assert_checktrue(length(content)>0);
 assert_checktrue(size(content)>=[20,1]);
 assert_checktrue(length(content2)>0);
 assert_checktrue(size(content2)>=[20,1]);
-xmlClose(xmlFile);
-xmlClose(xmlFile2);
-// Close the file a second time
-assert_checkerror("xmlClose(xmlFile)","xmlClose: XML document does not exist.");
+xmlDelete(xmlFile);
+xmlDelete(xmlFile2);
+// Delete the file a second time
+assert_checkerror("xmlDelete(xmlFile)","xmlDelete: XML document does not exist.");
 
 // Work with the structure
 xmlFile=xmlRead(SCI+"/etc/modules.xml");
@@ -46,4 +46,4 @@ for (i=1:length(elements))
     assert_checkequal(length(xmlFile.root.children(i).attributes),0);
   end
 end
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
index bfc50f3..7c90cb2 100644 (file)
@@ -18,8 +18,8 @@ xp = xmlXPath(doc, "//a");
 assert_checkequal(length(xp),0);
 doc2 = xmlReadStr("<root><b>Scilab</b></root>");
 assert_checktrue(and(xmlDump(doc)==xmlDump(doc2)));
-xmlClose(doc);
-xmlClose(doc2);
+xmlDelete(doc);
+xmlDelete(doc2);
 // Remove the first element
 doc = xmlReadStr("<root><a>Hello</a><b>Scilab</b><a>World</a></root>");
 xmlRemove(doc.root.children(1));
@@ -37,10 +37,10 @@ doc = xmlReadStr("<root><a>Hello</a><b>Scilab</b><a>World</a></root>");
 xmlRemove(doc.root.children);
 doc4 = xmlReadStr("<root></root>");
 assert_checktrue(and(xmlDump(doc)==xmlDump(doc4)));
-xmlClose(doc);
-xmlClose(doc2);
-xmlClose(doc3);
-xmlClose(doc4);
+xmlDelete(doc);
+xmlDelete(doc2);
+xmlDelete(doc3);
+xmlDelete(doc4);
 doc = xmlReadStr("<root><a>Hello</a><mynode><b>Scilab</b></mynode><a>World</a></root>");
 xmlRemove(doc.root.children(1));
 doc2 = xmlReadStr("<root><mynode><b>Scilab</b></mynode><a>World</a></root>");
@@ -56,5 +56,5 @@ doc = xmlReadStr("<root><a>Hello</a><mynode><b>Scilab</b></mynode><a>World</a></
 xmlRemove(doc.root.children(2).children(1));
 doc2 = xmlReadStr("<root><a>Hello</a><mynode></mynode><a>World</a></root>");
 assert_checktrue(and(xmlDump(doc)==xmlDump(doc2)));
-xmlClose(doc);
-xmlClose(doc2);
+xmlDelete(doc);
+xmlDelete(doc2);
index a80cd67..aa0e949 100644 (file)
@@ -23,8 +23,8 @@ assert_checkequal(length(xp),0);
 doc2 = xmlReadStr("<root><b>Scilab</b></root>");
 assert_checktrue(and(xmlDump(doc)==xmlDump(doc2)));
 
-xmlClose(doc);
-xmlClose(doc2);
+xmlDelete(doc);
+xmlDelete(doc2);
 
 
 // Remove the first element
@@ -46,10 +46,10 @@ xmlRemove(doc.root.children);
 doc4 = xmlReadStr("<root></root>");
 assert_checktrue(and(xmlDump(doc)==xmlDump(doc4)));
 
-xmlClose(doc);
-xmlClose(doc2);
-xmlClose(doc3);
-xmlClose(doc4);
+xmlDelete(doc);
+xmlDelete(doc2);
+xmlDelete(doc3);
+xmlDelete(doc4);
 
 doc = xmlReadStr("<root><a>Hello</a><mynode><b>Scilab</b></mynode><a>World</a></root>");
 xmlRemove(doc.root.children(1));
@@ -69,5 +69,5 @@ doc = xmlReadStr("<root><a>Hello</a><mynode><b>Scilab</b></mynode><a>World</a></
 xmlRemove(doc.root.children(2).children(1));
 doc2 = xmlReadStr("<root><a>Hello</a><mynode></mynode><a>World</a></root>");
 assert_checktrue(and(xmlDump(doc)==xmlDump(doc2)));
-xmlClose(doc);
-xmlClose(doc2);
+xmlDelete(doc);
+xmlDelete(doc2);
index da51363..68111a3 100644 (file)
@@ -27,8 +27,8 @@ assert_checkequal(xmlDump(doc),xmlDump(doc2));
 xmlSetAttributes(doc.root.children(2).attributes, ["truc" "machin"]);
 doc2 = xmlReadStr("<root><a hello=""world"" bonjour=""monde"" foo=""bar"" bar=""foo2""><b><c hello=""world"" bonjour=""monde""></c></b></a><b bar=""foo2"" truc=""machin""></b></root>");
 assert_checkequal(xmlDump(doc),xmlDump(doc2));
-xmlClose(doc);
-xmlClose(doc2);
+xmlDelete(doc);
+xmlDelete(doc2);
 doc = xmlReadStr("<root><a><b><c></c></b></a><b></b></root>");
 xp = xmlXPath(doc, "//accc");
 a=xmlSetAttributes(xp, ["hello" "world" ; "bonjour" "monde"]);
index 2a25b39..a755ba5 100644 (file)
@@ -36,8 +36,8 @@ xmlSetAttributes(doc.root.children(2).attributes, ["truc" "machin"]);
 doc2 = xmlReadStr("<root><a hello=""world"" bonjour=""monde"" foo=""bar"" bar=""foo2""><b><c hello=""world"" bonjour=""monde""></c></b></a><b bar=""foo2"" truc=""machin""></b></root>");
 assert_checkequal(xmlDump(doc),xmlDump(doc2));
 
-xmlClose(doc);
-xmlClose(doc2);
+xmlDelete(doc);
+xmlDelete(doc2);
 
 
 doc = xmlReadStr("<root><a><b><c></c></b></a><b></b></root>");
index 30914e3..8b3be04 100644 (file)
@@ -21,4 +21,4 @@ xmlValidate("SCI/modules/xml/tests/unit_tests/library.xml", schema);
 xmlValidate(doc, dtd);
 xmlValidate(doc, rng);
 xmlValidate(doc, schema);
-xmlClose(doc, dtd, schema, rng);
+xmlDelete(doc, dtd, schema, rng);
index b523001..f16388a 100644 (file)
@@ -30,4 +30,4 @@ xmlValidate(doc, rng);
 xmlValidate(doc, schema);
 
 
-xmlClose(doc, dtd, schema, rng);
\ No newline at end of file
+xmlDelete(doc, dtd, schema, rng);
\ No newline at end of file
index 33c8179..8fa9176 100644 (file)
@@ -28,4 +28,4 @@ assert_checkequal(doc2.root.children(1).attributes.att,"foo");
 assert_checkequal(doc2.root.children(1).attributes.rib,"bar");
 assert_checkequal(doc2.root.children(1).children(1).name,"b");
 assert_checkequal(doc2.root.children(1).children(1).content,"Hello");
-xmlClose("all");
+xmlDelete("all");
index 3a00344..2a49158 100644 (file)
@@ -34,4 +34,4 @@ assert_checkequal(doc2.root.children(1).attributes.rib,"bar");
 assert_checkequal(doc2.root.children(1).children(1).name,"b");
 assert_checkequal(doc2.root.children(1).children(1).content,"Hello");
 
-xmlClose("all");
+xmlDelete("all");
index 2f54485..bd81809 100644 (file)
@@ -27,18 +27,18 @@ freeBooks=xmlXPath(xmlFile,"/bookstore/book[price=0]/title");
 assert_checkequal(freeBooks.size,1);
 assert_checkequal(size(freeBooks),[1,1]); 
 assert_checkequal(freeBooks(1).content,"Scilab rox");
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
 xmlFile=xmlRead(SCI+"/modules/xml/tests/unit_tests/sep_69_example.xml");
 titles=xmlXPath(xmlFile, "/root/hello");
 assert_checkequal(titles.size,2);
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
 xmlFile=xmlRead(SCI+"/etc/modules.xml");
 content=xmlDump(xmlFile);
 assert_checktrue(length(content)>0);
 assert_checktrue(size(content)>=[1,1]);
-xmlClose(xmlFile);
-// Close the file a second time
-assert_checkerror("xmlClose(xmlFile)",gettext("xmlClose: XML document does not exist."));
+xmlDelete(xmlFile);
+// Delete the file a second time
+assert_checkerror("xmlDelete(xmlFile)",gettext("xmlDelete: XML document does not exist."));
 xmlClasspath=xmlRead(SCI+"/etc/classpath.xml");
 jarPath=xmlXPath(xmlClasspath, "//classpaths/path[@load=''onUse'']/load");
 assert_checktrue(length(jarPath(1).attributes.on)>0); // Should be Console
@@ -49,7 +49,7 @@ jarPath=xmlXPath(xmlClasspath, "//classpaths/path[@load!=''onUse'']");
 assert_checktrue(length(jarPath(1).attributes.value)>0);
 assert_checkequal(jarPath(1).attributes.load,"startup");
 assert_checkequal(jarPath(1).parent.name,"classpaths"); // it is the root dir
-xmlClose(xmlClasspath);
+xmlDelete(xmlClasspath);
 xmlFile=xmlRead(SCI+"/etc/modules.xml");
 xmlFile2=xmlRead(SCI+"/etc/classpath.xml");
 content=xmlDump(xmlFile);
@@ -59,10 +59,10 @@ assert_checktrue(length(content)>0);
 assert_checktrue(size(content)>=[1,1]);
 assert_checktrue(length(content2)>0);
 assert_checktrue(size(content2)>=[1,1]);
-xmlClose(xmlFile);
-xmlClose(xmlFile2);
-// Close the file a second time
-assert_checkerror("xmlClose(xmlFile)","xmlClose: XML document does not exist.");
+xmlDelete(xmlFile);
+xmlDelete(xmlFile2);
+// Delete the file a second time
+assert_checkerror("xmlDelete(xmlFile)","xmlDelete: XML document does not exist.");
 xmlFile=xmlRead(SCI+"/modules/xml/tests/unit_tests/w3cExample.xml");
 titles=xmlXPath(xmlFile, "/bookstore/book/title");
 assert_checkequal(titles.name,["title","title","title","title","title"]);
@@ -72,7 +72,7 @@ assert_checkequal(prices.name,["price","price","price","price","price"]);
 assert_checkequal(prices.content,["30.00","29.99","49.99","39.95","0.0"]);
 titlesEmpty=xmlXPath(xmlFile, "/bookstore/book/prices");
 assert_checkequal(length(titlesEmpty),0);
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
 xmlFile=xmlRead(SCI+"/modules/xml/tests/unit_tests/w3cExample.xml");
 titles=xmlXPath(xmlFile, "/bookstore");
 results=xmlXPath(titles(1), "book[title=''Everyday Italian'']");
@@ -80,7 +80,7 @@ assert_checkequal(length(results),1);
 assert_checkequal(results.name,"book");
 assert_checkequal(results.content,"Everyday ItalianGiada De Laurentiis200530.00");
 assert_checkequal(results(1).children(1).content,"Everyday Italian");
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
 doc = xmlReadStr("<root att=""attribute""><a a1=""A1"" a2=""A2"" a3=""A3""><b>Hello</b><c>Scilab</c><b>World</b></a><b>Nothing</b></root>");
 e = doc.root.children(1);
 assert_checkequal(e.content,"HelloScilabWorld");
@@ -89,4 +89,4 @@ xp = xmlXPath(e, "@*");
 assert_checkequal(["A1","A2","A3"],xmlAsText(xp));
 xp = xmlXPath(e, "b");
 assert_checkequal(["Hello","World"],xmlAsText(xp));
-xmlClose(doc);
+xmlDelete(doc);
index c7e290b..e975df6 100644 (file)
@@ -32,20 +32,20 @@ assert_checkequal(freeBooks.size,1);
 assert_checkequal(size(freeBooks),[1,1]); 
 assert_checkequal(freeBooks(1).content,"Scilab rox");
 
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
 
 xmlFile=xmlRead(SCI+"/modules/xml/tests/unit_tests/sep_69_example.xml");
 titles=xmlXPath(xmlFile, "/root/hello");
 assert_checkequal(titles.size,2);
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
 
 xmlFile=xmlRead(SCI+"/etc/modules.xml");
 content=xmlDump(xmlFile);
 assert_checktrue(length(content)>0);
 assert_checktrue(size(content)>=[1,1]);
-xmlClose(xmlFile);
-// Close the file a second time
-assert_checkerror("xmlClose(xmlFile)",gettext("xmlClose: XML document does not exist."));
+xmlDelete(xmlFile);
+// Delete the file a second time
+assert_checkerror("xmlDelete(xmlFile)",gettext("xmlDelete: XML document does not exist."));
 
 
 xmlClasspath=xmlRead(SCI+"/etc/classpath.xml");
@@ -61,7 +61,7 @@ assert_checkequal(jarPath(1).attributes.load,"startup");
 assert_checkequal(jarPath(1).parent.name,"classpaths"); // it is the root dir
 
 
-xmlClose(xmlClasspath);
+xmlDelete(xmlClasspath);
 
 xmlFile=xmlRead(SCI+"/etc/modules.xml");
 xmlFile2=xmlRead(SCI+"/etc/classpath.xml");
@@ -72,10 +72,10 @@ assert_checktrue(length(content)>0);
 assert_checktrue(size(content)>=[1,1]);
 assert_checktrue(length(content2)>0);
 assert_checktrue(size(content2)>=[1,1]);
-xmlClose(xmlFile);
-xmlClose(xmlFile2);
-// Close the file a second time
-assert_checkerror("xmlClose(xmlFile)","xmlClose: XML document does not exist.");
+xmlDelete(xmlFile);
+xmlDelete(xmlFile2);
+// Delete the file a second time
+assert_checkerror("xmlDelete(xmlFile)","xmlDelete: XML document does not exist.");
 
 
 xmlFile=xmlRead(SCI+"/modules/xml/tests/unit_tests/w3cExample.xml");
@@ -90,7 +90,7 @@ assert_checkequal(prices.content,["30.00","29.99","49.99","39.95","0.0"]);
 titlesEmpty=xmlXPath(xmlFile, "/bookstore/book/prices");
 assert_checkequal(length(titlesEmpty),0);
 
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
 
 xmlFile=xmlRead(SCI+"/modules/xml/tests/unit_tests/w3cExample.xml");
 titles=xmlXPath(xmlFile, "/bookstore");
@@ -99,7 +99,7 @@ assert_checkequal(length(results),1);
 assert_checkequal(results.name,"book");
 assert_checkequal(results.content,"Everyday ItalianGiada De Laurentiis200530.00");
 assert_checkequal(results(1).children(1).content,"Everyday Italian");
-xmlClose(xmlFile);
+xmlDelete(xmlFile);
 
 doc = xmlReadStr("<root att=""attribute""><a a1=""A1"" a2=""A2"" a3=""A3""><b>Hello</b><c>Scilab</c><b>World</b></a><b>Nothing</b></root>");
 
@@ -113,4 +113,4 @@ assert_checkequal(["A1","A2","A3"],xmlAsText(xp));
 xp = xmlXPath(e, "b");
 assert_checkequal(["Hello","World"],xmlAsText(xp));
 
-xmlClose(doc);
+xmlDelete(doc);
index fa4c4ed..d827dee 100644 (file)
     <ClCompile Include="sci_gateway\cpp\sci_xmlAddNs.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlAsNumber.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlAsText.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_xmlClose.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_xmlDelete.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlDocument.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlDump.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlElement.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlFormat.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlGetNsByHref.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlGetNsByPrefix.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_xmlGetOpenStreams.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_xmlGetOpenDocs.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlIsValidObject.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlNs.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_xmlRead.cpp" />
index 6e7d656..854ec84 100644 (file)
     <ClCompile Include="sci_gateway\cpp\sci_print.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_xmlClose.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_xmlDelete.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="sci_gateway\cpp\sci_xmlDump.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_xmlGetOpenStreams.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_xmlGetOpenDocs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="sci_gateway\cpp\sci_xmlRead.cpp">