223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

strip outermost quotes from labels

This commit is contained in:
Philip Eisenlohr 2016-10-18 15:33:24 -04:00
parent b8bf51b366
commit ff2f827a68
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/damask/asciitable.py
View File

@ -336,6 +336,7 @@ class ASCIItable():
try: try:
idx.append(int(label)-1) # column given as integer number? idx.append(int(label)-1) # column given as integer number?
except ValueError: except ValueError:
label = label[1:-1] if label[0] == label[-1] and label[0] in ('"',"'") else label # remove outermost quotations
try: try:
idx.append(self.tags.index(label)) # locate string in label list idx.append(self.tags.index(label)) # locate string in label list
except ValueError: except ValueError:
@ -348,6 +349,7 @@ class ASCIItable():
idx = int(labels)-1 # offset for python array indexing idx = int(labels)-1 # offset for python array indexing
except ValueError: except ValueError:
try: try:
labels = labels[1:-1] if labels[0] == labels[-1] and labels[0] in ('"',"'") else labels # remove outermost quotations
idx = self.tags.index(labels) idx = self.tags.index(labels)
except ValueError: except ValueError:
try: try:
@ -380,6 +382,7 @@ class ASCIItable():
while idx+myDim < len(self.tags) and self.tags[idx+myDim].startswith("%i_"%(myDim+1)): while idx+myDim < len(self.tags) and self.tags[idx+myDim].startswith("%i_"%(myDim+1)):
myDim += 1 # add while found myDim += 1 # add while found
except ValueError: # column has string label except ValueError: # column has string label
label = label[1:-1] if label[0] == label[-1] and label[0] in ('"',"'") else label # remove outermost quotations
if label in self.tags: # can be directly found? if label in self.tags: # can be directly found?
myDim = 1 # scalar by definition myDim = 1 # scalar by definition
elif '1_'+label in self.tags: # look for first entry of possible multidim object elif '1_'+label in self.tags: # look for first entry of possible multidim object
@ -399,6 +402,7 @@ class ASCIItable():
while idx+dim < len(self.tags) and self.tags[idx+dim].startswith("%i_"%(dim+1)): while idx+dim < len(self.tags) and self.tags[idx+dim].startswith("%i_"%(dim+1)):
dim += 1 # add as long as found dim += 1 # add as long as found
except ValueError: # column has string label except ValueError: # column has string label
labels = labels[1:-1] if labels[0] == labels[-1] and labels[0] in ('"',"'") else labels # remove outermost quotations
if labels in self.tags: # can be directly found? if labels in self.tags: # can be directly found?
dim = 1 # scalar by definition dim = 1 # scalar by definition
elif '1_'+labels in self.tags: # look for first entry of possible multidim object elif '1_'+labels in self.tags: # look for first entry of possible multidim object