From: <sha...@us...> - 2012-01-27 17:19:21
|
Revision: 15744 http://exist.svn.sourceforge.net/exist/?rev=15744&view=rev Author: shabanovd Date: 2012-01-27 17:19:11 +0000 (Fri, 27 Jan 2012) Log Message: ----------- [ignore] allow PUT function to accept ITEM as second parameter Modified Paths: -------------- trunk/eXist/extensions/modules/src/org/exist/xquery/modules/httpclient/BaseHTTPClientFunction.java trunk/eXist/extensions/modules/src/org/exist/xquery/modules/httpclient/PUTFunction.java Modified: trunk/eXist/extensions/modules/src/org/exist/xquery/modules/httpclient/BaseHTTPClientFunction.java =================================================================== --- trunk/eXist/extensions/modules/src/org/exist/xquery/modules/httpclient/BaseHTTPClientFunction.java 2012-01-27 13:58:37 UTC (rev 15743) +++ trunk/eXist/extensions/modules/src/org/exist/xquery/modules/httpclient/BaseHTTPClientFunction.java 2012-01-27 17:19:11 UTC (rev 15744) @@ -87,7 +87,7 @@ protected static final Logger logger = Logger.getLogger( BaseHTTPClientFunction.class ); protected static final FunctionParameterSequenceType URI_PARAM = new FunctionParameterSequenceType( "url", Type.ANY_URI, Cardinality.EXACTLY_ONE, "The URL to process" ); - protected static final FunctionParameterSequenceType PUT_CONTENT_PARAM = new FunctionParameterSequenceType( "content", Type.NODE, Cardinality.EXACTLY_ONE, "The XML PUT payload/content. If it is an XML Node it will be serialized, any other type will be atomized into a string." ); + protected static final FunctionParameterSequenceType PUT_CONTENT_PARAM = new FunctionParameterSequenceType( "content", Type.ITEM, Cardinality.EXACTLY_ONE, "The XML PUT payload/content. If it is an XML Node it will be serialized. If it is a binary stream it pass as it, any other type will be atomized into a string." ); protected static final FunctionParameterSequenceType POST_CONTENT_PARAM = new FunctionParameterSequenceType( "content", Type.ITEM, Cardinality.EXACTLY_ONE, "The XML POST payload/content. If it is an XML Node it will be serialized, any other type will be atomized into a string." ); protected static final FunctionParameterSequenceType POST_FORM_PARAM = new FunctionParameterSequenceType( "content", Type.ELEMENT, Cardinality.EXACTLY_ONE, "The form data in the format <httpclient:fields><httpclient:field name=\"\" value=\"\" type=\"string|file\"/>...</httpclient:fields>. If the field values will be suitably URLEncoded and sent with the mime type application/x-www-form-urlencoded." ); protected static final FunctionParameterSequenceType PERSIST_PARAM = new FunctionParameterSequenceType( "persist", Type.BOOLEAN, Cardinality.EXACTLY_ONE, "Indicates if the HTTP state (eg. cookies, credentials, etc.) should persist for the life of this xquery" ); Modified: trunk/eXist/extensions/modules/src/org/exist/xquery/modules/httpclient/PUTFunction.java =================================================================== --- trunk/eXist/extensions/modules/src/org/exist/xquery/modules/httpclient/PUTFunction.java 2012-01-27 13:58:37 UTC (rev 15743) +++ trunk/eXist/extensions/modules/src/org/exist/xquery/modules/httpclient/PUTFunction.java 2012-01-27 17:19:11 UTC (rev 15744) @@ -69,15 +69,15 @@ XML_BODY_RETURN ), - new FunctionSignature( - new QName( "put", NAMESPACE_URI, PREFIX ), - "Performs a HTTP PUT request.." + " This method returns the HTTP response encoded as an XML fragment, that looks as follows: <httpclient:response xmlns:httpclient=\"http://exist-db.org/xquery/httpclient\" statusCode=\"200\"><httpclient:headers><httpclient:header name=\"name\" value=\"value\"/>...</httpclient:headers><httpclient:body type=\"xml|xhtml|text|binary\" mimetype=\"returned content mimetype\">body content</httpclient:body></httpclient:response>" + - " where XML body content will be returned as a Node, HTML body content will be tidied into an XML compatible form, a body with mime-type of \"text/...\" will be returned as a URLEncoded string, and any other body content will be returned as xs:base64Binary encoded data.", - new SequenceType[] { - URI_PARAM, PUT_CONTENT_PARAM, PERSIST_PARAM, REQUEST_HEADER_PARAM, INDENTATION_PARAM - }, - XML_BODY_RETURN - ) + new FunctionSignature( + new QName( "put", NAMESPACE_URI, PREFIX ), + "Performs a HTTP PUT request.." + " This method returns the HTTP response encoded as an XML fragment, that looks as follows: <httpclient:response xmlns:httpclient=\"http://exist-db.org/xquery/httpclient\" statusCode=\"200\"><httpclient:headers><httpclient:header name=\"name\" value=\"value\"/>...</httpclient:headers><httpclient:body type=\"xml|xhtml|text|binary\" mimetype=\"returned content mimetype\">body content</httpclient:body></httpclient:response>" + + " where XML body content will be returned as a Node, HTML body content will be tidied into an XML compatible form, a body with mime-type of \"text/...\" will be returned as a URLEncoded string, and any other body content will be returned as xs:base64Binary encoded data.", + new SequenceType[] { + URI_PARAM, PUT_CONTENT_PARAM, PERSIST_PARAM, REQUEST_HEADER_PARAM, INDENTATION_PARAM + }, + XML_BODY_RETURN + ) }; public PUTFunction( XQueryContext context, FunctionSignature signature ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |