Revision 49479
Added by Katerina Iatropoulou over 6 years ago
| modules/uoa-search/branches/person_remove/src/main/java/eu/dnetlib/data/search/utils/cql/ParameterQueryEnhancer.java | ||
|---|---|---|
| 139 | 139 |
|
| 140 | 140 |
public static void enhanceQueryWithAccessRights(StringBuilder queryBuilder, HttpServletRequest request) {
|
| 141 | 141 |
String oa = request.getParameter("OA");
|
| 142 |
addBooleanQueryTerm("resultbestlicense", oa, "Open Access", queryBuilder);
|
|
| 142 |
addBooleanQueryTerm("resultbestaccessright", oa, "Open Access", queryBuilder);
|
|
| 143 | 143 |
} |
| 144 | 144 |
|
| 145 | 145 |
public static void enhanceQueryWithDate(StringBuilder queryBuilder, HttpServletRequest request) throws IllegalArgumentException{
|
| ... | ... | |
| 255 | 255 |
private static boolean checkPublicationSortParameterFields(String sortField) {
|
| 256 | 256 |
if ((sortField != null) && (!sortField.isEmpty()) && |
| 257 | 257 |
sortField.matches("dateofcollection|resultstoragedate|resultembargoenddate|resultembargoendyear|" +
|
| 258 |
"resulttypeid|resulttypename|resultlanguageid|resultlanguagename|resultbestlicense|" +
|
|
| 258 |
"resulttypeid|resulttypename|resultlanguageid|resultlanguagename|resultbestaccessright|" +
|
|
| 259 | 259 |
"resultbestlicenseid|resultdateofacceptance|resultacceptanceyear")) {
|
| 260 | 260 |
return true; |
| 261 | 261 |
} |
| modules/uoa-search/branches/person_remove/src/main/resources/sygma.xsl | ||
|---|---|---|
| 49 | 49 |
<webresource><xsl:value-of select="@value"/></webresource> |
| 50 | 50 |
</xsl:for-each> |
| 51 | 51 |
</xsl:for-each> |
| 52 |
<bestlicense><xsl:value-of select="field[@name='bestlicense']/@value"/></bestlicense>
|
|
| 52 |
<bestlicense><xsl:value-of select="field[@name='bestaccessright']/@value"/></bestlicense>
|
|
| 53 | 53 |
</publication> |
| 54 | 54 |
</xsl:template> |
| 55 | 55 |
|
| modules/uoa-search/branches/person_remove/src/main/resources/publication_csv_notitle.xsl | ||
|---|---|---|
| 107 | 107 |
|
| 108 | 108 |
<!--access --> |
| 109 | 109 |
<xsl:text>"</xsl:text> |
| 110 |
<xsl:value-of select="../field[@name='bestlicense']/@value"/>
|
|
| 110 |
<xsl:value-of select="../field[@name='bestaccessright']/@value"/>
|
|
| 111 | 111 |
<xsl:text>"</xsl:text> |
| 112 | 112 |
<xsl:text>
</xsl:text> |
| 113 | 113 |
|
| ... | ... | |
| 181 | 181 |
|
| 182 | 182 |
<!--access --> |
| 183 | 183 |
<xsl:text>"</xsl:text> |
| 184 |
<xsl:value-of select="../field[@name='bestlicense']/@value"/>
|
|
| 184 |
<xsl:value-of select="../field[@name='bestaccessright']/@value"/>
|
|
| 185 | 185 |
<xsl:text>"</xsl:text> |
| 186 | 186 |
<xsl:text>
</xsl:text> |
| 187 | 187 |
</xsl:otherwise> |
| modules/uoa-search/branches/person_remove/src/main/resources/csv_publication.xsl | ||
|---|---|---|
| 71 | 71 |
<xsl:text>,</xsl:text> |
| 72 | 72 |
|
| 73 | 73 |
<!-- Access --> |
| 74 |
<xsl:value-of select="bestlicense/@classname"/>
|
|
| 74 |
<xsl:value-of select="bestaccessright/@classname"/>
|
|
| 75 | 75 |
<xsl:text>
</xsl:text> |
| 76 | 76 |
|
| 77 | 77 |
</xsl:template> |
| modules/uoa-search/branches/person_remove/src/main/resources/sygma_dataset.xsl | ||
|---|---|---|
| 45 | 45 |
<webresource><xsl:value-of select="@value"/></webresource> |
| 46 | 46 |
</xsl:for-each> |
| 47 | 47 |
</xsl:for-each> |
| 48 |
<bestlicense><xsl:value-of select="field[@name='bestlicense']/@value"/></bestlicense>
|
|
| 48 |
<bestlicense><xsl:value-of select="field[@name='bestaccessright']/@value"/></bestlicense>
|
|
| 49 | 49 |
<relatedpublications> |
| 50 | 50 |
<xsl:for-each select="field[@name='isRelatedTo']"> |
| 51 | 51 |
<xsl:if test="field[@name='resulttypeid']/@value = 'publication'"> |
| modules/uoa-search/branches/person_remove/src/main/resources/csv.xsl | ||
|---|---|---|
| 106 | 106 |
|
| 107 | 107 |
<!--access --> |
| 108 | 108 |
<xsl:text>"</xsl:text> |
| 109 |
<xsl:value-of select="../field[@name='bestlicense']/@value"/>
|
|
| 109 |
<xsl:value-of select="../field[@name='bestaccessright']/@value"/>
|
|
| 110 | 110 |
<xsl:text>"</xsl:text> |
| 111 | 111 |
<xsl:text>
</xsl:text> |
| 112 | 112 |
|
| ... | ... | |
| 179 | 179 |
|
| 180 | 180 |
<!--access --> |
| 181 | 181 |
<xsl:text>"</xsl:text> |
| 182 |
<xsl:value-of select="../field[@name='bestlicense']/@value"/>
|
|
| 182 |
<xsl:value-of select="../field[@name='bestaccessright']/@value"/>
|
|
| 183 | 183 |
<xsl:text>"</xsl:text> |
| 184 | 184 |
<xsl:text>
</xsl:text> |
| 185 | 185 |
</xsl:otherwise> |
| modules/uoa-search/branches/person_remove/src/main/resources/html_publication_special.xsl | ||
|---|---|---|
| 89 | 89 |
|
| 90 | 90 |
<!-- Access --> |
| 91 | 91 |
<td> |
| 92 |
<xsl:value-of select="bestlicense/@classname"/>
|
|
| 92 |
<xsl:value-of select="bestaccessright/@classname"/>
|
|
| 93 | 93 |
</td> |
| 94 | 94 |
</tr> |
| 95 | 95 |
</xsl:template> |
| modules/uoa-search/branches/person_remove/src/main/resources/publication_tsv_notitle.xsl | ||
|---|---|---|
| 108 | 108 |
|
| 109 | 109 |
<!--access --> |
| 110 | 110 |
<xsl:text>"</xsl:text> |
| 111 |
<xsl:value-of select="../field[@name='bestlicense']/@value"/>
|
|
| 111 |
<xsl:value-of select="../field[@name='bestaccessright']/@value"/>
|
|
| 112 | 112 |
<xsl:text>"</xsl:text> |
| 113 | 113 |
<xsl:text>
</xsl:text> |
| 114 | 114 |
|
| ... | ... | |
| 181 | 181 |
|
| 182 | 182 |
<!--access --> |
| 183 | 183 |
<xsl:text>"</xsl:text> |
| 184 |
<xsl:value-of select="../field[@name='bestlicense']/@value"/>
|
|
| 184 |
<xsl:value-of select="../field[@name='bestaccessright']/@value"/>
|
|
| 185 | 185 |
<xsl:text>"</xsl:text> |
| 186 | 186 |
<xsl:text>
</xsl:text> |
| 187 | 187 |
</xsl:otherwise> |
| modules/uoa-search/branches/person_remove/src/main/resources/tsv.xsl | ||
|---|---|---|
| 106 | 106 |
|
| 107 | 107 |
<!--access --> |
| 108 | 108 |
<xsl:text>"</xsl:text> |
| 109 |
<xsl:value-of select="../field[@name='bestlicense']/@value"/>
|
|
| 109 |
<xsl:value-of select="../field[@name='bestaccessright']/@value"/>
|
|
| 110 | 110 |
<xsl:text>"</xsl:text> |
| 111 | 111 |
<xsl:text>
</xsl:text> |
| 112 | 112 |
|
| ... | ... | |
| 179 | 179 |
|
| 180 | 180 |
<!--access --> |
| 181 | 181 |
<xsl:text>"</xsl:text> |
| 182 |
<xsl:value-of select="../field[@name='bestlicense']/@value"/>
|
|
| 182 |
<xsl:value-of select="../field[@name='bestaccessright']/@value"/>
|
|
| 183 | 183 |
<xsl:text>"</xsl:text> |
| 184 | 184 |
<xsl:text>
</xsl:text> |
| 185 | 185 |
</xsl:otherwise> |
| modules/uoa-search/branches/person_remove/src/main/resources/result.xsl | ||
|---|---|---|
| 247 | 247 |
</field> |
| 248 | 248 |
</xsl:for-each> |
| 249 | 249 |
|
| 250 |
<xsl:for-each select="./bestlicense">
|
|
| 251 |
<field name="bestlicense" indexId="resultbestlicense" multiplicity="false" label="Best License">
|
|
| 250 |
<xsl:for-each select="./bestaccessright">
|
|
| 251 |
<field name="bestaccessright" indexId="resultbestaccessright" multiplicity="false" label="Best License">
|
|
| 252 | 252 |
<xsl:attribute name="value"> |
| 253 | 253 |
<xsl:value-of select="@classid" /> |
| 254 | 254 |
</xsl:attribute> |
| ... | ... | |
| 690 | 690 |
<field name = "hostedbyname" indexId = "resulthostingdatasourcename" multiplicity="false"> |
| 691 | 691 |
<xsl:attribute name = "value"> <xsl:value-of select="./hostedby/@name"/> </xsl:attribute> |
| 692 | 692 |
</field> |
| 693 |
<xsl:for-each select="./licence">
|
|
| 694 |
<field name = "licenceid" indexId = "" multiplicity = "true">
|
|
| 693 |
<xsl:for-each select="./accessright">
|
|
| 694 |
<field name = "accessrightid" indexId = "" multiplicity = "true">
|
|
| 695 | 695 |
<xsl:attribute name = "value"> <xsl:value-of select="./@classid"/> </xsl:attribute> |
| 696 | 696 |
</field> |
| 697 |
<field name = "licencename" indexId = "resultrights" multiplicity = "true">
|
|
| 697 |
<field name = "accessrightname" indexId = "resultrights" multiplicity = "true">
|
|
| 698 | 698 |
<xsl:attribute name = "value"> <xsl:value-of select="./@classname"/> </xsl:attribute> |
| 699 | 699 |
</field> |
| 700 | 700 |
</xsl:for-each> |
| modules/uoa-search/branches/person_remove/src/main/resources/csv_publication_special.xsl | ||
|---|---|---|
| 88 | 88 |
<xsl:text>),</xsl:text> |
| 89 | 89 |
|
| 90 | 90 |
<!-- Access --> |
| 91 |
<xsl:value-of select="../../../bestlicense/@classname"/>
|
|
| 91 |
<xsl:value-of select="../../../bestaccessright/@classname"/>
|
|
| 92 | 92 |
<xsl:text>
</xsl:text> |
| 93 | 93 |
|
| 94 | 94 |
</xsl:for-each> |
| modules/uoa-search/branches/person_remove/src/main/resources/dc.xsl | ||
|---|---|---|
| 68 | 68 |
<xsl:value-of select="." /> |
| 69 | 69 |
</dc:identifier> |
| 70 | 70 |
</xsl:template> |
| 71 |
<xsl:template match="bestlicense">
|
|
| 71 |
<xsl:template match="bestaccessright">
|
|
| 72 | 72 |
<dc:rights> |
| 73 | 73 |
<xsl:value-of select="./@classname" /> |
| 74 | 74 |
</dc:rights> |
| modules/uoa-search/branches/person_remove/src/main/resources/html_publication.xsl | ||
|---|---|---|
| 90 | 90 |
|
| 91 | 91 |
<!-- Access --> |
| 92 | 92 |
<td> |
| 93 |
<xsl:value-of select="bestlicense/@classname"/>
|
|
| 93 |
<xsl:value-of select="bestaccessright/@classname"/>
|
|
| 94 | 94 |
</td> |
| 95 | 95 |
</tr> |
| 96 | 96 |
</xsl:template> |
| modules/uoa-search/branches/person_remove/src/main/resources/html.xsl | ||
|---|---|---|
| 113 | 113 |
|
| 114 | 114 |
<!--access --> |
| 115 | 115 |
<td> |
| 116 |
<xsl:value-of select="field[@name='bestlicense']/@value"/>
|
|
| 116 |
<xsl:value-of select="field[@name='bestaccessright']/@value"/>
|
|
| 117 | 117 |
</td> |
| 118 | 118 |
</tr> |
| 119 | 119 |
|
Also available in: Unified diff
Adopting the change of licence field to accessright, related to #3128