Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

goci-1127 Bug in Exporting studies #371

Merged
merged 1 commit into from
Oct 9, 2023
Merged

goci-1127 Bug in Exporting studies #371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...aces/goci-ui/src/main/java/uk/ac/ebi/spot/goci/refactoring/dto/StudySolrDTOAssembler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public class StudySolrDTOAssembler implements ResourceAssembler<StudyDoc, Resour


private static final Logger log = LoggerFactory.getLogger(StudySolrDTOAssembler.class);
private final static String INITIAL_SAMPLE_DESC_REGEX = "([1-9][0-9]{0,9}(?:,[0-9]{3,5})*)";
//private final static String INITIAL_SAMPLE_DESC_REGEX = "([1-9][0-9]{0,9}(?:,[0-9]{3,5})*)";
private final static String INITIAL_SAMPLE_DESC_REGEX = "([1-9][0-9]{0,9}(?:,[0-9]{3,5}))";
final Pattern pattern = Pattern.compile(INITIAL_SAMPLE_DESC_REGEX);

@Autowired
Expand Down Expand Up @@ -177,8 +178,8 @@ private List<String> populateInitialSampleDesc(String sampleDesc) {

for(int i = 0; i < sampleNumbers.size(); i++) {
String freetext = "";
//log.info("sampleNumbers ["+i+"]->"+sampleNumbers.get(i));
//log.info("text ["+i+"]->"+text.get(i));
// log.info("sampleNumbers ["+i+"]->"+sampleNumbers.get(i));
// log.info("text ["+i+"]->"+text.get(i));
if(text.size() > sampleNumbers.size() ){
freetext = sampleNumbers.get(i)+ text.get(i+1);
} else {
Expand Down