Merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba

Proposed by Juan Zacarias
Status: Merged
Approved by: Juan Zacarias
Approved revision: 11057
Merged at revision: 11058
Proposed branch: lp:~zorba-coders/zorba/bug-950621
Merge into: lp:zorba
Diff against target: 884 lines (+4/-795)
11 files modified
ChangeLog (+1/-0)
NOTICE.txt (+0/-740)
src/functions/pregenerated/func_parsing_and_serializing.cpp (+0/-13)
src/functions/pregenerated/function_enum.h (+0/-1)
src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp (+3/-28)
src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml (+0/-6)
test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_14.xq (+0/-1)
test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.spec (+0/-1)
test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.xq (+0/-2)
test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.spec (+0/-1)
test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.xq (+0/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-950621
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+123655@code.launchpad.net

This proposal supersedes a proposal from 2012-07-16.

Commit message

Removed fn:parse-xml#2
Fix for bug 950621

Description of the change

Removed fn:parse-xml#2
Fix for bug 950621

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) wrote : Posted in a previous version of this proposal

Change looks good, but please add a line to the Changelog - something like "Fixed bug #950621 (Removed two-arg version of fn:parse-xml(); use XML module function xml:parse() instead)" in the Bug Fixes section.

review: Needs Fixing
Revision history for this message
Juan Zacarias (juan457) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-950621-2012-09-19T15-33-07.413Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-950621-2012-09-24T17-23-59.183Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

lp:~zorba-coders/zorba/bug-950621 updated
11057. By Juan Zacarias

