X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav-contactlist.cpp;h=16acdb5aaf30c4f88e6f4a3fcc2237b64cbb7eba;hb=26c542881613813bd6a671a56e78f129944f68e6;hp=ac388d14b7fc42f8ddb3d078dc437dd81a1bd95b;hpb=9bb2fe74bfed060ee6ee764ea8ed95c25e3e0446;p=xestiaab%2F.git

diff --git a/source/carddav/carddav-contactlist.cpp b/source/carddav/carddav-contactlist.cpp
index ac388d1..16acdb5 100644
--- a/source/carddav/carddav-contactlist.cpp
+++ b/source/carddav/carddav-contactlist.cpp
@@ -30,6 +30,8 @@
 
 ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
 
+	// Get the contact list.
+	
 	ContactListData ContactListFinal;
 	std::map<wxString,FileSyncData> ContactList;
 	
@@ -85,10 +87,7 @@ ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
 		SyncData.Append(wxT("<D:sync-collection xmlns:D=\"DAV:\"\n"));
 		SyncData.Append(wxT(" xmlns:C=\"urn:ietf:params:xml:ns:carddav\">\n"));
 		SyncData.Append(wxT("<D:sync-token>"));
-		//SyncData.Trim();
-		//SyncData.Append(wxT("data:,00378c55-1f44-44a2-a255-84f6560b5cac_580"));
 		SyncData.Append(SyncTokenInc);
-		//SyncData.Trim();
 		SyncData.Append(wxT("</D:sync-token>\n"));
 		SyncData.Append(wxT("<D:sync-level>1</D:sync-level>\n"));
 		SyncData.Append(wxT("<D:prop>\n"));
@@ -113,18 +112,7 @@ ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
 		SyncDataBuffer = SyncData.ToUTF8();
 
 	}
-	
-	//static const char* query = SyncData.mb_str();
-	
-	/*char *query = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n\
-		<D:sync-collection xmlns:D=\"DAV:\"\n\
-		 xmlns:C=\"urn:ietf:params:xml:ns:carddav\">\n\
-		<D:sync-token>data:,00378c55-1f44-44a2-a255-84f6560b5cac_580</D:sync-token>\n\
-		<D:sync-level>1</D:sync-level>\n\
-		<D:prop>\n\
-			<D:getetag/>\n\
-		</D:prop>\n\
-	</D:sync-collection>\n";*/
+
 	const char* query = SyncDataBuffer.data();
 	
 	// Try SSL first.
@@ -170,13 +158,6 @@ ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
 		
 		}
 
-		//UploadData.readptr = &CardDAVDataQuery;
-		//UploadData.sizeleft = CardDAVDataQuery.Len();
-		//curl_easy_setopt(conn, CURLOPT_UPLOAD, 1);
-		//curl_easy_setopt(conn, CURLOPT_READDATA, &UploadData);
-		//curl_easy_setopt(conn, CURLOPT_READFUNCTION, UploadReadFunc);
-		
-		//curl_easy_setopt(conn, CURLOPT_WRITEFUNCTION, writefunc);
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDS, query);
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDSIZE, strlen(query));
 
@@ -228,16 +209,11 @@ ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
 		// the certificates as PEM files.
 		
 		if (claconncode == CURLE_SSL_CACERT && wxFile::Exists(ServerCertFilename) == TRUE){
-		
-			//curl_easy_cleanup(conn);
-			//conn = curl_easy_init();
 
 			CURL *sslerrconn;
 			sslerrconn = curl_easy_init();
 			CURLcode sslerrconncode;
-
-			//claconncode = (curl_easy_perform(conn));
-
+			
 			wxString ServerAddressOnly = wxT("https://") + ServerAddress + wxT(":") + wxString::Format(wxT("%i"), ServerPort) + wxT("/");
 
 			curl_easy_setopt(sslerrconn, CURLOPT_URL, (const char*)ServerAddressOnly.mb_str(wxConvUTF8));
@@ -421,14 +397,6 @@ ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
 		curl_easy_setopt(conn, CURLOPT_CUSTOMREQUEST, "REPORT");
 		curl_easy_setopt(conn, CURLOPT_NOSIGNAL, 1);
 		curl_easy_setopt(conn, CURLOPT_HTTPHEADER, slist);
-
-		//UploadData.readptr = &CardDAVDataQuery;
-		//UploadData.sizeleft = CardDAVDataQuery.Len();
-		//curl_easy_setopt(conn, CURLOPT_UPLOAD, 1);
-		//curl_easy_setopt(conn, CURLOPT_READDATA, &UploadData);
-		//curl_easy_setopt(conn, CURLOPT_READFUNCTION, UploadReadFunc);
-		
-		//curl_easy_setopt(conn, CURLOPT_WRITEFUNCTION, writefunc);
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDS, query);
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDSIZE, strlen(query));		
 		
@@ -928,13 +896,6 @@ ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
 
 	SleepFor(2000000000);
 
-	/*timespec n1, n2;
-						
-	n1.tv_sec = 0;
-	n1.tv_nsec = 2000000000L;
-		
-	nanosleep(&n1, &n2);*/
-
 	xmlFreeDoc(xmlCardDAVDoc);
 	curl_easy_cleanup(conn);