Skip to content

Commit 572a371

Browse files
author
ehennum
committed
#1317 #1316 #1315 #1314 consistent with 10.0-8 server release
1 parent bd09cfd commit 572a371

File tree

13 files changed

+395
-93
lines changed

13 files changed

+395
-93
lines changed

marklogic-client-api/src/main/java/com/marklogic/client/expression/CtsExpr.java

+12-12
Large diffs are not rendered by default.

marklogic-client-api/src/main/java/com/marklogic/client/expression/FnExpr.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ public interface FnExpr {
379379
*/
380380
public ServerExpression count(ServerExpression arg, ServerExpression maximum);
381381
/**
382-
* Returns xs:date(fn:current-dateTime()) . This is an xs:date (with timezone) that is current at some time during the evaluation of a query or transformation in which fn:current-date() is executed. This function is *stable*. The precise instant during the query or transformation represented by the value of fn:current-date() is *implementation dependent*.
382+
* Returns xs:date(fn:current-dateTime()). This is an xs:date (with timezone) that is current at some time during the evaluation of a query or transformation in which fn:current-date() is executed. This function is *stable*. The precise instant during the query or transformation represented by the value of fn:current-date() is *implementation dependent*.
383383
*
384384
* <a name="ml-server-type-current-date"></a>
385385
@@ -399,7 +399,7 @@ public interface FnExpr {
399399
*/
400400
public ServerExpression currentDateTime();
401401
/**
402-
* Returns xs:time(fn:current-dateTime()) . This is an xs:time (with timezone) that is current at some time during the evaluation of a query or transformation in which fn:current-time() is executed. This function is *stable*. The precise instant during the query or transformation represented by the value of fn:current-time() is *implementation dependent*.
402+
* Returns xs:time(fn:current-dateTime()). This is an xs:time (with timezone) that is current at some time during the evaluation of a query or transformation in which fn:current-time() is executed. This function is *stable*. The precise instant during the query or transformation represented by the value of fn:current-time() is *implementation dependent*.
403403
*
404404
* <a name="ml-server-type-current-time"></a>
405405
@@ -1922,7 +1922,7 @@ public interface FnExpr {
19221922
* <p>
19231923
* Provides a client interface to the <a href="http://docs.marklogic.com/fn:sum" target="mlserverdoc">fn:sum</a> server function.
19241924
* @param arg The sequence of values to be summed. (of <a href="{@docRoot}/doc-files/types/xs_anyAtomicType.html">xs:anyAtomicType</a>)
1925-
* @param zero The value to return as zero if the input sequence is the empty sequence. (of <a href="{@docRoot}/doc-files/types/xs_anyAtomicType.html">xs:anyAtomicType</a>)
1925+
* @param zero The value to return as zero if the input sequence is the empty sequence. This parameter is not available in the 0.9-ml XQuery dialect. (of <a href="{@docRoot}/doc-files/types/xs_anyAtomicType.html">xs:anyAtomicType</a>)
19261926
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_anyAtomicType.html">xs:anyAtomicType</a> server data type
19271927
*/
19281928
public ServerExpression sum(ServerExpression arg, String zero);
@@ -1931,7 +1931,7 @@ public interface FnExpr {
19311931
* <p>
19321932
* Provides a client interface to the <a href="http://docs.marklogic.com/fn:sum" target="mlserverdoc">fn:sum</a> server function.
19331933
* @param arg The sequence of values to be summed. (of <a href="{@docRoot}/doc-files/types/xs_anyAtomicType.html">xs:anyAtomicType</a>)
1934-
* @param zero The value to return as zero if the input sequence is the empty sequence. (of <a href="{@docRoot}/doc-files/types/xs_anyAtomicType.html">xs:anyAtomicType</a>)
1934+
* @param zero The value to return as zero if the input sequence is the empty sequence. This parameter is not available in the 0.9-ml XQuery dialect. (of <a href="{@docRoot}/doc-files/types/xs_anyAtomicType.html">xs:anyAtomicType</a>)
19351935
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_anyAtomicType.html">xs:anyAtomicType</a> server data type
19361936
*/
19371937
public ServerExpression sum(ServerExpression arg, ServerExpression zero);

marklogic-client-api/src/main/java/com/marklogic/client/expression/GeoExpr.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ public interface GeoExpr {
670670
* Provides a client interface to the <a href="http://docs.marklogic.com/geo:region-approximate" target="mlserverdoc">geo:region-approximate</a> server function.
671671
* @param region A cts region. (of <a href="{@docRoot}/doc-files/types/cts_region.html">cts:region</a>)
672672
* @param threshold How close the approximation should be, in the units specified by the units option. (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
673-
* @param options Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. Tolerance must be smaller than the value of the threhold parameter. (of <a href="{@docRoot}/doc-files/types/xs_string.html">xs:string</a>)
673+
* @param options Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. Tolerance must be smaller than the value of the threshold parameter. (of <a href="{@docRoot}/doc-files/types/xs_string.html">xs:string</a>)
674674
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_region.html">cts:region</a> server data type
675675
*/
676676
public CtsRegionExpr regionApproximate(ServerExpression region, double threshold, String options);
@@ -680,7 +680,7 @@ public interface GeoExpr {
680680
* Provides a client interface to the <a href="http://docs.marklogic.com/geo:region-approximate" target="mlserverdoc">geo:region-approximate</a> server function.
681681
* @param region A cts region. (of <a href="{@docRoot}/doc-files/types/cts_region.html">cts:region</a>)
682682
* @param threshold How close the approximation should be, in the units specified by the units option. (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
683-
* @param options Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. Tolerance must be smaller than the value of the threhold parameter. (of <a href="{@docRoot}/doc-files/types/xs_string.html">xs:string</a>)
683+
* @param options Options include: "coordinate-system=value" Use the given coordinate system. Valid values are wgs84, wgs84/double, etrs89, etrs89/double, raw and raw/double. Defaults to the governing coordinating system. "precision=value" Use the coordinate system at the given precision. Allowed values: float and double. Defaults to the precision of the governing coordinate system. "units=value" Measure distance, radii of circles, and tolerance in the specified units. Allowed values: miles (default), km, feet, meters. "tolerance=distance" Tolerance is the largest allowable variation in geometry calculations. If the distance between two points is less than tolerance, then the two points are considered equal. For the raw coordinate system, use the units of the coordinates. For geographic coordinate systems, use the units specified by the units option. Tolerance must be smaller than the value of the threshold parameter. (of <a href="{@docRoot}/doc-files/types/xs_string.html">xs:string</a>)
684684
* @return a server expression with the <a href="{@docRoot}/doc-files/types/cts_region.html">cts:region</a> server data type
685685
*/
686686
public CtsRegionExpr regionApproximate(ServerExpression region, ServerExpression threshold, ServerExpression options);

marklogic-client-api/src/main/java/com/marklogic/client/expression/MathExpr.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public interface MathExpr {
6666
*/
6767
public ServerExpression atan(ServerExpression x);
6868
/**
69-
* Returns the arc tangent of y/x, in radians, in the range from -pi/2 to +pi/2 (inclusive), using the signs of y and x to determine the apropriate quadrant.
69+
* Returns the arc tangent of y/x, in radians, in the range from -pi/2 to +pi/2 (inclusive), using the signs of y and x to determine the appropriate quadrant.
7070
* <p>
7171
* Provides a client interface to the <a href="http://docs.marklogic.com/math:atan2" target="mlserverdoc">math:atan2</a> server function.
7272
* @param y The floating point dividend. (of <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a>)
@@ -75,7 +75,7 @@ public interface MathExpr {
7575
*/
7676
public ServerExpression atan2(ServerExpression y, double x);
7777
/**
78-
* Returns the arc tangent of y/x, in radians, in the range from -pi/2 to +pi/2 (inclusive), using the signs of y and x to determine the apropriate quadrant.
78+
* Returns the arc tangent of y/x, in radians, in the range from -pi/2 to +pi/2 (inclusive), using the signs of y and x to determine the appropriate quadrant.
7979
*
8080
* <a name="ml-server-type-atan2"></a>
8181

0 commit comments

Comments
 (0)