update schema and bnf

Author: Martin187187

documentation/IDTA-01004/modules/ROOT/partials/bnf/access-rule-model.bnf

@@ -12,5 +12,14 @@
     ( <SingleObject> <ws> )* 
     ( <UseObjectGroup> <ws> )* 
     ( ( "FORMULA:" <ws> <Condition> ) | ("USEFORMULA" <ws> <StringLiteral>) <ws> ) <ws>
-    ( "FRAGMENT:" <ws> <FieldIdentifierFragment> <ws> ( ( "FILTER:" <ws> <Condition> ) | ("USEFILTER" <ws> <StringLiteral>) <ws> ) <ws> )?
+    ( <Filter> <ws> )?
     ( <FilterList> <ws> )?
+    
+<Filter> ::= 
+    "FILTER:" <ws> ( <SecurityQueryFilter> <ws> )
+
+<FilterList> ::= 
+    "FILTERLIST:" <ws> ( <SecurityQueryFilter> <ws> )*
+
+<SecurityQueryFilter> ::= 
+    "FRAGMENT:" <ws> <FieldIdentifierFragment> <ws> ( ( "CONDITION:" <ws> <Condition> ) | ("USEFORMULA" <ws> <StringLiteral>) <ws> ) <ws>

documentation/IDTA-01004/modules/ROOT/partials/bnf/access-rules.bnf

@@ -12,14 +12,17 @@
     ( <SingleObject> <ws> )* 
     ( <UseObjectGroup> <ws> )* 
     ( ( "FORMULA:" <ws> <Condition> ) | ("USEFORMULA" <ws> <StringLiteral>) <ws> ) <ws>
-    ( "FRAGMENT:" <ws> <FieldIdentifierFragment> <ws> ( ( "FILTER:" <ws> <Condition> ) | ("USEFILTER" <ws> <StringLiteral>) <ws> ) <ws> )?
+    ( <Filter> <ws> )?
     ( <FilterList> <ws> )?
 
+<Filter> ::= 
+    "FILTER:" <ws> ( <SecurityQueryFilter> <ws> )
+
 <FilterList> ::= 
-    "FILTERLIST:" <ws> ( <SecurityQueryFilter> <ws> )+
+    "FILTERLIST:" <ws> ( <SecurityQueryFilter> <ws> )*
 
 <SecurityQueryFilter> ::= 
-    "FRAGMENT:" <ws> <FieldIdentifierFragment> <ws> ( ( "FILTER:" <ws> <Condition> ) | ("USEFILTER" <ws> <StringLiteral>) <ws> ) <ws>
+    "FRAGMENT:" <ws> <FieldIdentifierFragment> <ws> ( ( "CONDITION:" <ws> <Condition> ) | ("USEFORMULA" <ws> <StringLiteral>) <ws> ) <ws>
 
 <ACL> ::= 
     "ATTRIBUTES:" <ws> 
@@ -32,7 +35,7 @@
     "USEACL" <ws> <StringLiteral> <ws>
 
 <Right> ::= 
-    "CREATE" | "READ" | "UPDATE" | "DELETE" | "EXECUTE" | "VIEW" | "ALL"
+    "CREATE" | "READ" | "UPDATE" | "DELETE" | "EXECUTE" | "VIEW" | "ALL" | "TREE"
 
 <Access> ::= 
     "ALLOW" | "DISABLED"
@@ -82,8 +85,8 @@
     "USEOBJECTS" <ws> <StringLiteral> <ws>
 
 <Condition> ::= <logicalExpression> <ws>
- 
- <logicalExpression> ::= <logicalNestedExpression> | <logicalOrExpression> | <logicalAndExpression> |
+
+<logicalExpression> ::= <logicalNestedExpression> | <logicalOrExpression> | <logicalAndExpression> |
 <logicalNotExpression> | <matchExpression> | <BoolLiteral> | <castToBool> | <singleComparison>
 <logicalNestedExpression> ::= "(" <ws> <logicalExpression> ")" <ws>
 <logicalOrExpression> ::= "$or" <ws> "(" <ws> <logicalExpression> ( "," <ws> <logicalExpression> )+ ")" <ws>
