Skip to content

Commit dc232b8

Browse files
AdamF42AdamF42
committed
[DURACOM-448] Cleaned up relations
1 parent 6dcfcb8 commit dc232b8

3 files changed

Lines changed: 31 additions & 300 deletions

File tree

‎dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/test-discovery.xml‎

Lines changed: 18 additions & 183 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
<entry key="eperson_claims" value-ref="eperson_claims"/>
111111
<!-- multilanguage types facet configuration -->
112112
<entry key="123456789/language-test-1" value-ref="multilanguage-types"/>
113+
113114
<!-- ========================================================== -->
114115
<!-- DSpace-CRIS Authority-based RELATION Discovery Configurations -->
115116
<!-- These configurations map entity relationships to discovery -->
@@ -128,9 +129,6 @@
128129
<!-- Maps to: OrgUnit.isProjectOfOrgUnit (from Project → OrgUnit relationship) -->
129130
<!-- Shows RP Projects via investigators affiliated with this OrgUnit -->
130131
<entry key="RELATION.OrgUnit.rpprojects" value-ref="relationOrgunitRPProjectConfiguration"/>
131-
<!-- Maps to: OrgUnit.isPublicationOfOrgUnit (from Publication → OrgUnit relationship) -->
132-
<!-- Shows Publications sponsored by this OrgUnit -->
133-
<entry key="RELATION.OrgUnit.publications" value-ref="relationOrgunitPublicationsConfiguration"/>
134132
<!-- Maps to: OrgUnit.isPublicationOfOrgUnit via Person affiliation -->
135133
<!-- Shows Publications authored by people affiliated with this OrgUnit -->
136134
<entry key="RELATION.OrgUnit.rppublications" value-ref="relationOrgunitRPPublicationsConfiguration"/>
@@ -140,20 +138,7 @@
140138
<!-- Maps to: OrgUnit.isProjectOfOrgUnit (from Project → OrgUnit relationship) -->
141139
<!-- Shows Projects participated by this OrgUnit -->
142140
<entry key="RELATION.OrgUnit.projects" value-ref="relationOrgunitProjectsConfiguration"/>
143-
<!-- Maps to: OrgUnit.isOrgUnitOfOrgUnit (hierarchical OrgUnit relationship) -->
144-
<!-- Shows sub-organizations of this OrgUnit -->
145-
<entry key="RELATION.OrgUnit.organizations" value-ref="relationOrgunitOrgunitsConfiguration"/>
146-
147-
<!-- Project Related Items -->
148-
<!-- Maps to: Project.isProjectOfProject (related projects) -->
149-
<!-- Shows Projects related to this Project -->
150-
<entry key="RELATION.Project.projects" value-ref="relationProjectProjectsConfiguration"/>
151-
<!-- Maps to: Project.isFundingOfProject (from Funding → Project relationship) -->
152-
<!-- Shows Fundings related to this Project -->
153-
<entry key="RELATION.Project.fundings" value-ref="relationProjectFundingsConfiguration"/>
154-
<!-- Maps to: Project.isPublicationOfProject (from Publication → Project relationship) -->
155-
<!-- Shows Publications related to this Project -->
156-
<entry key="RELATION.Project.researchoutputs" value-ref="relationProjectPublicationConfiguration"/>
141+
157142
<!-- COAR NOTIFY LDN MESSAGES configuration -->
158143
<entry key="NOTIFY.incoming" value-ref="NOTIFY.incoming"/>
159144
<entry key="NOTIFY.outgoing" value-ref="NOTIFY.outgoing"/>
@@ -1131,7 +1116,7 @@
11311116
<property name="defaultFilterQueries">
11321117
<list>
11331118
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
1134-
<value>projectinvestigators_authority:{0} AND search.resourcetype:Item</value>
1119+
<value>project.investigator_authority:{0} AND search.resourcetype:Item</value>
11351120
<value>-withdrawn:true AND -discoverable:false</value>
11361121
</list>
11371122
</property>
@@ -1156,6 +1141,8 @@
11561141
<!--Which sidebar facets are to be displayed-->
11571142
<property name="sidebarFacets">
11581143
<list>
1144+
<!-- <ref bean="graphPublicationByType" />-->
1145+
<!-- <ref bean="graphPublicationByDate" />-->
11591146
<ref bean="searchFilterIssued" />
11601147
<ref bean="searchFilterAuthor" />
11611148
<ref bean="searchFilterEditor" />
@@ -1172,6 +1159,8 @@
11721159
<property name="searchFilters">
11731160
<list>
11741161
<ref bean="searchFilterTitle" />
1162+
<!-- <ref bean="graphPublicationByType" />-->
1163+
<!-- <ref bean="graphPublicationByDate" />-->
11751164
<ref bean="searchFilterIssued" />
11761165
<ref bean="searchFilterAuthor" />
11771166
<ref bean="searchFilterEditor" />
@@ -1220,241 +1209,87 @@
12201209
</property>
12211210
</bean>
12221211

1223-
<!-- project investigated by people affiliated to an orgunit -->
1212+
<!-- OrgUnit → RP Projects (via join from person affiliation) -->
1213+
<!-- Maps to: OrgUnit.isProjectOfOrgUnit via Person investigators -->
12241214
<bean id="relationOrgunitRPProjectConfiguration" class="org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration">
1225-
<!--The sort filters for the discovery search-->
12261215
<property name="searchSortConfiguration">
12271216
<bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
1228-
<!--<property name="defaultSort" ref="sortDateIssued"/>-->
1229-
<!--DefaultSortOrder can either be desc or asc (desc is default)-->
12301217
<property name="sortFields">
12311218
<list>
1232-
<ref bean="sortByRPProjectsSelection" />
12331219
<ref bean="sortTitleAsc" />
12341220
</list>
12351221
</property>
12361222
</bean>
12371223
</property>
1238-
<!--Any default filter queries, these filter queries will be used for all
1239-
queries done by discovery for this configuration -->
12401224
<property name="defaultFilterQueries">
12411225
<list>
1242-
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
1243-
<value>'{'!join from=search.resourceid to=projectinvestigators_authority fromIndex=${solr.multicorePrefix}search'}'person.affiliation.name_authority:{0}</value>
1226+
<value>'{'!join from=search.resourceid to=project.investigator_authority fromIndex=${solr.multicorePrefix}search'}'person.affiliation.name_authority:{0}</value>
12441227
<value>-withdrawn:true AND -discoverable:false</value>
12451228
</list>
12461229
</property>
12471230
</bean>
12481231

1249-
<!-- publication sponsored by an orgunit -->
1250-
<bean id="relationOrgunitPublicationsConfiguration" class="org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration">
1251-
<!--The sort filters for the discovery search-->
1252-
<property name="searchSortConfiguration">
1253-
<bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
1254-
<!--<property name="defaultSort" ref="sortDateIssued"/>-->
1255-
<!--DefaultSortOrder can either be desc or asc (desc is default)-->
1256-
<property name="sortFields">
1257-
<list>
1258-
<ref bean="sortByPublicationsSelection" />
1259-
<ref bean="sortTitleAsc" />
1260-
</list>
1261-
</property>
1262-
</bean>
1263-
</property>
1264-
<!--Any default filter queries, these filter queries will be used for all
1265-
queries done by discovery for this configuration -->
1266-
<property name="defaultFilterQueries">
1267-
<list>
1268-
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
1269-
<value>dc.description.sponsorship_authority:{0}</value>
1270-
<value>-withdrawn:true AND -discoverable:false</value>
1271-
</list>
1272-
</property>
1273-
</bean>
1274-
1275-
<!-- publication authored by people affiliated to an orgunit -->
1232+
<!-- OrgUnit → RP Publications (via join from author affiliation) -->
1233+
<!-- Maps to: OrgUnit.isPublicationOfOrgUnit via Person authors -->
12761234
<bean id="relationOrgunitRPPublicationsConfiguration" class="org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration">
1277-
<!--The sort filters for the discovery search-->
12781235
<property name="searchSortConfiguration">
12791236
<bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
1280-
<!--<property name="defaultSort" ref="sortDateIssued"/>-->
1281-
<!--DefaultSortOrder can either be desc or asc (desc is default)-->
12821237
<property name="sortFields">
12831238
<list>
1284-
<ref bean="sortByRPPublicationsSelection" />
1239+
<ref bean="sortDateIssuedDesc" />
12851240
<ref bean="sortTitleAsc" />
12861241
</list>
12871242
</property>
12881243
</bean>
12891244
</property>
1290-
<!--Any default filter queries, these filter queries will be used for all
1291-
queries done by discovery for this configuration -->
12921245
<property name="defaultFilterQueries">
12931246
<list>
1294-
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
12951247
<value>'{'!join from=search.resourceid to=author_authority fromIndex=${solr.multicorePrefix}search'}'person.affiliation.name_authority:{0}</value>
12961248
<value>-withdrawn:true AND -discoverable:false</value>
12971249
</list>
12981250
</property>
12991251
</bean>
13001252

