Replaced token processing in REV with ProcessTokens.

[xestiaab/.git] / source / contacteditor / ContactDataObject.cpp

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 6ee703e..44a361d 100644 (file)
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -511,17 +511,8 @@ void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString Property
                }                       
                
                CaptureString(&PropertyValue, FALSE);
-                                                               
-               if (FirstToken == TRUE){
-                               
-                       PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-                       FirstToken = FALSE;
-                               
-               } else {
-                               
-                       PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-                               
-               }
+               
+               ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
        
        }       
        
@@ -5158,6 +5149,28 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe
 
 }
 
+void ProcessTokens(wxString *PropertyName,
+       wxString *PropertyValue,
+       wxString *PropertyTokens,
+       bool *FirstToken){
+       
+       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);
+                       
+               }
+               
+       }
+       
+}
+
 void ProcessStringValue(wxString *PropertyName,
        wxString PropertyNameMatch,
        std::map<int,wxString> *MapPtr,
@@ -5206,30 +5219,6 @@ void ProcessIntegerValue(wxString *PropertyName,
 
 }
 
-void ProcessIntegerValue(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,