Skip to content

Commit 20fa588

Browse files
rentonsarentonsa
authored
Merge pull request #604 from WebSepp/master
changed the uuids for the ids
2 parents 2f874f2 + d147a8b commit 20fa588

16 files changed

+75
-43
lines changed

‎config/alumni.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@
2323

2424
$config['skylight_oaipmhallowed'] = true;
2525

26+
27+
2628
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
2729
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
28-
$config['skylight_container_id'] = '17';
30+
$config['skylight_container_id'] = 'dcc42cf5-a713-4dc5-97e1-482a871cf1ea';
2931
}
3032
else {
3133
$config['skylight_container_id'] = '13';

‎config/art.php

+14-1
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,24 @@
2323

2424
$config['skylight_oaipmhallowed'] = true;
2525

26+
27+
28+
2629
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
27-
$config['skylight_container_id'] = '3';
30+
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
31+
$config['skylight_container_id'] = '55da8679-0e59-473c-9c2f-41c69448ed0a';
32+
}
33+
else {
34+
$config['skylight_container_id'] = '3';
35+
}
2836
$config['skylight_container_field'] = 'location.coll';
2937
$config['skylight_sitemap_type'] = 'internal';
3038

39+
40+
41+
42+
43+
3144
$config['skylight_fields'] = array(
3245
'Title' => 'dc.title.en',
3346
'Alternative Title' => 'dc.title.alternative.en',

‎config/calendars.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@
2424
$config['skylight_oaipmhallowed'] = true;
2525

2626
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
27-
$config['skylight_container_id'] = '14';
27+
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
28+
$config['skylight_container_id'] = 'dde7662b-e357-4a4a-8c14-4d08b858bfe9';
29+
}
30+
else {
31+
$config['skylight_container_id'] = '14';
32+
}
33+
//$config['skylight_container_id'] = '14';
2834
$config['skylight_container_field'] = 'location.coll';
2935
$config['skylight_sitemap_type'] = 'internal';
3036

‎config/clds.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@
2323
$config['skylight_oaipmhallowed'] = true;
2424

2525
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
26-
$config['skylight_container_id'] = '1';
26+
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
27+
$config['skylight_container_id'] = '7f32ba59-795e-40e8-b869-5b2a5114a4be';
28+
}
29+
else {
30+
$config['skylight_container_id'] = '1';
31+
}
32+
//$config['skylight_container_id'] = '1';
2733
$config['skylight_container_field'] = 'location.coll';
2834
$config['skylight_sitemap_type'] = 'internal';
2935

‎config/coimbra-colls.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if (strpos($_SERVER['HTTP_HOST'], "test") !== false || strpos($_SERVER['HTTP_HOST'], "localhost") !== false) {
44
$config['skylight_ga_code'] = 'UA-25737241-6';
5-
$config['skylight_container_id'] = '83';
5+
$config['skylight_container_id'] = 'd5722bba-2411-4efa-8f94-79598d98c519';
66
$config['skylight_image_server'] = 'https://test.cantaloupe.is.ed.ac.uk';
77
}
88
else {
@@ -26,8 +26,6 @@
2626

2727
$config['skylight_oaipmhallowed'] = true;
2828

29-
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
30-
3129
$config['skylight_container_field'] = 'location.coll';
3230
//$config['skylight_container_id'] = '62';
3331
$config['skylight_sitemap_type'] = 'internal';

‎config/coimbra.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if (strpos($_SERVER['HTTP_HOST'], "test") !== false || strpos($_SERVER['HTTP_HOST'], "localhost") !== false) {
44
$config['skylight_ga_code'] = 'UA-25737241-6';
5-
$config['skylight_container_id'] = '63';
5+
$config['skylight_container_id'] = 'ac679585-911d-4ae1-8c9a-5c47e660926f';
66
$config['skylight_image_server'] = 'https://test.cantaloupe.is.ed.ac.uk';
77
}
88
else {
@@ -26,8 +26,6 @@
2626

2727
$config['skylight_oaipmhallowed'] = true;
2828

29-
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
30-
3129
$config['skylight_container_field'] = 'location.coll';
3230
//$config['skylight_container_id'] = '62';
3331
$config['skylight_sitemap_type'] = 'internal';

‎config/exhibitions.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@
3030
$config['skylight_parallax'] = true;
3131

3232
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
33-
$config['skylight_container_id'] = '17';
33+
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
34+
$config['skylight_container_id'] = '8b29daa7-16dd-4217-8366-5576cce3e79f'; //why is there no uuid for 17?
35+
}
36+
else {
37+
$config['skylight_container_id'] = '17';
38+
}
3439
$config['skylight_container_field'] = 'location.coll';
3540
$config['skylight_sitemap_type'] = 'external';
36-
41+
//$config['skylight_container_id'] = '17';
3742

3843
$config['skylight_fields'] = array('Title' => 'dc.title.en',
3944
'Creator' => 'dc.contributor.author.en',

‎config/geddes.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// set the base url and ga code
66
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
7-
$config['skylight_container_id'] = '87';
7+
$config['skylight_container_id'] = '50092146-e1bb-4d9f-8755-b024a27ae0ae';
88
}
99
else {
1010
$config['skylight_container_id'] = '73';
@@ -22,7 +22,6 @@
2222

2323
$config['skylight_oaipmhallowed'] = true;
2424

25-
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
2625
$config['skylight_container_field'] = 'location.coll';
2726
$config['skylight_sitemap_type'] = 'external';
2827

‎config/guardbook.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
// set the base url and ga code
88
if (strpos($_SERVER['HTTP_HOST'], "localhost") !== false) {
99
$config['skylight_ga_code'] = '';
10-
$config['skylight_container_id'] = '67';
10+
$config['skylight_container_id'] = 'f0c7bb72-ab20-4693-be0d-43918440a8cd';
1111
}
1212
else if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
1313
$config['skylight_ga_code'] = 'UA-25737241-6';
14-
$config['skylight_container_id'] = '67';
14+
$config['skylight_container_id'] = 'f0c7bb72-ab20-4693-be0d-43918440a8cd';
1515
}
1616
else {
1717
$config['skylight_ga_code'] = 'UA-25737241-9';
18-
$config['skylight_container_id'] = '51';
18+
$config['skylight_container_id'] = '51'; //Pick the ID from the else statement (51) with the uuid from (51) and put that uuid in the if statement
1919
}
2020

2121
// The platform and version of your repository.
@@ -34,7 +34,6 @@
3434

3535
$config['skylight_oaipmhallowed'] = true;
3636

37-
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
3837
$config['skylight_container_field'] = 'location.coll';
3938
$config['skylight_sitemap_type'] = 'external';
4039

‎config/mimed.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@
2424
$config['skylight_oaipmhallowed'] = true;
2525

2626
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
27-
$config['skylight_container_id'] = '11';
27+
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
28+
$config['skylight_container_id'] = '21f59b48-a294-4960-b926-e1f56d32d90b';
29+
}
30+
else {
31+
$config['skylight_container_id'] = '11';
32+
}
33+
//$config['skylight_container_id'] = '11';
2834
$config['skylight_container_field'] = 'location.coll';
2935
$config['skylight_sitemap_type'] = 'internal';
3036

