Revision 39276
Added by Claudio Atzori about 9 years ago
| modules/dnet-deduplication/trunk/src/main/java/eu/dnetlib/functionality/modular/ui/dedup/DedupServiceInternalController.java | ||
|---|---|---|
| 292 | 292 |
paths.put("organization", new HashMap<String, String>());
|
| 293 | 293 |
paths.put("person", new HashMap<String, String>());
|
| 294 | 294 |
|
| 295 |
paths.get("result").put("provenance", "collectedfrom/value");
|
|
| 296 |
paths.get("organization").put("provenance", "collectedfrom/value");
|
|
| 297 |
paths.get("person").put("provenance", "collectedfrom/value");
|
|
| 298 |
|
|
| 295 | 299 |
paths.get("result").put("title", "result/metadata/title/value");
|
| 296 | 300 |
paths.get("result").put("dateofacceptance", "result/metadata/dateofacceptance/value");
|
| 297 | 301 |
paths.get("result").put("description", "result/metadata/description/value");
|
| ... | ... | |
| 443 | 447 |
// final String base64 = s.replaceAll("<record.*>", "").replace("</record>", "");
|
| 444 | 448 |
final String base64 = StringUtils.substringBefore(StringUtils.substringAfter(s, ">"), "<"); |
| 445 | 449 |
try {
|
| 446 |
final byte[] oaf = Base64.decodeBase64(base64); |
|
| 447 |
return OafDecoder.decode(oaf).getOaf(); |
|
| 450 |
final byte[] oafBytes = Base64.decodeBase64(base64); |
|
| 451 |
final Oaf oaf = OafDecoder.decode(oafBytes).getOaf(); |
|
| 452 |
return oaf; |
|
| 448 | 453 |
} catch (final Throwable e) {
|
| 449 | 454 |
throw new IllegalArgumentException("unable to decode base64 encoded Oaf object: " + base64);
|
| 450 | 455 |
} |
| modules/dnet-deduplication/trunk/src/main/resources/eu/dnetlib/web/resources/html/dedup/recordTable.html | ||
|---|---|---|
| 5 | 5 |
text-overflow: ellipsis; |
| 6 | 6 |
white-space: nowrap; |
| 7 | 7 |
} |
| 8 |
.modal-lg {
|
|
| 9 |
width:80%; |
|
| 10 |
} |
|
| 8 | 11 |
</style> |
| 9 | 12 |
<table class="table table-condensed"> |
| 10 | 13 |
<thead> |
| modules/dnet-deduplication/trunk/src/main/resources/eu/dnetlib/web/resources/html/dedup/add.html | ||
|---|---|---|
| 59 | 59 |
remove-from-group-fn="remove"></ng-dedup-records-table> |
| 60 | 60 |
<ng-dedup-records-table |
| 61 | 61 |
ng-show="group.entityType.type == 'organization'" |
| 62 |
theads="Group size,Legal name,Legal short name,Website URL" |
|
| 63 |
fields="groupSize,legalname,legalshortname,websiteurl" |
|
| 62 |
theads="Group size,Legal name,Legal short name,Country,Website URL"
|
|
| 63 |
fields="groupSize,legalname,legalshortname,country,websiteurl"
|
|
| 64 | 64 |
results="results.results" group="group" |
| 65 | 65 |
show-merged-fn="showRootModal" add-to-group-fn="add" |
| 66 | 66 |
remove-from-group-fn="remove"></ng-dedup-records-table> |
| ... | ... | |
| 90 | 90 |
<div class="col-xs-12" ng-show="groupIdDetails"> |
| 91 | 91 |
|
| 92 | 92 |
<ng-dedup-records-table ng-show="group.entityType.type == 'result'" |
| 93 |
theads="Group size,Title,Publication date,Abstract"
|
|
| 94 |
fields="groupSize,title,dateofacceptance,description"
|
|
| 93 |
theads="Title,Publication date,Abstract,Provenance"
|
|
| 94 |
fields="title,dateofacceptance,description,provenance"
|
|
| 95 | 95 |
results="group.detailList" group="group" removal="removalGroup" |
| 96 | 96 |
add-to-removal-group-fn="addToRemovalGroup" remove-from-removal-group-fn="removeFromRemovalGroup"></ng-dedup-records-table> |
| 97 | 97 |
<ng-dedup-records-table |
| 98 | 98 |
ng-show="group.entityType.type == 'organization'" |
| 99 |
theads="Group size,Legal name,Legal short name,Website URL"
|
|
| 100 |
fields="groupSize,legalname,legalshortname,websiteurl"
|
|
| 99 |
theads="Legal name,Legal short name,Country,Website URL,Provenance"
|
|
| 100 |
fields="legalname,legalshortname,country,websiteurl,provenance"
|
|
| 101 | 101 |
results="group.detailList" group="group" removal="removalGroup" |
| 102 | 102 |
add-to-removal-group-fn="addToRemovalGroup" remove-from-removal-group-fn="removeFromRemovalGroup"></ng-dedup-records-table> |
| 103 | 103 |
<ng-dedup-records-table |
| 104 | 104 |
ng-show="group.entityType.type == 'person'" |
| 105 |
theads="Group size,Fullname"
|
|
| 106 |
fields="groupSize,fullname"
|
|
| 105 |
theads="Fullname,Provenance"
|
|
| 106 |
fields="fullname,provenance"
|
|
| 107 | 107 |
results="group.detailList" group="group" removal="removalGroup" |
| 108 | 108 |
add-to-removal-group-fn="addToRemovalGroup" remove-from-removal-group-fn="removeFromRemovalGroup"></ng-dedup-records-table> |
| 109 | 109 |
</div> |
| ... | ... | |
| 131 | 131 |
<div class="col-xs-12" ng-show="groupIdDetails"> |
| 132 | 132 |
|
| 133 | 133 |
<ng-dedup-records-table ng-show="group.entityType.type == 'result'" |
| 134 |
theads="Group size,Title,Publication date,Authors,Abstract"
|
|
| 135 |
fields="groupSize,title,dateofacceptance,author,description"
|
|
| 134 |
theads="Title,Publication date,Authors,Abstract,Provenance"
|
|
| 135 |
fields="title,dateofacceptance,author,description,provenance"
|
|
| 136 | 136 |
results="groupIdDetails.list" group="group"></ng-dedup-records-table> |
| 137 | 137 |
<ng-dedup-records-table |
| 138 | 138 |
ng-show="group.entityType.type == 'organization'" |
| 139 |
theads="Group size,Legal name,Legal short name,Website URL"
|
|
| 140 |
fields="groupSize,legalname,legalshortname,websiteurl"
|
|
| 139 |
theads="Legal name,Legal short name,Country,Website URL,Provenance"
|
|
| 140 |
fields="legalname,legalshortname,country,websiteurl,provenance"
|
|
| 141 | 141 |
results="groupIdDetails.list" group="group"></ng-dedup-records-table> |
| 142 | 142 |
<ng-dedup-records-table |
| 143 | 143 |
ng-show="group.entityType.type == 'person'" |
| 144 |
theads="Group size,Fullname"
|
|
| 145 |
fields="groupSize,fullname"
|
|
| 144 |
theads="Fullname,Provenance"
|
|
| 145 |
fields="fullname,provenance"
|
|
| 146 | 146 |
results="groupIdDetails.list" group="group"></ng-dedup-records-table> |
| 147 | 147 |
|
| 148 | 148 |
</div> |
| modules/dnet-deduplication/trunk/src/main/resources/eu/dnetlib/web/resources/js/dedup_inspector_controllers.js | ||
|---|---|---|
| 143 | 143 |
$scope.defaultFields = function() {
|
| 144 | 144 |
switch($scope.group.entityType.type) {
|
| 145 | 145 |
case "result": |
| 146 |
return "title,dateofacceptance,description"; |
|
| 146 |
return "title,dateofacceptance,description,provenance";
|
|
| 147 | 147 |
case "organization": |
| 148 |
return "legalname,legalshortname,websiteurl";
|
|
| 148 |
return "legalname,legalshortname,country,websiteurl,provenance";
|
|
| 149 | 149 |
case "person": |
| 150 | 150 |
return "fullname"; |
| 151 | 151 |
default: |
| ... | ... | |
| 156 | 156 |
$scope.allFields = function() {
|
| 157 | 157 |
switch($scope.group.entityType.type) {
|
| 158 | 158 |
case "result": |
| 159 |
return "title,dateofacceptance,author,description"; |
|
| 159 |
return "title,dateofacceptance,author,description,provenance";
|
|
| 160 | 160 |
case "organization": |
| 161 |
return "legalname,legalshortname,country,websiteurl"; |
|
| 161 |
return "legalname,legalshortname,country,websiteurl,provenance";
|
|
| 162 | 162 |
default: |
| 163 | 163 |
return ""; |
| 164 | 164 |
} |
Also available in: Unified diff
Show group modal: removed group size, width set to 80%
organizations - added country
all entities - added provenance (collected from)