Skip to content

Commit 1a807b2

Browse files
amartinezcsucamartinezcsuc
committed
Merge branch 'release/1.6'
2 parents 02164b4 + 27f692f commit 1a807b2

File tree

61 files changed

+3414
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+3414
-345
lines changed

‎echoes-gui/echoes-gui-client/app/quality/quality.detail.error.html‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,22 @@ <h2>{{vm.title}} <span class="badge badge-light">{{vm.data._size}}</span></h2>
66
<table ng-table="vm.tableParams" class="table" show-filter="false">
77
<tr ng-repeat="data in $data">
88
<td title="'name'">
9-
<a target="_self" href="/rest/api/quality/user/{{vm.profile.sub}}/id/{{data.quality.data}}/{{data.value}}/download">{{data.value}}</a>
9+
<a target="_self" href="/rest/api/quality/user/{{vm.profile.sub}}/id/{{data.quality.data}}/{{data.input}}/download">{{data.input}}</a>
1010
</td>
11-
<td title="'schema'">
11+
<td title="'schema'" class="text-center">
1212
<i ng-if="data.validSchema" class="glyphicon glyphicon-ok text-success"></i>
1313
<a ng-if="!data.validSchema && data.schema" href ng-click="vm.schema(data.schema)"><i class="glyphicon glyphicon-remove text-danger"></i></a>
1414
</td>
15-
<td title="'schematron'">
15+
<td title="'schematron'" class="text-center">
1616
<i ng-if="data.validSchematron" class="glyphicon glyphicon-ok text-success"></i>
1717
<i ng-if="!data.validSchematron && !data.validSchema" class="glyphicon glyphicon-minus"></i>
1818
<a ng-if="!data.validSchematron && data.schematron" href ng-click="vm.schematron(data.schematron)"><i class="glyphicon glyphicon-remove text-danger"></i></a>
1919
</td>
20+
<td title="'content'" class="text-center">
21+
<i ng-if="data.isValidContent" class="glyphicon glyphicon-ok text-success"></i>
22+
<i ng-if="!data.isValidContent" class="glyphicon glyphicon-minus"></i>
23+
<a ng-if="!data.isValidContent && data.content" href ng-click="vm.content(data.content)"><i class="glyphicon glyphicon-remove text-danger"></i></a>
24+
</td>
2025
</tr>
2126
</table>
2227
</div>

‎echoes-gui/echoes-gui-config/src/main/java/org/csuc/typesafe/quality/QualityConfig.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package org.csuc.typesafe.quality;
2+
3+
import com.typesafe.config.Config;
4+
import com.typesafe.config.ConfigFactory;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
7+
8+
import java.nio.file.Files;
9+
import java.nio.file.Path;
10+
import java.util.Objects;
11+
12+
public class QualityConfig {
13+
14+
private static Logger logger = LogManager.getLogger(QualityConfig.class);
15+
16+
private Path filename;
17+
18+
public QualityConfig(Path filename) {
19+
this.filename = filename;
20+
}
21+
22+
public Config getQualityConfig(){
23+
Config defaultConfig = ConfigFactory.parseResources("quality.defaults.conf");
24+
if(Objects.nonNull(filename) && Files.exists(filename)){
25+
logger.debug("load config {}", filename);
26+
Config fallbackConfig = ConfigFactory.parseFile(filename.toFile())
27+
.withFallback(defaultConfig)
28+
.resolve();
29+
return fallbackConfig;
30+
}else{
31+
logger.debug("load config defaults.conf");
32+
return defaultConfig;
33+
}
34+
}
35+
}

‎echoes-gui/echoes-gui-config/src/main/resources/quality.defaults.conf‎

