Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0261590B6 for ; Fri, 24 Feb 2012 14:59:17 +0000 (UTC) Received: (qmail 28937 invoked by uid 500); 24 Feb 2012 14:59:16 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 28898 invoked by uid 500); 24 Feb 2012 14:59:16 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 28889 invoked by uid 99); 24 Feb 2012 14:59:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 14:59:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 14:59:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D7A202388900; Fri, 24 Feb 2012 14:58:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1293281 - in /incubator/ooo/trunk/main/ucb/source/ucp/webdav: SerfPropFindReqProcImpl.cxx SerfPropPatchReqProcImpl.cxx Date: Fri, 24 Feb 2012 14:58:55 -0000 To: ooo-commits@incubator.apache.org From: orw@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120224145855.D7A202388900@eris.apache.org> Author: orw Date: Fri Feb 24 14:58:55 2012 New Revision: 1293281 URL: http://svn.apache.org/viewvc?rev=1293281&view=rev Log: some refactoring to PROPPATCH and PROPFIND requests Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx?rev=1293281&r1=1293280&r2=1293281&view=diff ============================================================================== --- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx (original) +++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx Fri Feb 24 14:58:55 2012 @@ -92,12 +92,9 @@ serf_bucket_t * SerfPropFindReqProcImpl: // body bucket - certain properties OR all properties OR only property names serf_bucket_t* body_bkt = 0; - sal_Int32 nDataLen = 0; + rtl::OUString aBodyText; { // create and fill body bucket with requested properties - body_bkt = serf_bucket_aggregate_create( pSerfBucketAlloc ); - - serf_bucket_t* tmp = 0; const int nPropCount = ( !mbOnlyPropertyNames && mpPropNames ) ? mpPropNames->size() : 0; @@ -111,72 +108,34 @@ serf_bucket_t * SerfPropFindReqProcImpl: thePropName ); /* <*propname* xmlns="*propns*" /> */ - tmp = SERF_BUCKET_SIMPLE_STRING_LEN("<", 1, pSerfBucketAlloc ); - serf_bucket_aggregate_append( body_bkt, tmp ); - nDataLen += 1; - - tmp = SERF_BUCKET_SIMPLE_STRING( thePropName.name, pSerfBucketAlloc ); - serf_bucket_aggregate_append( body_bkt, tmp ); - nDataLen += strlen(thePropName.name); - - tmp = SERF_BUCKET_SIMPLE_STRING_LEN( " xmlns=\"", - sizeof(" xmlns=\"")-1, - pSerfBucketAlloc ); - serf_bucket_aggregate_append( body_bkt, tmp ); - nDataLen += sizeof(" xmlns=\"")-1; - - tmp = SERF_BUCKET_SIMPLE_STRING( thePropName.nspace, pSerfBucketAlloc ); - serf_bucket_aggregate_append( body_bkt, tmp ); - nDataLen += strlen(thePropName.nspace); - - tmp = SERF_BUCKET_SIMPLE_STRING_LEN( "\"/>", sizeof("\"/>")-1, - pSerfBucketAlloc ); - serf_bucket_aggregate_append( body_bkt, tmp ); - nDataLen += sizeof("\"/>")-1; + aBodyText += rtl::OUString::createFromAscii( "<" ); + aBodyText += rtl::OUString::createFromAscii( thePropName.name ); + aBodyText += rtl::OUString::createFromAscii( " xmlnx=\"" ); + aBodyText += rtl::OUString::createFromAscii( thePropName.nspace ); + aBodyText += rtl::OUString::createFromAscii( "\"/>" ); } - tmp = SERF_BUCKET_SIMPLE_STRING_LEN("", - sizeof("")-1, - pSerfBucketAlloc ); - serf_bucket_aggregate_prepend(body_bkt, tmp); - nDataLen += sizeof("")-1; - - tmp = SERF_BUCKET_SIMPLE_STRING_LEN("", - sizeof("")-1, - pSerfBucketAlloc ); - serf_bucket_aggregate_append(body_bkt, tmp); - nDataLen += sizeof("")-1; + aBodyText = rtl::OUString::createFromAscii( "" ) + + aBodyText + + rtl::OUString::createFromAscii( "" ); } else { if ( mbOnlyPropertyNames ) { - tmp = SERF_BUCKET_SIMPLE_STRING_LEN( "", - sizeof("")-1, - pSerfBucketAlloc ); - nDataLen += sizeof("")-1; + aBodyText = rtl::OUString::createFromAscii( "" ); } else { - tmp = SERF_BUCKET_SIMPLE_STRING_LEN( "", - sizeof("")-1, - pSerfBucketAlloc ); - nDataLen += sizeof("")-1; + aBodyText = rtl::OUString::createFromAscii( "" ); } - serf_bucket_aggregate_append( body_bkt, tmp ); } - tmp = SERF_BUCKET_SIMPLE_STRING_LEN( PROPFIND_HEADER, - sizeof(PROPFIND_HEADER)-1, - pSerfBucketAlloc ); - serf_bucket_aggregate_prepend(body_bkt, tmp); - nDataLen += sizeof(PROPFIND_HEADER)-1; - - tmp = SERF_BUCKET_SIMPLE_STRING_LEN(PROPFIND_TRAILER, - sizeof(PROPFIND_TRAILER)-1, - pSerfBucketAlloc ); - serf_bucket_aggregate_append(body_bkt, tmp); - nDataLen += sizeof(PROPFIND_TRAILER)-1; + aBodyText = rtl::OUString::createFromAscii( PROPFIND_HEADER ) + + aBodyText + + rtl::OUString::createFromAscii( PROPFIND_TRAILER ); + body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), + pSerfBucketAlloc ); } // create serf request @@ -193,10 +152,14 @@ serf_bucket_t * SerfPropFindReqProcImpl: serf_bucket_headers_setn( hdrs_bkt, "Accept-Encoding", "gzip"); // request specific header fields + // request specific header fields serf_bucket_headers_setn( hdrs_bkt, "Depth", mDepthStr ); - serf_bucket_headers_setn( hdrs_bkt, "Content-Type", "application/xml" ); - serf_bucket_headers_setn( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( nDataLen ), RTL_TEXTENCODING_UTF8 ) ); + if ( body_bkt != 0 && aBodyText.getLength() > 0 ) + { + serf_bucket_headers_setn( hdrs_bkt, "Content-Type", "application/xml" ); + serf_bucket_headers_setn( hdrs_bkt, "Content-Length", + rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); + } return req_bkt; } Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx?rev=1293281&r1=1293280&r2=1293281&view=diff ============================================================================== --- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx (original) +++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx Fri Feb 24 14:58:55 2012 @@ -132,7 +132,6 @@ serf_bucket_t * SerfPropPatchReqProcImpl // add PropPatch xml trailer at end aBodyText += rtl::OUString::createFromAscii( PROPPATCH_TRAILER ); - const char* pTestValue = rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ); body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), pSerfBucketAlloc ); }