lkrsnik/list
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Added custom name string functionality

Browse Source
This commit is contained in:
Luka
2019-01-16 09:09:25 +01:00
parent 2d7d5169cc
commit 4a53362566
7 changed files with 241 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/data/Corpus.java
View File

@@ -35,12 +35,23 @@ public class Corpus {
private boolean gosOrthMode;
boolean hasMsdData;
private ArrayList<String> validationErrors;
private String corpusName = "";
public Corpus() {
validationErrors = new ArrayList<>();
setTotal();
}
public String getCorpusName() {
return corpusName;
}
public void setCorpusName(String corpusName) {
System.out.println(corpusName);
this.corpusName = corpusName;
logger.info("Corpus.set: ", corpusName);
}
public CorpusType getCorpusType() {
return corpusType;
}

33
src/main/java/data/StatisticsNew.java
View File

@@ -109,34 +109,43 @@ public class StatisticsNew {
if (filter.getAl() == AnalysisLevel.STRING_LEVEL) {
Integer ngramLevel = filter.getNgramValue();
String name = corpus.getCorpusName();
if(ngramLevel == 0) {
sb.append(corpus.getCorpusType().toString())
.append(separator)
.append(I18N.get("exportFileName.letters"))
if(!name.equals("")) {
sb.append(name)
.append(separator);
}
sb.append(I18N.get("exportFileName.letters"))
.append(separator)
.append(filter.getCalculateFor())
.append(separator);
} else if(ngramLevel == 1) {
if (filter.getSuffixLength() != null && filter.getSuffixList() != null && filter.getPrefixLength() != null && filter.getPrefixList() != null) {
sb.append(corpus.getCorpusType().toString())
.append(separator)
.append(I18N.get("exportFileName.wordParts"))
if(!name.equals("")) {
sb.append(name)
.append(separator);
}
sb.append(I18N.get("exportFileName.wordParts"))
.append(separator)
.append(filter.getCalculateFor())
.append(separator);
} else {
sb.append(corpus.getCorpusType().toString())
.append(separator)
.append(I18N.get("exportFileName.words"))
if(!name.equals("")) {
sb.append(name)
.append(separator);
}
sb.append(I18N.get("exportFileName.words"))
.append(separator)
.append(filter.getCalculateFor())
.append(separator);
}
}
else {
sb.append(corpus.getCorpusType().toString())
.append(separator)
.append(I18N.get("exportFileName.wordSets"))
if(!name.equals("")) {
sb.append(name)
.append(separator);
}
sb.append(I18N.get("exportFileName.wordSets"))
.append(separator);
sb.append(filter.getCalculateFor().toString())
.append(separator);