Merge remote-tracking branch 'origin/master' into 125-language

reconciliation-api · Dec 18, 2023 · bf8446d · bf8446d
2 parents b400ac9 + 1c25297
commit bf8446d
Show file tree

Hide file tree

Showing 32 changed files with 172 additions and 136 deletions.
diff --git a/draft/examples/manifest/invalid/bad-authentication.json b/draft/examples/manifest/invalid/bad-authentication.json
@@ -1,7 +1,8 @@
 {
   "name": "OpenCorporates Reconciliation Service",
-  "identifierSpace": "http://rdf.freebase.com/ns/type.object.id",
-  "schemaSpace": "http://rdf.freebase.com/ns/type.object.id",
+  "view": {
+    "url": "{+id}"
+  },
   "authentication": {
      "foo": "bar"
   }

diff --git a/draft/examples/manifest/invalid/feature-view.json b/draft/examples/manifest/invalid/feature-view.json
@@ -1,7 +1,8 @@
 {
     "name": "VIAF",
-    "identifierSpace": "http://vocab.getty.edu/doc/#GVP_URLs_and_Prefixes",
-    "schemaSpace": "http://vocab.getty.edu/doc/#The_Getty_Vocabularies_and_LOD",
+    "view": {
+        "url": "https://viaf.org/viaf/{id}"
+    },
     "feature_view": {
         "url": "https://vocab.getty.edu/recon/features/"
     }

diff --git a/...nvalid/godot-missing-identifierSpace.json → .../manifest/invalid/godot-missing-view.json b/...nvalid/godot-missing-identifierSpace.json → .../manifest/invalid/godot-missing-view.json
@@ -7,9 +7,6 @@
   ],
   "name": "GODOT (Graph of Dated Objects and Texts) Reconciliation Service - Roman Consulates",
   "preview": {
-    "url": "https://godot.date/reconcile/preview={{id}}"
-  },
-  "view": {
-    "url": "https://godot.date/id/{{id}}"
+    "url": "https://godot.date/reconcile/preview={id}"
   }
 }
diff --git a/draft/examples/manifest/invalid/missing-version.json b/draft/examples/manifest/invalid/missing-version.json
@@ -1,5 +1,6 @@
 {
     "name": "VIAF",
-    "identifierSpace": "http://vocab.getty.edu/doc/#GVP_URLs_and_Prefixes",
-    "schemaSpace": "http://vocab.getty.edu/doc/#The_Getty_Vocabularies_and_LOD"
+    "view": {
+        "url": "https://viaf.org/viaf/{id}"
+    }
 }
diff --git a/draft/examples/manifest/invalid/old-version.json b/draft/examples/manifest/invalid/old-version.json
@@ -1,6 +1,7 @@
 {
     "versions": ["0.1"],
     "name": "VIAF",
-    "identifierSpace": "http://vocab.getty.edu/doc/#GVP_URLs_and_Prefixes",
-    "schemaSpace": "http://vocab.getty.edu/doc/#The_Getty_Vocabularies_and_LOD"
+    "view": {
+        "url": "https://viaf.org/viaf/{id}"
+    }
 }
diff --git a/draft/examples/manifest/invalid/opencorporates.json b/draft/examples/manifest/invalid/opencorporates.json
@@ -1,12 +1,10 @@
 {
   "name": "OpenCorporates Reconciliation Service",
-  "identifierSpace": "http://rdf.freebase.com/ns/type.object.id",
-  "schemaSpace": "http://rdf.freebase.com/ns/type.object.id",
   "view": {
-    "url": "https://opencorporates.com{{id}}"
+    "url": "https://opencorporates.com{id}"
   },
   "preview": {
-    "url": "https://opencorporates.com{{id}}/preview",
+    "url": "https://opencorporates.com{id}/preview",
     "width": 430,
     "height": 300
   },

diff --git a/draft/examples/manifest/invalid/ror-invalid-view-pattern.json b/draft/examples/manifest/invalid/ror-invalid-view-pattern.json
@@ -1,7 +1,5 @@
 {
   "name": "ROR Reconciliation Service",
-  "identifierSpace": "http://ror.org/organization",
-  "schemaSpace": "http://ror.org/ns/type.object.id",
   "defaultTypes": [
     {
       "id": "/ror/organization",
@@ -13,14 +11,14 @@
   },
   "suggest": {
     "entity": {
-      "flyout_service_path": "/flyout?id=${id}",
+      "flyout_service_path": "/flyout?id={id}",
       "service_path": "/suggest",
       "service_url": "https://reconcile.ror.org"
     }
   },
   "preview": {
     "width": 400,
     "height": 100,
-    "url": "https://reconcile.ror.org/preview/{{id}}"
+    "url": "https://reconcile.ror.org/preview/{id}"
   }
 }
diff --git a/draft/examples/manifest/invalid/slub-invalid-property-setting.json b/draft/examples/manifest/invalid/slub-invalid-property-setting.json
@@ -59,15 +59,13 @@
       "service_url": "http://data.slub-dresden.de"
     }
   },
-  "identifierSpace": "http://data.slub-dresden.de",
   "name": "SLUB LOD reconciliation for OpenRefine",
   "preview": {
     "height": 100,
-    "url": "http://data.slub-dresden.de/{{id}}.preview",
+    "url": "http://data.slub-dresden.de/{id}.preview",
     "width": 320
   },
-  "schemaSpace": "http://schema.org",
   "view": {
-    "url": "http://data.slub-dresden.de/{{id}}"
+    "url": "http://data.slub-dresden.de/{id}"
   }
 }
diff --git a/draft/examples/manifest/valid/authentication.json b/draft/examples/manifest/valid/authentication.json
@@ -1,11 +1,9 @@
 {
   "versions": [ "0.2" ],
   "view": {
-    "url": "http://vivo.med.cornell.edu/individual?uri={{id}}"
+    "url": "http://vivo.med.cornell.edu/individual?uri={id}"
   },
-  "identifierSpace": "http://vivo.med.cornell.edu/individual/",
   "name": "VIVO Reconciliation Service",
-  "schemaSpace": "http://vivo.med.cornell.edu/individual/",
   "authentication": {
     "type": "apiKey",
     "description": "Vivo API key",

diff --git a/draft/examples/manifest/valid/codefork-viaf.json b/draft/examples/manifest/valid/codefork-viaf.json
@@ -1,8 +1,6 @@
 {
   "versions": ["0.2"],
   "name": "VIAF",
-  "identifierSpace": "http://rdf.freebase.com/ns/user/hangy/viaf",
-  "schemaSpace": "http://rdf.freebase.com/ns/type.object.id",
   "view": {
     "url": "http://viaf.org/viaf/{id}"
   },

diff --git a/draft/examples/manifest/valid/example-min.json b/draft/examples/manifest/valid/example-min.json
@@ -1,6 +1,7 @@
 {
     "versions": ["0.2"],
     "name": "VIAF",
-    "identifierSpace": "http://vocab.getty.edu/doc/#GVP_URLs_and_Prefixes",
-    "schemaSpace": "http://vocab.getty.edu/doc/#The_Getty_Vocabularies_and_LOD"
+    "view": {
+        "url": "https://viaf.org/viaf/{id}"
+    }
 }
diff --git a/draft/examples/manifest/valid/feature-view.json b/draft/examples/manifest/valid/feature-view.json
@@ -1,8 +1,9 @@
 {
     "versions": ["0.2"],
     "name": "VIAF",
-    "identifierSpace": "http://vocab.getty.edu/doc/#GVP_URLs_and_Prefixes",
-    "schemaSpace": "http://vocab.getty.edu/doc/#The_Getty_Vocabularies_and_LOD",
+    "view": {
+        "url": "https://viaf.org/viaf/{id}"
+    },
     "feature_view": {
         "url": "https://vocab.getty.edu/recon/features/{id}"
     }

diff --git a/draft/examples/manifest/valid/findthatcharity.json b/draft/examples/manifest/valid/findthatcharity.json
@@ -1,8 +1,6 @@
 {
   "versions": ["0.2"],
   "name": "findthatcharity",
-  "identifierSpace": "http://rdf.freebase.com/ns/type.object.id",
-  "schemaSpace": "http://rdf.freebase.com/ns/type.object.id",
   "view": {
     "url": "https://findthatcharity.uk/charity/{id}"
   },

diff --git a/draft/examples/manifest/valid/fundref.json b/draft/examples/manifest/valid/fundref.json
@@ -1,8 +1,9 @@
 {
   "versions": ["0.2"],
   "name": "Open Funder Registry Reconciliation Service",
-  "identifierSpace": "http://openfunder.crossref.org/openfunder",
-  "schemaSpace": "http://openfunder.crossref.org/ns/type.object.id",
+  "view": {
+    "url": "{+id}"
+  },
   "defaultTypes": [
     {
       "id": "/fundref/funder_name",

diff --git a/draft/examples/manifest/valid/geocollider-sinatra.json b/draft/examples/manifest/valid/geocollider-sinatra.json
@@ -1,8 +1,6 @@
 {
   "versions": ["0.2"],
   "name": "Pleiades Reconciliation for OpenRefine",
-  "schemaSpace": "https://pleiades.stoa.org/places/",
-  "identifierSpace": "https://pleiades.stoa.org/places/vocab#",
   "view": {
     "url": "{+id}"
   },

diff --git a/draft/examples/manifest/valid/getty.json b/draft/examples/manifest/valid/getty.json
@@ -18,14 +18,12 @@
       "name": "Search all Vocabs"
     }
   ],
-  "identifierSpace": "http://vocab.getty.edu/doc/#GVP_URLs_and_Prefixes",
   "name": "Getty Vocabularies Reconciliation Service",
   "batchSize": 50,
   "preview": {
     "height": 200,
     "width": 350
   },
-  "schemaSpace": "http://vocab.getty.edu/doc/#The_Getty_Vocabularies_and_LOD",
   "suggest": {
     "entity": false,
     "property": true,

diff --git a/draft/examples/manifest/valid/kerameikos.json b/draft/examples/manifest/valid/kerameikos.json
@@ -4,8 +4,6 @@
   "view": {
     "url": "http://kerameikos.org/id/{id}"
   },
-  "identifierSpace": "http://kerameikos.org/id/",
-  "schemaSpace": "http://kerameikos.org/ontology",
   "defaultTypes": [
     {
       "id": "skos:Concept",

diff --git a/draft/examples/manifest/valid/kew.json b/draft/examples/manifest/valid/kew.json
@@ -1,13 +1,11 @@
 {
   "versions": ["0.2"],
   "name": "IPNI Name Reconciliation Service",
-  "identifierSpace": "http://ipni.org/urn:lsid:ipni.org:names:",
-  "schemaSpace": "http://rdf.freebase.com/ns/type.object.id",
   "view": {
-    "url": "http://ipni.org/urn:lsid:ipni.org:names:{{id}}"
+    "url": "http://ipni.org/urn:lsid:ipni.org:names:{id}"
   },
   "preview": {
-    "url": "http://ipni.org/urn:lsid:ipni.org:names:{{id}}",
+    "url": "http://ipni.org/urn:lsid:ipni.org:names:{id}",
     "width": 400,
     "height": 400
   },

diff --git a/draft/examples/manifest/valid/lobid-gnd.json b/draft/examples/manifest/valid/lobid-gnd.json
@@ -1,8 +1,6 @@
 {
   "versions": ["0.2"],
   "name": "GND reconciliation for OpenRefine",
-  "identifierSpace": "https://lobid.org/gnd/",
-  "schemaSpace": "https://d-nb.info/standards/elementset/gnd#AuthorityResource",
   "defaultTypes": [
     {
       "id": "AuthorityResource",
@@ -44,7 +42,7 @@
     }
   ],
   "view": {
-    "url": "https://lobid.org/gnd/{{id}}"
+    "url": "https://lobid.org/gnd/{id}"
   },
   "preview": {
     "height": 100,

diff --git a/draft/examples/manifest/valid/nomisma.json b/draft/examples/manifest/valid/nomisma.json
@@ -2,10 +2,8 @@
   "versions": ["0.2"],
   "name": "Nomisma.org",
   "view": {
-    "url": "http://nomisma.org/id/{{id}}"
+    "url": "http://nomisma.org/id/{id}"
   },
-  "identifierSpace": "http://nomisma.org/id/",
-  "schemaSpace": "http://nomisma.org/ontology",
   "defaultTypes": [
     {
       "id": "nmo:CoinWear",

diff --git a/draft/examples/manifest/valid/occrp.json b/draft/examples/manifest/valid/occrp.json
@@ -1,10 +1,8 @@
 {
   "versions": ["0.2"],
   "name": "OCCRP Aleph",
-  "identifierSpace": "http://rdf.freebase.com/ns/type.object.id",
-  "schemaSpace": "http://rdf.freebase.com/ns/type.object.id",
   "view": {
-    "url": "https://aleph.occrp.org/entities/{{id}}"
+    "url": "https://aleph.occrp.org/entities/{id}"
   },
   "preview": {
     "width": 800,

diff --git a/draft/examples/manifest/valid/ordnance-survey.json b/draft/examples/manifest/valid/ordnance-survey.json
@@ -1,9 +1,7 @@
 {
   "versions": ["0.2"],
   "name": "Code-Point Open Reconciliation API",
-  "identifierSpace": "http://data.ordnancesurvey.co.uk/id/data/code-point-open",
-  "schemaSpace": "http://data.ordnancesurvey.co.uk/id/data/code-point-open",
   "view": {
-    "url": "{{id}}"
+    "url": "{+id}"
   }
 }
diff --git a/draft/examples/manifest/valid/vivo-cornell.json b/draft/examples/manifest/valid/vivo-cornell.json
@@ -1,9 +1,8 @@
 {
   "versions": ["0.2"],
   "view": {
-    "url": "http://vivo.med.cornell.edu/individual?uri={{id}}"
+    "url": "http://vivo.med.cornell.edu/individual?uri={id}"
   },
-  "identifierSpace": "http://vivo.med.cornell.edu/individual/",
   "name": "VIVO Reconciliation Service",
   "defaultTypes": [
     {
@@ -34,6 +33,5 @@
       "name": "obo:IAO_0000030",
       "id": "http://purl.obolibrary.org/obo/IAO_0000030"
     }
-  ],
-  "schemaSpace": "http://vivo.med.cornell.edu/individual/"
+  ]
 }
diff --git a/draft/examples/manifest/valid/wikidata.json b/draft/examples/manifest/valid/wikidata.json
@@ -5,7 +5,6 @@
     "width": 400,
     "height": 100
   },
-  "schemaSpace": "http://www.wikidata.org/prop/direct/",
   "documentation": "https://tools.wmflabs.org/openrefine-wikidata/",
   "logo": "https://tools.wmflabs.org/openrefine-wikidata/logo.png",
   "serviceVersion": "1.2.3",
@@ -77,12 +76,11 @@
     }
   ],
   "view": {
-    "url": "https://www.wikidata.org/wiki/{{id}}"
+    "url": "https://www.wikidata.org/wiki/{id}"
   },
   "suggest": {
     "type": true,
     "entity": true,
     "property": true
-  },
-  "identifierSpace": "http://www.wikidata.org/entity/"
+  }
 }
diff --git a/draft/examples/reconciliation-query-batch/valid/example-full.json b/draft/examples/reconciliation-query-batch/valid/example-full.json
@@ -7,11 +7,17 @@
       "properties": [
         {
           "pid": "professionOrOccupation",
-          "v": "Politik*"
+          "v": "Politik*",
+          "required": false,
+          "match_quantifier": "any",
+          "match_qualifier": "WildcardMatch"
         },
         {
           "pid": "affiliation",
-          "v": "http://d-nb.info/gnd/2022139-3"
+          "v": "http://d-nb.info/gnd/2022139-3",
+          "required": false,
+          "match_quantifier": "any",
+          "match_qualifier": "ExactMatch"
         }
       ]
     },
@@ -22,11 +28,17 @@
       "properties": [
         {
           "pid": "professionOrOccupation",
-          "v": "Politik*"
+          "v": "Politik*",
+          "required": false,
+          "match_quantifier": "any",
+          "match_qualifier": "WildcardMatch"
         },
         {
           "pid": "affiliation",
-          "v": "http://d-nb.info/gnd/2022139-3"
+          "v": "http://d-nb.info/gnd/2022139-3",
+          "required": false,
+          "match_quantifier": "any",
+          "match_qualifier": "ExactMatch"
         }
       ]
     }

diff --git a/draft/examples/reconciliation-result-batch/valid/minimal.json b/draft/examples/reconciliation-result-batch/valid/minimal.json
@@ -0,0 +1,28 @@
+{
+  "results": [
+    {
+      "candidates": [
+        {
+          "id": "120333937",
+          "name": "Urbaniak, Regina"
+        },
+        {
+          "id": "1127147390",
+          "name": "Urbaniak, Jan"
+        }
+      ]
+    },
+    {
+      "candidates": [
+        {
+          "id": "123064325",
+          "name": "Schwanhold, Ernst"
+        },
+        {
+          "id": "116362988X",
+          "name": "Schwanhold, Nadine"
+        }
+      ]
+    }
+  ]
+}