1301-
<!-- people affiliated to an orgunit -->
1253+
<!-- OrgUnit → People (via person.affiliation.name_authority) -->
1254+
<!-- Maps to: OrgUnit.isPersonOfOrgUnit (affiliated people) -->
13021255
<bean id="relationOrgunitPersonsConfiguration" class="org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration">
1303-
<!--The sort filters for the discovery search-->
13041256
<property name="searchSortConfiguration">
13051257
<bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
1306-
<!--<property name="defaultSort" ref="sortDateIssued"/>-->
1307-
<!--DefaultSortOrder can either be desc or asc (desc is default)-->
13081258
<property name="sortFields">
13091259
<list>
1310-
<ref bean="sortByPeopleSelection" />
13111260
<ref bean="sortTitleAsc" />
13121261
</list>
13131262
</property>
13141263
</bean>
13151264
</property>
1316-
<!--Any default filter queries, these filter queries will be used for all
1317-
queries done by discovery for this configuration -->
13181265
<property name="defaultFilterQueries">
13191266
<list>
1320-
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
13211267
<value>person.affiliation.name_authority:{0}</value>
13221268
<value>-withdrawn:true AND -discoverable:false</value>
13231269
</list>
13241270
</property>
13251271
</bean>
13261272

1327-
<!-- project participated by an orgunit -->
1273+
<!-- OrgUnit → Projects (via dc.contributor.other_authority) -->
1274+
<!-- Maps to: OrgUnit.isProjectOfOrgUnit (participated projects) -->
13281275
<bean id="relationOrgunitProjectsConfiguration" class="org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration">
1329-
<!--The sort filters for the discovery search-->
1330-
<property name="searchSortConfiguration">
1331-
<bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
1332-
<!--<property name="defaultSort" ref="sortDateIssued"/>-->
1333-
<!--DefaultSortOrder can either be desc or asc (desc is default)-->
1334-
<property name="sortFields">
1335-
<list>
1336-
<ref bean="sortByProjectsSelection" />
1337-
<ref bean="sortTitleAsc" />
1338-
</list>
1339-
</property>
1340-
</bean>
1341-
</property>
1342-
<!--Any default filter queries, these filter queries will be used for all
1343-
queries done by discovery for this configuration -->
1344-
<property name="defaultFilterQueries">
1345-
<list>
1346-
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
1347-
<value>involvedorganisation_authority:{0}</value>
1348-
<value>-withdrawn:true AND -discoverable:false</value>
1349-
</list>
1350-
</property>
1351-
</bean>
1352-
1353-
<!-- suborganisation unit of an orgunit -->
1354-
<bean id="relationOrgunitOrgunitsConfiguration" class="org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration">
1355-
<!--The sort filters for the discovery search-->
1356-
<property name="searchSortConfiguration">
1357-
<bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
1358-
<!--<property name="defaultSort" ref="sortDateIssued"/>-->
1359-
<!--DefaultSortOrder can either be desc or asc (desc is default)-->
1360-
<property name="sortFields">
1361-
<list>
1362-
<ref bean="sortByOrganizationsSelection" />
1363-
<ref bean="sortTitleAsc" />
1364-
</list>
1365-
</property>
1366-
</bean>
1367-
</property>
1368-
<!--Any default filter queries, these filter queries will be used for all
1369-
queries done by discovery for this configuration -->
1370-
<property name="defaultFilterQueries">
1371-
<list>
1372-
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
1373-
<value>organization.parentOrganization_authority:{0}</value>
1374-
<value>-withdrawn:true AND -discoverable:false</value>
1375-
</list>
1376-
</property>
1377-
</bean>
1378-
1379-
<!-- project related to a project -->
1380-
<bean id="relationProjectProjectsConfiguration" class="org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration">
1381-
<!--The sort filters for the discovery search-->
1382-
<property name="searchSortConfiguration">
1383-
<bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
1384-
<!--<property name="defaultSort" ref="sortDateIssued"/>-->
1385-
<!--DefaultSortOrder can either be desc or asc (desc is default)-->
1386-
<property name="sortFields">
1387-
<list>
1388-
<ref bean="sortByProjectsSelection" />
1389-
<ref bean="sortTitleAsc" />
1390-
</list>
1391-
</property>
1392-
</bean>
1393-
</property>
1394-
<!--Any default filter queries, these filter queries will be used for all
1395-
queries done by discovery for this configuration -->
1396-
<property name="defaultFilterQueries">
1397-
<list>
1398-
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
1399-
<value>dc.relation.project_authority:{0} AND entityType_keyword:Project</value>
1400-
<value>-withdrawn:true AND -discoverable:false</value>
1401-
</list>
1402-
</property>
1403-
</bean>
1404-
1405-
<!-- fundings related to a project -->
1406-
<bean id="relationProjectFundingsConfiguration" class="org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration">
1407-
<!--The sort filters for the discovery search-->
14081276
<property name="searchSortConfiguration">
14091277
<bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
1410-
<!--<property name="defaultSort" ref="sortDateIssued"/>-->
1411-
<!--DefaultSortOrder can either be desc or asc (desc is default)-->
14121278
<property name="sortFields">
14131279
<list>
1414-
<ref bean="sortByFundingsSelection" />
14151280
<ref bean="sortTitleAsc" />
14161281
</list>
14171282
</property>
14181283
</bean>
14191284
</property>
1420-
<!--Any default filter queries, these filter queries will be used for all
1421-
queries done by discovery for this configuration -->
14221285
<property name="defaultFilterQueries">
14231286
<list>
1424-
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
1425-
<value>dc.relation.project_authority:{0} AND entityType_keyword:Funding</value>
1287+
<value>dc.contributor.other_authority:{0}</value>
14261288
<value>-withdrawn:true AND -discoverable:false</value>
14271289
</list>
14281290
</property>
14291291
</bean>
14301292

