Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Find property name before the first semi-colon in ProcessTextVectors.
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Sat, 23 Jan 2016 11:58:22 +0000 (11:58 +0000)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Sat, 23 Jan 2016 11:58:22 +0000 (11:58 +0000)
source/common/text.cpp

index 08a732c..377377b 100644 (file)
@@ -14,11 +14,41 @@ multimap<string, string> ProcessTextVectors(vector<string> *TextProperties,
        int TextSeekCount = 0;
        int TextPropertySize = 0;
        int PropertySeekCount = 0;
+       string PropertyName = "";
+       int PropertyNameSize = 0;
+       char BufferChar = 0;
                
        for (vector<string>::iterator iter = TextProperties->begin();
                iter != TextProperties->end(); iter++){
-       
-               if (*iter == Property){
+               
+               TextPropertySize = iter->size();
+                       
+               if (TextPropertySize == 0){
+                       
+                       // Text property size is 0. Go to the next
+                       // pair.
+                       
+                       continue;
+                       
+               }
+                       
+               // Get the property data up to the first semi-colon.
+               
+               while (TextSeekCount < TextPropertySize){
+               
+                       BufferChar = (*iter)[TextSeekCount];
+                       
+                       if (BufferChar == ';'){
+                               break;
+                       }
+                       
+                       PropertyName += BufferChar;
+                       
+                       TextSeekCount++;
+                       
+               }
+               
+               if (*iter == Property || PropertyName == Property){
                        
                        ProcessResult.insert(make_pair((*TextProperties)[PropertySeekCount], 
                                (*TextValues)[PropertySeekCount]));
@@ -26,6 +56,9 @@ multimap<string, string> ProcessTextVectors(vector<string> *TextProperties,
                }
                        
                PropertySeekCount++;
+               TextPropertySize = 0;
+               TextSeekCount = 0;
+               PropertyName.clear();
                        
        }
                
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy