From 61eee53ab67fe8fef68d187b06739d1c8f10ef88 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Tue, 4 Feb 2020 15:52:38 +0200 Subject: [PATCH] Update notes for 2020-02-04 --- content/posts/2020-02.md | 15 +++++++++++++++ docs/2020-02/index.html | 25 ++++++++++++++++++++++--- docs/sitemap.xml | 10 +++++----- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/content/posts/2020-02.md b/content/posts/2020-02.md index 73a962c3d..8cf415a08 100644 --- a/content/posts/2020-02.md +++ b/content/posts/2020-02.md @@ -169,5 +169,20 @@ $ ~/dspace63/bin/dspace database migrate - The indexing issue I was having yesterday seems to only present itself the first time a new installation is running DSpace 6 - Once the indexing induced by touching `dspace/solr/search/conf/reindex.flag` has finished, subsequent manual invocations of `dspace index-discovery -b` work as expected - Nevertheless, I sent a message to the dspace-tech mailing list describing the issue to see if anyone has any comments +- I am seeing that the number of important commits on the unreleased DSpace 6.4 are really numerous and it might be better for us to target that version + - I did a simple test and it's easy to rebase my current 6.3 branch on top of the upstream `dspace-6_x` branch: + +``` +$ git checkout -b 6_x-dev64 6_x-dev +$ git rebase -i upstream/dspace-6_x +``` + +- I finally understand why our themes show all the "Browse by" buttons on community and collection pages in DSpace 6.x + - The code in `./dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/browseArtifacts/CommunityBrowse.java` iterates over all the browse indexes and prints them when it is called + - The XMLUI theme code in `dspace/modules/xmlui-mirage2/src/main/webapp/themes/0_CGIAR/xsl/preprocess/browse.xsl` calls the template because the id of the div matches "aspect.browseArtifacts.CommunityBrowse.list.community-browse" + - I checked the DRI of a community page on my local 6.x and DSpace Test 5.x by appending `?XML` to the URL and I see the ID is missing on DSpace 5.x + - The issue is the same with the ordering of the "My Account" link, but in Navigation.java + - I tried modifying `preprocess/browse.xsl` but it always ends up printing some default list of browse by links... + - I'm starting to wonder if Atmire's modules somehow override this, as I don't see how `CommunityBrowse.java` can behave like ours on DSpace 5.x unless they have overridden it (as the open source code is the same in 5.x and 6.x) diff --git a/docs/2020-02/index.html b/docs/2020-02/index.html index 008375161..eb721fb9f 100644 --- a/docs/2020-02/index.html +++ b/docs/2020-02/index.html @@ -20,7 +20,7 @@ The code finally builds and runs with a fresh install - + @@ -45,9 +45,9 @@ The code finally builds and runs with a fresh install "@type": "BlogPosting", "headline": "February, 2020", "url": "https:\/\/alanorth.github.io\/cgspace-notes\/2020-02\/", - "wordCount": "1011", + "wordCount": "1230", "datePublished": "2020-02-02T11:56:30+02:00", - "dateModified": "2020-02-04T08:44:50+02:00", + "dateModified": "2020-02-04T13:09:24+02:00", "author": { "@type": "Person", "name": "Alan Orth" @@ -292,6 +292,25 @@ $ ~/dspace63/bin/dspace database migrate
  • Nevertheless, I sent a message to the dspace-tech mailing list describing the issue to see if anyone has any comments
    • +
  • I am seeing that the number of important commits on the unreleased DSpace 6.4 are really numerous and it might be better for us to target that version + +
    • + +
    $ git checkout -b 6_x-dev64 6_x-dev
+$ git rebase -i upstream/dspace-6_x
+
    diff --git a/docs/sitemap.xml b/docs/sitemap.xml index 667159a15..5bf68733d 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -4,27 +4,27 @@ https://alanorth.github.io/cgspace-notes/categories/ - 2020-02-04T13:06:23+02:00 + 2020-02-04T13:09:24+02:00 https://alanorth.github.io/cgspace-notes/ - 2020-02-04T13:06:23+02:00 + 2020-02-04T13:09:24+02:00 https://alanorth.github.io/cgspace-notes/2020-02/ - 2020-02-04T08:44:50+02:00 + 2020-02-04T13:09:24+02:00 https://alanorth.github.io/cgspace-notes/categories/notes/ - 2020-02-04T13:06:23+02:00 + 2020-02-04T13:09:24+02:00 https://alanorth.github.io/cgspace-notes/posts/ - 2020-02-04T13:06:23+02:00 + 2020-02-04T13:09:24+02:00