From 29d04c06b96002e042540bb6ccfc057ef6ca8bb5 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Tue, 29 Aug 2017 13:21:44 +0200
Subject: [PATCH] 44024: search page finalisation

---
 ...-search-result-list-element.component.html |  8 +---
 ...-search-result-list-element.component.html |  8 +---
 ...-search-result-list-element.component.html | 12 +++---
 .../search-result-list-element.component.ts   | 38 +++++++++++++++++++
 tslint.json                                   |  2 +-
 5 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index f35d8766b0..914fb49487 100644
--- a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -1,6 +1,2 @@
-<a [routerLink]="['/collections/' + dso.id]" class="lead">
-    {{dso.name}}
-</a>
-<div *ngIf="dso.shortDescription" class="text-muted">
-    {{dso.shortDescription}}
-</div>
+<a [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="getFirstValue('dc.title')"></a>
+<div *ngIf="dso.shortDescription" class="text-muted" [innerHTML]="getFirstValue('dc.description.abstract')"></div>
diff --git a/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index 218c210be2..d09ef7d668 100644
--- a/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,6 +1,2 @@
-<a [routerLink]="['/communities/' + dso.id]" class="lead">
-    {{dso.name}}
-</a>
-<div *ngIf="dso.shortDescription" class="text-muted">
-    {{dso.shortDescription}}
-</div>
+<a [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="getFirstValue('dc.title')"></a>
+<div *ngIf="dso.shortDescription" class="text-muted" [innerHTML]="getFirstValue('dc.description.abstract')"></div>
diff --git a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html b/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
index e963b6abbf..27b40eeeeb 100644
--- a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
+++ b/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
@@ -1,14 +1,12 @@
-<a [routerLink]="['/items/' + dso.id]" class="lead">
-    {{dso.findMetadata("dc.title")}}
-</a>
+<a [routerLink]="['/items/' + dso.id]" class="lead" [innerHTML]="getFirstValue('dc.title')"></a>
 <div>
   <span class="text-muted">
     <span *ngIf="dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);" class="item-list-authors">
-        <span *ngFor="let authorMd of dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">{{authorMd.value}}
-            <span *ngIf="!last">; </span>
+        <span *ngFor="let author of getValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+            <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
         </span>
     </span>
-    (<span *ngIf="dso.findMetadata('dc.publisher')" class="item-list-publisher">{{dso.findMetadata("dc.publisher")}}, </span><span *ngIf="dso.findMetadata('dc.date.issued')" class="item-list-date">{{dso.findMetadata("dc.date.issued")}}</span>)
+    (<span *ngIf="dso.findMetadata('dc.publisher')" class="item-list-publisher" [innerHTML]="getFirstValue('dc.publisher')">, </span><span *ngIf="dso.findMetadata('dc.date.issued')" class="item-list-date" [innerHTML]="getFirstValue('dc.date.issued')"></span>)
   </span>
-    <div *ngIf="dso.findMetadata('dc.description.abstract')" class="item-list-abstract">{{dso.findMetadata("dc.description.abstract") | dsTruncate:[200] }}</div>
+    <div *ngIf="dso.findMetadata('dc.description.abstract')" class="item-list-abstract" [innerHTML]="getFirstValue('dc.description.abstract') | dsTruncate:[200]"></div>
 </div>
diff --git a/src/app/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/object-list/search-result-list-element/search-result-list-element.component.ts
index 72c55b0c64..3a2bf51c97 100644
--- a/src/app/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -4,6 +4,8 @@ import { ObjectListElementComponent } from '../object-list-element/object-list-e
 import { ListableObject } from '../listable-object/listable-object.model';
 import { SearchResult } from '../../search/search-result.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Metadatum } from '../../core/shared/metadatum.model';
+import { isEmpty, hasNoValue } from '../../shared/empty.util';
 
 @Component({
   selector: 'ds-search-result-list-element',
@@ -12,8 +14,44 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 
 export class SearchResultListElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends ObjectListElementComponent<T> {
   dso: K;
+
   public constructor(@Inject('objectElementProvider') public listable: ListableObject) {
     super(listable);
     this.dso = this.object.dspaceObject;
   }
+
+  getValues(keys: string[]): string[] {
+    const results: string[] = new Array<string>();
+    this.object.hitHighlights.forEach(
+      (md: Metadatum) => {
+        if (keys.indexOf(md.key) > -1) {
+          results.push(md.value);
+        }
+      }
+    );
+    if (isEmpty(results)) {
+      this.dso.filterMetadata(keys).forEach(
+        (md: Metadatum) => {
+          results.push(md.value);
+        }
+      );
+    }
+    return results;
+  }
+
+  getFirstValue(key: string): string {
+    let result: string;
+    this.object.hitHighlights.some(
+      (md: Metadatum) => {
+        if (key === md.key) {
+          result =  md.value;
+          return true;
+        }
+      }
+    );
+    if (hasNoValue(result)) {
+      result = this.dso.findMetadata(key);
+    }
+    return result;
+  }
 }
diff --git a/tslint.json b/tslint.json
index f971919ec6..8b685b8026 100644
--- a/tslint.json
+++ b/tslint.json
@@ -53,7 +53,7 @@
     "no-debugger": true,
     "no-duplicate-variable": true,
     "no-empty": true,
-    "no-empty-interface": true,
+    "no-empty-interface": false,
     "no-eval": true,
     "no-forward-ref": true,
     "no-inferrable-types": [