diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index b58a8e8181b..7faabdcb5f0 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java @@ -5461,6 +5461,14 @@ public Map getCVocConf(){ if (jo.containsKey("readonly") && jo.getString("readonly").toLowerCase().equals("true")) cvocReadonly = true; logger.fine("cvoc - readonly: " + cvocReadonly); + boolean cvocHideReadonlyUrls = false; + if (jo.containsKey("hideReadonlyUrls") && jo.getString("hideReadonlyUrls").toLowerCase().equals("true")) + cvocHideReadonlyUrls = true; + logger.fine("cvoc - cvocHideReadonlyUrls: " + cvocHideReadonlyUrls); + int cvocMinChars = 0; + if (jo.containsKey("minChars") && jo.getInt("minChars") >= 0) + cvocMinChars = jo.getInt("minChars"); + logger.fine("cvoc - minChars: " + cvocMinChars); String cvocProtocol = "skosmos";//default if (jo.containsKey("protocol")) cvocProtocol = jo.getString("protocol"); @@ -5485,10 +5493,9 @@ public Map getCVocConf(){ if (jo.containsKey("cvoc-url")) cvocUrl = jo.getString("cvoc-url"); logger.fine("cvoc - cvoc-url: " + cvocUrl); - CVoc cvoc = new CVoc(cvocUrl, cvocLang, cvocProtocol, cvocTermParentUri, cvocReadonly, vocabsList, vocabCodesList + CVoc cvoc = new CVoc(cvocUrl, cvocLang, cvocProtocol, cvocTermParentUri, cvocReadonly, cvocHideReadonlyUrls, cvocMinChars, vocabsList, vocabCodesList , cvocJsUrl, cvocMapId, cvocMapQuery); cvocMap.put(jo.getString("vocab-name"), cvoc); - } } return cvocMap; @@ -5502,14 +5509,18 @@ public class CVoc { String mapId; String mapQuery; boolean readonly; + boolean hideReadonlyUrls; + int minChars; List vocabs; List keys; - public CVoc(String cvocUrl, String language, String protocol, String termParentUri, boolean readonly, + public CVoc(String cvocUrl, String language, String protocol, String termParentUri, boolean readonly, boolean hideReadonlyUrls, int minChars, List vocabs, List keys, String jsUrl, String mapId, String mapQuery){ this.cvocUrl = cvocUrl; this.language = language; this.protocol = protocol; this.readonly = readonly; + this.hideReadonlyUrls = hideReadonlyUrls; + this.minChars = minChars; this.vocabs = vocabs; this.termParentUri = termParentUri; this.keys = keys; @@ -5531,6 +5542,10 @@ public String getTermParentUri() { public boolean isReadonly() { return readonly; } + public boolean isHideReadonlyUrls() { + return hideReadonlyUrls; + } + public int getMinChars() { return minChars; } public List getVocabs() { return vocabs; } diff --git a/src/main/webapp/datasetFieldForEditFragment.xhtml b/src/main/webapp/datasetFieldForEditFragment.xhtml index 486c189cc40..497cd08590a 100644 --- a/src/main/webapp/datasetFieldForEditFragment.xhtml +++ b/src/main/webapp/datasetFieldForEditFragment.xhtml @@ -49,6 +49,7 @@