[fql] Added extra tests for restoring original after deletion of structural correction (proycon/flat#120)

Author: proycon

pynlpl/formats/fql.py

@@ -1426,7 +1426,6 @@ def parse(q,i=0):
             action.span, i = Span.parse(q,i+1)
         if action.action == "DELETE" and q.kw(i,("RESTORE")):
             action.restore = q[i+1].upper()
-            print("DEBUG RESTORE=", action.restore,file=sys.stderr)
             i += 2
         else:
             action.restore = None
@@ -1609,14 +1608,14 @@ def __call__(self, query, contextselector, debug=False):
                                 if debug: print("[FQL EVALUATION DEBUG] Action - Applying DELETE to focus ", repr(focus),file=sys.stderr)
                                 p = focus.parent
                                 if action.restore == "ORIGINAL":
+                                    index = p.getindex(focus, False, False)
                                     if not isinstance(focus, folia.Correction):
                                         raise QueryError("RESTORE ORIGINAL can only be performed when the focus is a correction")
                                     #restore original
-                                    originals = list(focus.original())
-                                    for original in originals:
+                                    for original in reversed(focus.original()):
                                         if debug: print("[FQL EVALUATION DEBUG] Action - Restoring original: ", repr(original),file=sys.stderr)
                                         original.parent = p
-                                        p.append(original)
+                                        p.insert(index, original)
                                 p.remove(focus)
                                 #we set the parent back on the element we return, so return types like ancestor-focus work
                                 focus.parent = p

pynlpl/tests/fql.py

@@ -158,6 +158,8 @@
 Qfeat4 = "EDIT feat WHERE subset = \"strength\" AND class = \"strong\"  WITH class \"verystrong\"  FOR ID \"WR-P-E-J-0000000001.text.sentiment.1\""
 
 Qdelete_correction = "DELETE correction ID \"correctionexample.s.1.w.2.correction.1\" RESTORE ORIGINAL RETURN ancestor-focus"
+Qdelete_structural_correction = "DELETE correction ID \"correctionexample.s.3.correction.1\" RESTORE ORIGINAL RETURN ancestor-focus"
+Qdelete_structural_correction2 = "DELETE correction ID \"correctionexample.s.3.correction.2\" RESTORE ORIGINAL RETURN ancestor-focus"
 
 
 class Test1UnparsedQuery(unittest.TestCase):
@@ -973,6 +975,24 @@ def test4_delete_correction(self):
         self.assertIsInstance(results[0], folia.Word)
         self.assertEqual(results[0].text(), "word")
 
+    def test4b_delete_structural_correction(self):
+        """Deleting a structural correction and restoring the original (runon error)"""
+        q = fql.Query(Qdelete_structural_correction)
+        results = q(self.doc)
+        self.assertIsInstance(results[0], folia.Sentence)
+        self.assertIsInstance(results[0][0], folia.Word)
+        self.assertEqual(results[0][0].text(), "Ikhoor")
+
+    def test4c_delete_structural_correction(self):
+        """Deleting a structural correction and restoring the original (split error)"""
+        q = fql.Query(Qdelete_structural_correction2)
+        results = q(self.doc)
+        self.assertIsInstance(results[0], folia.Sentence)
+        self.assertIsInstance(results[0][1], folia.Word)
+        self.assertIsInstance(results[0][2], folia.Word)
+        self.assertEqual(results[0][1].text(), "on")
+        self.assertEqual(results[0][2].text(), "weer")
+
 if os.path.exists('../../FoLiA'):
     FOLIAPATH = '../../FoLiA/'
 elif os.path.exists('../FoLiA'):