Changeset 9e93790 in tol

Timestamp:

Nov 21, 2011, 10:56:36 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

9f6ab11

Parents:

6da87d6

Message:

Refs #1341
Compare.VersionString must handle with both numerical and string tokens

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3856 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/text_type/txtgra.cpp (modified) (2 diffs)

tol/btol/text_type/txtgra.cpp

@@ -2688 +2688 @@
   for(k=0; (k<n) && !cmp; k++)
   {
-    t1 = atoi(tok1[k].String());
-    t2 = atoi(tok2[k].String());
-    cmp = t1-t2;
+    if(isdigit(tok1[k][0]))
+    {
+      t1 = atoi(tok1[k].String());
+      t2 = atoi(tok2[k].String());
+      cmp = t1-t2;
+    }
+    else
+    {
+      cmp = strcmp(tok1[k].String(),tok2[k].String());
+    }  
   }
   if(!cmp) { cmp = n1-n2; }
@@ -2711 +2718 @@
 //--------------------------------------------------------------------
 {
-  contens_ = CompareVersionString(&Text(Arg(1)),&Text(Arg(2)));
-}
+  const BText& v1 = Text(Arg(1));
+  const BText& v2 = Text(Arg(2));
+  contens_ = CompareVersionString(&v1,&v2);
+}