Mercurial > hg > LGDataverses
diff src/main/java/edu/harvard/iq/dataverse/HandlenetServiceBean.java @ 12:c2e2d794847f
new: add config.properties file for gazetteer
author | Zoe Hong <zhong@mpiwg-berlin.mpg.de> |
---|---|
date | Wed, 30 Sep 2015 13:43:54 +0200 |
parents | a50cf11e5178 |
children |
line wrap: on
line diff
--- a/src/main/java/edu/harvard/iq/dataverse/HandlenetServiceBean.java Wed Sep 09 17:13:18 2015 +0200 +++ b/src/main/java/edu/harvard/iq/dataverse/HandlenetServiceBean.java Wed Sep 30 13:43:54 2015 +0200 @@ -225,29 +225,14 @@ return auth; } private String getRegistrationUrl(Dataset dataset) { - String siteUrl = getSiteUrl(); + - String targetUrl = siteUrl + "/dataset.xhtml?persistentId=hdl:" + dataset.getAuthority() + String targetUrl = "/dataset.xhtml?persistentId=hdl:" + dataset.getAuthority() + "/" + dataset.getIdentifier(); return targetUrl; } - public String getSiteUrl() { - String hostUrl = System.getProperty("dataverse.siteUrl"); - if (hostUrl != null && !"".equals(hostUrl)) { - return hostUrl; - } - String hostName = System.getProperty("dataverse.fqdn"); - if (hostName == null) { - try { - hostName = InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - return null; - } - } - hostUrl = "https://" + hostName; - return hostUrl; - } + private byte[] readKey(final String file) { byte[] key = null;