‎config/openbooks.is.ed.ac.uk.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
77
$config['base_url'] = 'https://test.openbooks.is.ed.ac.uk/';
88
$config['skylight_ga_code'] = 'UA-25737241-6';
9-
$config['skylight_container_id'] = '47';
9+
$config['skylight_container_id'] = '55e69b51-5e8d-4dc1-ae83-38d8e70fb46e';
1010
}
1111
else {
1212
$config['base_url'] = 'https://openbooks.is.ed.ac.uk/';
@@ -24,7 +24,6 @@
2424

2525
$config['skylight_oaipmhallowed'] = true;
2626

27-
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
2827
$config['skylight_container_field'] = 'location.coll';
2928
$config['skylight_sitemap_type'] = 'external';
3029

‎config/scottishgovernmentyearbooks.ed.ac.uk.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,16 @@
2626
$config['skylight_oaipmhallowed'] = true;
2727

2828
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
29-
$config['skylight_container_id'] = '16';
29+
30+
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
31+
$config['skylight_container_id'] = 'e99d9f85-ef2f-4de4-820b-9561cb759fec';
32+
}
33+
else {
34+
$config['skylight_container_id'] = '16';
35+
}
36+
37+
38+
//$config['skylight_container_id'] = '16';
3039
$config['skylight_container_field'] = 'location.coll';
3140
$config['skylight_sitemap_type'] = 'external';
3241

‎config/sjac-collection.is.ed.ac.uk.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// set ga code
99
if (strpos($_SERVER['HTTP_HOST'], "test") !== false || strpos($_SERVER['HTTP_HOST'], "localhost") !== false) {
1010
$config['skylight_ga_code'] = 'UA-25737241-6';
11-
$config['skylight_container_id'] = '89';
11+
$config['skylight_container_id'] = 'e78a064c-8d18-4e96-a160-f4e58a58cb39';
1212
$config['skylight_image_server'] = 'https://test.cantaloupe.is.ed.ac.uk';
1313
$config['base_url'] = 'https://test.sjac-collection.is.ed.ac.uk/';
1414
}
@@ -31,8 +31,6 @@
3131

3232
$config['skylight_oaipmhallowed'] = true;
3333

34-
35-
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
3634
$config['skylight_container_field'] = 'location.coll';
3735