Lines changed: 302 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,302 @@
1+
# QUALITY CONFIG
2+
3+
# The provided cultural heritage object
4+
#edm:ProvidedCHO {
5+
# dc:contributor {
6+
# }
7+
# dcterms:isReplacedBy {
8+
# }
9+
# dc:coverage {
10+
# }
11+
# dcterms:isRequiredBy {
12+
# }
13+
# dc:creator {
14+
# }
15+
# dcterms:issued {
16+
# }
17+
# dc:date {
18+
# }
19+
# dcterms:isVersionOf {
20+
# }
21+
# edm:description {
22+
# }
23+
# dcterms:medium {
24+
# }
25+
# dc:format {
26+
# }
27+
# dcterms:provenance {
28+
# }
29+
# dc:identifier {
30+
# }
31+
# dcterms:references {
32+
# }
33+
# dc:language {
34+
# }
35+
# dc:publisher {
36+
# }
37+
# dcterms:requires {
38+
# }
39+
# dc:relation {
40+
# }
41+
# dcterms:spatial {
42+
# }
43+
# dc:rights {
44+
# }
45+
# dcterms:tableOfContents {
46+
# }
47+
# dc:source {
48+
# }
49+
# dcterms:temporal {
50+
# }
51+
# dc:subject {
52+
# }
53+
# edm:currentLocation {
54+
# }
55+
# edm:title {
56+
# }
57+
# edm:hasMet {
58+
# }
59+
# dc:type {
60+
# }
61+
# edm:hasType {
62+
# }
63+
# dcterms:alternative {
64+
# }
65+
# edm:incorporates {
66+
# }
67+
# dcterms:conformsTo {
68+
# }
69+
# edm:isDerivativeOf {
70+
# }
71+
# dcterms:created {
72+
# }
73+
# edm:isNextInSequence {
74+
# }
75+
# dcterms:extent {
76+
# }
77+
# edm:isRelatedTo {
78+
# }
79+
# dcterms:hasFormat {
80+
# }
81+
# edm:isRepresentationOf {
82+
# }
83+
# dcterms:hasPart {
84+
# }
85+
# edm:isSimilarTo {
86+
# }
87+
# dcterms:hasVersion {
88+
# }
89+
# edm:isSuccessorOf {
90+
# }
91+
# dcterms:isFormatOf {
92+
# }
93+
# edm:realizes {
94+
# }
95+
# dcterms:isPartOf {
96+
# }
97+
# edm:type {
98+
# }
99+
# dcterms:isReferencedBy {
100+
# }
101+
# owl:sameAs {
102+
# }
103+
#}
104+
105+
# The web resource that is the digital representation
106+
#edm:WebResource {
107+
# dc:creator {
108+
# }
109+
# dcterms:hasPart {
110+
# }
111+
# dc:description {
112+
# }
113+
# dcterms:isFormatOf {
114+
# }
115+
# dc:format {
116+
# }
117+
# dcterms:isPartOf {
118+
# }
119+
# dc:rights {
120+
# }
121+
# dcterms:isReferencedBy {
122+
# }
123+
# dc:source {
124+
# }
125+
# dcterms:issued {
126+
# }
127+
# dcterms:conformsTo {
128+
# }
129+
# edm:isNextInSequence {
130+
# }
131+
# dcterms:created {
132+
# }
133+
# edm:rights {
134+
# }
135+
# dcterms:extent {
136+
# }
137+
# owl:sameAs {
138+
# }
139+
#}
140+
141+
# The aggregation that groups the classes together
142+
#ore:Aggregation {
143+
# edm:aggregatedCHO {
144+
# }
145+
# edm:provider {
146+
# }
147+
# edm:dataProvider {
148+
# }
149+
# dc:rights {
150+
# }
151+
# edm:hasView {
152+
# }
153+
# edm:rights {
154+
# }
155+
# edm:isShownAt {
156+
# }
157+
# edm:ugc {
158+
# }
159+
# edm:isShownBy {
160+
# }
161+
# edm:intermediateProvider {
162+
# }
163+
# edm:object {
164+
# }
165+
#}
166+
167+
# Who
168+
#edm:Agent {
169+
# skos:prefLabel{
170+
# }
171+
# foaf:name {
172+
# }
173+
# skos:altLabel {
174+
# }
175+
# rdaGr2:biographicalInformation {
176+
# }
177+
# skos:note {
178+
# }
179+
# rdaGr2:dateOfBirth {
180+
# }
181+
# dc:date {
182+
# }
183+
# rdaGr2:dateOfDeath {
184+
# }
185+
# dc:identifier {
186+
# }
187+
# rdaGr2:dateOfEstablishment {
188+
# }
189+
# dcterms:hasPart {
190+
# }
191+
# rdaGr2:dateOfTermination {
192+
# }
193+
# dcterms:isPartOf {
194+
# }
195+
# rdaGr2:gender {
196+
# }
197+
# edm:begin {
198+
# }
199+
# rdaGr2:placeOfBirth {
200+
# }
201+
# edm:end {
202+
# }
203+
# rdaGr2:placeOfDeath {
204+
# }
205+
# edm:hasMet {
206+
# }
207+
# rdaGr2:professionOrOccupation {
208+
# }
209+
# edm:isRelatedTo {
210+
# }
211+
# owl:sameAs {
212+
# }
213+
#}
214+
215+
# Where
216+
edm:Place {
217+
wgs84_pos:lat {
218+
level = INFO
219+
}
220+
skos:note {
221+
level = INFO
222+
}
223+
wgs84_pos:long {
224+
level = INFO
225+
}
226+
dcterms:hasPart {
227+
}
228+
wgs84_pos:alt {
229+
}
230+
# dcterms:isPartOf {
231+
# }
232+
skos:prefLabel {
233+
level = ERROR
234+
}
235+
# edm:isNextInSequence {
236+
# }
237+
skos:altLabel {
238+
level = INFO
239+
}
240+
# owl:sameAs {
241+
# }
242+
}
243+
244+
# When
245+
#edm:TimeSpan {
246+
# skos:prefLabel {
247+
# }
248+
# edm:begin {
249+
# }
250+
# skos:altLabel {
251+
# }
252+
# edm:end {
253+
# }
254+
# skos:note {
255+
# }
256+
# edm:isNextInSequence {
257+
# }
258+
# dcterms:hasPart {
259+
# }
260+
# owl:sameAs {
261+
# }
262+
# dcterms:isPartOf {
263+
# }
264+
#}
265+
266+
# What
267+
#skos:Concept {
268+
# skos:prefLabel {
269+
# }
270+
# skos:relatedMatch {
271+
# }
272+
# skos:altLabel {
273+
# }
274+
# skos:exactMatch {
275+
# }
276+
# skos:broader {
277+
# }
278+
# skos:closeMatch {
279+
# }
280+
# skos:narrower {
281+
# }
282+
# skos:note {
283+
# }
284+
# skos:related {
285+
# }
286+
# skos:notation {
287+
# }
288+
# skos:broadMatch {
289+
# }
290+
# skos:inScheme {
291+
# }
292+
# skos:narrowMatch {
293+
# }
294+
#}
295+
296+
# Access and usage
297+
# cc:License {
298+
# odrl:inheritFrom {
299+
# }
300+
# cc:deprecatedOn {
301+
# }
302+
#}

‎echoes-gui/echoes-gui-config/src/test/java/org/csuc/typesafe/quality/QualityConfigTest.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.csuc.typesafe.quality;
2+
3+
import org.junit.Test;
4+
5+
6+
public class QualityConfigTest {
7+
8+
@Test
9+
public void getQualityConfig() {
10+
QualityConfig qualityConfig = new QualityConfig(null);
11+
}
12+
}

‎echoes-gui/echoes-gui-consumer/echoes-gui-consumer-publish/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@
7676
<version>0.0.1</version>
7777
<scope>compile</scope>
7878
</dependency>
79+
<dependency>
80+
<groupId>org.csuc</groupId>
81+
<artifactId>quality</artifactId>
82+
<version>0.0.1</version>
83+
</dependency>
7984
</dependencies>
8085

8186
<build>

0 commit comments

Comments
 (0)