Changeset 149 for Mulberry/branches/v4.1d1/Sources_Common/HTTP/CardDAVClient/CCardDAVQueryReport.cpp

Timestamp:

01/13/08 12:24:39 (11 months ago)

Author:

cyrusdaboo

Message:

Support address book queries on multiple fields in a single request.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/HTTP/CardDAVClient/CCardDAVQueryReport.cpp (modified) (5 diffs)

Mulberry/branches/v4.1d1/Sources_Common/HTTP/CardDAVClient/CCardDAVQueryReport.cpp

@@ -34 +34 @@
 using namespace carddav; 
 
-CCardDAVQueryReport::CCardDAVQueryReport(CWebDAVSession* session, const cdstring& ruri, const cdstring& search_prop, const cdstring& search_text, const cdstring& match_type) :
+CCardDAVQueryReport::CCardDAVQueryReport(CWebDAVSession* session, const cdstring& ruri, const cdstrvect& search_props, const cdstring& search_text, const cdstring& match_type) :
         CWebDAVReport(session, ruri)
 {
-        InitRequestData(search_prop, search_text, match_type);
+        InitRequestData(search_props, search_text, match_type);
 }
 
@@ -46 +46 @@
 
 
-void CCardDAVQueryReport::InitRequestData(const cdstring& search_prop, const cdstring& search_text, const cdstring& match_type)
+void CCardDAVQueryReport::InitRequestData(const cdstrvect& search_props, const cdstring& search_text, const cdstring& match_type)
 {
         // Write XML info to a string
         std::ostrstream os;
-        GenerateXML(os, search_prop, search_text, match_type);
+        GenerateXML(os, search_props, search_text, match_type);
         os << ends;
         
@@ -56 +56 @@
 }
 
-void CCardDAVQueryReport::GenerateXML(std::ostream& os, const cdstring& search_prop, const cdstring& search_text, const cdstring& match_type)
+void CCardDAVQueryReport::GenerateXML(std::ostream& os, const cdstrvect& search_props, const cdstring& search_text, const cdstring& match_type)
 {
         using namespace xmllib;
@@ -71 +71 @@
         //           <C:text-match match-type="...">...</C:text-match>
         //         </C:prop-filter>
+        //     ...
         //       </C:filter>
         //   ...
@@ -98 +99 @@
         xmllib::XMLNode* filter = new xmllib::XMLNode(&xmldoc, query, cElement_filter.Name(), carddav_namespc);
         
-        // <CardDAV:prop-filter name="..."> element
-        xmllib::XMLNode* prop_filter = new xmllib::XMLNode(&xmldoc, filter, cElement_propfilter.Name(), carddav_namespc);
-        prop_filter->AddAttribute(cAttribute_name.Name(), search_prop);
+        for(cdstrvect::const_iterator iter = search_props.begin(); iter != search_props.end(); iter++)
+        {
+                // <CardDAV:prop-filter name="..."> element
+                xmllib::XMLNode* prop_filter = new xmllib::XMLNode(&xmldoc, filter, cElement_propfilter.Name(), carddav_namespc);
+                prop_filter->AddAttribute(cAttribute_name.Name(), *iter);
 
-        // <C:text-match match-type="...">...</C:text-match>
-        xmllib::XMLNode* text_match = new xmllib::XMLNode(&xmldoc, prop_filter, cElement_textmatch.Name(), carddav_namespc, search_text);
-        text_match->AddAttribute(cAttribute_matchtype.Name(), match_type);
+                // <C:text-match match-type="...">...</C:text-match>
+                xmllib::XMLNode* text_match = new xmllib::XMLNode(&xmldoc, prop_filter, cElement_textmatch.Name(), carddav_namespc, search_text);
+                text_match->AddAttribute(cAttribute_matchtype.Name(), match_type);
+        }
 
         // Now we have the complete document, so write it out (no indentation)