Skip to content

Commit

Permalink
No Calibri
Browse files Browse the repository at this point in the history
  • Loading branch information
@ralfhandl
ralfhandl committed Jul 25, 2023
1 parent 9880119 commit 5d29e55
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 94 deletions.
1 change: 1 addition & 0 deletions odata-protocol/temp/clean.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const clean = old
// clean up formatting
.replace(/<span[ \n]+style='font-family:\n?"Arial",sans-serif'>([^<]*)<\/span>/g,"$1")
.replace(/<span[ \n]style='(font-size:\n?[\d\.]+pt;[ \n]*)?color:\n?black(;\n?background:white)?'>([^<]*)<\/span>/g,"$3")
.replace(/<span[ \n]style='font-family:"Calibri",sans-serif'>([^<]*)<\/span>/g,"$1")
.replace(/<span[ \n]style='color:windowtext'>([^<]*)<\/span>/g,"$1")
.replace(/<span[ \n]style='background:white'>([^<]*)<\/span>/g,"$1")
.replace(/<span[ \n]style='color:#333333'>([^<]*)<\/span>/g,"$1")
Expand Down
31 changes: 13 additions & 18 deletions odata-protocol/temp/odata-v4.01-os-part1-protocol-clean.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ <h4>##subsubsubsec Preference <code>allow-entityreferences</code> (<code>odata.a
preference it MUST include a <a href="#sec_HeaderPreferenceApplied"><code>Preference-Applied</code></a> response header
containing the <code>allow-entityreferences</code> preference to
indicate that entity references MAY be returned in place of entities that have
previously been returned<span style='font-family:"Calibri",sans-serif'>.</span></p>
previously been returned.</p>

<p class=MsoNormal>If the <code>allow-entityreferences</code>
preference is specified on an individual request within a batch, then it
Expand Down Expand Up @@ -1444,11 +1444,10 @@ <h4>##subsubsubsec Preference <code>return=representation</code> and <code>retur
href="#sec_ResponseCode204NoContent"><code>204
No Content</code></a><code> </code>in which
case it MAY include a <a href="#sec_HeaderPreferenceApplied"><code>Preference-Applied</code></a><code> </code>response
header containing the <code>return=minimal </code>preference<span
style='font-family:"Calibri",sans-serif'>.</span></p>
header containing the <code>return=minimal </code>preference.</p>

<p class=MsoNormal>A preference of<span style='font-family:"Calibri",sans-serif'>
</span><code>return=representation</code> requests that the
<p class=MsoNormal>A preference of
<code>return=representation</code> requests that the
service invokes the request and returns the modified resource. The service MAY
apply this preference by returning the representation of the successfully
modified resource in the body of the response, formatted according to the rules
Expand Down Expand Up @@ -1646,7 +1645,7 @@ <h3>##subsubsec Header
<p class=MsoNormal>A response to a <a href="#sec_CreateanEntity">create</a> or
<a href="#sec_UpsertanEntity">upsert</a>
operation that returns <a href="#sec_ResponseCode204NoContent"><code>204 No
Content</code></a><span style='font-family:"Calibri",sans-serif'> </span>MUST
Content</code></a> MUST
include an <code>OData-EntityId</code> response header. The value of the header is the <a
href="#sec_EntityIdsandEntityReferences">entity-id</a> of the entity that was
acted on by the request. The syntax of the <code>OData-EntityId</code> header is defined in <a href="#ODataABNF">OData-ABNF</a>.</p>
Expand Down Expand Up @@ -2941,7 +2940,7 @@ <h3>##subsubsec Requesting Individual
Properties</h3>

<p class=MsoNormal>To retrieve an individual property, the client issues a <code>GET</code> request to the property URL. The property URL is the
entity read URL with <span style='font-family:"Calibri",sans-serif'>&quot;/&quot;</span>
entity read URL with &quot;/&quot;
and the property name appended.</p>

<p class=MsoNormal>For complex typed properties, the path can be further
Expand Down Expand Up @@ -3269,8 +3268,7 @@ <h5>##subsubsubsubsec Expand Options</h5>

<h6>##subsubsubsubsubsec Expand Option <code>$levels</code></h6>

<p class=MsoNormal style='page-break-after:avoid'>The <code>$levels</code><span
style='font-family:"Calibri",sans-serif'> </span>expand option can be used to
<p class=MsoNormal style='page-break-after:avoid'>The <code>$levels</code> expand option can be used to
specify the number of levels of recursion for a hierarchy in which the related
entity type is the same as, or can be cast to, the source entity type. A <code>$levels</code> option with a value of 1 specifies a single
expand with no recursion. The same expand options are applied at each level of
Expand Down Expand Up @@ -3356,7 +3354,7 @@ <h4>##subsubsubsec System
system query option restricts the set of items returned.</p>

<p class=MsoCaption>Example 46: return all Products whose <code>Price</code>
is less than <span style='font-family:"Calibri",sans-serif'>$10.00</span></p>
is less than $10.00</p>

<div style='border-top:solid windowtext 1.0pt;border-left:none;border-bottom:
solid windowtext 1.0pt;border-right:none;padding:3.0pt 0in 3.0pt 0in;
Expand Down Expand Up @@ -4202,8 +4200,7 @@ <h4>##subsubsubsec System
</div>

<p class=MsoNormal style='page-break-after:avoid'>Where <a
href="#sec_SystemQueryOptiontop"><code>$top</code><span
style='font-family:"Calibri",sans-serif'> </span></a>and <code>$skip</code>
href="#sec_SystemQueryOptiontop"><code>$top</code> </a>and <code>$skip</code>
are used together, <code>$skip</code> MUST be applied before <code>$top</code>, regardless of the order in which they appear in the
request. </p>

Expand Down Expand Up @@ -4587,7 +4584,7 @@ <h3>##subsubsec Requesting the Number of Items
segment MAY be used in combination with the <code>/$filter path</code>
segment to count the items in the filtered collection.</p>

<p class=MsoCaption>Example 70: return the number of products whose <code>Price</code> is less than <span style='font-family:"Calibri",sans-serif'>$10.00</span></p>
<p class=MsoCaption>Example 70: return the number of products whose <code>Price</code> is less than $10.00</p>

<div style='border-top:solid windowtext 1.0pt;border-left:none;border-bottom:
solid windowtext 1.0pt;border-right:none;padding:3.0pt 0in 3.0pt 0in;
Expand All @@ -4602,7 +4599,7 @@ <h3>##subsubsec Requesting the Number of Items
href="#sec_SystemQueryOptionfilter"><code>$filter</code></a>
system query option.</p>

<p class=MsoCaption>Example 71: return the number of products whose <code>Price</code> is less than <span style='font-family:"Calibri",sans-serif'>$10.00</span></p>
<p class=MsoCaption>Example 71: return the number of products whose <code>Price</code> is less than $10.00</p>

<div style='border-top:solid windowtext 1.0pt;border-left:none;border-bottom:
solid windowtext 1.0pt;border-right:none;padding:3.0pt 0in 3.0pt 0in;
Expand Down Expand Up @@ -5604,8 +5601,7 @@ <h3>##subsubsec Delete an Entity</h3>

<p class=MsoNormal>Services MAY implicitly delete or modify related entities if
required by <a href="#sec_HandlingofIntegrityConstraints">integrity constraints</a>.
If integrity constraints are declared in <code>$metadata</code><span
style='font-family:"Calibri",sans-serif'> </span>using a <code>ReferentialConstraint</code>
If integrity constraints are declared in <code>$metadata</code> using a <code>ReferentialConstraint</code>
element, services MUST modify affected related entities according to the
declared integrity constraints, e.g. by deleting dependent entities, or setting
dependent properties to <code>null</code> or their default
Expand Down Expand Up @@ -6675,8 +6671,7 @@ <h4>##subsubsubsec Invoking
entities. The ETag value for a collection as a whole is transported in the <code>ETag</code> header of a collection response.</p>

