| Chunk |
|---|
| Conflicting content |
|---|
private final String AGGREGATION_RELATIONS =
"skos:topConceptOf, skos:hasTopConcept, skos:inScheme, skos:member, skos:memberList";
<<<<<<< HEAD
public AggregationRelations(RepositoryConnection repCon) {
super(repCon,
=======
public AggregationRelations(VocabRepository vocabRepo) {
super(vocabRepo,
>>>>>>> 6215198f0b6c28a7ca39b1b0f994d814fa6ee740
"ar",
"Aggregation Relations Count",
"Counts the statements relating resources to ConceptSchemes or Collections", |
| Solution content |
|---|
private final String AGGREGATION_RELATIONS =
"skos:topConceptOf, skos:hasTopConcept, skos:inScheme, skos:member, skos:memberList";
public AggregationRelations(RepositoryConnection repCon) {
super(repCon,
"ar",
"Aggregation Relations Count",
"Counts the statements relating resources to ConceptSchemes or Collections", |
| File |
|---|
| AggregationRelations.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
private String createAggregationRelationsQuery() {
return SparqlPrefix.SKOS +" "+ SparqlPrefix.RDFS +
<<<<<<< HEAD
"SELECT * WHERE {" +
"{" +
"?res1 ?aggregationRelation ?res2 ." +
"}" +
"UNION" +
"{" +
"?res1 ?p ?res2 . " +
"?p rdfs:subPropertyOf ?aggregationRelation ." +
"}"+
"FILTER (?aggregationRelation IN ("+ AGGREGATION_RELATIONS+ "))" +
=======
"SELECT DISTINCT ?res1 ?relationType ?res2 WHERE {" +
"?res1 ?relationType ?res2 ."+
"?relationType rdfs:subPropertyOf* ?aggregationRelation ." +
"FILTER (?aggregationRelation IN (" +AGGREGATION_RELATIONS+ "))"+
>>>>>>> 6215198f0b6c28a7ca39b1b0f994d814fa6ee740
"}";
}
|
| Solution content |
|---|
private String createAggregationRelationsQuery() {
return SparqlPrefix.SKOS +" "+ SparqlPrefix.RDFS +
"SELECT * WHERE {" +
"{" +
"?res1 ?aggregationRelation ?res2 ." +
"}" +
"UNION" +
"{" +
"?res1 ?p ?res2 . " +
"?p rdfs:subPropertyOf ?aggregationRelation ." +
"}"+
"FILTER (?aggregationRelation IN ("+ AGGREGATION_RELATIONS+ "))" +
"}";
}
|
| File |
|---|
| AggregationRelations.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |