Skip to content

Commit 342f4dc

Browse files
committed
Refactor ESP service interface instructions and update DFU query sort order mappings
1 parent fe68908 commit 342f4dc

3 files changed

Lines changed: 2 additions & 7 deletions

File tree

.github/instructions/esp-service-interface.instructions.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ applyTo: '**/*.ecm'
1111
- Include the `exceptions_inline` attribute in any new `ESPresponse` element.
1212
- Include the `exceptions_inline` attribute in any new `ESPmethod` element only if its parent `ESPservice` element doesn't have an `exceptions_inline` attribute.
1313

14-
## Version Bumping
15-
- Always bump the `ESPservice` `version` and `default_client_version` when changing request/response schemas or behavior.
16-
- Use the next sequential version string (for example, if current is 1.67, bump to 1.68).
17-
- Keep changes backward compatible; do not remove or change existing fields without a version gate.
18-
1914
## Naming Conventions
2015
- Use `PascalCase` for element names.
2116
- Use lower case for native types such as `string`, `integer`, `boolean`, etc.

dali/base/dadfs.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14211,7 +14211,8 @@ static IPropertyTreeIterator *deserializeFileAttrIterator(MemoryBuffer& mb, unsi
1421114211
if (options.includeField(DFUQResultField::origsize))
1421214212
{
1421314213
const char *propName = getDFUQResultFieldName(DFUQResultField::origsize);
14214-
attr->setPropInt64(propName, attr->getPropInt64(getDFUQResultFieldName(DFUQResultField::origsize), -1));
14214+
if (!attr->hasProp(propName))
14215+
attr->setPropInt64(propName, -1);
1421514216
}
1421614217

1421714218
if (options.includeField(DFUQResultField::recordcount))

esp/services/ws_dfu/ws_dfuService.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3769,7 +3769,6 @@ void CWsDfuEx::setDFUQuerySortOrder(IEspDFUQueryRequest& req, StringBuffer& sort
37693769
static const std::unordered_map<std::string_view, std::string_view> legacyMappings =
37703770
{
37713771
{"FileSize", "@DFUSFsize"},
3772-
{"Size", "@origsize"},
37733772
{"CompressedFileSize", "@compressedSize"},
37743773
{"ContentType", "@kind"},
37753774
{"IsCompressed", "@compressed"},

0 commit comments

Comments
 (0)