X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=6247596bd22c3bdf3c92961822084f415326efbb;hb=7d729a4ae2a2f9255de6ea3babe3d5ee983fd1fd;hp=ffca4603a8bd88aae2ed7336a80b9fef1355606b;hpb=6cd8a887c1e346fef41e94e6593248246cf3c729;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index ffca460..6247596 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -611,24 +611,8 @@ void ContactDataObject::ProcessSource(wxString PropertySeg1, wxString PropertySe
 		
 		} else if (PropertyName == wxT("PREF")){
 			
-			int PriorityNumber = 0;
-			bool ValidNumber = TRUE;
-			
-			try{
-				PriorityNumber = std::stoi(PropertyValue.ToStdString());
-			}
-			
-			catch(std::invalid_argument &e){
-				ValidNumber = FALSE;
-			}
+			ProcessIntegerValue(this, &SourceListPref, &PropertyValue, SourceCount);
 
-			if (ValidNumber == TRUE){
-
-				SourceListPref.erase(*SourceCount);
-				SourceListPref.insert(std::make_pair(*SourceCount, PriorityNumber));
-
-			}
-		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
 			SourceListMediatype.erase(*SourceCount);
@@ -785,23 +769,7 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe
 		
 		} 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){
-
-				GroupsListPref.erase(*GroupCount);
-				GroupsListPref.insert(std::make_pair(*GroupCount, PriorityNumber));
-		
-			}
+			ProcessIntegerValue(this, &GroupsListPref, &PropertyValue, GroupCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 
@@ -898,23 +866,7 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
 		
 		} 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){
-
-				FullNamesListPref.erase(*FNCount);
-				FullNamesListPref.insert(std::make_pair(*FNCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &FullNamesListPref, &PropertyValue, FNCount);
 		
 		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
 			
@@ -1274,23 +1226,7 @@ void ContactDataObject::ProcessNickname(wxString PropertySeg1, wxString Property
 
 		} 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){
-
-				NicknamesListPref->erase(*NicknameCount);
-				NicknamesListPref->insert(std::make_pair(*NicknameCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, NicknamesListPref, &PropertyValue, NicknameCount);
 		
 		} else if (PropertyName == wxT("LANGUAGE")){
 
@@ -1765,23 +1701,7 @@ void ContactDataObject::ProcessTimeZone(wxString PropertySeg1, wxString Property
 
 		} 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){
-
-				TZListPref->erase(*TimeZoneCount);
-				TZListPref->insert(std::make_pair(*TimeZoneCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, TZListPref, &PropertyValue, TimeZoneCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 
@@ -1997,24 +1917,8 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
 			AddressListMediatype->insert(std::make_pair(*AddressCount, 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){
 
-				AddressListPref->erase(*AddressCount);
-				AddressListPref->insert(std::make_pair(*AddressCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, AddressListPref, &PropertyValue, AddressCount);
 		
 		} else {
 		
@@ -2279,23 +2183,7 @@ void ContactDataObject::ProcessEmail(wxString PropertySeg1, wxString PropertySeg
 		
 		} 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){
-
-				EmailListPref->erase(*EmailCount);
-				EmailListPref->insert(std::make_pair(*EmailCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, EmailListPref, &PropertyValue, EmailCount);
 		
 		} else {
 		
@@ -2430,23 +2318,7 @@ void ContactDataObject::ProcessIM(wxString PropertySeg1, wxString PropertySeg2,
 		
 		} 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){
-
-				IMListPref->erase(*IMCount);
-				IMListPref->insert(std::make_pair(*IMCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, IMListPref, &PropertyValue, IMCount);
 		
 		} else {
 		
@@ -2739,24 +2611,8 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
 			TelephoneListPID->insert(std::make_pair(*TelephoneCount, 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){
-
-				TelephoneListPref->erase(*TelephoneCount);
-				TelephoneListPref->insert(std::make_pair(*TelephoneCount, PriorityNumber));
 
-			}
+			ProcessIntegerValue(this, TelephoneListPref, &PropertyValue, TelephoneCount);
 		
 		} else {
 		
@@ -2882,23 +2738,7 @@ void ContactDataObject::ProcessLanguage(wxString PropertySeg1, wxString Property
 		
 		} 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){
-
-				LanguageListPref->erase(*LanguageCount);
-				LanguageListPref->insert(std::make_pair(*LanguageCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, LanguageListPref, &PropertyValue, LanguageCount);
 		
 		} else {
 		
@@ -3031,24 +2871,8 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 			GeopositionListMediatype->insert(std::make_pair(*GeographicCount, 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){
-
-				GeopositionListPref->erase(*GeographicCount);
-				GeopositionListPref->insert(std::make_pair(*GeographicCount, PriorityNumber));
 
-			}
+			ProcessIntegerValue(this, GeopositionListPref, &PropertyValue, GeographicCount);
 		
 		} else {
 		
@@ -3283,9 +3107,8 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 			}
 		
 		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			GeneralRelatedListLanguage.erase(*RelatedCount);
-			GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue));
+
+			ProcessIntegerValue(this, &GeneralRelatedListPref, &PropertyValue, RelatedCount);
 		
 		} else if (PropertyName != wxT("TYPE")) {
 		
@@ -3436,25 +3259,9 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
 			WebsiteListPID->insert(std::make_pair(*URLCount, 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){
-
-				WebsiteListPref->erase(*URLCount);
-				WebsiteListPref->insert(std::make_pair(*URLCount, PriorityNumber));
 
-			}
-					
+			ProcessIntegerValue(this, WebsiteListPref, &PropertyValue, URLCount);
+							
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
 			WebsiteListMediatype->erase(*URLCount);
@@ -3610,25 +3417,9 @@ void ContactDataObject::ProcessTitle(wxString PropertySeg1, wxString PropertySeg
 			TitleListPID->insert(std::make_pair(*TitleCount, 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){
 
-				TitleListPref->erase(*TitleCount);
-				TitleListPref->insert(std::make_pair(*TitleCount, PriorityNumber));
-
-			}
-					
+			ProcessIntegerValue(this, TitleListPref, &PropertyValue, TitleCount);
+			
 		} else if (PropertyName == wxT("LANGUAGE")){
 		
 			TitleListLanguage->erase(*TitleCount);
@@ -5877,6 +5668,31 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe
 
 }
 
+void ProcessIntegerValue(ContactDataObject *ContactData,
+	std::map<int,int> *PrefPtr, 
+	wxString *PropertyValue, 
+	int *ItemCount){
+
+	int PriorityNumber = 0;	
+	bool ValidNumber = TRUE;
+			
+	try{
+		PriorityNumber = std::stoi(PropertyValue->ToStdString());
+	}
+			
+	catch(std::invalid_argument &e){
+		ValidNumber = FALSE;
+	}
+
+	if (ValidNumber == TRUE){
+
+		PrefPtr->erase(*ItemCount);
+		PrefPtr->insert(std::make_pair(*ItemCount, PriorityNumber));
+
+	}
+
+}
+
 void SplitValues(wxString *PropertyLine, 
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength,