X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=66f42594d4daccf647c123e2dfc6f471d6b451e6;hb=17d33f5a39d1b64be75d308a78467290e96b7e38;hp=4dad1f9c30c9b9f53dda9662cec5ce994432b07e;hpb=8a44cb6af4ffe0aae2d27208d9471e0d6b158c8b;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 4dad1f9..66f4259 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -79,6 +79,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	bool BirthdayProcessed = FALSE;
 	bool AnniversaryProcessed = FALSE;
 	bool UIDProcessed = FALSE;
+	bool RevisionProcessed = FALSE;
 	int ContactLineLen = 0;
 	int QuoteBreakPoint = 0;
 	int SourceCount = 0;
@@ -108,6 +109,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	int KeyCount = 0;
 	int VendorCount = 0;
 	int XTokenCount = 0;
+	int XMLCount = 0;
 	wxString ContactLine;
 	wxString PropertyLine;
 	wxString PropertySeg1;
@@ -220,6 +222,16 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 			ProcessSource(PropertySeg1, PropertySeg2, &SourceCount);
 			SourceCount++;
 		
+		} else if (Property == wxT("XML")){
+		
+			ProcessXML(PropertySeg1, PropertySeg2, &XMLCount);
+			XMLCount++;
+		
+		} else if (Property == wxT("REV") && RevisionProcessed == FALSE){
+		
+			ProcessRevision(PropertySeg1, PropertySeg2);
+			RevisionProcessed = TRUE;
+		
 		} else if (Property == wxT("MEMBER")){
 
 			ProcessMember(PropertySeg1, PropertySeg2, &GroupCount);
@@ -441,6 +453,85 @@ void ContactDataObject::ProcessKind(wxString KindType){
 
 }
 
+void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString PropertySeg2){
+
+	size_t intPropertyLen = PropertySeg1.Len();
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+	std::map<int, int>::iterator SLiter;			
+	wxString PropertyData;
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyTokens;
+	bool FirstToken = TRUE;
+	int intSplitsFound = 0;
+	int intSplitSize = 0;
+	int intPrevValue = 5;
+	int intPref = 0;			
+	int intType = 0;
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 4;
+
+	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+	intiter != SplitPoints.end(); ++intiter){
+	
+		SLiter = SplitLength.find(intiter->first);
+	
+		PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+		
+		wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+		PropertyName = PropertyElement.GetNextToken();				
+		PropertyValue = PropertyElement.GetNextToken();
+		
+		intPrevValue = intiter->second;
+		
+		// Process properties.
+		
+		size_t intPropertyValueLen = PropertyValue.Len();
+		
+		if (PropertyValue.Mid((intPropertyValueLen - 1), 1) == wxT("\"")){
+			
+			PropertyValue.Trim();
+			PropertyValue.RemoveLast();
+			
+		}				
+		
+		if (PropertyValue.Mid(0, 1) == wxT("\"")){
+			
+			PropertyValue.Remove(0, 1);
+			
+		}			
+		
+		CaptureString(&PropertyValue, FALSE);
+								
+		if (FirstToken == TRUE){
+				
+			PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+			FirstToken = FALSE;
+				
+		} else {
+				
+			PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+		}
+	
+	}	
+	
+	CaptureString(&PropertySeg2, FALSE);
+	
+	Revision = PropertySeg2;
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		RevisionTokens = PropertyTokens;
+	
+	}
+
+
+}
+
 void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySeg2, int *SourceCount){
 
 	size_t intPropertyLen = PropertySeg1.Len();
@@ -593,6 +684,54 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 
 }
 
+void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2, int *XMLCount){
+
+	std::map<int, int> SplitPoints;
+	std::map<int, int> SplitLength;
+
+	int intPrevValue = 5;
+	int intPref = 0;			
+	int intType = 0;
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+
+	intPrevValue = 4;
+	
+	wxString PropertyName;
+	wxString PropertyValue;
+	wxString PropertyData;
+	wxString PropertyTokens;
+	std::map<int,int>::iterator SLiter;
+	bool FirstToken = TRUE;
+	
+	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
+	intiter != SplitPoints.end(); ++intiter){
+	
+		SLiter = SplitLength.find(intiter->first);
+	
+		PropertyData = PropertySeg1.Mid(intPrevValue, (SLiter->second));
+		
+		wxStringTokenizer PropertyElement (PropertyData, wxT("="));
+		PropertyName = PropertyElement.GetNextToken();				
+		PropertyValue = PropertyElement.GetNextToken();
+		
+		intPrevValue = intiter->second;
+		
+		CaptureString(&PropertyValue, FALSE);
+	
+		if (PropertyName == wxT("ALTID")){
+
+			XMLListAltID.erase(*XMLCount);
+			XMLListAltID.insert(std::make_pair(*XMLCount, PropertyValue));
+		
+		}
+		
+	}
+
+	XMLList.insert(std::make_pair(*XMLCount, PropertySeg2));
+
+}
+
 void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount){
 
 	std::map<int, int> SplitPoints;