Changeset 5470

Timestamp:

08/22/10 22:15:24 (15 years ago)

Author:

Eric.Larour

Message:

Making scaled response descriptors possible

File:

• issm/trunk/src/c/shared/String/DescriptorIndex.cpp (modified) (2 diffs)

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

@@ -20 +20 @@
         
         char * pch=NULL;
-        
+
         /*retrieve first token, separated by underscore: */
         pch = strtok (descriptor,"_");
@@ -30 +30 @@
                 if(!pch)ISSMERROR("%s%s%s"," scaled descriptor ",descriptor," is not correctly formatted!");
                 strcpy(root,pch);
-                /*now recover  the index: */
+                /*now recover  the index if it exists: */
                 pch = strtok (NULL, "_");
-                sscanf(pch,"%i",pindex);
-                if(!pch)ISSMERROR("%s%s%s"," scaled descriptor ",descriptor," is not correctly formatted!");
+                if(!pch){
+                        *pindex=-1;
+                }
+                else{
+                        sscanf(pch,"%i",pindex);
+                }
                 return ScaledEnum;
         }