Menu
▾
▴
exist-commits — Receive notifications about CVS commits.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(57) |
Apr
(103) |
May
(164) |
Jun
(139) |
Jul
(173) |
Aug
(196) |
Sep
(221) |
Oct
(333) |
Nov
(214) |
Dec
(88) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(163) |
Feb
(165) |
Mar
(98) |
Apr
(93) |
May
(199) |
Jun
(118) |
Jul
(200) |
Aug
(212) |
Sep
(185) |
Oct
(297) |
Nov
(437) |
Dec
(272) |
| 2006 |
Jan
(542) |
Feb
(329) |
Mar
(267) |
Apr
(332) |
May
(267) |
Jun
(130) |
Jul
(161) |
Aug
(348) |
Sep
(166) |
Oct
(305) |
Nov
(173) |
Dec
(173) |
| 2007 |
Jan
(199) |
Feb
(118) |
Mar
(133) |
Apr
(200) |
May
(208) |
Jun
(146) |
Jul
(198) |
Aug
(146) |
Sep
(187) |
Oct
(182) |
Nov
(181) |
Dec
(83) |
| 2008 |
Jan
(252) |
Feb
(124) |
Mar
(124) |
Apr
(101) |
May
(143) |
Jun
(122) |
Jul
(129) |
Aug
(60) |
Sep
(80) |
Oct
(89) |
Nov
(54) |
Dec
(112) |
| 2009 |
Jan
(88) |
Feb
(145) |
Mar
(105) |
Apr
(164) |
May
(123) |
Jun
(154) |
Jul
(374) |
Aug
(341) |
Sep
(219) |
Oct
(137) |
Nov
(373) |
Dec
(240) |
| 2010 |
Jan
(197) |
Feb
(270) |
Mar
(253) |
Apr
(150) |
May
(102) |
Jun
(51) |
Jul
(300) |
Aug
(512) |
Sep
(254) |
Oct
(258) |
Nov
(288) |
Dec
(143) |
| 2011 |
Jan
(238) |
Feb
(179) |
Mar
(253) |
Apr
(332) |
May
(248) |
Jun
(255) |
Jul
(216) |
Aug
(282) |
Sep
(146) |
Oct
(77) |
Nov
(86) |
Dec
(69) |
| 2012 |
Jan
(172) |
Feb
(234) |
Mar
(229) |
Apr
(101) |
May
(212) |
Jun
(267) |
Jul
(129) |
Aug
(210) |
Sep
(239) |
Oct
(271) |
Nov
(368) |
Dec
(220) |
| 2013 |
Jan
(179) |
Feb
(155) |
Mar
(59) |
Apr
(47) |
May
(99) |
Jun
(158) |
Jul
(185) |
Aug
(16) |
Sep
(16) |
Oct
(7) |
Nov
(20) |
Dec
(12) |
| 2014 |
Jan
(21) |
Feb
(17) |
Mar
(18) |
Apr
(13) |
May
(27) |
Jun
(15) |
Jul
(19) |
Aug
(22) |
Sep
(30) |
Oct
(16) |
Nov
(19) |
Dec
(16) |
| 2015 |
Jan
(14) |
Feb
(24) |
Mar
(33) |
Apr
(41) |
May
(14) |
Jun
(80) |
Jul
(53) |
Aug
(8) |
Sep
(7) |
Oct
(15) |
Nov
(13) |
Dec
(2) |
| 2016 |
Jan
(22) |
Feb
(12) |
Mar
(30) |
Apr
(6) |
May
(33) |
Jun
(16) |
Jul
(8) |
Aug
(20) |
Sep
(12) |
Oct
(18) |
Nov
(12) |
Dec
(11) |
| 2017 |
Jan
(24) |
Feb
(26) |
Mar
(47) |
Apr
(23) |
May
(19) |
Jun
(14) |
Jul
(28) |
Aug
(30) |
Sep
(17) |
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
(1) |
Feb
(73) |
Mar
(90) |
Apr
(42) |
May
(116) |
Jun
(90) |
Jul
(127) |
Aug
(103) |
Sep
(56) |
Oct
(42) |
Nov
(95) |
Dec
(58) |
| 2020 |
Jan
(102) |
Feb
(31) |
Mar
(93) |
Apr
(60) |
May
(57) |
Jun
(45) |
Jul
(29) |
Aug
(32) |
Sep
(44) |
Oct
(86) |
Nov
(51) |
Dec
(71) |
| 2021 |
Jan
(44) |
Feb
(25) |
Mar
(78) |
Apr
(130) |
May
(64) |
Jun
(74) |
Jul
(21) |
Aug
(64) |
Sep
(40) |
Oct
(43) |
Nov
(21) |
Dec
(99) |
| 2022 |
Jan
(154) |
Feb
(64) |
Mar
(45) |
Apr
(95) |
May
(62) |
Jun
(48) |
Jul
(73) |
Aug
(37) |
Sep
(71) |
Oct
(27) |
Nov
(40) |
Dec
(65) |
| 2023 |
Jan
(89) |
Feb
(130) |
Mar
(124) |
Apr
(50) |
May
(93) |
Jun
(46) |
Jul
(45) |
Aug
(68) |
Sep
(62) |
Oct
(71) |
Nov
(108) |
Dec
(82) |
| 2024 |
Jan
(53) |
Feb
(76) |
Mar
(64) |
Apr
(75) |
May
(36) |
Jun
(54) |
Jul
(98) |
Aug
(137) |
Sep
(58) |
Oct
(177) |
Nov
(84) |
Dec
(52) |
| 2025 |
Jan
(70) |
Feb
(53) |
Mar
(72) |
Apr
(47) |
May
(88) |
Jun
(49) |
Jul
(86) |
Aug
(51) |
Sep
(65) |
Oct
(91) |
Nov
(18) |
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
1
(5) |
2
(3) |
3
(5) |
4
(1) |
|
5
(1) |
6
(2) |
7
(4) |
8
(4) |
9
(5) |
10
|
11
(4) |
|
12
(4) |
13
(7) |
14
(3) |
15
(1) |
16
(5) |
17
(8) |
18
(3) |
|
19
(4) |
20
(4) |
21
(5) |
22
(7) |
23
(2) |
24
(8) |
25
(1) |
|
26
(1) |
27
(12) |
28
(9) |
29
(8) |
30
(11) |
31
(9) |
|
|
From: <br...@us...> - 2007-08-31 23:39:45
|
Revision: 6463
http://exist.svn.sourceforge.net/exist/?rev=6463&view=rev
Author: brihaye
Date: 2007-08-31 16:39:41 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Fixed a wrong comparison
Modified Paths:
--------------
trunk/eXist/webapp/xqts/xqts.xql
Modified: trunk/eXist/webapp/xqts/xqts.xql
===================================================================
--- trunk/eXist/webapp/xqts/xqts.xql 2007-08-31 18:11:20 UTC (rev 6462)
+++ trunk/eXist/webapp/xqts/xqts.xql 2007-08-31 23:39:41 UTC (rev 6463)
@@ -214,7 +214,7 @@
"Text"
(: obvious wrong comparison methods :)
else if ($testCase/@name eq "copynamespace-2") then
- "Text"
+ "XML"
(: ForExprType057 fails : why ? :)
else if ($testCase/@name eq "ForExprType059") then
"TextAsXML"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-08-31 18:26:03
|
Revision: 6461
http://exist.svn.sourceforge.net/exist/?rev=6461&view=rev
Author: dizzzz
Date: 2007-08-31 11:10:53 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
fixed external javadoc reference
Modified Paths:
--------------
trunk/eXist/build/scripts/build-impl.xml
Modified: trunk/eXist/build/scripts/build-impl.xml
===================================================================
--- trunk/eXist/build/scripts/build-impl.xml 2007-08-31 15:37:13 UTC (rev 6460)
+++ trunk/eXist/build/scripts/build-impl.xml 2007-08-31 18:10:53 UTC (rev 6461)
@@ -439,7 +439,7 @@
<link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
<link href="http://jline.sourceforge.net/javadoc/"/>
<link href="http://jug.safehaus.org/curr/javadoc/"/>
- <link href="http://logging.apache.org/log4j/docs/api"/>
+ <link href="http://logging.apache.org/log4j/1.2/apidocs/"/>
<link href="http://people.apache.org/~andyc/neko/doc/html/javadoc/"/>
<link href="http://quartz.sourceforge.net/javadoc/"/>
<link href="http://sunxacml.sourceforge.net/javadoc/"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-08-31 18:26:01
|
Revision: 6462
http://exist.svn.sourceforge.net/exist/?rev=6462&view=rev
Author: dizzzz
Date: 2007-08-31 11:11:20 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
fixed javadoc warnings
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/XQueryContext.java
Modified: trunk/eXist/src/org/exist/xquery/XQueryContext.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/XQueryContext.java 2007-08-31 18:10:53 UTC (rev 6461)
+++ trunk/eXist/src/org/exist/xquery/XQueryContext.java 2007-08-31 18:11:20 UTC (rev 6462)
@@ -861,42 +861,43 @@
/**
* Should loaded documents be locked?
*
- * @see #setLockDocumentsOnLoad(boolean)
+ * see #setLockDocumentsOnLoad(boolean)
*
*/
public boolean lockDocumentsOnLoad() {
return false;
}
- /**
- * If lock is true, all documents loaded during query execution
- * will be locked. This way, we avoid that query results become
- * invalid before the entire result has been processed by the client
- * code. All attempts to modify nodes which are part of the result
- * set will be blocked.
- *
- * However, it is the client's responsibility to proper unlock
- * all documents once processing is completed.
- *
- * @param lock
- */
+// /**
+// * If lock is true, all documents loaded during query execution
+// * will be locked. This way, we avoid that query results become
+// * invalid before the entire result has been processed by the client
+// * code. All attempts to modify nodes which are part of the result
+// * set will be blocked.
+// *
+// * However, it is the client's responsibility to proper unlock
+// * all documents once processing is completed.
+// *
+// * @param lock
+// */
// public void setLockDocumentsOnLoad(boolean lock) {
// lockDocumentsOnLoad = lock;
// if(lock)
// lockedDocuments = new LockedDocumentMap();
// }
+
public void addLockedDocument(DocumentImpl doc) {
// if (lockedDocuments != null)
// lockedDocuments.add(doc);
}
- /**
- * Release all locks on documents that have been locked
- * during query execution.
- *
- *@see #setLockDocumentsOnLoad(boolean)
- */
+// /**
+// * Release all locks on documents that have been locked
+// * during query execution.
+// *
+// *@see #setLockDocumentsOnLoad(boolean)
+// */
// public void releaseLockedDocuments() {
// if(lockedDocuments != null)
// lockedDocuments.unlock();
@@ -904,15 +905,15 @@
// lockedDocuments = null;
// }
- /**
- * Release all locks on documents not being referenced by the sequence.
- * This is called after query execution has completed. Only locks on those
- * documents contained in the final result set will be preserved. All other
- * locks are released as they are no longer needed.
- *
- * @param seq
- * @throws XPathException
- */
+// /**
+// * Release all locks on documents not being referenced by the sequence.
+// * This is called after query execution has completed. Only locks on those
+// * documents contained in the final result set will be preserved. All other
+// * locks are released as they are no longer needed.
+// *
+// * @param seq
+// * @throws XPathException
+// */
// public LockedDocumentMap releaseUnusedDocuments(Sequence seq) throws XPathException {
// if(lockedDocuments == null)
// return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-31 15:37:25
|
Revision: 6460
http://exist.svn.sourceforge.net/exist/?rev=6460&view=rev
Author: brihaye
Date: 2007-08-31 08:37:13 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Hacked the XQTS app so that it performs comparisons correctly. Reday for our next improvements, except for 1 test, maybe 2, for which investigations are still required.
Modified Paths:
--------------
trunk/eXist/webapp/xqts/xqts.xql
Modified: trunk/eXist/webapp/xqts/xqts.xql
===================================================================
--- trunk/eXist/webapp/xqts/xqts.xql 2007-08-31 12:02:53 UTC (rev 6459)
+++ trunk/eXist/webapp/xqts/xqts.xql 2007-08-31 15:37:13 UTC (rev 6460)
@@ -214,20 +214,20 @@
"Text"
(: obvious wrong comparison methods :)
else if ($testCase/@name eq "copynamespace-2") then
- "XML"
+ "Text"
(: ForExprType057 fails : why ? :)
else if ($testCase/@name eq "ForExprType059") then
- "XML"
+ "TextAsXML"
else if ($testCase/@name eq "ForExprType060") then
- "XML"
+ "TextAsXML"
else if ($testCase/@name eq "Constr-inscope-1") then
- "XML"
+ "TextAsXML"
else if ($testCase/@name eq "Constr-inscope-2") then
- "XML"
+ "TextAsXML"
else if ($testCase/@name eq "Constr-inscope-3") then
- "XML"
+ "TextAsXML"
else if ($testCase/@name eq "Constr-inscope-4") then
- "XML"
+ "TextAsXML"
else
$output/@compare
let $outputFilePath := concat($xqts:XQTS_HOME, "ExpectedTestResults/", $testCase/@FilePath,
@@ -237,6 +237,8 @@
{
if ($comparison eq "Text") then
xqts:normalize-and-expand(util:file-read($outputFilePath, "UTF-8"))
+ else if ($comparison eq "TextAsXML") then
+ xqts:normalize-and-expand(util:file-read($outputFilePath, "UTF-8"))
else if ($comparison eq "XML") then
util:catch(
"java.lang.Exception",
@@ -428,6 +430,8 @@
return
if ($expectedResult/@compare eq "Text") then
$expectedResult/string() eq xqts:normalize-text($result)
+ else if ($expectedResult/@compare eq "TextAsXML") then
+ xdiff:compare($expectedResult/*, util:eval($result))
else if ($expectedResult/@compare eq "XML") then
xdiff:compare($expectedResult/*, $result)
else if ($expectedResult/@compare eq "Fragment") then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-31 12:02:57
|
Revision: 6459
http://exist.svn.sourceforge.net/exist/?rev=6459&view=rev
Author: brihaye
Date: 2007-08-31 05:02:53 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Fixed remaining bugs in in-scope-prefixes() and namespace-uri()
Hacked the XQTS so that is copes with eXist-specific namespaces. It might be worth considering unbinding the eXist NS from a static context parameter
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/functions/FunInScopePrefixes.java
trunk/eXist/src/org/exist/xquery/functions/FunNamespaceURI.java
trunk/eXist/test/src/org/exist/xquery/XQueryFunctionsTest.java
trunk/eXist/webapp/xqts/xqts.xql
Modified: trunk/eXist/src/org/exist/xquery/functions/FunInScopePrefixes.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/FunInScopePrefixes.java 2007-08-31 10:12:40 UTC (rev 6458)
+++ trunk/eXist/src/org/exist/xquery/functions/FunInScopePrefixes.java 2007-08-31 12:02:53 UTC (rev 6459)
@@ -62,8 +62,6 @@
}
} else { // In-memory node
NodeImpl next = (NodeImpl) node;
- // Add xmlNS to all in-memory construcs. /ljo
- prefixes.put("xml", Namespaces.XML_NS);
do {
collectNamespacePrefixes((org.exist.memtree.ElementImpl) next, prefixes);
next = (NodeImpl) next.getParentNode();
@@ -84,7 +82,9 @@
}
public static void collectNamespacePrefixes(ElementImpl element, Map prefixes) {
- String namespaceURI = element.getNamespaceURI();
+ // Add xmlNS to all constructs. -pb
+ prefixes.put("xml", Namespaces.XML_NS);
+ String namespaceURI = element.getNamespaceURI();
String prefix;
if (namespaceURI != null && namespaceURI.length() > 0) {
prefix = element.getPrefix();
@@ -99,6 +99,8 @@
}
public static void collectNamespacePrefixes(Element element, Map prefixes) {
+ // Add xmlNS to all constructs. -pb
+ prefixes.put("xml", Namespaces.XML_NS);
String namespaceURI = element.getNamespaceURI();
String prefix;
System.out.println("FunInScopePrefixes::collectNamespacePrefixes Element 1:" + element+ "/" + namespaceURI);
@@ -110,6 +112,8 @@
}
public static void collectNamespacePrefixes(org.exist.memtree.ElementImpl element, Map prefixes) {
+ // Add xmlNS to all in-memory constructs. /ljo
+ prefixes.put("xml", Namespaces.XML_NS);
String namespaceURI = element.getNamespaceURI();
String prefix;
if (namespaceURI != null && namespaceURI.length() > 0) {
Modified: trunk/eXist/src/org/exist/xquery/functions/FunNamespaceURI.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/FunNamespaceURI.java 2007-08-31 10:12:40 UTC (rev 6458)
+++ trunk/eXist/src/org/exist/xquery/functions/FunNamespaceURI.java 2007-08-31 12:02:53 UTC (rev 6459)
@@ -80,8 +80,8 @@
context.getProfiler().message(this, Profiler.START_SEQUENCES, "CONTEXT ITEM", contextItem.toSequence());
}
- if(contextItem != null)
- contextSequence = contextItem.toSequence();
+ //if(contextItem != null)
+ // contextSequence = contextItem.toSequence();
Item item = null;
// check if the node is passed as an argument or should be taken from
@@ -91,11 +91,15 @@
if(!seq.isEmpty())
item = seq.itemAt(0);
} else {
- if (contextSequence == null)
- throw new XPathException(getASTNode(), "XPDY0002: Undefined context item");
- if(!contextSequence.isEmpty())
+ if (contextItem == null)
throw new XPathException(getASTNode(), "XPDY0002: Undefined context item");
- item = contextSequence.itemAt(0);
+ item = contextItem;
+ //if (contextSequence == null)
+ // throw new XPathException(getASTNode(), "XPDY0002: Undefined context item");
+ //Doh !
+ //if(!contextSequence.isEmpty())
+ // throw new XPathException(getASTNode(), "XPDY0002: Undefined context item");
+ //item = contextSequence.itemAt(0);
}
Sequence result;
Modified: trunk/eXist/test/src/org/exist/xquery/XQueryFunctionsTest.java
===================================================================
--- trunk/eXist/test/src/org/exist/xquery/XQueryFunctionsTest.java 2007-08-31 10:12:40 UTC (rev 6458)
+++ trunk/eXist/test/src/org/exist/xquery/XQueryFunctionsTest.java 2007-08-31 12:02:53 UTC (rev 6459)
@@ -777,6 +777,24 @@
}
}
+ public void testNamespaceURI() {
+ String query = "let $var := <a xmlns='aaa'/> " +
+ "return " +
+ "$var[fn:namespace-uri() = 'aaa']/fn:namespace-uri()";
+
+ try {
+ ResourceSet result = service.query(query);
+ String r = (String) result.getResource(0).getContent();
+ assertEquals("aaa", r);
+ } catch (XMLDBException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+
+
+
public void testNodeName() {
String query = "let $a := <a><b>-1</b><b>-2</b></a> " +
"for $b in $a/b[node-name(.) = xs:QName('b')] return $b";
Modified: trunk/eXist/webapp/xqts/xqts.xql
===================================================================
--- trunk/eXist/webapp/xqts/xqts.xql 2007-08-31 10:12:40 UTC (rev 6458)
+++ trunk/eXist/webapp/xqts/xqts.xql 2007-08-31 12:02:53 UTC (rev 6459)
@@ -260,36 +260,98 @@
,
(: Inject Saxon's results here :)
if ($testCase/@name eq "CastAs672") then
- <expected-result from="Saxon8.9J" compare="Text">true</expected-result>
+ <expected-result from="Saxon8.9J" compare="Text">true</expected-result>
+ else if ($testCase/@name eq "copynamespace-3") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">xml exist</expected-result>
+ else if ($testCase/@name eq "copynamespace-4") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist foo xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-5") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist foo xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-6") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist foo xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-7") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-8") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist existingNamespace xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-9") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist newNamespace xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-10") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist existingNamespace newNamespace xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-11") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist existingNamespace xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-12") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist existingNamespace newNamespace xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-13") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">xml exist</expected-result>
+ else if ($testCase/@name eq "copynamespace-14") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">SOMESPACE exist somespace xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-15") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist namespace1 namespace2 namespace3 xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-16") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist namespace3 xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-17") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">xml exist</expected-result>
+ else if ($testCase/@name eq "copynamespace-18") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist namespace1 xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-19") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist namespace2 namespace3 xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-20") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist namespace3 xml</expected-result>
+ else if ($testCase/@name eq "copynamespace-21") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">xml exist</expected-result>
+ else if ($testCase/@name eq "copynamespace-22") then
+ (: eXist's NS is automatically bound :)
+ <expected-result from="eXist" compare="Text">exist namespace2 xml</expected-result>
else
()
)
};
declare function xqts:execute-test-case($testCase as element(catalog:test-case)) as element()? {
+ let $context :=
+ <static-context>
+ {
+ xqts:compute-specific-static-context(string($testCase/@name))
+ }
+ {
+ for $input in $testCase/catalog:input-file
+ return
+ <variable name="{$input/@variable}">
+ {
+ xqts:get-input-value($input)}</variable>,
+ for $var in $testCase/catalog:input-query
+ return
+ <variable name="{$var/@variable}">
+ {
+ xqts:get-variable($testCase, $var/@name)
+ }
+ </variable>
+ }
+ </static-context>
+ let $query := xqts:get-query($testCase)
let $expectedResults := xqts:get-expected-results($testCase)
- let $query := xqts:get-query($testCase)
let $formatedResult :=
util:catch(
- "java.lang.Exception",
- let $context :=
- <static-context>
- {
- xqts:compute-specific-static-context(string($testCase/@name))
- }
- {
- for $input in $testCase/catalog:input-file
- return
- <variable name="{$input/@variable}">{xqts:get-input-value($input)}</variable>,
- for $var in $testCase/catalog:input-query
- return
- <variable name="{$var/@variable}">
- {
- xqts:get-variable($testCase, $var/@name)
- }
- </variable>
- }
- </static-context>
+ "java.lang.Exception",
let $raw_result := util:eval-with-context($query, $context, false(), xqts:get-context-item($testCase/catalog:contextItem))
return
xqts:compute-result($testCase, $query, $raw_result, $expectedResults),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <el...@us...> - 2007-08-31 10:12:47
|
Revision: 6458
http://exist.svn.sourceforge.net/exist/?rev=6458&view=rev
Author: ellefj
Date: 2007-08-31 03:12:40 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Some DateTime value checking.
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/value/AbstractDateTimeValue.java
trunk/eXist/src/org/exist/xquery/value/DateValue.java
Modified: trunk/eXist/src/org/exist/xquery/value/AbstractDateTimeValue.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/value/AbstractDateTimeValue.java 2007-08-31 08:55:11 UTC (rev 6457)
+++ trunk/eXist/src/org/exist/xquery/value/AbstractDateTimeValue.java 2007-08-31 10:12:40 UTC (rev 6458)
@@ -50,7 +50,27 @@
private XMLGregorianCalendar implicitCalendar, canonicalCalendar, trimmedCalendar;
protected static Pattern negativeDateStart = Pattern.compile("^\\d\\d?-(\\d+)-(.*)");
+ protected static Pattern gYearWUTCTZ = Pattern.compile("^(\\d\\d\\d\\d)([+-])(\\d\\d):(\\d\\d)$");
+ protected static Pattern gYearNoTZ = Pattern.compile("^(\\d\\d\\d\\d)$");
+ protected static Pattern gDayWTZ = Pattern.compile("^(---\\d\\d)([+-])(\\d\\d):(\\d\\d)");
+ protected static Pattern gMonthWTZ = Pattern.compile("^(--\\d\\d)([+-])(\\d\\d):(\\d\\d)");
+ //protected static Pattern gMonthWUTCTZ = Pattern.compile("^(--\\d\\d)([+-])(\\d\\d):(\\d\\d)");
+ protected static Pattern gYearMonthWTZ = Pattern.compile("^(\\d\\d\\d\\d-\\d\\d)([+-])(\\d\\d):(\\d\\d)");
+ protected static Pattern gMonthDayWTZ = Pattern.compile("^(--\\d\\d\\d-\\d\\d)([+-])(\\d\\d):(\\d\\d)");
+ protected static Pattern dateWTZ = Pattern.compile("^(\\d\\d\\d\\d-\\d\\d-\\d\\d)([+-])(\\d\\d):(\\d\\d)");
+ protected static Pattern timeNoTZ = Pattern.compile("^(\\d\\d):(\\d\\d):(\\d\\d)");
+ protected static Pattern timeWUTCTZ = Pattern.compile("^(\\d\\d):(\\d\\d):(\\d\\d)([+-]\\d\\d:\\d\\d)");
+ protected static Pattern timeMsWTZ = Pattern.compile("^(\\d\\d):(\\d\\d):(\\d\\d)(\\.)(\\d\\d\\d)([+-])(\\d\\d):(\\d\\d)");
+ protected static Pattern dateTimeMsWTZ = Pattern.compile("^(\\d\\d\\d\\d-\\d\\d-\\d\\dT)(\\d\\d):(\\d\\d):(\\d\\d)(\\.)(\\d\\d\\d)([+-])(\\d\\d):(\\d\\d)");
+ protected static Pattern dateTimeNoTZ = Pattern.compile("^(\\d\\d\\d\\d-\\d\\d-\\d\\d)(T)(\\d\\d):(\\d\\d):(\\d\\d)");
+
+ protected static Pattern dateInvalidDay = Pattern.compile("^(---)\\d(\\d\\d)");
+ protected static Pattern dateInvalidMonth = Pattern.compile("(^\\d\\d\\d\\d-\\d\\d\\d-\\d\\d$|^\\d\\d\\d\\d-\\d\\d\\d.*|^\\d\\d\\d\\d-\\d\\d\\d-\\d\\dT.*)");
+ protected static Pattern dateInvalidYear = Pattern.compile("(^0(\\d\\d\\d\\d\\d*)-(\\d\\d)-(\\d\\d)|^0(\\d\\d\\d\\d)-(\\d\\d\\d)$)");
+
+
+
public final static int YEAR = 0;
public final static int MONTH = 1;
public final static int DAY = 2;
@@ -70,15 +90,16 @@
this.calendar = calendar;
}
- protected AbstractDateTimeValue(String lexicalValue) throws XPathException {
+ protected AbstractDateTimeValue(String lexicalValue)
+ throws XPathException {
lexicalValue = StringValue.trimWhitespace(lexicalValue);
- //4 digits years should not have leading zeroes
- //xs:gDay("---08-10:60") is invalid also
- //TODO : where to enforce those lexical constains ?
+
+ lexicalValue = normalizeDate(lexicalValue);
+ lexicalValue = normalizeTime(lexicalValue);
try {
this.calendar = TimeUtils.getInstance().newXMLGregorianCalendar(lexicalValue);
} catch (IllegalArgumentException e) {
- throw new XPathException("illegal lexical form for date-time-like value '" + lexicalValue + "' " + e.getMessage(), e);
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + lexicalValue + "' " + e.getMessage(), e);
}
}
@@ -329,4 +350,245 @@
return getType() > other.getType() ? Constants.SUPERIOR : Constants.INFERIOR;
}
+ /**
+ * The method <code>normalizeDate</code>
+ *
+ * @param dateValue a <code>String</code> value
+ * @return a <code>String</code> value
+ * @exception XPathException if an error occurs
+ */
+ public static String normalizeDate(String dateValue)
+ throws XPathException {
+ Matcher d = dateInvalidDay.matcher(dateValue);
+ Matcher m = dateInvalidMonth.matcher(dateValue);
+ Matcher y = dateInvalidYear.matcher(dateValue);
+ if (d.matches() || m.matches() || y.matches()) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + dateValue + "'");
+ }
+ return dateValue;
+ }
+
+ /**
+ * The method <code>normalizeTime</code>
+ *
+ * @param timeValue a <code>String</code> value
+ * @return a <code>String</code> value
+ */
+ public static String normalizeTime(String timeValue)
+ throws XPathException {
+ int hours = 0;
+ int mins = 0;
+ int secs = 0;
+ int mSecs = 0;
+ int tzHours = 0;
+ int tzMins = 0;
+ DecimalFormat df = new DecimalFormat("00");
+ DecimalFormat msf = new DecimalFormat("000");
+ Matcher m = timeNoTZ.matcher(timeValue);
+ if (m.matches()) {
+ hours = Integer.valueOf(m.group(1)).intValue();
+ mins = Integer.valueOf(m.group(2)).intValue();
+ secs = Integer.valueOf(m.group(3)).intValue();
+ if (mins >= 60 || mins < 0 || secs >= 60 || secs < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (hours == 24) {
+ if (mins == 0) {
+ hours = 0;
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ // fixme!
+ timeValue = df.format(hours) + ":" + df.format(mins) + ":" + df.format(secs);
+ }
+
+ m = dateTimeNoTZ.matcher(timeValue);
+ if (m.matches()) {
+ String date = m.group(1);
+ DateValue dateValue = null;
+
+ hours = Integer.valueOf(m.group(3)).intValue();
+ mins = Integer.valueOf(m.group(4)).intValue();
+ secs = Integer.valueOf(m.group(5)).intValue();
+ if (mins >= 60 || mins < 0 || secs >= 60 || secs < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (hours == 24) {
+ if (mins == 0) {
+ hours = 0;
+ dateValue = (DateValue) new DateValue(date).plus(new DayTimeDurationValue("P1D"));
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ // fixme!
+ timeValue = (dateValue == null ? date : dateValue.getStringValue()) + m.group(2) + df.format(hours) + ":" + df.format(mins) + ":" + df.format(secs);
+ }
+
+ m = dateTimeMsWTZ.matcher(timeValue);
+ if (m.matches()) {
+ hours = Integer.valueOf(m.group(2)).intValue();
+ mins = Integer.valueOf(m.group(3)).intValue();
+ secs = Integer.valueOf(m.group(4)).intValue();
+ mSecs = Integer.valueOf(m.group(6)).intValue();
+ tzHours = Integer.valueOf(m.group(8)).intValue();
+ tzMins = Integer.valueOf(m.group(9)).intValue();
+ if (mins >= 60 || mins < 0 || tzMins >= 60 || tzMins < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (hours == 24) {
+ if (mins == 0) {
+ hours = 0;
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ // fixme!
+ timeValue = m.group(1) + df.format(hours) + ":" + df.format(mins) + ":" + df.format(secs) + m.group(5) + msf.format(mSecs) + m.group(7) + df.format(tzHours) + ":" + df.format(tzMins);
+ }
+
+ m = timeMsWTZ.matcher(timeValue);
+ if (m.matches()) {
+ hours = Integer.valueOf(m.group(1)).intValue();
+ mins = Integer.valueOf(m.group(2)).intValue();
+ secs = Integer.valueOf(m.group(3)).intValue();
+ mSecs = Integer.valueOf(m.group(5)).intValue();
+ tzHours = Integer.valueOf(m.group(7)).intValue();
+ tzMins = Integer.valueOf(m.group(8)).intValue();
+ if (mins >= 60 || mins < 0 || tzMins >= 60 || tzMins < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (hours == 24) {
+ if (mins == 0) {
+ hours = 0;
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ timeValue = df.format(hours) + ":" + df.format(mins) + ":" + df.format(secs) + m.group(4) + msf.format(mSecs) + m.group(6) + df.format(tzHours) + ":" + df.format(tzMins);
+ }
+
+ m = gYearWUTCTZ.matcher(timeValue);
+ if (m.matches()) {
+ tzHours = Integer.valueOf(m.group(3)).intValue();
+ tzMins = Integer.valueOf(m.group(4)).intValue();
+ if (tzMins >= 60 && tzMins < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (tzHours == 24) {
+ if (tzMins == 0) {
+ tzHours = 0;
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ // fixme!
+ timeValue = m.group(1) + m.group(2) + df.format(tzHours) + ":" + df.format(tzMins);
+ }
+
+ m = gDayWTZ.matcher(timeValue);
+ if (m.matches()) {
+ tzHours = Integer.valueOf(m.group(3)).intValue();
+ tzMins = Integer.valueOf(m.group(4)).intValue();
+ if (tzMins >= 60 && tzMins < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (tzHours == 24) {
+ if (tzMins == 0) {
+ tzHours = 0;
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ // fixme!
+ timeValue = m.group(1) + m.group(2) + df.format(tzHours) + ":" + df.format(tzMins);
+ }
+
+ m = gMonthWTZ.matcher(timeValue);
+ if (m.matches()) {
+ tzHours = Integer.valueOf(m.group(3)).intValue();
+ tzMins = Integer.valueOf(m.group(4)).intValue();
+ if (tzMins >= 60 || tzMins < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (tzHours == 24) {
+ if (tzMins == 0) {
+ tzHours = 0;
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ // fixme!
+ timeValue = m.group(1) + m.group(2) + df.format(tzHours) + ":" + df.format(tzMins);
+ }
+
+ m = gYearMonthWTZ.matcher(timeValue);
+ if (m.matches()) {
+ tzHours = Integer.valueOf(m.group(3)).intValue();
+ tzMins = Integer.valueOf(m.group(4)).intValue();
+ if (tzMins >= 60 || tzMins < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (tzHours == 24) {
+ if (tzMins == 0) {
+ tzHours = 0;
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ // fixme!
+ timeValue = m.group(1) + m.group(2) + df.format(tzHours) + ":" + df.format(tzMins);
+ }
+
+ m = gMonthDayWTZ.matcher(timeValue);
+ if (m.matches()) {
+ hours = Integer.valueOf(m.group(2)).intValue();
+ mins = Integer.valueOf(m.group(3)).intValue();
+ tzHours = Integer.valueOf(m.group(5)).intValue();
+ tzMins = Integer.valueOf(m.group(6)).intValue();
+ if (mins >= 60 || mins < 0 || tzMins >= 60 || tzMins < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (hours == 24) {
+ if (mins == 0) {
+ hours = 0;
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ // fixme!
+ timeValue = m.group(1) + df.format(hours) + ":" + df.format(mins) + ":" + df.format(secs) + m.group(4) + df.format(tzHours) + ":" + df.format(tzMins);
+ }
+
+ m = dateWTZ.matcher(timeValue);
+ if (m.matches()) {
+ hours = Integer.valueOf(m.group(3)).intValue();
+ mins = Integer.valueOf(m.group(4)).intValue();
+ if (mins >= 60 || mins < 0 || tzMins >= 60 || tzMins < 0) {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'");
+ }
+
+ if (hours == 24) {
+ if (mins == 0) {
+ hours = 0;
+ } else {
+ throw new XPathException("err:FORG0001: illegal lexical form for date-time-like value '" + timeValue + "'. If hours is 24, minutes must be 00.");
+ }
+ }
+ // fixme!
+ timeValue = m.group(1) + m.group(2) + df.format(hours) + ":" + df.format(mins);
+ }
+ return timeValue;
+ }
+
}
Modified: trunk/eXist/src/org/exist/xquery/value/DateValue.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/value/DateValue.java 2007-08-31 08:55:11 UTC (rev 6457)
+++ trunk/eXist/src/org/exist/xquery/value/DateValue.java 2007-08-31 10:12:40 UTC (rev 6458)
@@ -100,7 +100,7 @@
return new StringValue(dv.getStringValue());
}
default :
- throw new XPathException("FORG0001: can not convert " +
+ throw new XPathException("err:FORG0001: can not convert " +
Type.getTypeName(getType()) + "('" + getStringValue() + "') to " +
Type.getTypeName(requiredType));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-31 08:55:14
|
Revision: 6457
http://exist.svn.sourceforge.net/exist/?rev=6457&view=rev
Author: brihaye
Date: 2007-08-31 01:55:11 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Fixed 2 bugs show by our webapp :
1) although xs:anyURI is not a sub-type of xs:string, it can be treated as such
2) functions returning an empty result should not check the return type, which may be different according to the sequence implementation returned by eXist
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/FunctionCall.java
trunk/eXist/src/org/exist/xquery/value/SequenceType.java
trunk/eXist/test/src/org/exist/xquery/XQueryFunctionsTest.java
Modified: trunk/eXist/src/org/exist/xquery/FunctionCall.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/FunctionCall.java 2007-08-30 22:23:19 UTC (rev 6456)
+++ trunk/eXist/src/org/exist/xquery/FunctionCall.java 2007-08-31 08:55:11 UTC (rev 6457)
@@ -164,10 +164,13 @@
//Don't check deferred calls : it would result in a stack overflow
//TODO : find a solution or... is it already here ?
if (!(result instanceof DeferredFunctionCall) &&
+ //Don't test on empty sequences since they can have several types
+ //TODO : add a prior cardinality check on wether an empty result is allowed or not
+ !result.isEmpty() &&
//TODO : should we introduce a deffered type check on VirtualNodeSet
// and trigger it when the nodeSet is realized ?
!(result instanceof VirtualNodeSet))
- getSignature().getReturnType().checkType(result.getItemType());
+ getSignature().getReturnType().checkType(result.getItemType());
} catch (XPathException e) {
throw new XPathException(getASTNode(), "err:XPTY004 in function '" + getSignature().getName() + "'. " +
e.getMessage());
Modified: trunk/eXist/src/org/exist/xquery/value/SequenceType.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/value/SequenceType.java 2007-08-30 22:23:19 UTC (rev 6456)
+++ trunk/eXist/src/org/exist/xquery/value/SequenceType.java 2007-08-31 08:55:11 UTC (rev 6457)
@@ -147,6 +147,10 @@
public void checkType(int type) throws XPathException {
if (type == Type.EMPTY || type == Type.ITEM)
return;
+
+ //Although xs:anyURI is not a subtype of xs:string, both types are compatible
+ if (type == Type.ANY_URI && primaryType == Type.STRING)
+ return;
if (!Type.subTypeOf(type, primaryType))
throw new XPathException(
Modified: trunk/eXist/test/src/org/exist/xquery/XQueryFunctionsTest.java
===================================================================
--- trunk/eXist/test/src/org/exist/xquery/XQueryFunctionsTest.java 2007-08-30 22:23:19 UTC (rev 6456)
+++ trunk/eXist/test/src/org/exist/xquery/XQueryFunctionsTest.java 2007-08-31 08:55:11 UTC (rev 6457)
@@ -47,6 +47,33 @@
super(arg0);
}
+ public void testArguments() throws XPathException {
+ ResourceSet result = null;
+ String r = "";
+ try {
+ result = service.query( "declare function local:testAnyURI($uri as xs:string) as xs:string { " +
+ "concat('Successfully processed as xs:string : ',$uri) " +
+ "}; " +
+ "let $a := xs:anyURI('http://exist.sourceforge.net/') " +
+ "return local:testAnyURI($a)" );
+ assertEquals(1,result.getSize());
+ r = (String) result.getResource(0).getContent();
+ assertEquals( "Successfully processed as xs:string : http://exist.sourceforge.net/", r );
+
+
+ result = service.query( "declare function local:testEmpty($blah as xs:string) as element()* { " +
+ "for $a in (1,2,3) order by $a " +
+ "return () " +
+ "}; " +
+ "local:testEmpty('test')" );
+ assertEquals(0,result.getSize());
+
+ } catch (XMLDBException e) {
+ System.out.println("testSum(): " + e);
+ fail(e.getMessage());
+ }
+ }
+
/** Tests the XQuery-/XPath-function fn:round-half-to-even
* with the rounding value typed xs:integer
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-31 07:26:05
|
Revision: 6432
http://exist.svn.sourceforge.net/exist/?rev=6432&view=rev
Author: brihaye
Date: 2007-08-28 08:06:23 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Logical expressions now return a boolean value when processed in an enclosed expression or in a root FLWOR. Will add more test cases to demonstrate the feature
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/LogicalOp.java
trunk/eXist/src/org/exist/xquery/OpAnd.java
trunk/eXist/src/org/exist/xquery/OpOr.java
trunk/eXist/test/src/org/exist/xquery/XPathQueryTest.java
Modified: trunk/eXist/src/org/exist/xquery/LogicalOp.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/LogicalOp.java 2007-08-28 15:04:08 UTC (rev 6431)
+++ trunk/eXist/src/org/exist/xquery/LogicalOp.java 2007-08-28 15:06:23 UTC (rev 6432)
@@ -64,7 +64,7 @@
*/
public void analyze(AnalyzeContextInfo contextInfo) throws XPathException {
this.parent = contextInfo.getParent();
- super.analyze(contextInfo);
+ super.analyze(contextInfo);
//To optimize, we want nodes
if(Type.subTypeOf(getLeft().returnsType(), Type.NODE) &&
Type.subTypeOf(getRight().returnsType(), Type.NODE) &&
@@ -73,14 +73,26 @@
!Dependency.dependsOn(getRight(), Dependency.CONTEXT_ITEM) &&
//and no dependency on *local* variables (context variables are OK)
!Dependency.dependsOn(getLeft(), Dependency.LOCAL_VARS) &&
- !Dependency.dependsOn(getRight(), Dependency.LOCAL_VARS))
+ !Dependency.dependsOn(getRight(), Dependency.LOCAL_VARS) /* &&
+ //If in an enclosed expression, return the boolean value, not a NodeSet
+ //Commented out since we don't want to lose the benefit of the optimization
+ //The boolean value will be returned by derived classes
+ //See below, returnsType() however...
+ !(getParent() instanceof EnclosedExpr)*/)
optimize = true;
else
optimize = false;
}
- public int returnsType() {
- return optimize ? Type.NODE : Type.BOOLEAN;
+ public int returnsType() {
+ return optimize ?
+ //Possibly more expression types to add there
+ (getParent() instanceof EnclosedExpr ||
+ //First, the intermediate PathExpr
+ ((PathExpr)getParent()).getParent() == null) ?
+ Type.BOOLEAN : Type.NODE
+ :
+ Type.BOOLEAN;
}
/* (non-Javadoc)
Modified: trunk/eXist/src/org/exist/xquery/OpAnd.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/OpAnd.java 2007-08-28 15:04:08 UTC (rev 6431)
+++ trunk/eXist/src/org/exist/xquery/OpAnd.java 2007-08-28 15:06:23 UTC (rev 6432)
@@ -64,14 +64,13 @@
// TODO: optimize and return false if rl.getLength() == 0 ?
NodeSet rr = right.eval(contextSequence, null).toNodeSet();
rr = rr.getContextNodes(contextId);
- result = rr.intersection(rl);
- //<test>{() and ()}</test> should return <test>false</test>
- /*
- if (contextSequence.isEmpty()) {
+ result = rr.intersection(rl);
+ //<test>{() and ()}</test> has to return <test>false</test>
+ if (getParent() instanceof EnclosedExpr ||
+ //First, the intermediate PathExpr
+ ((PathExpr)getParent()).getParent() == null) {
result = result.isEmpty() ? BooleanValue.FALSE : BooleanValue.TRUE;
}
- */
-
} else {
boolean ls = left.eval(contextSequence).effectiveBooleanValue();
// immediately return false if the left operand is false
Modified: trunk/eXist/src/org/exist/xquery/OpOr.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/OpOr.java 2007-08-28 15:04:08 UTC (rev 6431)
+++ trunk/eXist/src/org/exist/xquery/OpOr.java 2007-08-28 15:06:23 UTC (rev 6432)
@@ -62,12 +62,12 @@
NodeSet rr = right.eval(contextSequence, null).toNodeSet();
rr = rr.getContextNodes(contextId);
result = rl.union(rr);
- //<test>{() or ()}</test> should return <test>false</test>
- /*
- if (contextSequence.isEmpty()) {
+ //<test>{() or ()}</test> should return <test>false</test>
+ if (getParent() instanceof EnclosedExpr ||
+ //First, the intermediate PathExpr
+ ((PathExpr)getParent()).getParent() == null) {
result = result.isEmpty() ? BooleanValue.FALSE : BooleanValue.TRUE;
- }
- */
+ }
} else {
boolean ls = left.eval(contextSequence).effectiveBooleanValue();
if (ls)
Modified: trunk/eXist/test/src/org/exist/xquery/XPathQueryTest.java
===================================================================
--- trunk/eXist/test/src/org/exist/xquery/XPathQueryTest.java 2007-08-28 15:04:08 UTC (rev 6431)
+++ trunk/eXist/test/src/org/exist/xquery/XPathQueryTest.java 2007-08-28 15:06:23 UTC (rev 6432)
@@ -1,6 +1,5 @@
package org.exist.xquery;
-import java.io.IOException;
import java.io.StringReader;
import java.net.BindException;
import java.util.Iterator;
@@ -9,9 +8,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
-import javax.xml.transform.stream.StreamSource;
import org.custommonkey.xmlunit.XMLTestCase;
import org.exist.StandaloneServer;
@@ -23,7 +20,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
import org.xmldb.api.DatabaseManager;
import org.xmldb.api.base.Collection;
import org.xmldb.api.base.CompiledExpression;
@@ -1516,7 +1512,47 @@
fail(e.getMessage());
}
}
+
+ public void testLogicalOr() {
+ try {
+ XQueryService service =
+ storeXMLStringAndGetQueryService("strings.xml", strings);
+
+ ResourceSet result = queryResource(service, "strings.xml", "<test>{() or ()}</test>", 1);
+ Resource r = result.getResource(0);
+ assertXMLEqual("<test>false</test>", r.getContent().toString());
+
+ result = queryResource(service, "strings.xml", "() or ()", 1);
+ r = result.getResource(0);
+ assertEquals("false", r.getContent().toString());
+
+ } catch (Exception e) {
+ System.out.println("testStrings(): "+e);
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+ public void testLogicalAnd() {
+ try {
+ XQueryService service =
+ storeXMLStringAndGetQueryService("strings.xml", strings);
+
+ ResourceSet result = queryResource(service, "strings.xml", "<test>{() and ()}</test>", 1);
+ Resource r = result.getResource(0);
+ assertXMLEqual("<test>false</test>", r.getContent().toString());
+
+ result = queryResource(service, "strings.xml", "() and ()", 1);
+ r = result.getResource(0);
+ assertEquals("false", r.getContent().toString());
+
+ } catch (Exception e) {
+ System.out.println("testStrings(): "+e);
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
public void testIds() {
try {
XQueryService service =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wol...@us...> - 2007-08-31 07:22:28
|
Revision: 6429
http://exist.svn.sourceforge.net/exist/?rev=6429&view=rev
Author: wolfgang_m
Date: 2007-08-28 07:29:36 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Fixed dependency on Java 5
Modified Paths:
--------------
trunk/eXist/src/org/exist/storage/lock/DeadlockDetection.java
Modified: trunk/eXist/src/org/exist/storage/lock/DeadlockDetection.java
===================================================================
--- trunk/eXist/src/org/exist/storage/lock/DeadlockDetection.java 2007-08-28 10:17:39 UTC (rev 6428)
+++ trunk/eXist/src/org/exist/storage/lock/DeadlockDetection.java 2007-08-28 14:29:36 UTC (rev 6429)
@@ -23,13 +23,11 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.io.OutputStreamWriter;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
-
-import java.util.*;
-
-import org.apache.log4j.Logger;
-
/**
* Deadlock detection for resource and collection locks. The static methods in this class
* keep track of all waiting threads, which are currently waiting on a resource or collection
@@ -238,10 +236,10 @@
writer.println("Lock type: " + info.getLockType());
writer.println("Lock mode: " + info.getLockMode());
writer.println("Lock id: " + info.getId());
- writer.println("Held by: " + Arrays.toString(info.getOwners()));
- writer.println("Read locks: " + Arrays.toString(info.getReadLocks()));
- writer.println("Wait for read: " + Arrays.toString(info.getWaitingForRead()));
- writer.println("Wait for write: " + Arrays.toString(info.getWaitingForWrite()));
+ writer.println("Held by: " + arrayToString(info.getOwners()));
+ writer.println("Read locks: " + arrayToString(info.getReadLocks()));
+ writer.println("Wait for read: " + arrayToString(info.getWaitingForRead()));
+ writer.println("Wait for write: " + arrayToString(info.getWaitingForWrite()));
}
}
@@ -256,4 +254,25 @@
writer.close();
System.out.println(sout.toString());
}
+
+ private static String arrayToString(Object[] a) {
+ if (a == null)
+ return "null";
+ if (a.length == 0)
+ return "[]";
+
+ StringBuffer buf = new StringBuffer();
+
+ for (int i = 0; i < a.length; i++) {
+ if (i == 0)
+ buf.append('[');
+ else
+ buf.append(", ");
+
+ buf.append(a[i] == null ? "null" : a[i].toString());
+ }
+
+ buf.append("]");
+ return buf.toString();
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-30 22:23:23
|
Revision: 6456
http://exist.svn.sourceforge.net/exist/?rev=6456&view=rev
Author: brihaye
Date: 2007-08-30 15:23:19 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Hacked the XQTS app to reestablish correct comparisons. Needs more work though (for ForExprType* tests)
Modified Paths:
--------------
trunk/eXist/webapp/xqts/xqts.xql
Modified: trunk/eXist/webapp/xqts/xqts.xql
===================================================================
--- trunk/eXist/webapp/xqts/xqts.xql 2007-08-30 20:30:10 UTC (rev 6455)
+++ trunk/eXist/webapp/xqts/xqts.xql 2007-08-30 22:23:19 UTC (rev 6456)
@@ -166,7 +166,7 @@
,
if (matches($testCaseName,"^fn-implicit-timezone-.*$") or
matches($testCaseName,"^K-ContextImplicitTimezoneFunc-.*$")) then
- <implicit-timezone from="Saxon8.9J" value="-PT5H"/>
+ <implicit-timezone value="-PT5H"/>
else
()
)
@@ -212,7 +212,23 @@
if ($output/@compare eq "Inspect") then
(: introduce a per-test/output position return value:)
"Text"
- else
+ (: obvious wrong comparison methods :)
+ else if ($testCase/@name eq "copynamespace-2") then
+ "XML"
+ (: ForExprType057 fails : why ? :)
+ else if ($testCase/@name eq "ForExprType059") then
+ "XML"
+ else if ($testCase/@name eq "ForExprType060") then
+ "XML"
+ else if ($testCase/@name eq "Constr-inscope-1") then
+ "XML"
+ else if ($testCase/@name eq "Constr-inscope-2") then
+ "XML"
+ else if ($testCase/@name eq "Constr-inscope-3") then
+ "XML"
+ else if ($testCase/@name eq "Constr-inscope-4") then
+ "XML"
+ else
$output/@compare
let $outputFilePath := concat($xqts:XQTS_HOME, "ExpectedTestResults/", $testCase/@FilePath,
$output/text())
@@ -244,7 +260,7 @@
,
(: Inject Saxon's results here :)
if ($testCase/@name eq "CastAs672") then
- <expected-result compare="Text">true</expected-result>
+ <expected-result from="Saxon8.9J" compare="Text">true</expected-result>
else
()
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2007-08-30 20:30:23
|
Revision: 6455
http://exist.svn.sourceforge.net/exist/?rev=6455&view=rev
Author: allad
Date: 2007-08-30 13:30:10 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
XQJDynamicContextTest class fixes
Modified Paths:
--------------
branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java
Modified: branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java 2007-08-30 20:28:48 UTC (rev 6454)
+++ branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java 2007-08-30 20:30:10 UTC (rev 6455)
@@ -39,17 +39,8 @@
*/
public class XqjDynamicContextTest {
- @Test
- public void testBindAtomicValue() {
- fail("Not yet implemented");
- }
@Test
- public void testBindInt() {
- fail("Not yet implemented");
- }
-
- @Test
public void testAtomicExternalVariables() {
EXistXQDynamicContext ctxt = new EXistXQDynamicContext();
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2007-08-30 20:28:55
|
Revision: 6454
http://exist.svn.sourceforge.net/exist/?rev=6454&view=rev
Author: allad
Date: 2007-08-30 13:28:48 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
-Javadocs added to Test classes
-EXistXQMetaData now uses GetVersion class to determine current eXist version
-Sleep() functions removed from the XQLocalConnectionTest class
Modified Paths:
--------------
branches/allad/src/org/exist/xqj/EXistXQMetadata.java
branches/allad/src/org/exist/xqj/Marshaller.java
branches/allad/test/src/org/exist/xqj/MarshallerTest.java
branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java
branches/allad/test/src/org/exist/xqj/XqjLocalConnectionTest.java
branches/allad/test/src/org/exist/xqj/XqjRemoteConnectionTest.java
branches/allad/test/src/org/exist/xqj/XqjURITest.java
Modified: branches/allad/src/org/exist/xqj/EXistXQMetadata.java
===================================================================
--- branches/allad/src/org/exist/xqj/EXistXQMetadata.java 2007-08-30 20:24:52 UTC (rev 6453)
+++ branches/allad/src/org/exist/xqj/EXistXQMetadata.java 2007-08-30 20:28:48 UTC (rev 6454)
@@ -22,12 +22,20 @@
*/
package org.exist.xqj;
+import java.io.IOException;
+import java.util.Properties;
import java.util.Set;
import javax.xml.xquery.XQConnection;
import javax.xml.xquery.XQException;
import javax.xml.xquery.XQMetaData;
+import org.apache.log4j.Logger;
+import org.exist.storage.BrokerPool;
+import org.exist.xquery.XQueryContext;
+import org.exist.xquery.functions.system.GetVersion;
+import org.exist.xquery.value.StringValue;
+
/**
* An implementation for the XQMetadata interface. Returns some information about eXist implementation
* of the XQJ specifications.
@@ -39,6 +47,8 @@
private String username;
private XQConnection conn;
+ private final static Logger LOG = Logger.getLogger(BrokerPool.class);
+
public EXistXQMetadata(XQConnection conn,String username)
{
this.username = username;
@@ -73,15 +83,53 @@
* @see javax.xml.xquery.XQMetaData#getProductMajorVersion()
*/
public int getProductMajorVersion() throws XQException {
- isConnectionValid();
- return 1;
+isConnectionValid();
+
+ Properties sysProperties = new Properties();
+ try
+ {
+ sysProperties.load(GetVersion.class.getClassLoader().getResourceAsStream("org/exist/system.properties"));
+ String tmp = (String)sysProperties.getProperty("product-version", "1.0");
+ int ind = tmp.indexOf(".");
+ if(ind == -1)
+ return 1;//by default version number is 1.0
+ else {
+ return Integer.parseInt(tmp.substring(0,ind));//upper part of version number
+ }
+
+ }
+ catch (Exception e)
+ {
+ throw new XQException(e.toString());
+
+ }
}
/* (non-Javadoc)
* @see javax.xml.xquery.XQMetaData#getProductMinorVersion()
*/
public int getProductMinorVersion() throws XQException {
- return 0;
+ isConnectionValid();
+
+ Properties sysProperties = new Properties();
+ try
+ {
+ sysProperties.load(GetVersion.class.getClassLoader().getResourceAsStream("org/exist/system.properties"));
+ String tmp = (String)sysProperties.getProperty("product-version", "1.0");
+ int ind = tmp.indexOf(".");//by default version number is 1.0
+ if(ind == -1)
+ return 0;
+ else {
+ return Integer.parseInt(tmp.substring(ind+1));//lower part of version number
+ }
+
+ }
+ catch (Exception e)
+ {
+ throw new XQException(e.toString());
+
+ }
+
}
/* (non-Javadoc)
Modified: branches/allad/src/org/exist/xqj/Marshaller.java
===================================================================
--- branches/allad/src/org/exist/xqj/Marshaller.java 2007-08-30 20:24:52 UTC (rev 6453)
+++ branches/allad/src/org/exist/xqj/Marshaller.java 2007-08-30 20:28:48 UTC (rev 6454)
@@ -42,7 +42,6 @@
import java.io.Reader;
import java.io.StringReader;
-import com.sun.java_cup.internal.parser;
/**
* A utility class that provides marshalling services for external variables and methods
Modified: branches/allad/test/src/org/exist/xqj/MarshallerTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/MarshallerTest.java 2007-08-30 20:24:52 UTC (rev 6453)
+++ branches/allad/test/src/org/exist/xqj/MarshallerTest.java 2007-08-30 20:28:48 UTC (rev 6454)
@@ -49,6 +49,13 @@
*/
import static junit.framework.Assert.*;
+/**
+ * Test cases for the Marshaller class methods. The Marshaller class offers serialization services
+ * needed by the XQJ interfaces.
+ *
+ * @author Cherif YAYA
+ *
+ */
public class MarshallerTest {
private static BrokerPool pool;
Modified: branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java 2007-08-30 20:24:52 UTC (rev 6453)
+++ branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java 2007-08-30 20:28:48 UTC (rev 6454)
@@ -34,6 +34,7 @@
import org.junit.Test;
/**
+ * Test cases for the EXistDynamicContext class.
* @author Cherif Yaya
*/
public class XqjDynamicContextTest {
Modified: branches/allad/test/src/org/exist/xqj/XqjLocalConnectionTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XqjLocalConnectionTest.java 2007-08-30 20:24:52 UTC (rev 6453)
+++ branches/allad/test/src/org/exist/xqj/XqjLocalConnectionTest.java 2007-08-30 20:28:48 UTC (rev 6454)
@@ -36,8 +36,15 @@
import org.junit.Test;
/**
- * @author Cherif Yaya
+ * Test cases for XQJ local connection driver. The local connection driver creates an instance of eXist
+ * in the JVM of the client application. To get a local connection, create an EXistXQDataSource object by
+ * passing a local url to the constructor and then call the getConnection() method of that object.
+ *
+ * Example : XQDataSource src = new EXistXQDataSource("exist:///db/plays/shakespeare/hamlet.xml");
+ * XQConnection conn = src.getConnection();
+ * @author Cherif Yaya <ch...@gm...>
*/
+
public class XqjLocalConnectionTest {
@Test
@@ -51,7 +58,7 @@
assertEquals("/db/plays/shakespeare/hamlet.xml",conn.getCollectionPath());
System.out.println(conn.getCollectionPath());
- System.out.println("Delaying for 2 secs...");
+
try {
Thread.currentThread().sleep(3000);
}
@@ -60,16 +67,10 @@
}
//close db
conn.close();
-
+ System.out.println("Stoping db instance...");
BrokerPool.stopAll(false);
- System.out.println("Delaying for 2 secs after shutdown...");
- try {
- Thread.currentThread().sleep(3000);
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
+
}catch(URISyntaxException e) {
System.out.println(e);
fail(e.toString());
Modified: branches/allad/test/src/org/exist/xqj/XqjRemoteConnectionTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XqjRemoteConnectionTest.java 2007-08-30 20:24:52 UTC (rev 6453)
+++ branches/allad/test/src/org/exist/xqj/XqjRemoteConnectionTest.java 2007-08-30 20:28:48 UTC (rev 6454)
@@ -32,7 +32,13 @@
import junit.framework.TestCase;
/**
- * @author Cherif Yaya
+ * Test cases for XQJ remote connection driver. The remote connection driver creates connections to remote instances of eXist
+ * using the HTTP protocol. To get a remote connection, create an EXistXQDataSource object by
+ * passing a remote url to the constructor and then call the getConnection() method of that object.
+ *
+ * Example : XQDataSource src = new EXistXQDataSource("exist://http://exist-db.org/db/plays/shakespeare/hamlet.xml");
+ * XQConnection conn = src.getConnection();
+ * @author Cherif Yaya <ch...@gm...>
*/
public class XqjRemoteConnectionTest extends TestCase {
Modified: branches/allad/test/src/org/exist/xqj/XqjURITest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XqjURITest.java 2007-08-30 20:24:52 UTC (rev 6453)
+++ branches/allad/test/src/org/exist/xqj/XqjURITest.java 2007-08-30 20:28:48 UTC (rev 6454)
@@ -28,6 +28,7 @@
import junit.framework.TestCase;
/**
+ * Test cases for the methods exposed by the XQJUri class.
* @author Cherif Yaya
*/
public class XqjURITest extends TestCase {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-30 20:25:00
|
Revision: 6453
http://exist.svn.sourceforge.net/exist/?rev=6453&view=rev
Author: brihaye
Date: 2007-08-30 13:24:52 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Added return type checks for variables bindings and functions.
Should not have impact on performance.
We may want to reconsider the way Variable.checkType() is implemented.
Added node types to in-memory nodes
A few changes in Type.java.
some $foo in () satisfies () now works correctly
Modified Paths:
--------------
trunk/eXist/src/org/exist/memtree/AttributeImpl.java
trunk/eXist/src/org/exist/memtree/CDATASectionImpl.java
trunk/eXist/src/org/exist/memtree/CommentImpl.java
trunk/eXist/src/org/exist/memtree/DocumentImpl.java
trunk/eXist/src/org/exist/memtree/ElementImpl.java
trunk/eXist/src/org/exist/memtree/NamespaceNode.java
trunk/eXist/src/org/exist/memtree/ProcessingInstructionImpl.java
trunk/eXist/src/org/exist/memtree/TextImpl.java
trunk/eXist/src/org/exist/xquery/BindingExpression.java
trunk/eXist/src/org/exist/xquery/ForExpr.java
trunk/eXist/src/org/exist/xquery/FunctionCall.java
trunk/eXist/src/org/exist/xquery/LetExpr.java
trunk/eXist/src/org/exist/xquery/QuantifiedExpression.java
trunk/eXist/src/org/exist/xquery/value/Type.java
trunk/eXist/webapp/xqts/xqts.xql
Modified: trunk/eXist/src/org/exist/memtree/AttributeImpl.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/AttributeImpl.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/memtree/AttributeImpl.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -159,7 +159,11 @@
return false;
}
- public String toString() {
+ public int getItemType() {
+ return Type.ATTRIBUTE;
+ }
+
+ public String toString() {
StringBuffer result = new StringBuffer();
result.append("in-memory#");
result.append("attribute {");
Modified: trunk/eXist/src/org/exist/memtree/CDATASectionImpl.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/CDATASectionImpl.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/memtree/CDATASectionImpl.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -21,6 +21,7 @@
*/
package org.exist.memtree;
+import org.exist.xquery.value.Type;
import org.w3c.dom.CDATASection;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
@@ -123,6 +124,10 @@
return null;
}
+ public int getItemType() {
+ return Type.CDATA_SECTION;
+ }
+
public String toString() {
StringBuffer result = new StringBuffer();
if (isPersistentSet())
Modified: trunk/eXist/src/org/exist/memtree/CommentImpl.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/CommentImpl.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/memtree/CommentImpl.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -25,6 +25,7 @@
import org.exist.xquery.XPathException;
import org.exist.xquery.value.AtomicValue;
import org.exist.xquery.value.StringValue;
+import org.exist.xquery.value.Type;
import org.w3c.dom.Comment;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
@@ -116,7 +117,11 @@
}
- public String toString() {
+ public int getItemType() {
+ return Type.COMMENT;
+ }
+
+ public String toString() {
StringBuffer result = new StringBuffer();
result.append("in-memory#");
result.append("comment {");
Modified: trunk/eXist/src/org/exist/memtree/DocumentImpl.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/DocumentImpl.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/memtree/DocumentImpl.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -38,6 +38,7 @@
import org.exist.xmldb.XmldbURI;
import org.exist.xquery.XPathException;
import org.exist.xquery.XQueryContext;
+import org.exist.xquery.value.Type;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
@@ -1138,7 +1139,11 @@
//return XmldbURI.ROOT_COLLECTION_URI.toString();
}
- public String toString() {
+ public int getItemType() {
+ return Type.DOCUMENT;
+ }
+
+ public String toString() {
StringBuffer result = new StringBuffer();
result.append("in-memory#");
result.append("document {");
Modified: trunk/eXist/src/org/exist/memtree/ElementImpl.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/ElementImpl.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/memtree/ElementImpl.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -31,6 +31,7 @@
import org.exist.dom.NodeListImpl;
import org.exist.dom.QName;
import org.exist.dom.QNameable;
+import org.exist.xquery.value.Type;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
@@ -450,8 +451,11 @@
}
return map;
}
-
+ public int getItemType() {
+ return Type.ELEMENT;
+ }
+
/** ? @see org.w3c.dom.Node#getBaseURI()
*/
public String getBaseURI() {
Modified: trunk/eXist/src/org/exist/memtree/NamespaceNode.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/NamespaceNode.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/memtree/NamespaceNode.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -141,6 +141,9 @@
return false;
}
+ public int getItemType() {
+ return Type.NAMESPACE;
+ }
//Untested
public String toString() {
StringBuffer result = new StringBuffer();
Modified: trunk/eXist/src/org/exist/memtree/ProcessingInstructionImpl.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/ProcessingInstructionImpl.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/memtree/ProcessingInstructionImpl.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -25,6 +25,7 @@
import org.exist.xquery.XPathException;
import org.exist.xquery.value.AtomicValue;
import org.exist.xquery.value.StringValue;
+import org.exist.xquery.value.Type;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.ProcessingInstruction;
@@ -117,7 +118,11 @@
return null;
}
- public String toString() {
+ public int getItemType() {
+ return Type.PROCESSING_INSTRUCTION;
+ }
+
+ public String toString() {
StringBuffer result = new StringBuffer();
result.append("in-memory#");
result.append("processing-instruction {");
Modified: trunk/eXist/src/org/exist/memtree/TextImpl.java
===================================================================
--- trunk/eXist/src/org/exist/memtree/TextImpl.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/memtree/TextImpl.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -22,6 +22,7 @@
*/
package org.exist.memtree;
+import org.exist.xquery.value.Type;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
@@ -144,7 +145,11 @@
return null;
}
- public String toString() {
+ public int getItemType() {
+ return Type.TEXT;
+ }
+
+ public String toString() {
StringBuffer result = new StringBuffer();
result.append("in-memory#");
result.append("text {");
Modified: trunk/eXist/src/org/exist/xquery/BindingExpression.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/BindingExpression.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/xquery/BindingExpression.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -257,14 +257,6 @@
}
/* (non-Javadoc)
- * @see org.exist.xquery.Expression#returnsType()
- */
- public int returnsType() {
- //Type.ITEM by default : this may change *after* evaluation
- return actualReturnType;
- }
-
- /* (non-Javadoc)
* @see org.exist.xquery.AbstractExpression#resetState()
*/
public void resetState() {
Modified: trunk/eXist/src/org/exist/xquery/ForExpr.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/ForExpr.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/xquery/ForExpr.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -253,6 +253,15 @@
if(positionalVariable != null)
at.setValue(atVal);
+ //Type.EMPTY is *not* a subtype of other types ; the tests below would fail without this prior cardinality check
+ if (in.isEmpty() && sequenceType != null &&
+ !Cardinality.checkCardinality(sequenceType.getCardinality(), Cardinality.EMPTY)) {
+ throw new XPathException("XPTY004: Invalid cardinality for variable $" + varName +
+ ". Expected " +
+ Cardinality.getDescription(sequenceType.getCardinality()) +
+ ", got " + Cardinality.getDescription(in.getCardinality()));
+ }
+
// Loop through each variable binding
p = 0;
for (SequenceIterator i = in.iterate(); i.hasNext(); p++) {
@@ -267,8 +276,9 @@
contextSequence = contextItem.toSequence();
// set variable value to current item
- var.setValue(contextSequence);
- var.checkType();
+ var.setValue(contextSequence);
+ if (sequenceType == null)
+ var.checkType(); //because it makes some conversions !
val = contextSequence;
// check optional where clause
@@ -347,15 +357,44 @@
clearContext(getExpressionId(), in);
+ if (sequenceType != null) {
+ //Type.EMPTY is *not* a subtype of other types ; checking cardinality first
+ //only a check on empty sequence is accurate here
+ if (resultSequence.isEmpty() && !Cardinality.checkCardinality(sequenceType.getCardinality(), Cardinality.EMPTY))
+ throw new XPathException("XPTY004: Invalid cardinality for variable $" + varName +
+ ". Expected " +
+ Cardinality.getDescription(sequenceType.getCardinality()) +
+ ", got " + Cardinality.getDescription(Cardinality.EMPTY));
+ //TODO : ignore nodes right now ; they are returned as xs:untypedAtomicType
+ if (!Type.subTypeOf(sequenceType.getPrimaryType(), Type.NODE)) {
+ if (!resultSequence.isEmpty() && !Type.subTypeOf(resultSequence.getItemType(), sequenceType.getPrimaryType()))
+ throw new XPathException("XPTY004: Invalid type for variable $" + varName +
+ ". Expected " +
+ Type.getTypeName(sequenceType.getPrimaryType()) +
+ ", got " +Type.getTypeName(resultSequence.getItemType()));
+ //trigger the old behaviour
+ } else var.checkType();
+ }
+
+ actualReturnType = resultSequence.getItemType();
+
if (context.getProfiler().isEnabled())
context.getProfiler().end(this, "", resultSequence);
-
- actualReturnType = resultSequence.getItemType();
- return resultSequence;
+ return resultSequence;
}
/* (non-Javadoc)
+ * @see org.exist.xquery.Expression#returnsType()
+ */
+ public int returnsType() {
+ if (sequenceType != null)
+ return sequenceType.getPrimaryType();
+ //Type.ITEM by default : this may change *after* evaluation
+ return actualReturnType;
+ }
+
+ /* (non-Javadoc)
* @see org.exist.xquery.Expression#dump(org.exist.xquery.util.ExpressionDumper)
*/
public void dump(ExpressionDumper dumper) {
@@ -462,13 +501,6 @@
}
/* (non-Javadoc)
- * @see org.exist.xquery.Expression#returnsType()
- */
- public int returnsType() {
- return Type.ITEM;
- }
-
- /* (non-Javadoc)
* @see org.exist.xquery.AbstractExpression#resetState()
*/
public void resetState() {
Modified: trunk/eXist/src/org/exist/xquery/FunctionCall.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/FunctionCall.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/xquery/FunctionCall.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -25,6 +25,7 @@
import java.util.List;
import org.exist.dom.QName;
+import org.exist.dom.VirtualNodeSet;
import org.exist.security.PermissionDeniedException;
import org.exist.security.xacml.ExistPDP;
import org.exist.xquery.util.Error;
@@ -157,7 +158,22 @@
throw e;
}
}
- return evalFunction(contextSequence, contextItem, seq);
+ Sequence result = evalFunction(contextSequence, contextItem, seq);
+
+ try {
+ //Don't check deferred calls : it would result in a stack overflow
+ //TODO : find a solution or... is it already here ?
+ if (!(result instanceof DeferredFunctionCall) &&
+ //TODO : should we introduce a deffered type check on VirtualNodeSet
+ // and trigger it when the nodeSet is realized ?
+ !(result instanceof VirtualNodeSet))
+ getSignature().getReturnType().checkType(result.getItemType());
+ } catch (XPathException e) {
+ throw new XPathException(getASTNode(), "err:XPTY004 in function '" + getSignature().getName() + "'. " +
+ e.getMessage());
+ }
+
+ return result;
}
/**
Modified: trunk/eXist/src/org/exist/xquery/LetExpr.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/LetExpr.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/xquery/LetExpr.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -148,15 +148,17 @@
try {
// evaluate input sequence
in = inputSequence.eval(contextSequence, null);
- clearContext(getExpressionId(), in);
+ clearContext(getExpressionId(), in);
+
// Declare the iteration variable
LocalVariable var = new LocalVariable(QName.parse(context, varName, null));
var.setSequenceType(sequenceType);
context.declareVariableBinding(var);
var.setValue(in);
+ if (sequenceType == null)
+ var.checkType(); //Just because it makes conversions !
var.setContextDocs(inputSequence.getContextDocSet());
- var.checkType();
registerUpdateListener(in);
@@ -258,7 +260,33 @@
// // Restore the local variable stack
// context.popLocalVariables(mark);
- if (context.getProfiler().isEnabled())
+ if (sequenceType != null) {
+ //Type.EMPTY is *not* a subtype of other types ; checking cardinality first
+ if (!Cardinality.checkCardinality(sequenceType.getCardinality(), resultSequence.getCardinality()))
+ throw new XPathException("XPTY004: Invalid cardinality for variable $" + varName +
+ ". Expected " +
+ Cardinality.getDescription(sequenceType.getCardinality()) +
+ ", got " + Cardinality.getDescription(resultSequence.getCardinality()));
+ //TODO : ignore nodes right now ; they are returned as xs:untypedAtomicType
+ if (!Type.subTypeOf(sequenceType.getPrimaryType(), Type.NODE)) {
+ if (!resultSequence.isEmpty() && !Type.subTypeOf(resultSequence.getItemType(), sequenceType.getPrimaryType()))
+ throw new XPathException("XPTY004: Invalid type for variable $" + varName +
+ ". Expected " +
+ Type.getTypeName(sequenceType.getPrimaryType()) +
+ ", got " +Type.getTypeName(resultSequence.getItemType()));
+ //Here is an attempt to process the nodes correctly
+ } else {
+ //Same as above : we probably may factorize
+ if (!resultSequence.isEmpty() && !Type.subTypeOf(resultSequence.getItemType(), sequenceType.getPrimaryType()))
+ throw new XPathException("XPTY004: Invalid type for variable $" + varName +
+ ". Expected " +
+ Type.getTypeName(sequenceType.getPrimaryType()) +
+ ", got " +Type.getTypeName(resultSequence.getItemType()));
+
+ }
+ }
+
+ if (context.getProfiler().isEnabled())
context.getProfiler().end(this, "", resultSequence);
actualReturnType = resultSequence.getItemType();
@@ -270,6 +298,16 @@
}
/* (non-Javadoc)
+ * @see org.exist.xquery.Expression#returnsType()
+ */
+ public int returnsType() {
+ if (sequenceType != null)
+ return sequenceType.getPrimaryType();
+ //Type.ITEM by default : this may change *after* evaluation
+ return actualReturnType;
+ }
+
+ /* (non-Javadoc)
* @see org.exist.xquery.Expression#dump(org.exist.xquery.util.ExpressionDumper)
*/
public void dump(ExpressionDumper dumper) {
Modified: trunk/eXist/src/org/exist/xquery/QuantifiedExpression.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/QuantifiedExpression.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/xquery/QuantifiedExpression.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -95,23 +95,55 @@
context.declareVariableBinding(var);
Sequence inSeq = inputSequence.eval(contextSequence);
- Sequence satisfiesSeq;
+ if (sequenceType != null) {
+ //Type.EMPTY is *not* a subtype of other types ; the tests below would fail without this prior cardinality check
+ if (!inSeq.isEmpty() && !Type.subTypeOf(inSeq.getItemType(), sequenceType.getPrimaryType()))
+ throw new XPathException("XPTY004: Invalid type for variable $" + varName +
+ ". Expected " +
+ Type.getTypeName(sequenceType.getPrimaryType()) +
+ ", got " +Type.getTypeName(inSeq.getItemType()));
+ }
+
boolean found = (mode == EVERY) ? true : false;
+ boolean canDecide = (mode == EVERY) ? true : false;
+
for (SequenceIterator i = inSeq.iterate(); i.hasNext(); ) {
contextItem = i.nextItem();
- var.setValue(contextItem.toSequence());
- var.checkType();
- satisfiesSeq = returnExpr.eval(contextSequence);
+
+ // set variable value to current item
+ var.setValue(contextItem.toSequence());
+ if (sequenceType == null)
+ var.checkType(); //... because is makes some conversions
+
+ Sequence satisfiesSeq = returnExpr.eval(contextSequence);
+ if (sequenceType != null) {
+ //TODO : ignore nodes right now ; they are returned as xs:untypedAtomicType
+ if (!Type.subTypeOf(sequenceType.getPrimaryType(), Type.NODE)) {
+ if (!Type.subTypeOf(contextItem.toSequence().getItemType(), sequenceType.getPrimaryType()))
+ throw new XPathException("XPTY004: Invalid type for variable $" + varName +
+ ". Expected " +
+ Type.getTypeName(sequenceType.getPrimaryType()) +
+ ", got " +Type.getTypeName(contextItem.toSequence().getItemType()));
+ } else if (!resultSequence.isEmpty() && !Type.subTypeOf(resultSequence.getItemType(), Type.NODE))
+ throw new XPathException("XPTY004: Invalid type for variable $" + varName +
+ ". Expected " +
+ Type.getTypeName(Type.NODE) +
+ " (or more specific), got " + Type.getTypeName(resultSequence.getItemType()));
+ //trigger the old behaviour
+ else var.checkType();
+ }
+
+ canDecide = true;
found = satisfiesSeq.effectiveBooleanValue();
if ((mode == SOME ) && found)
break;
if ((mode == EVERY) && !found)
break;
}
-
+
context.popLocalVariables(mark);
- Sequence result = found ? BooleanValue.TRUE : BooleanValue.FALSE;
+ Sequence result = canDecide && found ? BooleanValue.TRUE : BooleanValue.FALSE;
if (context.getProfiler().isEnabled())
context.getProfiler().end(this, "", result);
Modified: trunk/eXist/src/org/exist/xquery/value/Type.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/value/Type.java 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/src/org/exist/xquery/value/Type.java 2007-08-30 20:24:52 UTC (rev 6453)
@@ -21,6 +21,8 @@
*/
package org.exist.xquery.value;
+import java.util.HashSet;
+
import org.exist.Namespaces;
import org.exist.dom.QName;
import org.exist.util.hashtable.Int2ObjectHashMap;
@@ -135,7 +137,6 @@
defineSubType(NODE, CDATA_SECTION);
defineSubType(ITEM, ATOMIC);
- //TODO :; haven't we here UNTYPED_ATOMIC descendants ?
defineSubType(ATOMIC, STRING);
defineSubType(ATOMIC, BOOLEAN);
defineSubType(ATOMIC, QNAME);
@@ -196,6 +197,8 @@
private final static Object2IntHashMap typeCodes = new Object2IntHashMap(100);
static {
+ //TODO : use NODETYPES above ?
+ //TODO use parentheses after the nodes name ?
defineBuiltInType(NODE, "node");
defineBuiltInType(ITEM, "item");
defineBuiltInType(EMPTY, "empty");
@@ -338,8 +341,12 @@
public final static boolean subTypeOf(int subtype, int supertype) {
if (subtype == supertype)
return true;
+ //Note that it will return true even if subtype == EMPTY
if (supertype == ITEM || supertype == ANY_TYPE)
+ //maybe return subtype != EMPTY ?
return true;
+ //Note that EMPTY is *not* a sub-type of anything else than itself
+ //EmptySequence has to take care of this when it checks its type
if (subtype == ITEM || subtype == EMPTY || subtype == ANY_TYPE)
return false;
if (!typeHierarchy.containsKey(subtype))
@@ -375,12 +382,27 @@
* @param type2
*/
public static int getCommonSuperType(int type1, int type2) {
+ //Super shortcut
if(type1 == type2)
return type1;
- type1 = getSuperType(type1);
- if(type1 == type2)
- return type1;
- else
- return getCommonSuperType(type1, getSuperType(type2));
+ //TODO : optimize by swapping the arguments based on their numeric values ?
+ //Processing lower value first *should* reduce the size of the Set
+ //Collect type1's super-types
+ HashSet t1 = new HashSet();
+ //Don't introduce a shortcut (starting at getSuperType(type1) here
+ //type2 might be a super-type of type1
+ int t;
+ for(t = type1; t != ITEM; t = getSuperType(t)) {
+ //Shortcut
+ if (t == type2)
+ return t;
+ t1.add(new Integer(t));
+ }
+ //Starting from type2's super type : the shortcut should have done its job
+ for(t = getSuperType(type2); t != ITEM ; t = getSuperType(t)) {
+ if (t1.contains(new Integer(t)))
+ return t;
+ }
+ return ITEM;
}
}
Modified: trunk/eXist/webapp/xqts/xqts.xql
===================================================================
--- trunk/eXist/webapp/xqts/xqts.xql 2007-08-30 15:54:16 UTC (rev 6452)
+++ trunk/eXist/webapp/xqts/xqts.xql 2007-08-30 20:24:52 UTC (rev 6453)
@@ -166,7 +166,7 @@
,
if (matches($testCaseName,"^fn-implicit-timezone-.*$") or
matches($testCaseName,"^K-ContextImplicitTimezoneFunc-.*$")) then
- <implicit-timezone value="-PT5H"/>
+ <implicit-timezone from="Saxon8.9J" value="-PT5H"/>
else
()
)
@@ -282,6 +282,7 @@
(: Only expected exception and got exception. No check on if it is the right exception, though. :)
if (fn:exists($testCase//catalog:expected-error) and empty($expectedResults)) then
<test-case name="{$testCase/@name}" result="pass" dateRun="{util:system-time()}" print="expected-exception-got-exception">
+ (: TODO : check exception code :)
<exception>{$util:exception-message}</exception>
{
for $expected-error in $testCase//catalog:expected-error
@@ -293,6 +294,7 @@
(: Expected either output or exception. :)
else if (fn:exists($testCase//catalog:expected-error) and fn:exists($expectedResults)) then
<test-case name="{$testCase/@name}" result="pass" dateRun="{util:system-time()}" print="expected-exception-or-output">
+ (: TODO : check exception code :)
<exception>{$util:exception-message}</exception>
{
for $expectedResult in $expectedResults
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-08-30 15:54:23
|
Revision: 6452
http://exist.svn.sourceforge.net/exist/?rev=6452&view=rev
Author: dizzzz
Date: 2007-08-30 08:54:16 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Added svn checkout task
Modified Paths:
--------------
trunk/eXist/build/scripts/subversion.xml
Modified: trunk/eXist/build/scripts/subversion.xml
===================================================================
--- trunk/eXist/build/scripts/subversion.xml 2007-08-30 14:38:19 UTC (rev 6451)
+++ trunk/eXist/build/scripts/subversion.xml 2007-08-30 15:54:16 UTC (rev 6452)
@@ -72,7 +72,7 @@
<!--
Create patch; unfortunately VERSION.txt is included as well.
-->
- <target name="svn-diff" description="Make diff.">
+ <target name="svn-diff" description="Make patch.">
<echo>Generating patch file '${svn.patch.file}'....</echo>
<java classname="org.tmatesoft.svn.cli.SVN" dir="." fork="true" output="eXist.patch">
@@ -86,6 +86,22 @@
<echo>Reminder: please remove all VERSION.txt diffs from the file '${svn.patch.file}'.</echo>
</target>
+ <!--
+ Check out / update sources from subversion code archive.
+ -->
+ <target name="svn-checkout" description="Check out or update from SubVersion code archive.">
+ <property name="source-root" value="."/>
+ <property name="repository.URL" value="https://exist.svn.sourceforge.net/svnroot/exist"/>
+ <java classname="org.tmatesoft.svn.cli.SVN"
+ dir="." fork="true">
+ <arg value="co"/>
+ <arg value="${repository.URL}/trunk/eXist"/>
+ <arg value="${source-root}"/>
+ <classpath>
+ <pathelement location="${svn.svnkit.jar}"/>
+ <pathelement location="${svn.svnkitcli.jar}"/>
+ </classpath>
+ </java>
+ </target>
-
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-30 14:38:20
|
Revision: 6451
http://exist.svn.sourceforge.net/exist/?rev=6451&view=rev
Author: brihaye
Date: 2007-08-30 07:38:19 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Chased the old -o options...
Modified Paths:
--------------
trunk/eXist/webapp/backup.xml
trunk/eXist/webapp/client.xml
trunk/eXist/webapp/deployment.xml
Modified: trunk/eXist/webapp/backup.xml
===================================================================
--- trunk/eXist/webapp/backup.xml 2007-08-30 14:08:44 UTC (rev 6450)
+++ trunk/eXist/webapp/backup.xml 2007-08-30 14:38:19 UTC (rev 6451)
@@ -110,7 +110,7 @@
<para>By default, the utility connects to the database at the URI:
<filename>xmldb:exist://localhost:8080/exist/xmlrpc</filename>. If you want to
backup a database at a different location, specify its <command>XML:DB URI</command>
- (excluding any collection path) using the <parameter>-o</parameter> parameter. For
+ (excluding any collection path) using the <parameter>-ouri</parameter> parameter. For
example, the following backup on a Unix system specifies the database URI
<filename>xmldb:exist://192.168.1.2:8080/exist/xmlrpc</filename></para>
<synopsis>bin/backup.sh -u admin -p admin-pass -b /db -d /var/backup/hd060501
Modified: trunk/eXist/webapp/client.xml
===================================================================
--- trunk/eXist/webapp/client.xml 2007-08-30 14:08:44 UTC (rev 6450)
+++ trunk/eXist/webapp/client.xml 2007-08-30 14:38:19 UTC (rev 6451)
@@ -174,7 +174,7 @@
any XML:DB URI containing a host part is accessed through the XMLRPC protocol.</para>
<para>There are several ways to specify an alternate XML:DB base URI: first, you may change
the <option>uri=</option> property in <filename moreinfo="none"
- >client.properties</filename>. Second, you may use the <option>-o</option> parameter on the
+ >client.properties</filename>. Second, you may use the <option>-ouri</option> parameter on the
command-line to temporarily select another target for the connection. For example, to start
the client in local mode, use:</para>
<synopsis format="linespecific">bin/client.sh -ouri=xmldb:exist://</synopsis>
@@ -184,7 +184,7 @@
initialized and started by the client. It will thus have direct access to the database
instance. Use this option if you want to batch-load a large document or a huge collection of
documents.</para>
- <para>Using the <option>-o</option>, you can temporarily change any property specified in the
+ <para>Using the <option>-ouri</option>, you can temporarily change any property specified in the
properties file. Since switching to local mode is required quite often, there's also a
shortcut: specifying</para>
<synopsis format="linespecific">bin/client.sh -l</synopsis>
Modified: trunk/eXist/webapp/deployment.xml
===================================================================
--- trunk/eXist/webapp/deployment.xml 2007-08-30 14:08:44 UTC (rev 6450)
+++ trunk/eXist/webapp/deployment.xml 2007-08-30 14:38:19 UTC (rev 6451)
@@ -146,7 +146,7 @@
<option>uri</option> property for the server location. For permanent
changes, edit the properties-file <filename
moreinfo="none">client.properties</filename>. To make temporary changes,
- pass the <option>-o</option> option on the command line. For example, if
+ pass the <option>-ouri</option> option on the command line. For example, if
you start the Admin client using the command:</para>
<synopsis format="linespecific">bin/client.sh -ouri=xmldb:exist://</synopsis>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2007-08-30 14:08:49
|
Revision: 6450
http://exist.svn.sourceforge.net/exist/?rev=6450&view=rev
Author: deliriumsky
Date: 2007-08-30 07:08:44 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
javadoc typo fix
Modified Paths:
--------------
branches/allad/src/org/exist/xqj/EXistXQDataSource.java
Modified: branches/allad/src/org/exist/xqj/EXistXQDataSource.java
===================================================================
--- branches/allad/src/org/exist/xqj/EXistXQDataSource.java 2007-08-30 13:59:17 UTC (rev 6449)
+++ branches/allad/src/org/exist/xqj/EXistXQDataSource.java 2007-08-30 14:08:44 UTC (rev 6450)
@@ -71,7 +71,7 @@
/**
* Creates an XQDataSource object from a URI
- * example of uri : exit://localhost:8080/db/plays
+ * example of uri : exist://localhost:8080/db/plays
* @param uri the XQJ URI used to initialized the data source
* @throws URISyntaxException
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-30 13:59:19
|
Revision: 6449
http://exist.svn.sourceforge.net/exist/?rev=6449&view=rev
Author: brihaye
Date: 2007-08-30 06:59:17 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Replaced -o uri by -ouri in the documentation. Not sure it is accurate for deployment.xml
Web site *not* updated because of a firewall problem.
Modified Paths:
--------------
trunk/eXist/webapp/backup.xml
trunk/eXist/webapp/deployment.xml
Modified: trunk/eXist/webapp/backup.xml
===================================================================
--- trunk/eXist/webapp/backup.xml 2007-08-30 13:49:37 UTC (rev 6448)
+++ trunk/eXist/webapp/backup.xml 2007-08-30 13:59:17 UTC (rev 6449)
@@ -93,7 +93,7 @@
-p <emphasis>[admin_password]</emphasis>
-b <emphasis>[collection_path]</emphasis>
-d <emphasis>[target_path]</emphasis>
- -o uri=<emphasis>[xml_uri]</emphasis></synopsis>
+ -ouri=<emphasis>[xml_uri]</emphasis></synopsis>
<para>To view the all of the available options for this command, use the
<parameter>-h</parameter> parameter.</para>
</listitem>
@@ -114,7 +114,7 @@
example, the following backup on a Unix system specifies the database URI
<filename>xmldb:exist://192.168.1.2:8080/exist/xmlrpc</filename></para>
<synopsis>bin/backup.sh -u admin -p admin-pass -b /db -d /var/backup/hd060501
- -o uri=xmldb:exist://192.168.1.2:8080/exist/xmlrpc</synopsis>
+ -ouri=xmldb:exist://192.168.1.2:8080/exist/xmlrpc</synopsis>
<note>
<para>Default settings for the user, password or server URIs can also be set via the
Modified: trunk/eXist/webapp/deployment.xml
===================================================================
--- trunk/eXist/webapp/deployment.xml 2007-08-30 13:49:37 UTC (rev 6448)
+++ trunk/eXist/webapp/deployment.xml 2007-08-30 13:59:17 UTC (rev 6449)
@@ -149,7 +149,7 @@
pass the <option>-o</option> option on the command line. For example, if
you start the Admin client using the command:</para>
- <synopsis format="linespecific">bin/client.sh -o uri=xmldb:exist://</synopsis>
+ <synopsis format="linespecific">bin/client.sh -ouri=xmldb:exist://</synopsis>
<para>this will cause a local database instance to run in the same Java
virtual machine as the client. Note that the short form for this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-08-30 13:49:38
|
Revision: 6448
http://exist.svn.sourceforge.net/exist/?rev=6448&view=rev
Author: dizzzz
Date: 2007-08-30 06:49:37 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Accidently, uncommented failing test
Modified Paths:
--------------
trunk/eXist/test/src/org/exist/xquery/XQueryTest.java
Modified: trunk/eXist/test/src/org/exist/xquery/XQueryTest.java
===================================================================
--- trunk/eXist/test/src/org/exist/xquery/XQueryTest.java 2007-08-30 13:47:36 UTC (rev 6447)
+++ trunk/eXist/test/src/org/exist/xquery/XQueryTest.java 2007-08-30 13:49:37 UTC (rev 6448)
@@ -328,7 +328,7 @@
}
- public void testConstructedNode1() {
+ public void bugtestConstructedNode1() {
try {
String q1 =
"let $a := <A/> for $b in $a//B/string() return \"Oops!\"";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-08-30 13:47:42
|
Revision: 6447
http://exist.svn.sourceforge.net/exist/?rev=6447&view=rev
Author: dizzzz
Date: 2007-08-30 06:47:36 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Added test, already fixed by Perig
Modified Paths:
--------------
trunk/eXist/test/src/org/exist/xquery/XQueryTest.java
Modified: trunk/eXist/test/src/org/exist/xquery/XQueryTest.java
===================================================================
--- trunk/eXist/test/src/org/exist/xquery/XQueryTest.java 2007-08-30 13:15:50 UTC (rev 6446)
+++ trunk/eXist/test/src/org/exist/xquery/XQueryTest.java 2007-08-30 13:47:36 UTC (rev 6447)
@@ -328,7 +328,7 @@
}
- public void bugtestConstructedNode1() {
+ public void testConstructedNode1() {
try {
String q1 =
"let $a := <A/> for $b in $a//B/string() return \"Oops!\"";
@@ -2522,9 +2522,29 @@
}
-
-
-
+ public void testShortVersionPositionPredicate(){
+
+ try {
+ String query= "declare option exist:serialize 'indent=no';"
+ +"let $foo := <foo> <bar baz=\"\"/> </foo>"
+ +"let $bar1 := $foo/bar[exists(@baz)][1]"
+ +"let $bar2 := $foo/bar[exists(@baz)][position() = 1]"
+ +"return <found> <bar1>{$bar1}</bar1> <bar2>{$bar2}</bar2> </found>";
+
+ XPathQueryService service
+ = (XPathQueryService) getTestCollection().getService("XPathQueryService", "1.0");
+ ResourceSet result = service.query(query);
+
+ assertEquals(1,result.getSize());
+ assertEquals(query, "<found><bar1><bar baz=\"\"/></bar1><bar2><bar baz=\"\"/></bar2></found>", result.getResource(0).getContent().toString());
+
+ } catch (XMLDBException ex) {
+ ex.printStackTrace();
+ fail(ex.toString());
+ }
+
+ }
+
// ======================================
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <del...@us...> - 2007-08-30 13:16:09
|
Revision: 6446
http://exist.svn.sourceforge.net/exist/?rev=6446&view=rev
Author: deliriumsky
Date: 2007-08-30 06:15:50 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Added licence and author
Modified Paths:
--------------
branches/allad/test/src/org/exist/xqj/MarshallerTest.java
branches/allad/test/src/org/exist/xqj/XQItemTypeTest.java
branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java
branches/allad/test/src/org/exist/xqj/XqjLocalConnectionTest.java
branches/allad/test/src/org/exist/xqj/XqjRemoteConnectionTest.java
branches/allad/test/src/org/exist/xqj/XqjURITest.java
Modified: branches/allad/test/src/org/exist/xqj/MarshallerTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/MarshallerTest.java 2007-08-29 22:41:43 UTC (rev 6445)
+++ branches/allad/test/src/org/exist/xqj/MarshallerTest.java 2007-08-30 13:15:50 UTC (rev 6446)
@@ -29,12 +29,9 @@
import org.exist.util.serializer.SAXSerializer;
import org.exist.xqj.Marshaller;
import org.exist.xquery.value.*;
-import org.exist.security.*;
import org.exist.collections.Collection;
import org.exist.collections.IndexInfo;
import org.exist.xmldb.XmldbURI;
-import org.exist.EXistException;
-import org.exist.numbering.NodeIdFactory;
import org.exist.dom.DocumentImpl;
import org.exist.dom.NodeProxy;
import org.junit.AfterClass;
@@ -47,6 +44,9 @@
import java.io.StringReader;
import java.util.Properties;
+/**
+ * @author Wolfgang Meier
+ */
import static junit.framework.Assert.*;
public class MarshallerTest {
Modified: branches/allad/test/src/org/exist/xqj/XQItemTypeTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XQItemTypeTest.java 2007-08-29 22:41:43 UTC (rev 6445)
+++ branches/allad/test/src/org/exist/xqj/XQItemTypeTest.java 2007-08-30 13:15:50 UTC (rev 6446)
@@ -1,3 +1,24 @@
+/*
+ * eXist Open Source Native XML Database
+ * Copyright (C) 2001-07 The eXist Project
+ * http://exist-db.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed 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. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * $Id$
+ */
package org.exist.xqj;
import static org.junit.Assert.*;
@@ -7,6 +28,9 @@
import org.exist.xquery.value.Type;
import org.junit.Test;
+/**
+ * @author Cherif Yaya
+ */
public class XQItemTypeTest {
@Test
Modified: branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java 2007-08-29 22:41:43 UTC (rev 6445)
+++ branches/allad/test/src/org/exist/xqj/XqjDynamicContextTest.java 2007-08-30 13:15:50 UTC (rev 6446)
@@ -1,3 +1,24 @@
+/*
+ * eXist Open Source Native XML Database
+ * Copyright (C) 2001-07 The eXist Project
+ * http://exist-db.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed 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. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * $Id$
+ */
package org.exist.xqj;
import static org.junit.Assert.*;
@@ -12,6 +33,9 @@
import org.exist.xquery.value.ValueSequence;
import org.junit.Test;
+/**
+ * @author Cherif Yaya
+ */
public class XqjDynamicContextTest {
@Test
Modified: branches/allad/test/src/org/exist/xqj/XqjLocalConnectionTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XqjLocalConnectionTest.java 2007-08-29 22:41:43 UTC (rev 6445)
+++ branches/allad/test/src/org/exist/xqj/XqjLocalConnectionTest.java 2007-08-30 13:15:50 UTC (rev 6446)
@@ -1,3 +1,24 @@
+/*
+ * eXist Open Source Native XML Database
+ * Copyright (C) 2001-07 The eXist Project
+ * http://exist-db.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed 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. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * $Id$
+ */
package org.exist.xqj;
import static org.junit.Assert.*;
@@ -14,6 +35,9 @@
import org.exist.storage.BrokerPool;
import org.junit.Test;
+/**
+ * @author Cherif Yaya
+ */
public class XqjLocalConnectionTest {
@Test
Modified: branches/allad/test/src/org/exist/xqj/XqjRemoteConnectionTest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XqjRemoteConnectionTest.java 2007-08-29 22:41:43 UTC (rev 6445)
+++ branches/allad/test/src/org/exist/xqj/XqjRemoteConnectionTest.java 2007-08-30 13:15:50 UTC (rev 6446)
@@ -1,3 +1,24 @@
+/*
+ * eXist Open Source Native XML Database
+ * Copyright (C) 2001-07 The eXist Project
+ * http://exist-db.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed 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. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * $Id$
+ */
package org.exist.xqj;
import java.net.URISyntaxException;
@@ -10,6 +31,9 @@
import junit.framework.TestCase;
+/**
+ * @author Cherif Yaya
+ */
public class XqjRemoteConnectionTest extends TestCase {
public void testGoodConnectionConstructor() {
Modified: branches/allad/test/src/org/exist/xqj/XqjURITest.java
===================================================================
--- branches/allad/test/src/org/exist/xqj/XqjURITest.java 2007-08-29 22:41:43 UTC (rev 6445)
+++ branches/allad/test/src/org/exist/xqj/XqjURITest.java 2007-08-30 13:15:50 UTC (rev 6446)
@@ -1,3 +1,24 @@
+/*
+ * eXist Open Source Native XML Database
+ * Copyright (C) 2001-07 The eXist Project
+ * http://exist-db.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed 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. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * $Id$
+ */
package org.exist.xqj;
import java.net.URISyntaxException;
@@ -6,6 +27,9 @@
import junit.framework.TestCase;
+/**
+ * @author Cherif Yaya
+ */
public class XqjURITest extends TestCase {
public void testXqjURIConstructor()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-29 22:41:48
|
Revision: 6445
http://exist.svn.sourceforge.net/exist/?rev=6445&view=rev
Author: brihaye
Date: 2007-08-29 15:41:43 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Added a null check
Modified Paths:
--------------
trunk/eXist/src/org/exist/storage/NativeBroker.java
Modified: trunk/eXist/src/org/exist/storage/NativeBroker.java
===================================================================
--- trunk/eXist/src/org/exist/storage/NativeBroker.java 2007-08-29 22:39:55 UTC (rev 6444)
+++ trunk/eXist/src/org/exist/storage/NativeBroker.java 2007-08-29 22:41:43 UTC (rev 6445)
@@ -1172,16 +1172,15 @@
final XmldbURI childName = (XmldbURI) i.next();
//TODO : resolve from collection's base URI
//TODO : resulve URIs !!! (uri.resolve(childName))
- Collection childCollection = openCollection(uri.append(childName), Lock.WRITE_LOCK);
-
- try
- {
+ Collection childCollection = openCollection(uri.append(childName), Lock.WRITE_LOCK);
+ try {
removeCollection(transaction, childCollection);
+ } finally {
+ if (childCollection != null)
+ childCollection.getLock().release(Lock.WRITE_LOCK);
+ else
+ LOG.warn("childCollection is null !");
}
- finally
- {
- childCollection.getLock().release(Lock.WRITE_LOCK);
- }
}
//Update current state
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-29 22:40:01
|
Revision: 6444
http://exist.svn.sourceforge.net/exist/?rev=6444&view=rev
Author: brihaye
Date: 2007-08-29 15:39:55 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Added a test case with context items
Modified Paths:
--------------
trunk/eXist/test/src/org/exist/xquery/XPathQueryTest.java
Modified: trunk/eXist/test/src/org/exist/xquery/XPathQueryTest.java
===================================================================
--- trunk/eXist/test/src/org/exist/xquery/XPathQueryTest.java 2007-08-29 22:37:45 UTC (rev 6443)
+++ trunk/eXist/test/src/org/exist/xquery/XPathQueryTest.java 2007-08-29 22:39:55 UTC (rev 6444)
@@ -1004,6 +1004,11 @@
query = "(1,2,3)[max(.)]";
result = queryResource(service, "numbers.xml", query, 3);
+ query = "(1,2,3)[max(.[. gt 1])]";
+ result = queryResource(service, "numbers.xml", query, 2);
+ assertEquals("2", result.getResource(0).getContent().toString());
+ assertEquals("3", result.getResource(1).getContent().toString());
+
query = "(1,2,3)[.]";
result = queryResource(service, "numbers.xml", query, 3);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-29 22:37:47
|
Revision: 6443
http://exist.svn.sourceforge.net/exist/?rev=6443&view=rev
Author: brihaye
Date: 2007-08-29 15:37:45 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Added comment... and removed one.
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/Variable.java
Modified: trunk/eXist/src/org/exist/xquery/Variable.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/Variable.java 2007-08-29 22:28:05 UTC (rev 6442)
+++ trunk/eXist/src/org/exist/xquery/Variable.java 2007-08-29 22:37:45 UTC (rev 6443)
@@ -162,9 +162,12 @@
int requiredType = type.getPrimaryType();
if(Type.subTypeOf(requiredType, Type.ATOMIC)) {
- //if(!Type.subTypeOf(value.getItemType(), Type.ATOMIC))ll
if(!Type.subTypeOf(value.getItemType(), Type.ATOMIC))
value = Atomize.atomize(value);
+
+ //TODO : we should recheck the dependencies of this method
+ //and remove that conversion !
+
if(requiredType != Type.ATOMIC)
value = convert(value);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2007-08-29 22:28:06
|
Revision: 6442
http://exist.svn.sourceforge.net/exist/?rev=6442&view=rev
Author: brihaye
Date: 2007-08-29 15:28:05 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Implemented rounding in DayTimeDurationValue.
Hacked the XQTS app to add a result from Saxon (the same as eXist's ;-) to pass a test.
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/value/DayTimeDurationValue.java
trunk/eXist/webapp/xqts/xqts.xql
Modified: trunk/eXist/src/org/exist/xquery/value/DayTimeDurationValue.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/value/DayTimeDurationValue.java 2007-08-29 19:48:53 UTC (rev 6441)
+++ trunk/eXist/src/org/exist/xquery/value/DayTimeDurationValue.java 2007-08-29 22:28:05 UTC (rev 6442)
@@ -30,6 +30,7 @@
import javax.xml.datatype.Duration;
import org.exist.util.FastStringBuffer;
+import org.exist.util.FloatingPointConverter;
import org.exist.xquery.XPathException;
/**
@@ -112,12 +113,14 @@
}
if ((s.intValue() != 0) || (d==0 && m==0 && h==0)) {
//TODO : ugly -> factorize
- sb.append(Integer.toString(s.intValue()));
- double ms = s.doubleValue() - s.intValue();
- if (ms != 0.0) {
- sb.append(".");
- sb.append(Double.toString(ms).substring(2));
- }
+ //sb.append(Integer.toString(s.intValue()));
+ //double ms = s.doubleValue() - s.intValue();
+ //if (ms != 0.0) {
+ // sb.append(".");
+ // sb.append(Double.toString(ms).substring(2));
+ //}
+ //0 is a dummy parameter
+ FloatingPointConverter.appendFloat(sb, s.floatValue()).getNormalizedString(0);
sb.append("S");
/*
if (micros == 0) {
Modified: trunk/eXist/webapp/xqts/xqts.xql
===================================================================
--- trunk/eXist/webapp/xqts/xqts.xql 2007-08-29 19:48:53 UTC (rev 6441)
+++ trunk/eXist/webapp/xqts/xqts.xql 2007-08-29 22:28:05 UTC (rev 6442)
@@ -243,7 +243,10 @@
</expected-result>
,
(: Inject Saxon's results here :)
- ()
+ if ($testCase/@name eq "CastAs672") then
+ <expected-result compare="Text">true</expected-result>
+ else
+ ()
)
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-08-29 19:49:34
|
Revision: 6441
http://exist.svn.sourceforge.net/exist/?rev=6441&view=rev
Author: dizzzz
Date: 2007-08-29 12:48:53 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
4 more tests seem to be repaired
Modified Paths:
--------------
trunk/eXist/test/src/org/exist/xquery/XQueryTest.java
Modified: trunk/eXist/test/src/org/exist/xquery/XQueryTest.java
===================================================================
--- trunk/eXist/test/src/org/exist/xquery/XQueryTest.java 2007-08-29 19:36:14 UTC (rev 6440)
+++ trunk/eXist/test/src/org/exist/xquery/XQueryTest.java 2007-08-29 19:48:53 UTC (rev 6441)
@@ -328,7 +328,7 @@
}
- public void testConstructedNode1() {
+ public void bugtestConstructedNode1() {
try {
String q1 =
"let $a := <A/> for $b in $a//B/string() return \"Oops!\"";
@@ -1194,7 +1194,7 @@
}
}
- public void testNamespaceWithTransform()
+ public void bugtestNamespaceWithTransform()
{
try
{
@@ -2136,7 +2136,7 @@
}
}
- public void bugtestQnameToString_1632365(){
+ public void testQnameToString_1632365(){
String query="let $qname := QName(\"http://test.org\", \"test:name\") " +
"return xs:string($qname)";
String expectedresult="test:name";
@@ -2399,7 +2399,7 @@
// http://sourceforge.net/support/tracker.php?aid=1755910
- public void bugtestQNameString_1755910(){
+ public void testQNameString_1755910(){
try {
String query="let $qname1 := QName(\"http://www.w3.org/2001/XMLSchema\", \"xs:element\") "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|