@@ -165,7 +168,7 @@
 
 <castToTime> ::= 
     "time" <ws> "(" <ws> ( <stringOperand> | <dateTimeOperand> ) <ws> ")" <ws>
-    
+
 <DateTimeLiteral> ::= <datetime> <ws>
 <TimeLiteral> ::= <time> <ws>
 <datetime> ::= <date> <ws> ( "T" | " " ) <ws> <time> <ws> ( <timezone> <ws> )?

documentation/IDTA-01004/modules/ROOT/partials/examples/filter.bnf

@@ -18,19 +18,20 @@ ACCESSRULE:
         $aasdesc#specificAssetIds[].value $eq "ACME001"
       )
     )
-  FRAGMENT: $aasdesc#specificAssetIds[]
   FILTER:
-    $or(
-      $match(
-        $aasdesc#specificAssetIds[].name  $eq "manufacturerPartId",
-        $aasdesc#specificAssetIds[].value $eq "99991"
-      ),
-      $match(
-        $aasdesc#specificAssetIds[].name $eq "customerPartId",
-        $aasdesc#specificAssetIds[].value $eq "ACME001"
-      ),
-      $aasdesc#specificAssetIds[].name $eq "partInstanceId",
-      $aasdesc#specificAssetIds[].externalSubjectId $eq CLAIM("BusinessPartnerNumber"),
-      $aasdesc#specificAssetIds[].externalSubjectId $eq "PUBLIC_READABLE"
-    )
+    FRAGMENT: $aasdesc#specificAssetIds[]
+    CONDITION:
+      $or(
+        $match(
+          $aasdesc#specificAssetIds[].name  $eq "manufacturerPartId",
+          $aasdesc#specificAssetIds[].value $eq "99991"
+        ),
+        $match(
+          $aasdesc#specificAssetIds[].name $eq "customerPartId",
+          $aasdesc#specificAssetIds[].value $eq "ACME001"
+        ),
+        $aasdesc#specificAssetIds[].name $eq "partInstanceId",
+        $aasdesc#specificAssetIds[].externalSubjectId $eq CLAIM("BusinessPartnerNumber"),
+        $aasdesc#specificAssetIds[].externalSubjectId $eq "PUBLIC_READABLE"
+      )
 

documentation/IDTA-01004/modules/ROOT/partials/json/aas-queries-and-access-rules-schema.json

@@ -654,19 +654,12 @@
         "USEFORMULA": {
           "type": "string"
         },
-        "FRAGMENT": {
-          "$ref": "#/definitions/fieldIdentifierFragment"
-        },
         "FILTER": {
-          "$ref": "#/definitions/logicalExpression",
+          "$ref": "#/definitions/SecurityQueryFilter",
           "additionalProperties": false
         },
-        "USEFILTER": {
-          "type": "string"
-        },
         "FILTERLIST": {
           "type": "array",
-          "minItems": 1,
           "items": {
             "$ref": "#/definitions/SecurityQueryFilter"
           }
@@ -714,43 +707,6 @@
               ]
             }
           ]
-        },
-        {
-          "oneOf": [
-            {
-              "required": [
-                "FRAGMENT",
-                "FILTER"
-              ]
-            },
-            {
-              "required": [
-                "FRAGMENT",
-                "USEFILTER"
-              ]
-            },
-            {
-              "not": {
-                "anyOf": [
-                  {
-                    "required": [
-                      "FRAGMENT"
-                    ]
-                  },
-                  {
-                    "required": [
-                      "FILTER"
-                    ]
-                  },
-                  {
-                    "required": [
-                      "USEFILTER"
-                    ]
-                  }
-                ]
-              }
-            }
-          ]
         }
       ],
       "additionalProperties": false
@@ -761,10 +717,10 @@
         "FRAGMENT": {
           "$ref": "#/definitions/fieldIdentifierFragment"
         },
-        "FILTER": {
+        "CONDITION": {
           "$ref": "#/definitions/logicalExpression"
         },
-        "USEFILTER": {
+        "USEFORMULA": {
           "type": "string"
         }
       },
@@ -774,12 +730,12 @@
       "oneOf": [
         {
           "required": [
-            "FILTER"
+            "CONDITION"
           ]
         },
         {
           "required": [
-            "USEFILTER"
+            "USEFORMULA"
           ]
         }
       ],