3836
$config['skylight_fields'] = array(

‎config/skylight.php

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<?php
22

33
// hostnames
4-
$config['skylight_hostnames'] = array('stuartsound.is.ed.ac.uk','www.fairbairn.ac.uk', 'test.fairbairn.ac.uk','test.exampapers.ed.ac.uk', 'exampapers.ed.ac.uk', 'test.scottishgovernmentyearbooks.ed.ac.uk', 'www.scottishgovernmentyearbooks.ed.ac.uk','test.openbooks.is.ed.ac.uk','openbooks.is.ed.ac.uk','test.sopacollection.ph.ed.ac.uk','sopacollection.ph.ed.ac.uk', 'test.exhibitions.ed.ac.uk', 'exhibitions.ed.ac.uk', 'test.lac-projects.is.ed.ac.uk', 'lac-projects.is.ed.ac.uk', 'test.stuartsound.is.ed.ac.uk', 'www.stuartsound.is.ed.ac.uk', 'test.bodylanguage.is.ed.ac.uk');
4+
$config['skylight_hostnames'] = array('sjac-collection.is.ed.ac.uk', 'stuartsound.is.ed.ac.uk','www.fairbairn.ac.uk', 'exampapers.ed.ac.uk', 'test.scottishgovernmentyearbooks.ed.ac.uk', 'www.scottishgovernmentyearbooks.ed.ac.uk','openbooks.is.ed.ac.uk','sopacollection.ph.ed.ac.uk', 'exhibitions.ed.ac.uk', 'lac-projects.is.ed.ac.uk', 'www.stuartsound.is.ed.ac.uk');
55

66
// Uncomment this if you want to use urls of the form http://.../prefix/...
7-
8-
$config['skylight_url_prefixes'] = array('lhsacasenotes', 'jlss', 'stcecilias','mimed', 'art', 'calendars', 'iconics', 'towardsdolly', 'alumni', 'coimbra', 'guardbook', 'sessionpapers', 'exhibitions', 'bodylanguage');
7+
$config['skylight_url_prefixes'] = array('eerc','exhibitions','umis','cockburn','coimbra-colls', 'public-art','archivemedia', 'geddes', 'lhsacasenotes','stcecilias','mimed', 'art', 'calendars', 'iconics', 'towardsdolly', 'alumni', 'coimbra', 'guardbook');
98

109
$config['skylight_handle_prefixes'] = array(3 => "art", 11 => "mimed");
1110

1211
// The URL of the parent solr server
13-
$config['skylight_solrbase'] = 'http://localhost:9130/solr/search/';
12+
$config['skylight_solrbase'] = 'http://collectionssolr.is.ed.ac.uk/search/';
1413
//$config['skylight_solrbase'] = 'http://collectionsinternal.is.ed.ac.uk:8080/solr/search/';
15-
//$config['skylight_solrbase'] = 'http://collectionssolr.is.ed.ac.uk/search/';
1614

1715
//DSpace handle server prefix
1816
$config['skylight_handle_prefix'] = '10683';
@@ -26,8 +24,8 @@
2624
$config['skylight_local_path'] = '../skylight-local';
2725

2826
// The main username and password (by Demo admin:admin)
29-
$config['skylight_adminusername'] = '';
30-
$config['skylight_adminpassword'] = '';
27+
$config['skylight_adminusername'] = 'admin';
28+
$config['skylight_adminpassword'] = '21232f297a57a5a743894a0e4a801fc3';
3129

3230
// Whether to use LDAP for admin authentication
3331
$config['skylight_adminldap'] = False;
@@ -57,8 +55,8 @@
5755
$config['skylight_cache'] = false;
5856

5957
// Keys required for the recapthca system
60-
$config['skylight_recaptcha_key_public'] = '';
61-
$config['skylight_recaptcha_key_private'] = '';
58+
$config['skylight_recaptcha_key_public'] = '6LfwNvESAAAAAGjRS4uoS8SXEn-OjY3XPqF4bwcz';
59+
$config['skylight_recaptcha_key_private'] = '6LfwNvESAAAAAFqj8NQPkTZ4wKAoa0h6vEDNfSLi';
6260

6361
// Digital object management
6462
$config['skylight_bitstream_field'] = 'dc.format.original';
@@ -92,5 +90,5 @@
9290

9391
// Can themes be overridden by the user using ?theme={themename}
9492
$config['skylight_theme_allowoverride'] = false;
95-
96-
?>
93+
​
94+
?>

‎config/stcecilias.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// set ga code
1313
if (strpos($_SERVER['HTTP_HOST'], "test") !== false) {
1414
$config['skylight_ga_code'] = '';
15-
$config['skylight_container_id'] = '84';
15+
$config['skylight_container_id'] = 'bac433ed-36a9-4660-b49c-49d3fd0bed2c';
1616
}
1717
else {
1818
$config['skylight_ga_code'] = 'UA-25737241-9';
@@ -25,8 +25,6 @@
2525

2626
$config['skylight_oaipmhallowed'] = true;
2727

28-
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
29-
3028
$config['skylight_container_field'] = 'location.coll';
3129
$config['skylight_sitemap_type'] = 'internal';
3230

‎config/umis.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
if (strpos($_SERVER['HTTP_HOST'], "test") !== false || strpos($_SERVER['HTTP_HOST'], "localhost") !== false) {
44
$config['skylight_ga_code'] = 'UA-25737241-6';
5-
$config['skylight_container_id'] = '83';
6-
$config['skylight_image_server'] = 'https://test.cantaloupe.is.ed.ac.uk';
5+
$config['skylight_container_id'] = 'a2f5be37-b61d-4321-aa73-181145ba59ac';
6+
$config['skylight_image_server'] = 'https://cantaloupe.is.ed.ac.uk';
77
}
88
else {
99
$config['skylight_ga_code'] = 'UA-25737241-6';
@@ -26,8 +26,6 @@
2626

2727
$config['skylight_oaipmhallowed'] = true;
2828

29-
// Container ID and the field used in solr index to store this ID. Used for restricting search/browse scope.
30-
3129
$config['skylight_container_field'] = 'location.coll';
3230
//$config['skylight_container_id'] = '62';
3331
$config['skylight_sitemap_type'] = 'internal';

0 commit comments

Comments
 (0)