Revision 60411
Added by Argiro Kokogiannaki about 3 years ago
| QueryGenerator.java | ||
|---|---|---|
| 600 | 600 |
return " order by claim.claimedBy "+((desc)?"desc":"asc"); |
| 601 | 601 |
|
| 602 | 602 |
}else if(orderBy.equals("source")){
|
| 603 |
return " order by claim.source_title "+((desc)?"desc":"asc");
|
|
| 603 |
return " order by source_title "+((desc)?"desc":"asc"); |
|
| 604 | 604 |
|
| 605 | 605 |
}else if(orderBy.equals("target")){
|
| 606 |
return " order by claim.target_title "+((desc)?"desc":"asc");
|
|
| 606 |
return " order by target_title "+((desc)?"desc":"asc"); |
|
| 607 | 607 |
|
| 608 | 608 |
}else{
|
| 609 | 609 |
return " order by claim.claim_date desc"; |
| ... | ... | |
| 667 | 667 |
public String generateCountByContext(String contextId ,String keyword, List<String> types, ArrayList<Object> params) {
|
| 668 | 668 |
if((keyword == null || keyword.equals(""))&&types.isEmpty()){
|
| 669 | 669 |
params.add(contextId+"%"); |
| 670 |
return " select count(*) from claim where "+" claim.source_id like ?"; |
|
| 670 |
params.add("%_connect_" + contextId);
|
|
| 671 |
return " select count(*) from claim where "+" claim.source_id like ? or claim.claimed_in_dashboard like ? "; |
|
| 671 | 672 |
} |
| 672 | 673 |
return " select count(*) from claim where claim.id in ( select claim.id from ("+generateFetchClaimsByContext(contextId, null,null,keyword,null,false, types, params)+")as claim )";
|
| 673 | 674 |
|
| ... | ... | |
| 750 | 751 |
if(i > 0){
|
| 751 | 752 |
clause = clause.concat(" or ");
|
| 752 | 753 |
} |
| 753 |
clause = clause.concat(" claim.claimed_in_dashboard = ? or source_id = ?");
|
|
| 754 |
clause = clause.concat(" claim.claimed_in_dashboard = ? or source_id like ?");
|
|
| 754 | 755 |
clauseParams.add("beta_connect_"+dashboards.get(i));
|
| 755 |
clauseParams.add(dashboards.get(i)); |
|
| 756 |
clauseParams.add(dashboards.get(i)+"%");
|
|
| 756 | 757 |
} |
| 757 | 758 |
if(dashboards.size()>0){
|
| 758 | 759 |
clause = clause.concat(")");
|
| ... | ... | |
| 857 | 858 |
} |
| 858 | 859 |
|
| 859 | 860 |
private String getClaimFields() {
|
| 860 |
return " claim.id, claim.claim_date, claim.claimedBy, claim.source_type, claim.target_type, claim.semantics, claim.curation_date, claim.curated_by, claim.approved "; |
|
| 861 |
return " claim.id, claim.claim_date, claim.claimedBy, claim.source_type, claim.target_type, claim.semantics, claim.curation_date, claim.curated_by, claim.approved, claim.claimed_in_dashboard ";
|
|
| 861 | 862 |
} |
| 862 | 863 |
private String getResultFields(String tableAlias) {
|
| 863 | 864 |
return " "+tableAlias+".openaire_id, "+tableAlias+".title "+tableAlias+"_title, "+tableAlias+".result_type, "+tableAlias+".doi, "+tableAlias+".orcidworkid, "+tableAlias+".access_rights, "+tableAlias+".embargo_end_date, "+tableAlias+".best_license, "+tableAlias+".external_url, "+tableAlias+".collected_from, "+tableAlias+".record_path, "+tableAlias+".record_format "; |
| ... | ... | |
| 866 | 867 |
return " "+tableAlias+".openaire_id, "+tableAlias+".name as "+tableAlias+"_title, "+tableAlias+".acronym, "+tableAlias+".funder_id, "+tableAlias+".funder_name, "+tableAlias+".funder_acronym, null as field7, array_to_string("+tableAlias+".contact_person,','), null as field9, null as field10, null as field11, null as field12 ";
|
| 867 | 868 |
} |
| 868 | 869 |
private String getContextFields(String tableAlias) {
|
| 869 |
return " "+tableAlias+".openaire_id, "+tableAlias+".name "+tableAlias+"_title, "+" null as field4, null as field5, null as field6, null as field7, null as field8, null as field9, null as field10, null as field11, null as field12, null as field13 "; |
|
| 870 |
return " "+tableAlias+".openaire_id, "+tableAlias+".name "+tableAlias+"_title, "+" null as field4, null as field5, null as field6, null as field7, null as field8, null as field9, null as field10, null as field11, null as field12, null as field13 ";
|
|
| 870 | 871 |
} |
| 871 | 872 |
|
| 872 | 873 |
private String getFieldsPerType(String type, String tableAlias){
|
Also available in: Unified diff
- fix order by titles
- context query: get results made in the same dashboard
- add claimed_in_dashboard in the result
- commit changes in Test CopyFromBeta