<p class=MsoCaption>Example 95: invoke the <code>SampleEntities.CreateOrder</code>
action using <code>/Customers('ALFKI'</code><span
class=VerbatimChar><span style='font-family:"Calibri",sans-serif'>) </span></span>as
action using <code>/Customers('ALFKI') </code>as
the customer (or binding parameter). The values <code>2</code>
for the <code>quantity</code> parameter and <code>BLACKFRIDAY</code> for the <code>discountCode</code>
parameter are passed in the body of the request. Invoke the action only if the
Expand Down
65 changes: 27 additions & 38 deletions odata-protocol/temp/odata-v4.01-os-part1-protocol-raw.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -968,8 +968,7 @@ In the case the service applies the `allow-entityreferences` preference
it MUST include a [`Preference-Applied`](#sec_HeaderPreferenceApplied)
response header containing the `allow-entityreferences` preference to
indicate that entity references MAY be returned in place of entities
that have previously been
returned[.]{style="font-family:\"Calibri\",sans-serif"}
that have previously been returned.

If the `allow-entityreferences` preference is specified on an individual
request within a batch, then it specifies the preference for that
Expand Down Expand Up @@ -1291,15 +1290,13 @@ apply this preference by returning
[`204 No Content`](#sec_ResponseCode204NoContent)` `in which case it MAY
include a
[`Preference-Applied`](#sec_HeaderPreferenceApplied)` `response header
containing the
`return=minimal `preference[.]{style="font-family:\"Calibri\",sans-serif"}

A preference of[
]{style="font-family:\"Calibri\",sans-serif"}`return=representation`
requests that the service invokes the request and returns the modified
resource. The service MAY apply this preference by returning the
representation of the successfully modified resource in the body of the
response, formatted according to the rules specified for the requested
containing the `return=minimal `preference.

A preference of `return=representation` requests that the service
invokes the request and returns the modified resource. The service MAY
apply this preference by returning the representation of the
successfully modified resource in the body of the response, formatted
according to the rules specified for the requested
[format](#sec_Formats)[. In this case the service]{.Hyperlink1} MAY
include a [`Preference-Applied`](#sec_HeaderPreferenceApplied) response
header containing the `return=representation` preference.
Expand Down Expand Up @@ -1477,8 +1474,7 @@ response, but MAY be included in individual responses within a batch.

A response to a [create](#sec_CreateanEntity) or
[upsert](#sec_UpsertanEntity) operation that returns
[`204 No Content`](#sec_ResponseCode204NoContent)[
]{style="font-family:\"Calibri\",sans-serif"}MUST include an
[`204 No Content`](#sec_ResponseCode204NoContent) MUST include an
`OData-EntityId` response header. The value of the header is the
[entity-id](#sec_EntityIdsandEntityReferences) of the entity that was
acted on by the request. The syntax of the `OData-EntityId` header is
Expand Down Expand Up @@ -2641,9 +2637,8 @@ property referencing a media entity whose value is null returns
### ##subsubsec Requesting Individual Properties

To retrieve an individual property, the client issues a `GET` request to
the property URL. The property URL is the entity read URL with
[\"/\"]{style="font-family:\"Calibri\",sans-serif"} and the property
name appended.
the property URL. The property URL is the entity read URL with \"/\" and
the property name appended.

For complex typed properties, the path can be further extended with the
name of an individual property of the complex type.
Expand Down Expand Up @@ -2939,12 +2934,11 @@ http://host/service.svc/Customers?\$expand=SampleModel.VipCustomer/InHouseStaff

###### ##subsubsubsubsubsec Expand Option `$levels`

The `$levels`[ ]{style="font-family:\"Calibri\",sans-serif"}expand
option can be used to specify the number of levels of recursion for a
hierarchy in which the related entity type is the same as, or can be
cast to, the source entity type. A `$levels` option with a value of 1
specifies a single expand with no recursion. The same expand options are
applied at each level of the hierarchy.
The `$levels` expand option can be used to specify the number of levels
of recursion for a hierarchy in which the related entity type is the
same as, or can be cast to, the source entity type. A `$levels` option
with a value of 1 specifies a single expand with no recursion. The same
expand options are applied at each level of the hierarchy.

Services MAY support the symbolic value `max` in addition to numeric
values. In that case they MUST solve circular dependencies by injecting
Expand Down Expand Up @@ -3019,8 +3013,7 @@ return [`501 Not Implemented`](#sec_ResponseCode501NotImplemented).

The `$filter` system query option restricts the set of items returned.

Example 46: return all Products whose `Price` is less than
[\$10.00]{style="font-family:\"Calibri\",sans-serif"}
Example 46: return all Products whose `Price` is less than \$10.00

::: {style="border-top:solid windowtext 1.0pt;border-left:none;border-bottom:
solid windowtext 1.0pt;border-right:none;padding:3.0pt 0in 3.0pt 0in;
Expand Down Expand Up @@ -3306,10 +3299,9 @@ background:#D9D9D9;margin-left:.3in;margin-right:.3in"}
GET http://host/service/Products?\$skip=5
:::

Where [`$top`[
]{style="font-family:\"Calibri\",sans-serif"}](#sec_SystemQueryOptiontop)and
`$skip` are used together, `$skip` MUST be applied before `$top`,
regardless of the order in which they appear in the request.
Where [`$top`](#sec_SystemQueryOptiontop) and `$skip` are used together,
`$skip` MUST be applied before `$top`, regardless of the order in which
they appear in the request.

Example 55: return the third through seventh products of the `Products`
entity set
Expand Down Expand Up @@ -3643,7 +3635,7 @@ the `/$filter path` segment to count the items in the filtered
collection.

Example 70: return the number of products whose `Price` is less than
[\$10.00]{style="font-family:\"Calibri\",sans-serif"}
\$10.00

::: {style="border-top:solid windowtext 1.0pt;border-left:none;border-bottom:
solid windowtext 1.0pt;border-right:none;padding:3.0pt 0in 3.0pt 0in;
Expand All @@ -3657,7 +3649,7 @@ combination with the [`$filter`](#sec_SystemQueryOptionfilter) system
query option.

Example 71: return the number of products whose `Price` is less than
[\$10.00]{style="font-family:\"Calibri\",sans-serif"}
\$10.00

::: {style="border-top:solid windowtext 1.0pt;border-left:none;border-bottom:
solid windowtext 1.0pt;border-right:none;padding:3.0pt 0in 3.0pt 0in;
Expand Down Expand Up @@ -4595,8 +4587,7 @@ deleting it; clients need not delete the relations explicitly.

Services MAY implicitly delete or modify related entities if required by
[integrity constraints](#sec_HandlingofIntegrityConstraints). If
integrity constraints are declared in `$metadata`[
]{style="font-family:\"Calibri\",sans-serif"}using a
integrity constraints are declared in `$metadata` using a
`ReferentialConstraint` element, services MUST modify affected related
entities according to the declared integrity constraints, e.g. by
deleting dependent entities, or setting dependent properties to `null`
Expand Down Expand Up @@ -5591,12 +5582,10 @@ collection as a whole is transported in the `ETag` header of a
collection response.

Example 95: invoke the `SampleEntities.CreateOrder` action using
`/Customers('ALFKI'`[[)
]{style="font-family:\"Calibri\",sans-serif"}]{.VerbatimChar}as the
customer (or binding parameter). The values `2` for the `quantity`
parameter and `BLACKFRIDAY` for the `discountCode` parameter are passed
in the body of the request. Invoke the action only if the customer's
ETag still matches.
`/Customers('ALFKI') `as the customer (or binding parameter). The values
`2` for the `quantity` parameter and `BLACKFRIDAY` for the
`discountCode` parameter are passed in the body of the request. Invoke
the action only if the customer's ETag still matches.

::: {style="border-top:solid windowtext 1.0pt;border-left:none;border-bottom:
solid windowtext 1.0pt;border-right:none;padding:3.0pt 0in 3.0pt 0in;
Expand Down
Loading

0 comments on commit 5d29e55

Please sign in to comment.