Changeset 512

Timestamp:

05/23/16 13:50:18 (9 years ago)

Author:

Maciej Komosinski

Message:

No trailing space in full name when last name is empty

Location:

cpp/frams

Files:

• model/autoname.cpp (modified) (3 diffs)
• model/autoname.h (modified) (1 diff)
• util/sstringutils.cpp (modified) (1 diff)
• util/sstringutils.h (modified) (1 diff)
• util/validitychecks.cpp (modified) (1 diff)
• util/validitychecks.h (modified) (1 diff)

cpp/frams/model/autoname.cpp

@@ -11 +11 @@
         SString t;
         t = firstName(model);
-        t += ' ';
-        t += lastName(model);
+        SString last=lastName(model);
+        if (last.len()>0)
+                {
+                t += ' ';
+                t += last;
+                }
         return t;
 }
@@ -33 +37 @@
 }
 
-SString AutoName::firstName(Model& model)
+SString AutoName::firstName(const SString& g)
 {
         char buf[8];
         unsigned int s1 = 0, s2 = 0, s3 = 0;
-        SString g = model.getGeno().getGene();
         const char *x = g.c_str();
+        if (*x==0) return SString();
         for (; *x; x++) { s1 += *x; s2 = s2**x + *x; s3 = (s3^*x) + *x; }
         char* t = buf;
@@ -46 +50 @@
         buf[0] = (char)toupper(buf[0]);
         return SString(buf);
+}
+
+SString AutoName::firstName(Model& model)
+{
+        return firstName(model.getGeno().getGene());
 }
 

cpp/frams/model/autoname.h

@@ -11 +11 @@
 class AutoName
 {
+public:
+        static SString makeName(Model&);
+        static SString firstName(const SString& g);
         static SString firstName(Model&);
         static SString lastName(Model&);
-public:
-        static SString makeName(Model&);
 };
 

cpp/frams/util/sstringutils.cpp

@@ -259 +259 @@
 }
 
-SString trim(SString& s)
+SString trim(const SString& s)
 {
         const unsigned char*b = (const unsigned char*)s.c_str();

cpp/frams/util/sstringutils.h

@@ -26 +26 @@
 void strSetField(SString& txt, const SString& name, const SString& value);
 
-SString trim(SString& s); ///< remove leading/trailing whitespace
+SString trim(const SString& s); ///< remove leading/trailing whitespace
 bool removeCR(SString& s); ///< remove '\r' return true if changed
 bool matchWildcard(const SString& word, const SString& pattern);///< '*' in pattern matches any substring

cpp/frams/util/validitychecks.cpp

@@ -21 +21 @@
 }
 
-SString stringCheck(SString& in,const char* msgobj,const char* msgfun,const char* msg,SString (*checker)(SString& in))
+SString stringCheck(SString& in,const char* msgobj,const char* msgfun,const char* msg,SString (*checker)(const SString& in))
 {
 if (!checker)

cpp/frams/util/validitychecks.h

@@ -10 +10 @@
 
 bool listIndexCheck(SList* list,int index,const char* msgobj,const char* msgfun);
-SString stringCheck(SString& in,const char* msgobj,const char* msgfun,const char* msg,SString (*checker)(SString& in)=NULL);
+SString stringCheck(SString& in,const char* msgobj,const char* msgfun,const char* msg,SString (*checker)(const SString& in)=NULL);
 
 #endif