1.1.6

src/delete_processing/delete_processing.mfotl

-LET delete_processing(data,dataid,dsid) = use(data,dataid,dsid) AND (NOT ONCE (ds_consent(dsid,data) OR legal_grounds(dsid,data))) IN
+LET delete_processing(data,dataid,dsid) = use(data,dataid,dsid) AND (ONCE delete(data,dataid,dsid)) IN
 delete_processing(data,dataid,dsid)
\ No newline at end of file

src/delete_processing/delete_processing.sig

 use(data:string, dataid:string, dsid:string)
-ds_consent(dsid:string, data:string)
-legal_grounds(dsid:string, data:string)
+delete(data:string, dataid:string, dsid:string)
+

src/gdpr.mfotl

-LET lawful_processing(data,dataid,dsid) = f"lawful_processing/lawful_processing.mfotl"s"lawful_processing/lawful_processing.sig" IN
-LET consent(data,dataid,dsid) = f"consent/consent.mfotl"s"consent/consent.sig" IN
-LET info_on_consent(data,dataid,dsid) = f"info_on_consent/info_on_consent.mfotl"s"info_on_consent/info_on_consent.sig" IN
-LET right_to_access(dsid) = f"right_to_access/right_to_access.mfotl"s"right_to_access/right_to_access.sig" IN
-LET delete(data,dataid,dsid) = f"delete/delete.mfotl"s"delete/delete.sig" IN
-LET delete_processing(data,dataid,dsid) = f"delete_processing/delete_processing.mfotl"s"delete_processing/delete_processing.sig" IN
-LET delete_publish(data,dataid,dsid,d) = f"delete_publish/delete_publish.mfotl"s"delete_publish/delete_publish.sig" IN
-LET right_to_restriction_of_processing(data,dataid,dsid) = f"right_to_restriction_of_processing/right_to_restriction_of_processing.mfotl"s"right_to_restriction_of_processing/right_to_restriction_of_processing.sig" IN
-LET right_to_object(data,dataid,dsid) = f"right_to_object/right_to_object.mfotl"s"right_to_object/right_to_object.sig" IN
-(lawful_processing(data,dataid,dsid) AND type="lawful_processing") OR
-(consent(data,dataid,dsid) AND type="consent") OR
-(info_on_consent(data,dataid,dsid) AND type="info_on_consent") OR
-(right_to_object(data,dataid,dsid) AND type="right_to_object") OR
-(delete(data,dataid,dsid) AND type = "delete") OR 
-(delete_processing(data,dataid,dsid) AND type = "delete_processing") OR 
-(right_to_restriction_of_processing(data,dataid,dsid) AND type = "right_to_restriction_of_processing")
+(LET lawful_processing(data,dataid,dsid) = f"lawful_processing/lawful_processing.mfotl"s"lawful_processing/lawful_processing.sig" IN
+(lawful_processing(data,dataid,dsid) AND d = ""  AND type="lawful_processing")) 
+OR
+(LET consent(data,dataid,dsid) = f"consent/consent.mfotl"s"consent/consent.sig" IN
+(consent(data,dataid,dsid) AND d = ""  AND type="consent"))
+OR
+(LET info_on_consent(data,dataid,dsid) = f"info_on_consent/info_on_consent.mfotl"s"info_on_consent/info_on_consent.sig" IN
+(info_on_consent(data,dataid,dsid) AND d = ""  AND type="info_on_consent"))
+OR
+(LET right_to_access(dsid) = f"right_to_access/right_to_access.mfotl"s"right_to_access/right_to_access.sig" IN
+(right_to_access(dsid) AND d = ""  AND type = "right_to_access") AND data="" AND dataid=dsid)
+OR
+(LET delete(data,dataid,dsid) = f"delete/delete.mfotl"s"delete/delete.sig" IN
+(delete(data,dataid,dsid) AND d = ""  AND type = "delete"))
+OR 
+(LET delete_processing(data,dataid,dsid) = f"delete_processing/delete_processing.mfotl"s"delete_processing/delete_processing.sig" IN
+(delete_processing(data,dataid,dsid) AND d = "" AND type = "delete_processing"))
+OR
+(LET delete_publish(data,dataid,dsid,d) = f"delete_publish/delete_publish.mfotl"s"delete_publish/delete_publish.sig" IN
+(delete_publish(data,dataid,dsid,d) AND type = "delete_publish"))
+OR
+(LET right_to_restriction_of_processing(data,dataid,dsid) = f"right_to_restriction_of_processing/right_to_restriction_of_processing.mfotl"s"right_to_restriction_of_processing/right_to_restriction_of_processing.sig" IN
+(right_to_restriction_of_processing(data,dataid,dsid) AND d = ""  AND type = "right_to_restriction_of_processing"))
+OR
+(LET right_to_object(data,dataid,dsid) = f"right_to_object/right_to_object.mfotl"s"right_to_object/right_to_object.sig" IN
+(right_to_object(data,dataid,dsid) AND d = ""  AND type="right_to_object"))