Repository: trafodion
Updated Branches:
  refs/heads/master 9b53555e3 -> 7a5f3885d


[TRAFODION-2875] Fix inaccuracies in text comparison in analyzeMessageGuide.py


Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e349dea8
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e349dea8
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e349dea8

Branch: refs/heads/master
Commit: e349dea868a310679487d6b7a2244798107b35a4
Parents: db319b1
Author: Dave Birdsall <[email protected]>
Authored: Thu Jan 4 01:31:39 2018 +0000
Committer: Dave Birdsall <[email protected]>
Committed: Thu Jan 4 01:31:39 2018 +0000

----------------------------------------------------------------------
 core/sqf/sql/scripts/analyzeMessageGuide.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/e349dea8/core/sqf/sql/scripts/analyzeMessageGuide.py
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/analyzeMessageGuide.py 
b/core/sqf/sql/scripts/analyzeMessageGuide.py
index d903421..162d738 100644
--- a/core/sqf/sql/scripts/analyzeMessageGuide.py
+++ b/core/sqf/sql/scripts/analyzeMessageGuide.py
@@ -416,6 +416,7 @@ class MessagesTable:
             elif state == 2:
                 if line[i] == '>':
                     state = 0
+                    result = result + '.elided.'
                 else:
                     throwAway = throwAway + '>' + line[i]
             i = i + 1
@@ -426,7 +427,7 @@ class MessagesTable:
             result = result + ' <' + throwAway
         #print "Before<: " + line
         #print "After<: " + result
-        return result 
+        return result.rstrip() # ignore trailing spaces
 
     def removeDollarTerms(self,line):
         # removes text of the form $0~Datatype0 (where Datatype might
@@ -470,10 +471,11 @@ class MessagesTable:
                 if line[i].isalpha():
                     throwAway = throwAway + line[i]
                 elif line[i].isdigit():
-                    state = 0  # we reached the end of the dollar text         
         
-                else:
-                    result = result + line[i]
                     state = 0  # we reached the end of the dollar text
+                    result = result + '.elided.'                  
+                else: 
+                    state = 0  # we reached the end of the dollar text
+                    result = result + '.elided.' + line[i]
             i = i + 1
 
         # if we reached the end of the line then put the throwaway text
@@ -482,7 +484,7 @@ class MessagesTable:
             result = result + throwAway
         #print "Before$: " + line
         #print "After$: " + result
-        return result           
+        return result.rstrip() # ignore trailing spaces          
 
 
     def compareText(self):

Reply via email to