From 1b796b80dd689ec3eab6151d5a324175e2785315 Mon Sep 17 00:00:00 2001
From: Christian Tacke <58549698+ChristianTackeGSI@users.noreply.github.com>
Date: Fri, 2 Sep 2022 13:01:12 +0200
Subject: [PATCH] build(metaUpdater): Reorder orcid in CodeMeta

`@id` is usually quite at the top of elements in schema.org
style json files.  It's usually the canonical identifier
for that element.

So reorder ORCIDs to the top in those entries.
---
 codemeta.json  | 8 ++++----
 meta_update.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/codemeta.json b/codemeta.json
index 6be56f9d..3f4d96ab 100644
--- a/codemeta.json
+++ b/codemeta.json
@@ -17,9 +17,9 @@
     },
     {
       "@type": "Person",
+      "@id": "https://orcid.org/0000-0003-3787-1910",
       "givenName": "Dennis",
-      "familyName": "Klein",
-      "@id": "https://orcid.org/0000-0003-3787-1910"
+      "familyName": "Klein"
     },
     {
       "@type": "Person",
@@ -92,9 +92,9 @@
     },
     {
       "@type": "Person",
+      "@id": "https://orcid.org/0000-0002-5321-8404",
       "givenName": "Christian",
-      "familyName": "Tacke",
-      "@id": "https://orcid.org/0000-0002-5321-8404"
+      "familyName": "Tacke"
     },
     {
       "@type": "Person",
diff --git a/meta_update.py b/meta_update.py
index 9f5e62fc..f38dea4b 100755
--- a/meta_update.py
+++ b/meta_update.py
@@ -77,7 +77,7 @@ class CodeMetaManipulator(Manipulator):
         if entry is None:
             entry = OrderedDict()
             entry['@type'] = 'Person'
-        for field in ('givenName', 'familyName', 'email', 'orcid'):
+        for field in ('orcid', 'givenName', 'familyName', 'email'):
             val = matchdict.get(field, None)
             if val is not None:
                 if field == 'orcid':