Removed fn:parse-xml#2, Fix for bug 950621

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-950621-2012-09-24T21-02-24.705Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2012-09-24 17:21:47 +0000
3+++ ChangeLog 2012-09-24 21:00:28 +0000
4@@ -31,6 +31,7 @@
5 * Optimize positional predicate that is in CNF with other predicates.
6
7 Bug Fixes/Other Changes:
8+ * Fixed bug #950621 (Removed two-arg version of fn:parse-xml(); use XML module function xml:parse() instead)
9 * Fixed bug #867227 (Improved error message for missing commas)
10 * Fixed bug #1024033 and #1023170 (segfaults in parse-xml:parse())
11 * Fixed bug #898792 (Dynamically computed strings can now be cast to xs:QName)
12
13=== removed file 'NOTICE.txt'
14--- NOTICE.txt 2012-09-17 00:36:37 +0000
15+++ NOTICE.txt 1970-01-01 00:00:00 +0000
16@@ -1,740 +0,0 @@
17------------
18-Zorba 2.6.0
19------------
20-
21-(Note: This file is generated automatically from NOTICE.xml.
22-Please do not modify this file directly.)
23-
24-
25-
26-
27-Apache 2
28-
29- Copyright 2006-2011 The FLWOR Foundation
30-
31- See LICENSE.txt for license information.
32-
33- ------------------------
34- This product includes software developed at
35- The FLWOR Foundation (http://www.flworfound.org/).
36-
37- ------------------------
38- Portions of this software were developed at the Systems
39- Group of the ETH Zurich, Switzerland.
40-
41-
42-Other files used by this project:
43-----------------------------------------------------
44-
45-src/zorbatypes/m_apm.h
46-src/zorbatypes/mapm/
47-
48-Copyright: 1999-2007 Michael C. Ring
49-Website: http://www.tc.umn.edu/~ringx004/mapm-main.html
50-
51- This software is Freeware.
52-
53- Permission to use, copy, and distribute this software and its
54- documentation for any purpose with or without fee is hereby granted,
55- provided that the above copyright notice appear in all copies and
56- that both that copyright notice and this permission notice appear
57- in supporting documentation.
58-
59- Permission to modify the software is granted. Permission to distribute
60- the modified code is granted. Modifications are to be distributed by
61- using the file 'license.txt' as a template to modify the file header.
62- 'license.txt' is available in the official MAPM distribution.
63-
64- To distribute modified source code, insert the file 'license.txt'
65- at the top of all modified source code files and edit accordingly.
66-
67- This software is provided "as is" without express or implied warranty.
68-
69-----------------------------------------------------
70-
71-src/zorbamisc/config/stdint.h
72-
73-Copyright: 2006 Alexander Chemeris
74-
75-
76- Redistribution and use in source and binary forms, with or without
77- modification, are permitted provided that the following conditions are met:
78-
79- 1. Redistributions of source code must retain the above copyright notice,
80- this list of conditions and the following disclaimer.
81-
82- 2. Redistributions in binary form must reproduce the above copyright
83- notice, this list of conditions and the following disclaimer in the
84- documentation and/or other materials provided with the distribution.
85-
86- 3. The name of the author may be used to endorse or promote products
87- derived from this software without specific prior written permission.
88-
89- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
90- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
91- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
92- EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
93- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
94- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
95- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
96- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
97- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
98- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
99-
100-----------------------------------------------------
101-
102-src/zorbautils/stemmer/
103-
104-Copyright: 2001 Dr. Martin Porter
105-
106-
107- All the software given out on this Snowball site is covered by the BSD
108- License (see http://www.opensource.org/licenses/bsd-license.html), with
109- Copyright (c) 2001, Dr Martin Porter, and (for the Java developments)
110- Copyright (c) 2002, Richard Boulton.
111-
112- Essentially, all this means is that you can do what you like with the code,
113- except claim another Copyright for it, or claim that it is issued under a
114- different license. The software is also issued without warranties, which
115- means that if anyone suffers through its use, they cannot come back and sue
116- you. You also have to alert anyone to whom you give the Snowball software to
117- the fact that it is covered by the BSD license.
118-
119- We have not bothered to insert the licensing arrangement into the text of
120- the Snowball software.
121-
122-----------------------------------------------------
123-
124-src/util/less.h
125-
126-Copyright: 1998 Paul J. Lucas
127-
128-
129- Redistribution and use in source and binary forms, with or without
130- modification, are permitted provided that the following conditions are met:
131-
132- o Redistributions of source code must retain the above copyright notice,
133- this list of conditions and the following disclaimer.
134-
135- o Redistributions in binary form must reproduce the above copyright
136- notice, this list of conditions and the following disclaimer in the
137- documentation and/or other materials provided with the distribution.
138-
139- o The name of the author may not be used to endorse or promote products
140- derived from this software without specific prior written permission.
141-
142- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
143- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
144- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
145- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
146- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
147- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
148- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
149- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
150- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
151- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
152- POSSIBILITY OF SUCH DAMAGE.
153-
154-----------------------------------------------------
155-
156-src/util/auto_vector.h (has been modified)
157-
158-Copyright: 2003 Reliable Software
159-
160-
161- Redistribution and use in source and binary forms, with or without
162- modification, are permitted provided that the following conditions are met:
163-
164- o Redistributions of source code must retain the above copyright notice,
165- this list of conditions and the following disclaimer.
166-
167- o Redistributions in binary form must reproduce the above copyright
168- notice, this list of conditions and the following disclaimer in the
169- documentation and/or other materials provided with the distribution.
170-
171- o The name of the author may not be used to endorse or promote products
172- derived from this software without specific prior written permission.
173-
174- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
175- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
176- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
177- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
178- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
179- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
180- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
181- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
182- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
183- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
184- POSSIBILITY OF SUCH DAMAGE.
185-
186-----------------------------------------------------
187-
188-cmake_modules/FindBoost.cmake
189-
190-Copyright:
191- 2006-2008 Andreas Schneider <mail@cynapses.org>
192- 2007 Wengo
193- 2007 Mike Jackson
194- 2008 Andreas Pakulat <apaku@gmx.de>
195-
196-
197-
198- Redistribution AND use is allowed according to the terms of the New BSD license.
199- For details see the accompanying COPYING-CMAKE-SCRIPTS file.
200-
201-----------------------------------------------------
202-
203-cmake_modules/FindJNI.cmake
204-cmake_modules/FindPythonLibs.cmake
205-cmake_modules/FindSWIG.cmake
206-
207-Copyright: 2001-2009 Kitware, Inc.
208-
209-
210- Distributed under the OSI-approved BSD License (the "License");
211- see accompanying file Copyright.txt for details.
212-
213- This software is distributed WITHOUT ANY WARRANTY; without even the
214- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
215- See the License for more information.
216-
217- CMake - Cross Platform Makefile Generator
218- Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
219- All rights reserved.
220-
221- Redistribution and use in source and binary forms, with or without
222- modification, are permitted provided that the following conditions
223- are met:
224-
225- * Redistributions of source code must retain the above copyright
226- notice, this list of conditions and the following disclaimer.
227-
228- * Redistributions in binary form must reproduce the above copyright
229- notice, this list of conditions and the following disclaimer in the
230- documentation and/or other materials provided with the distribution.
231-
232- * Neither the names of Kitware, Inc., the Insight Software Consortium,
233- nor the names of their contributors may be used to endorse or promote
234- products derived from this software without specific prior written
235- permission.
236-
237- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
238- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
239- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
240- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
241- HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
242- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
243- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
244- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
245- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
246- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
247- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
248-
249- ------------------------------------------------------------------------------
250-
251- The above copyright and license notice applies to distributions of
252- CMake in source and binary form. Some source files contain additional
253- notices of original copyright by their contributors; see each source
254- for details. Third-party software packages supplied with CMake under
255- compatible licenses provide their own copyright notices documented in
256- corresponding subdirectories.
257-
258- ------------------------------------------------------------------------------
259-
260- CMake was initially developed by Kitware with the following sponsorship:
261-
262- * National Library of Medicine at the National Institutes of Health
263- as part of the Insight Segmentation and Registration Toolkit (ITK).
264-
265- * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
266- Visualization Initiative.
267-
268- * National Alliance for Medical Image Computing (NAMIC) is funded by the
269- National Institutes of Health through the NIH Roadmap for Medical Research,
270- Grant U54 EB005149.
271-
272- * Kitware, Inc.
273-
274-----------------------------------------------------
275-
276-/xml.xsd
277-
278-Copyright: 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
279-
280-
281- All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
282-
283- W3C Software Notice and License
284-
285- This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
286-
287- License
288-
289- By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
290-
291- Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
292- •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
293- •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
294- •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
295-
296- Disclaimers
297-
298- THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
299-
300- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
301-
302- The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
303-
304-----------------------------------------------------
305-
306-schemas/xslt-xquery-serialization.xsd
307-
308-Copyright: 2010 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
309-
310-
311- All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
312-
313- W3C Software Notice and License
314-
315- This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
316-
317- License
318-
319- By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
320-
321- Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
322- •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
323- •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
324- •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
325-
326- Disclaimers
327-
328- THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
329-
330- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
331-
332- The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
333-
334-----------------------------------------------------
335-
336-modules/w3c/xpath-functions.xsd
337-
338-Copyright: 2005 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
339-
340-
341- All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
342-
343- W3C Software Notice and License
344-
345- This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
346-
347- License
348-
349- By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
350-
351- Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
352- •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
353- •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
354- •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
355-
356- Disclaimers
357-
358- THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
359-
360- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
361-
362- The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
363-
364-----------------------------------------------------
365-
366-include/xqc.h
367-
368-Copyright: 2008, Matthias Brantner, John Snelson
369-
370-
371- * All rights reserved.
372- *
373- * Redistribution and use in source and binary forms, with or without
374- * modification, are permitted provided that the following conditions are met:
375- *
376- * * Redistributions of source code must retain the above copyright notice,
377- * this list of conditions and the following disclaimer.
378- * * Redistributions in binary form must reproduce the above copyright
379- * notice, this list of conditions and the following disclaimer in the
380- * documentation and/or other materials provided with the distribution.
381- * * Neither the name of the developers nor the names of contributors may be
382- * used to endorse or promote products derived from this software without
383- * specific prior written permission.
384- *
385- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
386- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
387- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
388- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
389- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
390- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
391- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
392- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
393- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
394- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
395- * POSSIBILITY OF SUCH DAMAGE.
396-
397-----------------------------------------------------
398-
399-modules/functx/functx.xq
400-
401-Copyright: 2007 Datypic
402-
403-
404- : This library is free software; you can redistribute it and/or
405- : modify it under the terms of the GNU Lesser General Public
406- : License as published by the Free Software Foundation; either
407- : version 2.1 of the License.
408-
409- : This library is distributed in the hope that it will be useful,
410- : but WITHOUT ANY WARRANTY; without even the implied warranty of
411- : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
412- : Lesser General Public License for more details.
413-
414- : You should have received a copy of the GNU Lesser General Public
415- : License along with this library; if not, write to the Free Software
416- : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
417-
418-----------------------------------------------------
419-
420-src/compiler/parser/FlexLexer.h
421-
422-Copyright: 1993 The Regents of the University of California
423-
424-
425- // All rights reserved.
426- //
427- // This code is derived from software contributed to Berkeley by
428- // Kent Williams and Tom Epperly.
429- //
430- // Redistribution and use in source and binary forms, with or without
431- // modification, are permitted provided that the following conditions
432- // are met:
433-
434- // 1. Redistributions of source code must retain the above copyright
435- // notice, this list of conditions and the following disclaimer.
436- // 2. Redistributions in binary form must reproduce the above copyright
437- // notice, this list of conditions and the following disclaimer in the
438- // documentation and/or other materials provided with the distribution.
439-
440- // Neither the name of the University nor the names of its contributors
441- // may be used to endorse or promote products derived from this software
442- // without specific prior written permission.
443-
444- // THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
445- // IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
446- // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
447- // PURPOSE.
448-
449-----------------------------------------------------
450-
451-src/diagnostics/StackWalker.cpp
452-src/diagnostics/StackWalker.h
453-
454-Copyright: 2005 Jochen Kalmbach
455-
456-
457- Under BSD License: http://www.opensource.org/licenses/bsd-license.php
458-
459-----------------------------------------------------
460-
461-src/util/singleton.h
462-src/util/threads.h
463-
464-Copyright: 2001 Andrei Alexandrescu
465-
466-
467- This code accompanies the book:
468- Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
469- Patterns Applied". Copyright (c) 2001. Addison-Wesley.
470- Permission to use, copy, modify, distribute and sell this software for any
471- purpose is hereby granted without fee, provided that the above copyright
472- notice appear in all copies and that both that copyright notice and this
473- permission notice appear in supporting documentation.
474- The author or Addison-Wesley Longman make no representations about the
475- suitability of this software for any purpose. It is provided "as is"
476- without express or implied warranty.
477-
478-
479-External libraries used by this project:
480-----------------------------------------------------
481-
482-Name: LIBXML2
483-Preferred version: 2.2.16 or higher
484-Is mandatory: true
485-Website: http://xmlsoft.org/
486-License: MIT
487-Copyright: 1998-2002 Daniel Veillard. All Rights Reserved.
488-External notice:
489-
490- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
491-
492- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
493-
494- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
495-
496- Except as contained in this notice, the name of Daniel Veillard shall not
497- be used in advertising or otherwise to promote the sale, use or other deal-
498- ings in this Software without prior written authorization from him.
499-
500-----------------------------------------------------
501-
502-Name: LIBXSLT
503-Preferred version: 1.1.26
504-Is mandatory: false
505-Website: http://xmlsoft.org/XSLT/
506-License: MIT
507-Copyright: 2001-2002 Daniel Veillard. All Rights Reserved.
508-External notice:
509-
510- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
511-
512- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
513-
514- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
515-
516-
517- Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from him.
518-
519-
520-----------------------------------------------------
521-
522-Name: ICU4C
523-Preferred version: 3.6 or higher
524-Is mandatory: true
525-Website: http://www.icu-project.org/
526-License: ICU License
527-Copyright: 1995-2011 International Business Machines Corporation and others
528-External notice:
529-
530- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
531-
532- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
533-
534- Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
535-
536-----------------------------------------------------
537-
538-Name: CURL
539-Preferred version: above 7.12
540-Is mandatory: false
541-Website: http://curl.haxx.se/
542-License: MIT/X derivate license
543-Copyright: 1996 - 2011, Daniel Stenberg, <daniel@haxx.se>.
544-External notice:
545-
546- All rights reserved.
547-
548- Permission to use, copy, modify, and distribute this software for any purpose
549- with or without fee is hereby granted, provided that the above copyright
550- notice and this permission notice appear in all copies.
551-
552- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
553- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
554- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
555- NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
556- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
557- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
558- OR OTHER DEALINGS IN THE SOFTWARE.
559-
560- Except as contained in this notice, the name of a copyright holder shall not
561- be used in advertising or otherwise to promote the sale, use or other dealings
562- in this Software without prior written authorization of the copyright holder.
563-
564-----------------------------------------------------
565-
566-Name: ICONV
567-Preferred version: above 1.12
568-Is mandatory: true
569-Website: http://www.gnu.org/software/libiconv/
570-License: LGPL
571-Copyright: 1998, 2010 Free Software Foundation, Inc.
572-External notice:
573-
574-----------------------------------------------------
575-
576-Name: ZLIB
577-Preferred version: 1.2.5
578-Is mandatory: true
579-Website: http://www.zlib.net/
580-Copyright: 1995-2004 Jean-loup Gailly and Mark Adler
581-External notice:
582-
583- This software is provided 'as-is', without any express or implied
584- warranty. In no event will the authors be held liable for any damages
585- arising from the use of this software.
586-
587- Permission is granted to anyone to use this software for any purpose,
588- including commercial applications, and to alter it and redistribute it
589- freely, subject to the following restrictions:
590-
591- 1. The origin of this software must not be misrepresented; you must not
592- claim that you wrote the original software. If you use this software
593- in a product, an acknowledgment in the product documentation would be
594- appreciated but is not required.
595- 2. Altered source versions must be plainly marked as such, and must not be
596- misrepresented as being the original software.
597- 3. This notice may not be removed or altered from any source distribution.
598-
599- Jean-loup Gailly jloup@gzip.org
600- Mark Adler madler@alumni.caltech.edu
601-
602-----------------------------------------------------
603-
604-Name: XERCES
605-Preferred version: 2.8.0 or higher
606-Is mandatory: true
607-Website: http://xerces.apache.org/xerces-c/
608-License: Apache 2
609-Copyright: Copyright © 1999-2010 The Apache Software Foundation. All Rights Reserved.
610-External notice:
611-
612- http://www.apache.org/licenses/LICENSE-2.0
613-
614-----------------------------------------------------
615-
616-Name: BOOST (boost_filesystem)
617-Preferred version: 1.32 or higher
618-Is mandatory: false
619-Website: http://www.boost.org/
620-License: Boost Software License v1.0
621-Copyright:
622- Beman Dawes, David Abrahams, 1998-2005.
623- Rene Rivera 2004-2007
624-
625-External notice:
626-
627- Permission is hereby granted, free of charge, to any person or organization
628- obtaining a copy of the software and accompanying documentation covered by
629- this license (the "Software") to use, reproduce, display, distribute,
630- execute, and transmit the Software, and to prepare derivative works of the
631- Software, and to permit third-parties to whom the Software is furnished to
632- do so, all subject to the following:
633-
634- The copyright notices in the Software and this entire statement, including
635- the above license grant, this restriction and the following disclaimer,
636- must be included in all copies of the Software, in whole or in part, and
637- all derivative works of the Software, unless such copies or derivative
638- works are solely in the form of machine-executable object code generated by
639- a source language processor.
640-
641- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
642- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
643- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
644- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
645- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
646- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
647- DEALINGS IN THE SOFTWARE.
648-
649-
650-External applications used by this project:
651-----------------------------------------------------
652-
653-Name: FLEX
654-Preferred version: 2.5.33
655-Is mandatory: false
656-Website: http://flex.sourceforge.net/
657-Copyright:
658- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The Flex Project.
659- 1990, 1997 The Regents of the University of California. All rights reserved.
660-
661-External notice:
662-
663- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
664-
665- 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
666- 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
667-
668- Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
669-
670- THIS SOFTWARE IS PROVIDED “AS IS” AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
671-
672-----------------------------------------------------
673-
674-Name: BISON
675-Preferred version: 2.4 or higher
676-Is mandatory: false
677-Website: http://www.gnu.org/software/bison/
678-License: GPL
679-Copyright: 1998, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
680-External notice:
681-
682-----------------------------------------------------
683-
684-Name: DOXYGEN
685-Preferred version: v1.7.4
686-Is mandatory: false
687-Website: www.doxygen.org
688-License: GPL
689-Copyright: 1997-2011 by Dimitri van Heesch
690-External notice:
691-
692- Permission to use, copy, modify, and distribute this software and its documentation under the terms of the GNU General Public License is hereby granted.
693- No representations are made about the suitability of this software for any purpose.
694- It is provided "as is" without express or implied warranty.
695- See the GNU General Public License for more details.
696-
697- Documents produced by doxygen are derivative works derived from the input used in their production; they are not affected by this license.
698-
699-----------------------------------------------------
700-
701-Name: CMAKE
702-Preferred version: 2.8.4
703-Is mandatory: true
704-Website: http://www.cmake.org/
705-License: Creative Commons Attribution-NoDerivs 3.0 Unported License
706-Copyright: 2000-2009 Kitware, Inc., Insight Software Consortium. All rights reserved.
707-External notice:
708-
709- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
710-
711- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
712-
713- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
714-
715- Neither the names of Kitware, Inc., the Insight Software Consortium, nor the names of their contributors may be used to endorse or promote products derived from this software without specific prior written permission.
716-
717- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
718-
719-----------------------------------------------------
720-
721-Name: SWIG
722-Preferred version: 2.0.4 or above
723-Is mandatory: false
724-Website: http://www.swig.org/
725-License: GPL
726-Copyright:
727- 1995-2011 The SWIG Developers
728- 2005-2006 Arizona Board of Regents (University of Arizona).
729- 1998-2005 University of Chicago.
730- 1995-1998 The University of Utah and the Regents of the University of California
731-
732-External notice:
733-
734- SWIG is free software: you can redistribute it and/or modify it
735- under the terms of the GNU General Public License as published by
736- the Free Software Foundation, either version 3 of the License, or
737- (at your option) any later version. See the LICENSE-GPL file for
738- the full terms of the GNU General Public license version 3.
739-
740- Portions of SWIG are also licensed under the terms of the licenses
741- in the file LICENSE-UNIVERSITIES. You must observe the terms of
742- these licenses, as well as the terms of the GNU General Public License,
743- when you distribute SWIG.
744-
745- The SWIG library and examples, under the Lib and Examples top level
746- directories, are distributed under the following terms:
747-
748- You may copy, modify, distribute, and make derivative works based on
749- this software, in source code or object code form, without
750- restriction. If you distribute the software to others, you may do
751- so according to the terms of your choice. This software is offered as
752- is, without warranty of any kind.
753-
754- See the COPYRIGHT file for a list of contributors to SWIG and their
755- copyright notices.
756-
757\ No newline at end of file
758
759=== modified file 'src/functions/pregenerated/func_parsing_and_serializing.cpp'
760--- src/functions/pregenerated/func_parsing_and_serializing.cpp 2012-09-17 00:36:37 +0000
761+++ src/functions/pregenerated/func_parsing_and_serializing.cpp 2012-09-24 21:00:28 +0000
762@@ -68,19 +68,6 @@
763
764
765 {
766- DECL_WITH_KIND(sctx, fn_parse_xml_3_0,
767- (createQName("http://www.w3.org/2005/xpath-functions","","parse-xml"),
768- GENV_TYPESYSTEM.STRING_TYPE_QUESTION,
769- GENV_TYPESYSTEM.STRING_TYPE_ONE,
770- GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
771- FunctionConsts::FN_PARSE_XML_2);
772-
773- }
774-
775-
776-
777-
778- {
779 DECL_WITH_KIND(sctx, fn_serialize_3_0,
780 (createQName("http://www.w3.org/2005/xpath-functions","","serialize"),
781 GENV_TYPESYSTEM.ITEM_TYPE_STAR,
782
783=== modified file 'src/functions/pregenerated/function_enum.h'
784--- src/functions/pregenerated/function_enum.h 2012-09-20 04:43:11 +0000
785+++ src/functions/pregenerated/function_enum.h 2012-09-24 21:00:28 +0000
786@@ -345,7 +345,6 @@
787 FN_ZORBA_XML_PARSE_2,
788 FN_PARSE_XML_FRAGMENT_1,
789 FN_PARSE_XML_1,
790- FN_PARSE_XML_2,
791 FN_SERIALIZE_1,
792 FN_SERIALIZE_2,
793 FN_RESOLVE_QNAME_2,
794
795=== modified file 'src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp'
796--- src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp 2012-09-20 04:43:11 +0000
797+++ src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp 2012-09-24 21:00:28 +0000
798@@ -74,34 +74,9 @@
799 is = iss.get();
800 }
801
802- // optional base URI argument
803- if (theChildren.size() == 2)
804- {
805- consumeNext(result, theChildren[1].getp(), planState);
806- ZORBA_ASSERT(result);
807-
808- try {
809- lValidatedBaseUri = URI(result->getStringValue());
810- } catch (ZorbaException const& /* e */) {
811- throw XQUERY_EXCEPTION(
812- err::FODC0007,
813- ERROR_PARAMS( result->getStringValue() ),
814- ERROR_LOC( loc )
815- );
816- }
817-
818- if (!lValidatedBaseUri.is_absolute()) {
819- throw XQUERY_EXCEPTION(
820- err::FODC0007,
821- ERROR_PARAMS( lValidatedBaseUri.toString() ),
822- ERROR_LOC( loc )
823- );
824- }
825-
826- result->getStringValue2(baseUri);
827- } else {
828- baseUri = theSctx->get_base_uri();
829- }
830+
831+ baseUri = theSctx->get_base_uri();
832+
833
834 try {
835 store::LoadProperties loadProps;
836
837=== modified file 'src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml'
838--- src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml 2012-09-20 04:43:11 +0000
839+++ src/runtime/spec/parsing_and_serializing/parsing_and_serializing.xml 2012-09-24 21:00:28 +0000
840@@ -27,12 +27,6 @@
841 <zorba:param>xs:string?</zorba:param> <!-- string to parse -->
842 <zorba:output>document-node()</zorba:output>
843 </zorba:signature>
844-
845- <zorba:signature localname="parse-xml" prefix="fn" version="3.0">
846- <zorba:param>xs:string?</zorba:param> <!-- string to parse -->
847- <zorba:param>xs:string</zorba:param> <!-- base uri -->
848- <zorba:output>node()*</zorba:output>
849- </zorba:signature>
850
851 <zorba:methods>
852 <zorba:accessesDynCtx returnValue="true"/>
853
854=== removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_14.xq'
855--- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_14.xq 2012-09-17 00:36:37 +0000
856+++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_14.xq 1970-01-01 00:00:00 +0000
857@@ -1,1 +0,0 @@
858-fn:base-uri(fn:parse-xml("<a xml:base='foo'/>", "http://example.org/")/a)
859
860=== removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.spec'
861--- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.spec 2012-09-17 00:36:37 +0000
862+++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.spec 1970-01-01 00:00:00 +0000
863@@ -1,1 +0,0 @@
864-Error: http://www.w3.org/2005/xqt-errors:FODC0007
865
866=== removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.xq'
867--- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.xq 2012-09-17 00:36:37 +0000
868+++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_15.xq 1970-01-01 00:00:00 +0000
869@@ -1,2 +0,0 @@
870-(: check for not absolute URI (FODC0007) :)
871-fn:parse-xml("<a xml:base='foo'/>", "blub")
872
873=== removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.spec'
874--- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.spec 2012-09-17 00:36:37 +0000
875+++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.spec 1970-01-01 00:00:00 +0000
876@@ -1,1 +0,0 @@
877-Error: http://www.w3.org/2005/xqt-errors:FODC0007
878
879=== removed file 'test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.xq'
880--- test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.xq 2012-09-17 00:36:37 +0000
881+++ test/rbkt/Queries/zorba/parsing_and_serializing/fn_parse-xml_16.xq 1970-01-01 00:00:00 +0000
882@@ -1,2 +0,0 @@
883-(: check for invalid URI (FODC0007) :)
884-fn:parse-xml("<a xml:base='foo'/>", "http://")

Subscribers

People subscribed via source and target branches