Revision 57485
Added by Konstantina Galouni over 4 years ago
searchPage.component.ts | ||
---|---|---|
229 | 229 |
keywordQuery += " or "; |
230 | 230 |
} |
231 | 231 |
let field = this.keywordFields[i]; |
232 |
keywordQuery += field.name+field.equalityOperator+StringUtils.URIEncode(keyword); |
|
232 |
//keywordQuery += field.name+field.equalityOperator+StringUtils.URIEncode(keyword); |
|
233 |
keywordQuery += field.name+field.equalityOperator+StringUtils.quote(StringUtils.URIEncode(keyword)); |
|
233 | 234 |
} |
234 | 235 |
} else { |
235 | 236 |
keywordQuery += "&q=" + StringUtils.URIEncode(keyword); |
... | ... | |
389 | 390 |
allLimits+=(allLimits.length==0?"?":"&")+'keyword=' + this.searchUtils.keyword; |
390 | 391 |
this.parameterNames.push("keyword"); |
391 | 392 |
this.parameterValues.push(this.searchUtils.keyword); |
392 |
} |
|
393 |
//this.parameterValues.push(StringUtils.quote(this.searchUtils.keyword)); |
|
394 |
} |
|
393 | 395 |
if(this.searchUtils.page != 1 && includePage){ |
394 | 396 |
allLimits+=((allLimits.length == 0)?'?':'&') + 'page=' + this.searchUtils.page; |
395 | 397 |
} |
... | ... | |
463 | 465 |
keywordQuery += " or "; |
464 | 466 |
} |
465 | 467 |
let field = this.keywordFields[i]; |
466 |
keywordQuery += field.name+field.equalityOperator+StringUtils.URIEncode(this.searchUtils.keyword); |
|
468 |
//keywordQuery += field.name+field.equalityOperator+StringUtils.URIEncode(this.searchUtils.keyword); |
|
469 |
keywordQuery += field.name+field.equalityOperator+StringUtils.quote(StringUtils.URIEncode(this.searchUtils.keyword)); |
|
467 | 470 |
} |
468 | 471 |
} else { |
469 | 472 |
keywordQuery += "&q=" + StringUtils.URIEncode(this.searchUtils.keyword); |
Also available in: Unified diff
[Trunk | Library]: Deposit Pages:
1. utils/properties/searchFields.ts: in 'DEPOSIT_DATASOURCE_KEYWORD_FIELDS' use field 'datasourcetypeuiname' instead of 'datasourcetypename' and use field 'datasourcesubject' with 'all' operator.
2. services/searchDataproviders.service.ts: [Bug fix]: Add subject only when there is some content.
3. searchPages/searchUtils/searchPage.component.ts: Add quotes in keyword for query (could cause problems with special keywords e.g. 'and and').
4. deposit/depositFirstPage.component.ts & deposit/searchDataprovidersToDeposit.component.ts: Use same placeholder in search form and add search by 'type'.
5. deposit/searchResultsInDeposit.component.html: Change 'NOT OPENAIRE COMPATIBLE' label with 'Not yet registered' and change tooltip from 'Compatibility' to 'OpenAIRE compatibility'.