work on foliaupgrade and changed help text for stricttextvalidation o…

…ption in foliavalidator
proycon · Mar 25, 2019 · d131bb4 · d131bb4
1 parent 041d4b1
commit d131bb4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/folia b/folia
diff --git a/foliatools/foliaupgrade.py b/foliatools/foliaupgrade.py
@@ -24,6 +24,31 @@ def main():
     success = process(*args.files, **args.__dict__)
     sys.exit(0 if success else 1)
 
+def annotators2processors(doc, mainprocessor):
+    """Convert FoLiA v1 style annotators to v2 style processors (limited)"""
+    for element in doc.items():
+        if isinstance(element, folia.AbstractElement):
+            if element.annotator:
+                if element.annotatortype == folia.ProcessorType.MANUAL:
+                    annotatortype = folia.ProcessorType.MANUAL
+                else:
+                    annotatortype = folia.ProcessorType.AUTO
+                foundprocessor = None
+                for processor in doc.getprocessors(element.ANNOTATIONTYPE, element.set):
+                    if element.annotator == processor.name and annotatortype == processor.type:
+                        foundprocessor = processor
+                if foundprocessor:
+                    element.processor = foundprocessor
+                else:
+                    #Create a new processor
+                    newprocessor = folia.Processor(element.annotator, type=annotatortype)
+                    mainprocessor.append(newprocessor)
+                    element.setprocessor(newprocessor)
+                #delete the old style annotator
+                element.annotator = None
+                element.annotatortype = None
+
+
 def process(*files, **kwargs):
     success = False
     for file in files:
@@ -32,18 +57,21 @@ def process(*files, **kwargs):
             if r != 0:
                 success = False
         elif os.path.isfile(file):
-            doc = validate(file,schema=None, stricttextvalidation=True,autodeclare=True,output=False, warn=False, **kwargs)
-            doc.provenance.append(folia.Processor.create(name="foliaupgrade", version=VERSION))
+            mainprocessor = folia.Processor.create(name="foliaupgrade", version=VERSION)
+            doc = validate(file,schema=None, stricttextvalidation=True,autodeclare=True,output=False, warn=False,processor=mainprocessor,traceback=True,**kwargs)
             if doc is not False:
                 print("Upgrading " + doc.filename,file=sys.stderr)
                 doc.version = folia.FOLIAVERSION #upgrading involves more than just bumping the number, but that is handled implicitly already by the library when reading the document
+                annotators2processors(doc, mainprocessor)
                 if not kwargs.get('dryrun'):
                     doc.save(doc.filename + ".upgraded")
                     if not validate(file + ".upgraded",schema=None,stricttextvalidation=True,autodeclare=True,**kwargs):
                         print("Upgrade failed",file=sys.stderr)
                         success = False
                     else:
                         shutil.move(doc.filename + ".upgraded", file)
+                else:
+                    print(doc.xmlstring())
             else:
                 success  = False
     return success

diff --git a/foliatools/foliavalidator.py b/foliatools/foliavalidator.py
@@ -19,7 +19,7 @@ def validate(filename, schema = None,**kwargs):
         print(str(e), file=sys.stderr)
         return False
     try:
-        document = folia.Document(file=filename, deepvalidation=kwargs.get('deep',False),textvalidation=kwargs.get('stricttextvalidation',False),verbose=True, autodeclare=kwargs.get('autodeclare',False), debug=kwargs.get('debug'))
+        document = folia.Document(file=filename, deepvalidation=kwargs.get('deep',False),textvalidation=kwargs.get('stricttextvalidation',False),verbose=True, autodeclare=kwargs.get('autodeclare',False), processor=kwargs.get('processor'), debug=kwargs.get('debug',0))
     except folia.DeepValidationError as e:
         print("DEEP VALIDATION ERROR on full parse by library (stage 2/2), in " + filename,file=sys.stderr)
         print(e.__class__.__name__ + ": " + str(e),file=sys.stderr)
@@ -80,7 +80,7 @@ def commandparser(parser):
     parser.add_argument('-E','--extension', type=str,help="Extension", action='store',default="xml")
     parser.add_argument('-W','--nowarn',help="Suppress warnings", action='store_true', default=False)
     parser.add_argument('-i','--ignore',help="Always report a successful exit code, even in case of validation errors", action='store_true', default=False)
-    parser.add_argument('-t','--stricttextvalidation',help="Treat text validation errors strictly (recommended and default for FoLiA v1.5+)", action='store_true', default=False)
+    parser.add_argument('-t','--stricttextvalidation',help="Treat text validation errors strictly for FoLiA < v1.5,  it always enabled for for FoLiA v1.5+ regardless of this parameter", action='store_true', default=False)
     parser.add_argument('-o','--output',help="Output document to stdout", action='store_true', default=False)
     parser.add_argument('-D','--debug',type=int,help="Debug level", action='store',default=0)
     parser.add_argument('-b','--traceback',help="Provide a full traceback on validation errors", action='store_true', default=False)