1431-
<!-- publications related to a project -->
1432-
<bean id="relationProjectPublicationConfiguration" class="org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration">
1433-
<!--The sort filters for the discovery search-->
1434-
<property name="searchSortConfiguration">
1435-
<bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
1436-
<!--<property name="defaultSort" ref="sortDateIssued"/>-->
1437-
<!--DefaultSortOrder can either be desc or asc (desc is default)-->
1438-
<property name="sortFields">
1439-
<list>
1440-
<ref bean="sortByResearchOutputsSelection" />
1441-
<ref bean="sortTitleAsc" />
1442-
</list>
1443-
</property>
1444-
</bean>
1445-
</property>
1446-
<!--Any default filter queries, these filter queries will be used for all
1447-
queries done by discovery for this configuration -->
1448-
<property name="defaultFilterQueries">
1449-
<list>
1450-
<!--Only find related items. The placeholder {0} will be replaced with scope (UUID of item)-->
1451-
<value>dc.relation.project_authority:{0} AND entityType_keyword:Publication</value>
1452-
<value>-withdrawn:true AND -discoverable:false</value>
1453-
</list>
1454-
</property>
1455-
</bean>
1456-
1457-
14581293
<bean id="discovery-collection-2-2-1" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype">
14591294
<property name="id" value="discovery-collection-2-2-1"/>
14601295
<!--Which sidebar facets are to be displayed-->

‎dspace/config/modules/authority.cfg‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,16 @@ org.dspace.content.authority.EPersonAuthority = EPersonAuthority
394394
# choices.presentation.crispj.coinvestigators = suggest
395395
# authority.controlled.crispj.coinvestigators = true
396396
#
397+
# project.investigator: Investigator (links to Person)
398+
# choices.plugin.project.investigator = AuthorAuthority
399+
# choices.presentation.project.investigator = suggest
400+
# authority.controlled.project.investigator = true
401+
#
402+
# dc.contributor.other: Organization's name (links to OrgUnit)
403+
# choices.plugin.dc.contributor.other = OrgUnitAuthority
404+
# choices.presentation.dc.contributor.other = suggest
405+
# authority.controlled.dc.contributor.other = true
406+
#
397407
#---------------------------------------------------------------#
398408
# PERSON METADATA AUTHORITIES
399409
#---------------------------------------------------------------#

0 commit comments

Comments
 (0)