Revision 59116
Added by Katerina Iatropoulou almost 4 years ago
| modules/uoa-search/trunk/src/main/java/eu/dnetlib/data/search/solr/SolrClientLocator.java | ||
|---|---|---|
| 40 | 40 |
cachedUrl = chooseIndexService(urls); |
| 41 | 41 |
|
| 42 | 42 |
} else {
|
| 43 |
cachedUrl = getCachedIndexService(urls); |
|
| 43 | 44 |
logger.warn("Falling back to cached value for index : " + cachedUrl);
|
| 44 | 45 |
throw new IllegalArgumentException("Could not locate an index service with a SOLR interface");
|
| 45 | 46 |
} |
| ... | ... | |
| 57 | 58 |
return client; |
| 58 | 59 |
} |
| 59 | 60 |
|
| 60 |
private String chooseIndexService(List<String> urls) {
|
|
| 61 |
private String getCachedIndexService(List<String> urls) {
|
|
| 61 | 62 |
if (cachedUrl.equals("${services.index.default.url}"))
|
| 62 | 63 |
return urls.get(0); |
| 63 | 64 |
return cachedUrl; |
| 64 | 65 |
} |
| 65 | 66 |
|
| 67 |
private String chooseIndexService(List<String> urls) {
|
|
| 68 |
return urls.get(0); |
|
| 69 |
} |
|
| 70 |
|
|
| 71 |
|
|
| 66 | 72 |
public ServiceLocator<ISLookUpService> getLookUpServiceServiceLocator() {
|
| 67 | 73 |
return lookUpServiceServiceLocator; |
| 68 | 74 |
} |
| modules/uoa-search/trunk/src/main/resources/csv_publication.xsl | ||
|---|---|---|
| 44 | 44 |
<xsl:text>,</xsl:text> |
| 45 | 45 |
|
| 46 | 46 |
<!-- DOI --> |
| 47 |
<xsl:apply-templates select="pid"/> |
|
| 47 |
<xsl:for-each select="pid[@classid='doi']"> |
|
| 48 |
<xsl:value-of select="."/> |
|
| 49 |
<xsl:if test="not(position()=last())"> |
|
| 50 |
<xsl:text>;</xsl:text> |
|
| 51 |
</xsl:if> |
|
| 52 |
</xsl:for-each> |
|
| 48 | 53 |
<xsl:text>,</xsl:text> |
| 49 | 54 |
|
| 50 | 55 |
<!-- Funder|Project Name (GA Number) --> |
| modules/uoa-search/trunk/src/main/resources/csv_result_special.xsl | ||
|---|---|---|
| 52 | 52 |
<xsl:text>,</xsl:text> |
| 53 | 53 |
|
| 54 | 54 |
<!-- DOI --> |
| 55 |
<xsl:apply-templates select="pid"/> |
|
| 55 |
<xsl:for-each select="../../../pid[@classid='doi']"> |
|
| 56 |
<xsl:value-of select="."/> |
|
| 57 |
<xsl:if test="not(position()=last())"> |
|
| 58 |
<xsl:text>;</xsl:text> |
|
| 59 |
</xsl:if> |
|
| 60 |
</xsl:for-each> |
|
| 56 | 61 |
<xsl:text>,</xsl:text> |
| 57 | 62 |
|
| 58 | 63 |
<!-- Download from --> |
| ... | ... | |
| 99 | 104 |
|
| 100 | 105 |
</xsl:template> |
| 101 | 106 |
|
| 102 |
<xsl:template match="pid[@classid='doi']"> |
|
| 103 |
<xsl:value-of select="."/> |
|
| 104 |
</xsl:template> |
|
| 105 |
|
|
| 106 | 107 |
<xsl:template name="escape-quot-string"> |
| 107 | 108 |
<xsl:param name="s"/> |
| 108 | 109 |
<xsl:choose> |
| modules/uoa-search/trunk/src/main/resources/csv_publication_special.xsl | ||
|---|---|---|
| 48 | 48 |
<xsl:text>,</xsl:text> |
| 49 | 49 |
|
| 50 | 50 |
<!-- DOI --> |
| 51 |
<xsl:apply-templates select="pid"/> |
|
| 51 |
<xsl:for-each select="../../../pid[@classid='doi']"> |
|
| 52 |
<xsl:value-of select="."/> |
|
| 53 |
<xsl:if test="not(position()=last())"> |
|
| 54 |
<xsl:text>;</xsl:text> |
|
| 55 |
</xsl:if> |
|
| 56 |
</xsl:for-each> |
|
| 52 | 57 |
<xsl:text>,</xsl:text> |
| 53 | 58 |
|
| 54 | 59 |
<!-- Download from --> |
| ... | ... | |
| 95 | 100 |
|
| 96 | 101 |
</xsl:template> |
| 97 | 102 |
|
| 98 |
<xsl:template match="pid[@classid='doi']"> |
|
| 99 |
<xsl:value-of select="."/> |
|
| 100 |
</xsl:template> |
|
| 101 |
|
|
| 102 | 103 |
<xsl:template name="escape-quot-string"> |
| 103 | 104 |
<xsl:param name="s"/> |
| 104 | 105 |
<xsl:choose> |
| modules/uoa-search/trunk/src/main/resources/csv_result.xsl | ||
|---|---|---|
| 48 | 48 |
<xsl:text>,</xsl:text> |
| 49 | 49 |
|
| 50 | 50 |
<!-- DOI --> |
| 51 |
<xsl:apply-templates select="pid"/> |
|
| 51 |
<xsl:for-each select="pid[@classid='doi']"> |
|
| 52 |
<xsl:value-of select="."/> |
|
| 53 |
<xsl:if test="not(position()=last())"> |
|
| 54 |
<xsl:text>;</xsl:text> |
|
| 55 |
</xsl:if> |
|
| 56 |
</xsl:for-each> |
|
| 52 | 57 |
<xsl:text>,</xsl:text> |
| 53 | 58 |
|
| 54 | 59 |
<!-- Funder|Project Name (GA Number) --> |
| ... | ... | |
| 80 | 85 |
|
| 81 | 86 |
</xsl:template> |
| 82 | 87 |
|
| 83 |
<xsl:template match="pid[@classid='doi']"> |
|
| 84 |
<xsl:value-of select="."/> |
|
| 85 |
</xsl:template> |
|
| 86 |
|
|
| 87 | 88 |
<xsl:template name="escape-quot-string"> |
| 88 | 89 |
<xsl:param name="s"/> |
| 89 | 90 |
<xsl:choose> |
Also available in: Unified diff
DOIs mixed with other PIDs fixed - related to #5767