Changeset 5331

Timestamp:

08/17/10 17:09:13 (15 years ago)

Author:

Eric.Larour

Message:

Better isdistributed, look from the end of the string
backwards. This avoids descriptors like rheology_B2d1 to be
cut to rheology_B

File:

• issm/trunk/src/c/shared/String/isdistributed.cpp (modified) (1 diff)

issm/trunk/src/c/shared/String/isdistributed.cpp

@@ -25 +25 @@
         char* root=NULL;
 
-        /*intermediary: */
-        for(i=0;i<strlen(name);i++){
-                if (isdigit(name[i])){
-                        distributed=1;
-                        break;
-                }
-        }
+        /*Look at the end of the string, whether it's numeric or not: */
+        if (isdigit(name[strlen(name)-1]))distributed=1;
 
         if(distributed){
+                
                 root=(char*)xmalloc((strlen(name)+1)*sizeof(char));
                 strcpy(root,name);
         
-                for(i=0;i<strlen(name);i++){
+                /*Start from the end, until we find a letter, which we will, otherwise error out: */
+                for(i=strlen(name)-1;i>=0;i++){
                         if (isdigit(name[i])){
-                                root[i]='\0'; //finish the string here.
-                                break;
+                                root[i]='\0'; //finish the string here and keep looking for a letter
                         }
+                        else break;
                 }
         }