github-mirrors/odc-analyzer
1
0
Fork 0
mirror of https://github.com/ysoftdevs/odc-analyzer.git synced 2026-03-29 13:31:58 +02:00
Code Issues 2 Packages Projects Releases Wiki Activity

Added a quick workaround against multiplicities.

Browse Source
This commit is contained in:
Šesták Vít
2017-03-31 11:00:16 +02:00
parent 50c6b6daee
commit c646dbf620
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/libraryIdentificationList.scala.html
View File

@@ -10,11 +10,15 @@
// So, making the implicit explicit is a workaround for this issue. // So, making the implicit explicit is a workaround for this issue.
Ordering.Tuple4[Confidence.Value, String, String, String] Ordering.Tuple4[Confidence.Value, String, String, String]
} }
@cleanIdentifiers(identifiers: Set[Identifier]) = @{
if(addLink) identifiers
else identifiers.map(_.copy(url = "")) // Quick workaround for multiplicities caused by different URL
}
<ul> <ul>
@if(!dep.identifiers.exists(_.confidence >= Confidence.High)){ @if(!dep.identifiers.exists(_.confidence >= Confidence.High)){
<li><span class="identifier identifier-file" data-type="file" data-confidence="highest">@dep.fileNames.toSeq.sorted.mkString(", ")@if(addButtons){<span class="btn-xs library-identification-badge-hack">&nbsp;</span>}</span></li> <li><span class="identifier identifier-file" data-type="file" data-confidence="highest">@dep.fileNames.toSeq.sorted.mkString(", ")@if(addButtons){<span class="btn-xs library-identification-badge-hack">&nbsp;</span>}</span></li>
} }
@for(id <- dep.identifiers.toSeq.sortBy(i => (i.confidence, i.identifierType, i.name, i.url)).reverse){ @for(id <- cleanIdentifiers(dep.identifiers).toSeq.sortBy(i => (i.confidence, i.identifierType, i.name, i.url)).reverse){
<li> <li>
@identifier(id, addLink) @identifier(id, addLink)
@for(cpe <- id.toCpeIdentifierOption; suppressionXmlId <- suppressionXmlIdOption; if addButtons){ @for(cpe <- id.toCpeIdentifierOption; suppressionXmlId <- suppressionXmlIdOption; if addButtons){
@@ -23,7 +27,7 @@
@if(addButtons && suppressionXmlIdOption.isDefined){<span class="btn-xs library-identification-badge-hack">&nbsp;</span>} @if(addButtons && suppressionXmlIdOption.isDefined){<span class="btn-xs library-identification-badge-hack">&nbsp;</span>}
</li> </li>
} }
@for(id <- dep.suppressedIdentifiers.toSeq.sortBy(i => (i.confidence, i.identifierType, i.name, i.url)).reverse){ @for(id <- cleanIdentifiers(dep.suppressedIdentifiers).toSeq.sortBy(i => (i.confidence, i.identifierType, i.name, i.url)).reverse){
<li><del>@identifier(id, addLink)</del></li> <li><del>@identifier(id, addLink)</del></li>
} }
</ul> </ul>