X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=b7978f816e01c4ee1f3e9c2c0924118d03c9a882;hp=1bc8b77560d5497586117aa39e05bd5516fb0afb;hb=072925fb1ad8123b6739fdfdaaf490bc8611f381;hpb=78a23a10b1ff0a041ab18891290a160b41d94530

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 1bc8b77..b7978f8 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -98,6 +98,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 	int NoteCount = 0;
 	int CategoryCount = 0;
 	int PhotoCount = 0;
+	int LogoCount = 0;
 	wxString ContactLine;
 	wxString PropertyLine;
 	wxString PropertySeg1;
@@ -330,6 +331,13 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){
 			ProcessPhoto(PropertySeg1, PropertySeg2, &PhotoCount);
 			PhotoCount++;
 
+		} else if (Property == wxT("LOGO")) {
+		
+			// See frmContactEditor-LoadPhoto.cpp
+			
+			ProcessLogo(PropertySeg1, PropertySeg2, &LogoCount);
+			LogoCount++;
+
 		}
 		
 	}
@@ -4060,7 +4068,6 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
 	int intPrevValue = 7;
 	int intPref = 0;			
 	int intType = 0;
-	long ListCtrlIndex;
 	
 	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
 	
@@ -4262,6 +4269,223 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
 
 }
 
+void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount){
+
+	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 = 6;
+	int intPref = 0;			
+	int intType = 0;
+	
+	SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue);
+	
+	intPrevValue = 5;
+	
+	PropertyType PropType = PROPERTY_NONE;
+		
+	// Look for type before continuing.
+	
+	CheckType(&PropertySeg1, &SplitPoints, &SplitLength, &intPrevValue, &PropType);
+
+	intPrevValue = 5;
+
+	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 (PropertyName == wxT("ALTID")){
+
+			LogosListAltID.erase(*LogoCount);
+			LogosListAltID.insert(std::make_pair(*LogoCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PID")){
+
+			LogosListPID.erase(*LogoCount);
+			LogosListPID.insert(std::make_pair(*LogoCount, PropertyValue));
+		
+		} else if (PropertyName == wxT("PREF")){
+			
+			int PriorityNumber = 0;
+			bool ValidNumber = TRUE;
+			
+			try{
+				PriorityNumber = std::stoi(PropertyValue.ToStdString());
+			}
+			
+			catch(std::invalid_argument &e){
+				ValidNumber = FALSE;
+			}
+
+			if (ValidNumber == TRUE){
+
+				LogosListPref.erase(*LogoCount);
+				LogosListPref.insert(std::make_pair(*LogoCount, PriorityNumber));
+
+			}
+		
+		} else if (PropertyName == wxT("MEDIATYPE")){
+		
+			LogosListMediatype.erase(*LogoCount);
+			LogosListMediatype.insert(std::make_pair(*LogoCount, PropertyValue));
+					
+		} else {
+		
+			// Something else we don't know about so append
+			// to the tokens variable.
+			
+			if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty() && PropertyName != wxT("TYPE")){
+			
+				if (FirstToken == TRUE){
+				
+					PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+					FirstToken = FALSE;
+				
+				} else {
+				
+					PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+				}
+			
+			}
+		
+		}
+	
+	}	
+	
+	intPropertyLen = PropertySeg2.Len();
+	SplitPoints.clear();
+	SplitLength.clear();
+	intSplitsFound = 0;
+	intSplitSize = 0;
+	intPrevValue = 0;			
+	
+	CaptureString(&PropertySeg2, FALSE);
+	
+	for (int i = 0; i <= intPropertyLen; i++){
+
+		intSplitSize++;
+	
+		if (PropertySeg2.Mid(i, 1) == wxT(";")){
+	
+			intSplitsFound++;
+			SplitPoints.insert(std::make_pair(intSplitsFound, (i + 1)));
+			
+			if (intSplitsFound == 6){ 
+			
+				SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+				break; 
+				
+			} else {
+			
+				SplitLength.insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
+			
+			}
+			
+			intSplitSize = 0;					
+	
+		}
+
+	}
+	
+	wxString wxSPhotoURI;
+	wxString wxSPhotoMIME;
+	wxString wxSPhotoEncoding;
+	wxString wxSPhotoData;
+	std::string base64enc;
+	
+	if (intSplitsFound == 0){
+	
+	} else {
+	
+		std::map<int, int>::iterator striter;
+	
+		striter = SplitLength.find(1);
+	
+		wxStringTokenizer wSTDataType(PropertySeg2.Mid(0, striter->second), wxT(":"));
+	
+		while (wSTDataType.HasMoreTokens() == TRUE){
+		
+			wxSPhotoURI = wSTDataType.GetNextToken();
+			wxSPhotoMIME = wSTDataType.GetNextToken();
+			break;
+		
+		}			
+	
+		wxStringTokenizer wSTDataInfo(PropertySeg2.Mid((striter->second + 1)), wxT(","));			
+	
+		while (wSTDataInfo.HasMoreTokens() == TRUE){
+		
+			wxSPhotoEncoding = wSTDataInfo.GetNextToken();
+			wxSPhotoData = wSTDataInfo.GetNextToken();
+			base64enc = wxSPhotoData.mb_str();
+			break;
+		
+		}
+	
+	}
+	
+	// Add the data to the General/Home/Work address variables.
+	
+	LogosList.insert(std::make_pair(*LogoCount, base64enc));
+	LogosListPictureType.insert(std::make_pair(*LogoCount, wxSPhotoMIME));
+	LogosListPicEncType.insert(std::make_pair(*LogoCount, wxSPhotoEncoding));
+	
+	switch(PropType){
+		case PROPERTY_NONE:
+			break;
+		case PROPERTY_HOME:
+			LogosListType.insert(std::make_pair(*LogoCount, "home"));
+			break;
+		case PROPERTY_WORK:
+			LogosListType.insert(std::make_pair(*LogoCount, "work"));
+			break;
+	}
+	
+	if (!PropertyTokens.IsEmpty()){
+
+		LogosListTokens.insert(std::make_pair(*LogoCount, PropertyTokens));
+	
+	}
+
+}
+
 void SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength,