X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fvcard%2Fvcard34conv-v3conv.cpp;h=67d69e9fa1337ebebfdb3c28417f00614259abfe;hb=7eaabee120b68d2fb8fad317381435f4398a5e92;hp=7f523a3051e4b75c7ab52c052acf8b9167da0624;hpb=47c9e75a211e10b803a2ece2efc7daff4647e7c9;p=xestiaab%2F.git

diff --git a/source/vcard/vcard34conv-v3conv.cpp b/source/vcard/vcard34conv-v3conv.cpp
index 7f523a3..67d69e9 100644
--- a/source/vcard/vcard34conv-v3conv.cpp
+++ b/source/vcard/vcard34conv-v3conv.cpp
@@ -40,8 +40,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 
 	vCard ContactDatav3;
 	
-	//wxSContactFilename = Filename;
-	
 	// Check if we are using wxWidgets version 2.8 or less and
 	// execute the required command accordingly.
 	
@@ -130,11 +128,10 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 	int VendorCount = 0;
 	int XTokenCount = 0;
 	int ItemSeek = 1;
-	//int intValueSeek = 1;
 	
 	wxString strVer;
     
-    // Setup the version string.
+	// Setup the version string.
 	
 	strVer.Append(wxT("-//Xestia//Address Book Version "));
 	strVer.Append(wxT(XSDAB_VERSION));
@@ -171,8 +168,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			if (wxSPropertyNextLine.Mid(0, 1) == wxT(" ") || wxSPropertyNextLine.Mid(0, 1) == wxT("\t")){
 		
 				wxSPropertyNextLine.Remove(0, 1);
-				//wxSPropertyNextLine.Trim(FALSE);
-				//ContactLine.Trim();
 				ContactLine.Append(wxSPropertyNextLine);
 		
 			} else {
@@ -243,8 +238,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			wxString PropertyValue;
 			wxString PropertyTokens;
 			int intPrevValue = 4;
-
-			//SplitValues(&wxSPropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
 			
 			intPrevValue = 3;
 			
@@ -913,8 +906,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 						
 						} else if (TypePropertyName == wxT("textphone")){
 						
-							//if (!TelTypeOut.IsEmpty()){ TelTypeOut.Append(wxT(";")); }
-						
 							if (!FinalFriendlyString.IsEmpty()){  FinalFriendlyString.Append(_(", Textphone")); } else { FinalFriendlyString.Append(_("Textphone")); }
 						
 							TelTypeOut.Append(wxT(";"));
@@ -1019,15 +1010,15 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			
 			}
 			
-                    if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-GEO;X-GEOTYPE=") + strFinalType, wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-GEO;X-GEOTYPE=") + strFinalType, wxSPropertySeg2);
                         
-                    } else {
+			} else {
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-GEO;X-GEOTYPE=") + strFinalType + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-GEO;X-GEOTYPE=") + strFinalType + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
                         
-                    }
+			}
 		
 		} else if (wxSProperty == wxT("RELATED")){
 			
@@ -1609,15 +1600,15 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			
 			intPrevValue = 10;
 			
-                    if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-CALADRURI"), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-CALADRURI"), wxSPropertySeg2);
 
-                    } else {
+			} else {
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-CALADRURI;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-CALADRURI;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-                    }
+			}
 		
 		} else if (wxSProperty == wxT("FBURL")){
 		
@@ -1632,15 +1623,15 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
             
 			intPrevValue = 6;
 			
-                    if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-FBURL"), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-FBURL"), wxSPropertySeg2);
 
-                    } else {
+			} else {
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-FBURL;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-FBURL;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-                    }
+			}
 		
 		} else if (wxSProperty == wxT("KEY")){
 		
@@ -1655,15 +1646,15 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			
 			intPrevValue = 4;
 						
-            if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                ContactDatav3.AddRaw(wxT("X-VCARD4-KEY"), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-KEY"), wxSPropertySeg2);
 
-            } else {
+			} else {
                         
-                ContactDatav3.AddRaw(wxT("X-VCARD4-KEY;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-KEY;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-            }
+			}
 		
 		} else if (wxSProperty == wxT("UID")){
 		
@@ -1689,30 +1680,84 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			
 			}
 
-                    if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-") + wxSProperty, wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-") + wxSProperty, wxSPropertySeg2);
 
-                    } else {
+			} else {
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-") + wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-") + wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-                    }
+			}
 		
 		} else if (wxSProperty.Mid(0, 2) == wxT("X-")){
 			
 			size_t intPrevValue = (wxSProperty.Len() + 1);
 			
-            if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+                        
+		                ContactDatav3.AddRaw(wxSProperty, wxSPropertySeg2);
+
+			} else {
+                        
+				ContactDatav3.AddRaw(wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+
+			}
+			
+		} else if (wxSProperty.Mid(0, 12) == wxT("CLIENTPIDMAP")){
+		
+			// Process the Client PID maps.
+			
+			int intPrevValue = 14;
+			
+			intPrevValue = 12;
+			
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                ContactDatav3.AddRaw(wxSProperty, wxSPropertySeg2);
+		                ContactDatav3.AddRaw(wxT("X-VCARD4-CLIENTPIDMAP"), wxSPropertySeg2);
 
-            } else {
+			} else {
                         
-                ContactDatav3.AddRaw(wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-CLIENTPIDMAP;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-            }
+			}
+		
+		} else if (wxSProperty.Mid(0, 3) == wxT("XML")){
+		
+			// Process the XML values.
+			
+			int intPrevValue = 5;
+			
+			intPrevValue = 3;
 			
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+                        
+		                ContactDatav3.AddRaw(wxT("X-VCARD4-XML"), wxSPropertySeg2);
+
+			} else {
+                        
+				ContactDatav3.AddRaw(wxT("X-VCARD4-XML;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+
+			}
+		
+		} else if (wxSProperty.Mid(0, 6) == wxT("SOURCE")){
+		
+			// Process the source links.
+			
+			int intPrevValue = 8;
+			
+			intPrevValue = 6;
+			
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+                        
+		                ContactDatav3.AddRaw(wxT("X-VCARD4-SOURCE"), wxSPropertySeg2);
+
+			} else {
+                        
+				ContactDatav3.AddRaw(wxT("X-VCARD4-SOURCE;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+
+			}
+		
 		}
 		
 		// Reset the variables.