Update notes for 2018-04-04

content/posts/2018-04.md

@@ -41,6 +41,10 @@ Fixed 1 occurences of: AGRICULTURE FOR NUTRITION AND HEALTH
 ```
 $ export JAVA_OPTS='-Dfile.encoding=UTF-8 -Xmx1024m'
 $ time schedtool -D -e ionice -c2 -n7 nice -n19 dspace index-discovery -b
+
+real    76m13.841s
+user    8m22.960s
+sys     2m2.498s
 ```
 
 - Elizabeth from CIAT emailed to ask if I could help her by adding ORCID identifiers to all of Joseph Tohme's items
@@ -56,3 +60,21 @@ $ ./add-orcid-identifiers-csv.py -i /tmp/jtohme-2018-04-04.csv -db dspace -u dsp
 dc.contributor.author,cg.creator.id
 "Tohme, Joseph M.",Joe Tohme: 0000-0003-2765-7101
 ```
+
+- There was a quoting error in my CRP CSV and the replacements for `Forests, Trees and Agroforestry` got messed up
+- So I fixed them and had to re-index again!
+- I started preparing the git branch for the the DSpace 5.5→5.8 upgrade:
+
+```
+$ git checkout -b 5_x-dspace-5.8 5_x-prod
+$ git reset --hard ilri/5_x-prod
+$ git rebase -i dspace-5.8
+```
+
+- I was prepared to skip some commits that I had cherry picked from the upstream `dspace-5_x` branch when we did the DSpace 5.5 upgrade (see notes on 2016-10-19 and 2017-12-17):
+  - [DS-3246] Improve cleanup in recyclable components (upstream commit on dspace-5_x: 9f0f5940e7921765c6a22e85337331656b18a403)
+  - [DS-3250] applying patch provided by Atmire (upstream commit on dspace-5_x: c6fda557f731dbc200d7d58b8b61563f86fe6d06)
+  - bump up to latest minor pdfbox version (upstream commit on dspace-5_x: b5330b78153b2052ed3dc2fd65917ccdbfcc0439)
+  - DS-3583 Usage of correct Collection Array (#1731) (upstream commit on dspace-5_x: c8f62e6f496fa86846bfa6bcf2d16811087d9761)
+- ... but somehow git knew, and didn't include them in my interactive rebase!
+- I need to send this branch to Atmire and also arrange payment (see [ticket #560](https://tracker.atmire.com/tickets-cgiar-ilri/view-ticket?id=560) in their tracker)

docs/2016-10/index.html

@@ -30,7 +30,7 @@ I exported a random item’s metadata as CSV, deleted all columns except id
 
 <meta property="article:published_time" content="2016-10-03T15:53:00&#43;03:00"/>
 
-<meta property="article:modified_time" content="2018-03-09T22:10:33&#43;02:00"/>
+<meta property="article:modified_time" content="2018-04-04T16:25:57&#43;03:00"/>
 
 
 
@@ -73,7 +73,7 @@ I exported a random item&rsquo;s metadata as CSV, deleted all columns except id
   "url": "https://alanorth.github.io/cgspace-notes/2016-10/",
   "wordCount": "1828",
   "datePublished": "2016-10-03T15:53:00&#43;03:00",
-  "dateModified": "2018-03-09T22:10:33&#43;02:00",
+  "dateModified": "2018-04-04T16:25:57&#43;03:00",
   "author": {
     "@type": "Person",
     "name": "Alan Orth"
@@ -266,22 +266,21 @@ DELETE 11
 <h2 id="2016-10-18">2016-10-18</h2>
 
 <ul>
-<li><p>Start working on DSpace 5.5 porting work again:</p>
+<li>Start working on DSpace 5.5 porting work again:
+<br /></li>
+</ul>
 
-<p>$ git checkout -b 5_x-55 5_x-prod
+<pre><code>$ git checkout -b 5_x-55 5_x-prod
-$ git rebase -i dspace-5.5</p></li>
+$ git rebase -i dspace-5.5
+</code></pre>
 
-<li><p>Have to fix about ten merge conflicts, mostly in the SCSS for the CGIAR theme</p></li>
+<ul>
-
+<li>Have to fix about ten merge conflicts, mostly in the SCSS for the CGIAR theme</li>
-<li><p>Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream&rsquo;s 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it&rsquo;s better to use the upstream one</p></li>
+<li>Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream&rsquo;s 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it&rsquo;s better to use the upstream one</li>
-
+<li>I notice this rebase gets rid of GitHub merge commits&hellip; which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first</li>
-<li><p>I notice this rebase gets rid of GitHub merge commits&hellip; which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first</p></li>
+<li>Finished up applying the 5.5 sitemap changes to all themes</li>
-
+<li>Merge the <code>discovery.xml</code> cleanups (<a href="https://github.com/ilri/DSpace/pull/278">#278</a>)</li>
-<li><p>Finished up applying the 5.5 sitemap changes to all themes</p></li>
+<li>Merge some minor edits to the distribution license (<a href="https://github.com/ilri/DSpace/pull/285">#285</a>)</li>
-
-<li><p>Merge the <code>discovery.xml</code> cleanups (<a href="https://github.com/ilri/DSpace/pull/278">#278</a>)</p></li>
-
-<li><p>Merge some minor edits to the distribution license (<a href="https://github.com/ilri/DSpace/pull/285">#285</a>)</p></li>
 </ul>
 
 <h2 id="2016-10-19">2016-10-19</h2>

docs/2018-03/index.html

@@ -20,7 +20,7 @@ Export a CSV of the IITA community metadata for Martin Mueller
 
 <meta property="article:published_time" content="2018-03-02T16:07:54&#43;02:00"/>
 
-<meta property="article:modified_time" content="2018-04-04T15:14:21&#43;03:00"/>
+<meta property="article:modified_time" content="2018-04-04T15:57:34&#43;03:00"/>
 
 
 
@@ -53,7 +53,7 @@ Export a CSV of the IITA community metadata for Martin Mueller
   "url": "https://alanorth.github.io/cgspace-notes/2018-03/",
   "wordCount": "2960",
   "datePublished": "2018-03-02T16:07:54&#43;02:00",
-  "dateModified": "2018-04-04T15:14:21&#43;03:00",
+  "dateModified": "2018-04-04T15:57:34&#43;03:00",
   "author": {
     "@type": "Person",
     "name": "Alan Orth"

docs/2018-04/index.html

@@ -21,7 +21,7 @@ Catalina logs at least show some memory errors yesterday:
 
 <meta property="article:published_time" content="2018-04-01T16:13:54&#43;02:00"/>
 
-<meta property="article:modified_time" content="2018-04-01T17:21:41&#43;03:00"/>
+<meta property="article:modified_time" content="2018-04-04T15:57:34&#43;03:00"/>
 
 
 
@@ -53,9 +53,9 @@ Catalina logs at least show some memory errors yesterday:
   "@type": "BlogPosting",
   "headline": "April, 2018",
   "url": "https://alanorth.github.io/cgspace-notes/2018-04/",
-  "wordCount": "253",
+  "wordCount": "423",
   "datePublished": "2018-04-01T16:13:54&#43;02:00",
-  "dateModified": "2018-04-01T17:21:41&#43;03:00",
+  "dateModified": "2018-04-04T15:57:34&#43;03:00",
   "author": {
     "@type": "Person",
     "name": "Alan Orth"
@@ -162,6 +162,10 @@ Fixed 1 occurences of: AGRICULTURE FOR NUTRITION AND HEALTH
 
 <pre><code>$ export JAVA_OPTS='-Dfile.encoding=UTF-8 -Xmx1024m'
 $ time schedtool -D -e ionice -c2 -n7 nice -n19 dspace index-discovery -b
+
+real    76m13.841s
+user    8m22.960s
+sys     2m2.498s
 </code></pre>
 
 <ul>
@@ -180,6 +184,30 @@ $ time schedtool -D -e ionice -c2 -n7 nice -n19 dspace index-discovery -b
 &quot;Tohme, Joseph M.&quot;,Joe Tohme: 0000-0003-2765-7101
 </code></pre>
 
+<ul>
+<li>There was a quoting error in my CRP CSV and the replacements for <code>Forests, Trees and Agroforestry</code> got messed up</li>
+<li>So I fixed them and had to re-index again!</li>
+<li>I started preparing the git branch for the the DSpace 5.5→5.8 upgrade:</li>
+</ul>
+
+<pre><code>$ git checkout -b 5_x-dspace-5.8 5_x-prod
+$ git reset --hard ilri/5_x-prod
+$ git rebase -i dspace-5.8
+</code></pre>
+
+<ul>
+<li>I was prepared to skip some commits that I had cherry picked from the upstream <code>dspace-5_x</code> branch when we did the DSpace 5.5 upgrade (see notes on 2016-10-19 and 2017-12-17):
+
+<ul>
+<li>[DS-3246] Improve cleanup in recyclable components (upstream commit on dspace-5_x: 9f0f5940e7921765c6a22e85337331656b18a403)</li>
+<li>[DS-3250] applying patch provided by Atmire (upstream commit on dspace-5_x: c6fda557f731dbc200d7d58b8b61563f86fe6d06)</li>
+<li>bump up to latest minor pdfbox version (upstream commit on dspace-5_x: b5330b78153b2052ed3dc2fd65917ccdbfcc0439)</li>
+<li>DS-3583 Usage of correct Collection Array (#1731) (upstream commit on dspace-5_x: c8f62e6f496fa86846bfa6bcf2d16811087d9761)</li>
+</ul></li>
+<li>&hellip; but somehow git knew, and didn&rsquo;t include them in my interactive rebase!</li>
+<li>I need to send this branch to Atmire and also arrange payment (see <a href="https://tracker.atmire.com/tickets-cgiar-ilri/view-ticket?id=560">ticket #560</a> in their tracker)</li>
+</ul>
+
   
 
   

docs/sitemap.xml

@@ -4,12 +4,12 @@
   
   <url>
     <loc>https://alanorth.github.io/cgspace-notes/2018-04/</loc>
-    <lastmod>2018-04-01T17:21:41+03:00</lastmod>
+    <lastmod>2018-04-04T15:57:34+03:00</lastmod>
   </url>
   
   <url>
     <loc>https://alanorth.github.io/cgspace-notes/2018-03/</loc>
-    <lastmod>2018-04-04T15:14:21+03:00</lastmod>
+    <lastmod>2018-04-04T15:57:34+03:00</lastmod>
   </url>
   
   <url>
@@ -99,7 +99,7 @@
   
   <url>
     <loc>https://alanorth.github.io/cgspace-notes/2016-10/</loc>
-    <lastmod>2018-03-09T22:10:33+02:00</lastmod>
+    <lastmod>2018-04-04T16:25:57+03:00</lastmod>
   </url>
   
   <url>
@@ -159,7 +159,7 @@
   
   <url>
     <loc>https://alanorth.github.io/cgspace-notes/</loc>
-    <lastmod>2018-04-01T17:21:41+03:00</lastmod>
+    <lastmod>2018-04-04T15:57:34+03:00</lastmod>
     <priority>0</priority>
   </url>
   
@@ -170,7 +170,7 @@
   
   <url>
     <loc>https://alanorth.github.io/cgspace-notes/tags/notes/</loc>
-    <lastmod>2018-04-01T17:21:41+03:00</lastmod>
+    <lastmod>2018-04-04T15:57:34+03:00</lastmod>
     <priority>0</priority>
   </url>
   
@@ -182,13 +182,13 @@
   
   <url>
     <loc>https://alanorth.github.io/cgspace-notes/posts/</loc>
-    <lastmod>2018-04-01T17:21:41+03:00</lastmod>
+    <lastmod>2018-04-04T15:57:34+03:00</lastmod>
     <priority>0</priority>
   </url>
   
   <url>
     <loc>https://alanorth.github.io/cgspace-notes/tags/</loc>
-    <lastmod>2018-04-01T17:21:41+03:00</lastmod>
+    <lastmod>2018-04-04T15:57:34+03:00</lastmod>
     <priority>0</priority>
   </url>