Revision 47127
Added by Katerina Iatropoulou almost 7 years ago
| UsageReport.java | ||
|---|---|---|
| 22 | 22 |
List<ReportItem> reportItems = new ArrayList<>(); |
| 23 | 23 |
List<ReportException> reportExceptions = new ArrayList<>(); |
| 24 | 24 |
|
| 25 |
if(!granularity.toLowerCase().equals("totals") && !granularity.toLowerCase().equals("monthly")){
|
|
| 25 |
if(!granularity.equalsIgnoreCase("totals") && !granularity.equalsIgnoreCase("monthly")){
|
|
| 26 | 26 |
reportExceptions.add(new ReportException("3062", "Warning", "Invalid ReportAttribute Value", "Granularity: \'" + granularity + "\' unknown. Defaulting to Monthly"));
|
| 27 | 27 |
granularity = "Monthly"; |
| 28 | 28 |
} |
| ... | ... | |
| 99 | 99 |
itemid = "-1"; |
| 100 | 100 |
} |
| 101 | 101 |
} |
| 102 |
if (itemid.equals("") && repoid.equals("") && !reportName.toLowerCase().equals("rr1")){
|
|
| 102 |
if (itemid.equals("") && repoid.equals("") && !reportName.equalsIgnoreCase("rr1")){
|
|
| 103 | 103 |
reportExceptions.add(new ReportException("3070", "Error", "Required Filter Missing", "ItemIdentifier or RepositoryIdentifier must be supplied"));
|
| 104 | 104 |
} |
| 105 |
if(reportName.toLowerCase().equals("ar1")) {
|
|
| 105 |
if(reportName.equalsIgnoreCase("ar1")) {
|
|
| 106 | 106 |
if (!itemid.equals("-1") && !repoid.equals("-1") && beginDateParsed != null && endDateParsed != null && beginDateParsed.before(endDateParsed)) {
|
| 107 | 107 |
if (!itemid.equals("")) {
|
| 108 |
if(itemDataType.toLowerCase().equals("") || itemDataType.toLowerCase().equals("article")) {
|
|
| 108 |
if(itemDataType.toLowerCase().equals("") || itemDataType.equalsIgnoreCase("article")) {
|
|
| 109 | 109 |
executeItem(reportItems, itemIdentifier, repoid, "Article", beginDateParsed, endDateParsed, granularity); |
| 110 | 110 |
} |
| 111 | 111 |
else{
|
| ... | ... | |
| 120 | 120 |
} |
| 121 | 121 |
} |
| 122 | 122 |
} |
| 123 |
else if(reportName.toLowerCase().equals("ir1")){
|
|
| 123 |
else if(reportName.equalsIgnoreCase("ir1")){
|
|
| 124 | 124 |
if (!itemid.equals("-1") && !repoid.equals("-1") && beginDateParsed != null && endDateParsed != null && beginDateParsed.before(endDateParsed)) {
|
| 125 | 125 |
if (!itemid.equals("")) {
|
| 126 | 126 |
executeItem(reportItems, itemIdentifier, repoid, itemDataType, beginDateParsed, endDateParsed, granularity); |
| ... | ... | |
| 133 | 133 |
} |
| 134 | 134 |
} |
| 135 | 135 |
} |
| 136 |
else if(reportName.toLowerCase().equals("rr1")){
|
|
| 136 |
else if(reportName.equalsIgnoreCase("rr1")){
|
|
| 137 | 137 |
if(!repoid.equals("-1") && beginDateParsed != null && endDateParsed != null && beginDateParsed.before(endDateParsed)){
|
| 138 | 138 |
executeRepo(reportItems, repoid, itemDataType, beginDateParsed, endDateParsed, granularity); |
| 139 | 139 |
} |
Also available in: Unified diff
svn ignore and ignore case for string comparison