Skip to content
Snippets Groups Projects
Commit f5b720fb authored by tjc's avatar tjc
Browse files

fixes

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@13534 ee4ac58c-ac51-4696-9907-e4b3aa274f04
parent aad42885
No related branches found
No related tags found
No related merge requests found
...@@ -69,30 +69,22 @@ abstract class AbstractCvBox ...@@ -69,30 +69,22 @@ abstract class AbstractCvBox
*/ */
protected static String getFieldIgnoreSeparator(final String fieldName, final String qualifierString) protected static String getFieldIgnoreSeparator(final String fieldName, final String qualifierString)
{ {
String[] parts = qualifierString.split("="); String[] completeValues = qualifierString.split(";[\\S&&[^;=]]+=");
StringBuffer buff = null; StringBuffer buff = null;
for(int i=0; i<parts.length; i++) for(int i=0; i<completeValues.length; i++)
{ {
if(parts[i].endsWith(fieldName) && i<parts.length-1) if(qualifierString.indexOf(fieldName+"="+completeValues[i])>-1)
{ {
if(buff == null) if(buff == null)
buff = new StringBuffer(); buff = new StringBuffer();
else else
buff.append("; "); buff.append("; ");
buff.append(completeValues[i]);
String part = parts[i+1];
if(i<parts.length-2)
{
int ind = part.lastIndexOf(';');
buff.append(part.substring(0, ind));
}
else
buff.append(part);
} }
} }
if(buff != null) if(buff == null)
return buff.toString(); return getField(fieldName, qualifierString);
return getField(fieldName, qualifierString); return buff.toString();
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment