Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"limit": 5,
"props": [
{
"v": "Christel Hanewinckel"
"propertyValue": "Christel Hanewinckel"
},
{
"pid": "professionOrOccupation",
"v": "Politik*"
"propertyId": "professionOrOccupation",
"propertyValue": "Politik*"
},
{
"pid": "affiliation",
"v": "http://d-nb.info/gnd/2022139-3"
"propertyId": "affiliation",
"propertyValue": "http://d-nb.info/gnd/2022139-3"
}
]
},
Expand All @@ -22,15 +22,15 @@
"limit": 5,
"props": [
{
"v": "Franz Thönnes"
"propertyValue": "Franz Thönnes"
},
{
"pid": "professionOrOccupation",
"v": "Politik*"
"propertyId": "professionOrOccupation",
"propertyValue": "Politik*"
},
{
"pid": "affiliation",
"v": "http://d-nb.info/gnd/2022139-3"
"propertyId": "affiliation",
"propertyValue": "http://d-nb.info/gnd/2022139-3"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
{
"conditions": [
{
"v": "Hans-Eberhard Urbaniak"
"propertyValue": "Hans-Eberhard Urbaniak"
}
]
},
{
"conditions": [
{
"v": "Ernst Schwanhold"
"propertyValue": "Ernst Schwanhold"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"conditions": [
{
"matchType": "name",
"v": "Christel Hanewinckel"
"propertyValue": "Christel Hanewinckel"
}
],
"type": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"conditions": [
{
"matchType": "property",
"pid": "uid",
"v": "27eb892afbb2"
"propertyId": "uid",
"propertyValue": "27eb892afbb2"
}
]
},
{
"conditions": [
{
"matchType": "property",
"pid": "uid",
"v": "ab09da9dd37e"
"propertyId": "uid",
"propertyValue": "ab09da9dd37e"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
"conditions": [
{
"matchType": "name",
"v": "Christel Hanewinckel"
"propertyValue": "Christel Hanewinckel"
},
{
"matchType": "property",
"pid": "professionOrOccupation",
"v": "Politik*",
"propertyId": "professionOrOccupation",
"propertyValue": "Politik*",
"required": false,
"matchQuantifier": "any",
"matchQualifier": "WildcardMatch"
},
{
"matchType": "property",
"pid": "affiliation",
"v": "http://d-nb.info/gnd/2022139-3",
"propertyId": "affiliation",
"propertyValue": "http://d-nb.info/gnd/2022139-3",
"required": false,
"matchQuantifier": "any",
"matchQualifier": "ExactMatch"
Expand All @@ -32,20 +32,20 @@
"conditions": [
{
"matchType": "name",
"v": "Franz Thönnes"
"propertyValue": "Franz Thönnes"
},
{
"matchType": "property",
"pid": "professionOrOccupation",
"v": "Politik*",
"propertyId": "professionOrOccupation",
"propertyValue": "Politik*",
"required": false,
"matchQuantifier": "any",
"matchQualifier": "WildcardMatch"
},
{
"matchType": "property",
"pid": "affiliation",
"v": "http://d-nb.info/gnd/2022139-3",
"propertyId": "affiliation",
"propertyValue": "http://d-nb.info/gnd/2022139-3",
"required": false,
"matchQuantifier": "any",
"matchQualifier": "ExactMatch"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"conditions": [
{
"matchType": "name",
"v": "Hans-Eberhard Urbaniak"
"propertyValue": "Hans-Eberhard Urbaniak"
}
]
},
{
"conditions": [
{
"matchType": "name",
"v": "Ernst Schwanhold"
"propertyValue": "Ernst Schwanhold"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"conditions": [
{
"matchType": "name",
"v": "Christel Hanewinckel"
"propertyValue": "Christel Hanewinckel"
},
{
"matchType": "property",
"pid": "professionOrOccupation",
"v": [
"propertyId": "professionOrOccupation",
"propertyValue": [
"Politik*",
{
"id": "wissenschaftler",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"conditions": [
{
"matchType": "property",
"pid": "uid",
"v": "27eb892afbb2"
"propertyId": "uid",
"propertyValue": "27eb892afbb2"
}
]
},
{
"conditions": [
{
"matchType": "property",
"pid": "uid",
"v": "ab09da9dd37e"
"propertyId": "uid",
"propertyValue": "ab09da9dd37e"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"conditions": [
{
"matchType": "name",
"v": "Deng Shuping"
"propertyValue": "Deng Shuping"
},
{
"matchType": "property",
"pid": "professionOrOccupation",
"v": "art historian"
"propertyId": "professionOrOccupation",
"propertyValue": "art historian"
},
{
"matchType": "property",
"pid": "variantName",
"v": "鄧淑蘋",
"propertyId": "variantName",
"propertyValue": "鄧淑蘋",
"lang": "zh-Hant"
}
]
Expand Down
14 changes: 7 additions & 7 deletions 1.0-draft/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -524,19 +524,19 @@ <h3>Structure of a Reconciliation Query</h3>
<dl>
<dt><code>matchType</code></dt>
<dd>Either <code>name</code> or <code>property</code>, depending on whether the condition relates to entity names or their properties.</dd>
<dt><code>pid</code></dt>
<dt><code>propertyId</code></dt>
<dd>A <a href='#properties'>property</a> identifier, to be provided if and only if the <code>matchType</code> is <code>property</code>.</dd>
<dt><code>v</code></dt>
<dt><code>propertyValue</code></dt>
<dd>one or more <a>property values</a>. If <code>matchType</code> is <code>name</code>, then this value is to
be matched to entity names, otherwise to the property values via the supplied <code>pid</code>. The specifics of how this similarity
be matched to entity names, otherwise to the property values via the supplied <code>propertyId</code>. The specifics of how this similarity
is defined are determined by the service.</dd>
<dt><code>required</code></dt>
<dd>An optional boolean indicating if a match for the property is required for an entity to enter the list of candidates (i.e. acting like a filter or a WHERE clause in SQL)
or optional (i.e. only effecting the entity's rank in the list of candidates). If omitted, the service SHOULD assume the requested value to be <code>false</code>;</dd>
<dt><code>matchQuantifier</code></dt>
<dd>An optional string to indicate which of the values in <code>v</code> to match. MUST be <code>any</code> (equivalent to boolean OR), <code>all</code> (equivalent to boolean AND), or <code>none</code> (equivalent to boolean NOT). If omitted, the service SHOULD assume the requested value to be <code>any</code>;</dd>
<dd>An optional string to indicate which of the values in <code>propertyValue</code> to match. MUST be <code>any</code> (equivalent to boolean OR), <code>all</code> (equivalent to boolean AND), or <code>none</code> (equivalent to boolean NOT). If omitted, the service SHOULD assume the requested value to be <code>any</code>;</dd>
<dt><code>matchQualifier</code></dt>
<dd>An optional string to indicate how to match the values in <code>v</code>.
<dd>An optional string to indicate how to match the values in <code>propertyValue</code>.
This can be used for general matching relations like "skos:exactMatch", "skos:closeMatch", etc. or for specific features like spatial matching with geo data
(e.g. containment search with "schema:containsPlace" etc.) or custom matching on date fields (e.g. services supporting the [[EDTF]] specification could use "EDTF:Level-0" etc.
To allow discovery of supported qualifiers by clients, services that support <code>matchQualifier</code> MUST return the supported <code>matchQualifiers</code> for each property
Expand Down Expand Up @@ -965,7 +965,7 @@ <h3>Text-processing language</h3>

<p>All objects used in this protocol (entities, types, properties, queries, candidates, features, etc.) MAY declare an explicit <a>text-processing language</a> in a <code>lang</code> field.
The <code>lang</code> value MUST be a single valid (i.e. found in the [[IANA Language Subtag Registry]]) [[BCP 47]] language tag. This text-processing language applies to the natural language fields of the object: <code>name</code>, <code>description</code>,
<code>query</code> (for <a>reconciliation queries</a>), <code>v</code> and <code>str</code> (for <a>property values</a>), <code>helpText</code> (for <a>data extension property settings</a>). Nested objects inherit the text-processing language of their parent, and can override it by setting their own <code>lang</code> value
<code>query</code> (for <a>reconciliation queries</a>), <code>propertyValue</code> and <code>str</code> (for <a>property values</a>), <code>helpText</code> (for <a>data extension property settings</a>). Nested objects inherit the text-processing language of their parent, and can override it by setting their own <code>lang</code> value
(see example below). A default text-processing language for any natural language string returned or processed by a service MAY be set in the <code>lang</code> field of the <a href="#service-manifest">service manifest</a>.
Client and service implementors SHOULD consider the text-processing language to ensure correct processing of natural language content.</p>

Expand All @@ -981,7 +981,7 @@ <h3>Text direction</h3>

<p>All objects returned by reconciliation services (entities, types, properties, candidates, features, etc.) MAY declare an explicit text <a href="https://www.w3.org/International/articles/inline-bidi-markup/uba-basics">
base direction</a> in a <code>dir</code> field. The <code>dir</code> value MUST be <code>ltr</code> for left-to-right, <code>rtl</code> for right-to-left, or <code>auto</code> for determining the direction by examining the content of each JSON field.
This base direction applies to the natural language fields of the object: <code>name</code> and <code>description</code> (for candidates etc.), <code>v</code> and <code>str</code> (for <a>property values</a>), <code>helpText</code> (for <a>data extension property settings</a>).
This base direction applies to the natural language fields of the object: <code>name</code> and <code>description</code> (for candidates etc.), <code>propertyValue</code> and <code>str</code> (for <a>property values</a>), <code>helpText</code> (for <a>data extension property settings</a>).
Nested objects inherit the base direction of their parent, and can override it by setting their own <code>dir</code> value. A default base direction for any natural language string returned or processed by a service MAY be set in the <code>dir</code> field of the
<a href="#service-manifest">service manifest</a>. If no explicit base direction is given, left-to-right is considered the default base direction. Clients SHOULD consider the base direction to ensure correct rendering of content, e.g. by setting corresponding <code>dir</code> attributes when rendering JSON responses in HTML.
For instance, rendering a Persian label for 'Yahoo!' like <code>یاهو!</code> right-to-left will correctly display as <code dir="rtl">یاهو!</code>.</p>
Expand Down
6 changes: 3 additions & 3 deletions 1.0-draft/schemas/reconciliation-query-batch.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@
"property"
]
},
"pid": {
"propertyId": {
"type": "string",
"description": "The identifier of the property, whose values will be compared to the values supplied. Required if 'matchType' is 'property'."
},
"v": {
"propertyValue": {
"description": "A value (or array of values) to match against the entity names or property values associated with the property on each candidate",
"oneOf": [
{
Expand Down Expand Up @@ -116,7 +116,7 @@
},
"required": [
"matchType",
"v"
"propertyValue"
]
}
}
Expand Down