Changeset 921 for sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

Timestamp:

Sep 12, 2013 10:11:24 AM (9 years ago)

Author:

srkline

Message:

fixed an issue in Invariant where the file loader would fail if it tried to load in a name that was too long and needed to be truncated. Issue was resolved and updated to behave like the main file loader. Another good reason to consolidate the file loaders rather than have them scattered around...

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

@@ -627 +627 @@
         //Print S_fileName
         //Print tempName
-        
-        String cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0)
+
+// if the data loader forced a shorter name, get it now
+        String newStr = root:Packages:NIST:gShortNameStr
+        String cleanLastFileName
+        if(strlen(newStr) > 0)
+                 cleanLastFileName = CleanupName(newStr,0)
+        else
+                 cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0)
+        endif
+        
         String dataStr = "root:"+cleanLastFileName+":"
+
         
         // keep global copies of the names rather than reading from the popup