Merge pull request #374 from hbz/FRL-551

Merge Changes for ticket Frl 551 to master
hbz · Sep 27, 2022 · 9f6b9f2 · 9f6b9f2
2 parents 9ad668d + 479c8eb
commit 9f6b9f2
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 11 deletions.
diff --git a/app/views/Helper.java b/app/views/Helper.java
@@ -388,8 +388,7 @@ public static List<Map<String, Object>> listAuthors(Map<String, Object> h) {
 			String roleUri = c.at("/role/0/@id").asText();
 			String uri = c.at("/agent/0/@id").asText();
 
-			if ("http://id.loc.gov/vocabulary/relators/ctb".equals(roleUri)
-					|| "http://id.loc.gov/vocabulary/relators/cre".equals(roleUri)
+			if ("http://id.loc.gov/vocabulary/relators/cre".equals(roleUri)
 					|| "http://id.loc.gov/vocabulary/relators/aut".equals(roleUri)) {
 				Map<String, Object> contribution = new HashMap<>();
 				contribution.put("id", uri);
@@ -401,6 +400,27 @@ public static List<Map<String, Object>> listAuthors(Map<String, Object> h) {
 		}
 		return result;
 	}
+
+	public static List<Map<String, Object>> listContributors(Map<String, Object> h) {
+		List<Map<String, Object>> result = new ArrayList<>();
+		JsonNode hit = new ObjectMapper().valueToTree(h);
+		for (JsonNode c : hit.at("/contribution")) {
+			String name = c.at("/agent/0/label").asText();
+			String role = c.at("/role/0/label").asText();
+			String roleUri = c.at("/role/0/@id").asText();
+			String uri = c.at("/agent/0/@id").asText();
+
+			if ("http://id.loc.gov/vocabulary/relators/ctb".equals(roleUri)) {
+				Map<String, Object> contribution = new HashMap<>();
+				contribution.put("id", uri);
+				contribution.put("label", name);
+				contribution.put("roleName", role);
+				contribution.put("roleId", roleUri);
+				result.add(contribution);
+			}
+		}
+		return result;
+	}
 
 	public static List<Map<String, Object>> listCreators(Map<String, Object> h) {
 		List<Map<String, Object>> result = new ArrayList<>();

diff --git a/app/views/tags/getTitle.scala.html b/app/views/tags/getTitle.scala.html
@@ -68,13 +68,18 @@ <h1 class="title" id="page-title">
 					<h2 id="page-title-suffix" class="titlePost title-suffix">
 						@if(hit.contains("contribution")){
 							<ol class="author-title-list">
-								@for(c <-views.Helper.listAuthors(hit)){
+								@for(a <-views.Helper.listAuthors(hit)){
+									<li>@displayAuthors(a.get("id").toString(),a.get("label").toString(),a.get("roleId").toString(),a.get("roleName").toString())</li>
+								}
+							</ol>
+							<ol class="contributors-title-list">
+								@for(c <-views.Helper.listContributors(hit)){
 									<li>@displayAuthors(c.get("id").toString(),c.get("label").toString(),c.get("roleId").toString(),c.get("roleName").toString())</li>
 								}
 							</ol>
 
 						}else{
-							<ol class="author-title-list">
+							<ol class="creators-title-list">
 							@for(c <-views.Helper.listCreators(hit)){
 									<li>@displayCreators(c.get("id"),c.get("label").toString())</li>
 								}

diff --git a/app/views/tags/resourceShortView.scala.html b/app/views/tags/resourceShortView.scala.html
@@ -62,13 +62,18 @@ <h3 class="title">
 					<h4 id="page-title-suffix" class="titlePost title-suffix">
 						@if(hit.contains("contribution")){
 							<ol class="author-title-list">
-								@for(c <-views.Helper.listAuthors(hit)){
+								@for(a <-views.Helper.listAuthors(hit)){
+									<li>@displayAuthors(a.get("id").toString(),a.get("label").toString(),a.get("roleId").toString(),a.get("roleName").toString())</li>
+								}
+							</ol>
+							<ol class="contributors-title-list">
+								@for(c <-views.Helper.listContributors(hit)){
 									<li>@displayAuthors(c.get("id").toString(),c.get("label").toString(),c.get("roleId").toString(),c.get("roleName").toString())</li>
 								}
 							</ol>
 
 						}else{
-							<ol class="author-title-list">
+							<ol class="creators-title-list">
 							@for(c <-views.Helper.listCreators(hit)){
 									<li>@displayCreators(c.get("id"),c.get("label"))</li>
 								}

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
@@ -324,7 +324,7 @@ do not show separator before external links
 	font-size:12pt;
 }
 
-.search .author-title-list, .search .publicationYear {
+.search .author-title-list, .search .contributors-title-list, .search .publicationYear {
 	display: inline;
 	list-style: none;
 	list-style-type: none;
@@ -334,25 +334,30 @@ do not show separator before external links
 	font-size:10pt;
 }
 
-.author-title-list {
+.author-title-list, .contributors-title-list, .creators-title-list {
 	display: inline;
 	list-style: none;
 	list-style-type: none;
 	margin: 0;
 	padding: 0;
 }
 
-.author-title-list li {
+.author-title-list li, .contributors-title-list li, .creators-title-list li {
 	display: inline;
 }
 
-.author-title-list li:after {
-	content: "| ";
+.author-title-list li:after, .contributors-title-list li:after, .creators-title-list li:after {
+	content: " | ";
 }
 
 .author-title-list li:last-child:after {
+	content: " . ";
+}
+
+.contributors-title-list li:last-child:after, .creators-title-list li:last-child:after {
 	content: "";
 }
+
 .contribution tr td, .contribution tr th {
 	margin: 0;
 	padding: 0;