From bf775ee248e4cf61afa17e647598331e9c11c986 Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Wed, 9 Jun 2021 07:12:19 +0200 Subject: [PATCH] Updating version and conversions --- bin/module_version.py | 4 +- resources/SalomeApp.xml | 2 +- src/daComposant/daCore/version.py | 4 +- src/daEficas/CMakeLists.txt | 37 +++---- src/daEficas/Makefile.am | 37 +++---- ...V9_7_0.py => traduitADAOV7_4_0ToV9_8_0.py} | 2 +- ...V9_7_0.py => traduitADAOV7_5_0ToV9_8_0.py} | 2 +- ...V9_7_0.py => traduitADAOV7_5_1ToV9_8_0.py} | 2 +- ...V9_7_0.py => traduitADAOV7_6_0ToV9_8_0.py} | 2 +- ...V9_7_0.py => traduitADAOV7_7_0ToV9_8_0.py} | 2 +- ...V9_7_0.py => traduitADAOV7_8_0ToV9_8_0.py} | 2 +- ...V9_7_0.py => traduitADAOV8_1_0ToV9_8_0.py} | 2 +- src/daEficas/traduitADAOV8_2_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV8_2_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV8_3_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV8_3_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV8_4_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV8_4_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV8_5_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV8_5_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV8_6_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV8_6_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV9_2_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV9_2_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV9_3_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV9_3_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV9_4_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV9_4_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV9_5_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV9_5_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV9_6_0ToV9_7_0.py | 97 ------------------- src/daEficas/traduitADAOV9_6_0ToV9_8_0.py | 97 +++++++++++++++++++ src/daEficas/traduitADAOV9_7_0ToV9_8_0.py | 97 +++++++++++++++++++ ...ToV9_7_0.py => traduitADAOsansToV9_8_0.py} | 2 +- 34 files changed, 1118 insertions(+), 1019 deletions(-) rename src/daEficas/{traduitADAOV7_4_0ToV9_7_0.py => traduitADAOV7_4_0ToV9_8_0.py} (99%) rename src/daEficas/{traduitADAOV7_5_0ToV9_7_0.py => traduitADAOV7_5_0ToV9_8_0.py} (99%) rename src/daEficas/{traduitADAOV7_5_1ToV9_7_0.py => traduitADAOV7_5_1ToV9_8_0.py} (99%) rename src/daEficas/{traduitADAOV7_7_0ToV9_7_0.py => traduitADAOV7_6_0ToV9_8_0.py} (99%) rename src/daEficas/{traduitADAOV7_8_0ToV9_7_0.py => traduitADAOV7_7_0ToV9_8_0.py} (99%) rename src/daEficas/{traduitADAOV8_1_0ToV9_7_0.py => traduitADAOV7_8_0ToV9_8_0.py} (99%) rename src/daEficas/{traduitADAOV7_6_0ToV9_7_0.py => traduitADAOV8_1_0ToV9_8_0.py} (99%) delete mode 100644 src/daEficas/traduitADAOV8_2_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV8_2_0ToV9_8_0.py delete mode 100644 src/daEficas/traduitADAOV8_3_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV8_3_0ToV9_8_0.py delete mode 100644 src/daEficas/traduitADAOV8_4_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV8_4_0ToV9_8_0.py delete mode 100644 src/daEficas/traduitADAOV8_5_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV8_5_0ToV9_8_0.py delete mode 100644 src/daEficas/traduitADAOV8_6_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV8_6_0ToV9_8_0.py delete mode 100644 src/daEficas/traduitADAOV9_2_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV9_2_0ToV9_8_0.py delete mode 100644 src/daEficas/traduitADAOV9_3_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV9_3_0ToV9_8_0.py delete mode 100644 src/daEficas/traduitADAOV9_4_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV9_4_0ToV9_8_0.py delete mode 100644 src/daEficas/traduitADAOV9_5_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV9_5_0ToV9_8_0.py delete mode 100644 src/daEficas/traduitADAOV9_6_0ToV9_7_0.py create mode 100644 src/daEficas/traduitADAOV9_6_0ToV9_8_0.py create mode 100644 src/daEficas/traduitADAOV9_7_0ToV9_8_0.py rename src/daEficas/{traduitADAOsansToV9_7_0.py => traduitADAOsansToV9_8_0.py} (99%) diff --git a/bin/module_version.py b/bin/module_version.py index cea3255..0d0031a 100644 --- a/bin/module_version.py +++ b/bin/module_version.py @@ -29,9 +29,9 @@ __author__ = "Jean-Philippe ARGAUD" __all__ = [] name = "ADAO" -version = "9.7.0" +version = "9.8.0" year = "2021" -date = "samedi 01 mai 2021, 12:12:12 (UTC+0100)" +date = "lundi 01 novembre 2021, 12:12:12 (UTC+0100)" longname = name + ", a module for Data Assimilation and Optimization" cata = "V" + version.replace(".","_") diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index 9c458d5..c425756 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -28,7 +28,7 @@ - +
diff --git a/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py index ba13f3e..39570b4 100644 --- a/src/daComposant/daCore/version.py +++ b/src/daComposant/daCore/version.py @@ -27,9 +27,9 @@ __author__ = "Jean-Philippe ARGAUD" __all__ = [] name = "ADAO" -version = "9.7.0" +version = "9.8.0" year = "2021" -date = "samedi 01 mai 2021, 12:12:12 (UTC+0100)" +date = "lundi 01 novembre 2021, 12:12:12 (UTC+0100)" longname = name + ", a module for Data Assimilation and Optimization" cata = "V" + version.replace(".","_") diff --git a/src/daEficas/CMakeLists.txt b/src/daEficas/CMakeLists.txt index 353e9c9..0d86e2f 100644 --- a/src/daEficas/CMakeLists.txt +++ b/src/daEficas/CMakeLists.txt @@ -29,24 +29,25 @@ set(DAEFICAS_FILES __init__.py ${CMAKE_CURRENT_BINARY_DIR}/prefs_ADAO.py prefs.py - traduitADAOsansToV9_7_0.py - traduitADAOV7_4_0ToV9_7_0.py - traduitADAOV7_5_0ToV9_7_0.py - traduitADAOV7_5_1ToV9_7_0.py - traduitADAOV7_6_0ToV9_7_0.py - traduitADAOV7_7_0ToV9_7_0.py - traduitADAOV7_8_0ToV9_7_0.py - traduitADAOV8_1_0ToV9_7_0.py - traduitADAOV8_2_0ToV9_7_0.py - traduitADAOV8_3_0ToV9_7_0.py - traduitADAOV8_4_0ToV9_7_0.py - traduitADAOV8_5_0ToV9_7_0.py - traduitADAOV8_6_0ToV9_7_0.py - traduitADAOV9_2_0ToV9_7_0.py - traduitADAOV9_3_0ToV9_7_0.py - traduitADAOV9_4_0ToV9_7_0.py - traduitADAOV9_5_0ToV9_7_0.py - traduitADAOV9_6_0ToV9_7_0.py + traduitADAOsansToV9_8_0.py + traduitADAOV7_4_0ToV9_8_0.py + traduitADAOV7_5_0ToV9_8_0.py + traduitADAOV7_5_1ToV9_8_0.py + traduitADAOV7_6_0ToV9_8_0.py + traduitADAOV7_7_0ToV9_8_0.py + traduitADAOV7_8_0ToV9_8_0.py + traduitADAOV8_1_0ToV9_8_0.py + traduitADAOV8_2_0ToV9_8_0.py + traduitADAOV8_3_0ToV9_8_0.py + traduitADAOV8_4_0ToV9_8_0.py + traduitADAOV8_5_0ToV9_8_0.py + traduitADAOV8_6_0ToV9_8_0.py + traduitADAOV9_2_0ToV9_8_0.py + traduitADAOV9_3_0ToV9_8_0.py + traduitADAOV9_4_0ToV9_8_0.py + traduitADAOV9_5_0ToV9_8_0.py + traduitADAOV9_6_0ToV9_8_0.py + traduitADAOV9_7_0ToV9_8_0.py ) install(FILES ${DAEFICAS_FILES} DESTINATION "${ADAO_SCRIPT_PYTHON}/adao/daEficas") diff --git a/src/daEficas/Makefile.am b/src/daEficas/Makefile.am index 42aa36f..af59b54 100644 --- a/src/daEficas/Makefile.am +++ b/src/daEficas/Makefile.am @@ -34,23 +34,24 @@ mypkgpython_PYTHON = \ __init__.py \ prefs_ADAO.py \ prefs.py \ - traduitADAOsansToV9_7_0.py \ - traduitADAOV7_4_0ToV9_7_0.py \ - traduitADAOV7_5_0ToV9_7_0.py \ - traduitADAOV7_5_1ToV9_7_0.py \ - traduitADAOV7_6_0ToV9_7_0.py \ - traduitADAOV7_7_0ToV9_7_0.py \ - traduitADAOV7_8_0ToV9_7_0.py \ - traduitADAOV8_1_0ToV9_7_0.py \ - traduitADAOV8_2_0ToV9_7_0.py \ - traduitADAOV8_3_0ToV9_7_0.py \ - traduitADAOV8_4_0ToV9_7_0.py \ - traduitADAOV8_5_0ToV9_7_0.py \ - traduitADAOV8_6_0ToV9_7_0.py \ - traduitADAOV9_2_0ToV9_7_0.py \ - traduitADAOV9_3_0ToV9_7_0.py \ - traduitADAOV9_4_0ToV9_7_0.py \ - traduitADAOV9_5_0ToV9_7_0.py \ - traduitADAOV9_6_0ToV9_7_0.py + traduitADAOsansToV9_8_0.py \ + traduitADAOV7_4_0ToV9_8_0.py \ + traduitADAOV7_5_0ToV9_8_0.py \ + traduitADAOV7_5_1ToV9_8_0.py \ + traduitADAOV7_6_0ToV9_8_0.py \ + traduitADAOV7_7_0ToV9_8_0.py \ + traduitADAOV7_8_0ToV9_8_0.py \ + traduitADAOV8_1_0ToV9_8_0.py \ + traduitADAOV8_2_0ToV9_8_0.py \ + traduitADAOV8_3_0ToV9_8_0.py \ + traduitADAOV8_4_0ToV9_8_0.py \ + traduitADAOV8_5_0ToV9_8_0.py \ + traduitADAOV8_6_0ToV9_8_0.py \ + traduitADAOV9_2_0ToV9_8_0.py \ + traduitADAOV9_3_0ToV9_8_0.py \ + traduitADAOV9_4_0ToV9_8_0.py \ + traduitADAOV9_5_0ToV9_8_0.py \ + traduitADAOV9_6_0ToV9_8_0.py \ + traduitADAOV9_7_0ToV9_8_0.py EXTRA_DIST = prefs_ADAO.py.in diff --git a/src/daEficas/traduitADAOV7_4_0ToV9_7_0.py b/src/daEficas/traduitADAOV7_4_0ToV9_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_4_0ToV9_7_0.py rename to src/daEficas/traduitADAOV7_4_0ToV9_8_0.py index 937d1e7..24d80f9 100644 --- a/src/daEficas/traduitADAOV7_4_0ToV9_7_0.py +++ b/src/daEficas/traduitADAOV7_4_0ToV9_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V9_7_0" +version_out = "V9_8_0" usage="""Usage: python %(prog)s [args] diff --git a/src/daEficas/traduitADAOV7_5_0ToV9_7_0.py b/src/daEficas/traduitADAOV7_5_0ToV9_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_5_0ToV9_7_0.py rename to src/daEficas/traduitADAOV7_5_0ToV9_8_0.py index 937d1e7..24d80f9 100644 --- a/src/daEficas/traduitADAOV7_5_0ToV9_7_0.py +++ b/src/daEficas/traduitADAOV7_5_0ToV9_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V9_7_0" +version_out = "V9_8_0" usage="""Usage: python %(prog)s [args] diff --git a/src/daEficas/traduitADAOV7_5_1ToV9_7_0.py b/src/daEficas/traduitADAOV7_5_1ToV9_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_5_1ToV9_7_0.py rename to src/daEficas/traduitADAOV7_5_1ToV9_8_0.py index 937d1e7..24d80f9 100644 --- a/src/daEficas/traduitADAOV7_5_1ToV9_7_0.py +++ b/src/daEficas/traduitADAOV7_5_1ToV9_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V9_7_0" +version_out = "V9_8_0" usage="""Usage: python %(prog)s [args] diff --git a/src/daEficas/traduitADAOV7_7_0ToV9_7_0.py b/src/daEficas/traduitADAOV7_6_0ToV9_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_7_0ToV9_7_0.py rename to src/daEficas/traduitADAOV7_6_0ToV9_8_0.py index 9936a22..0a16ea8 100644 --- a/src/daEficas/traduitADAOV7_7_0ToV9_7_0.py +++ b/src/daEficas/traduitADAOV7_6_0ToV9_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V9_7_0" +version_out = "V9_8_0" usage="""Usage: python %(prog)s [args] diff --git a/src/daEficas/traduitADAOV7_8_0ToV9_7_0.py b/src/daEficas/traduitADAOV7_7_0ToV9_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_8_0ToV9_7_0.py rename to src/daEficas/traduitADAOV7_7_0ToV9_8_0.py index 9936a22..0a16ea8 100644 --- a/src/daEficas/traduitADAOV7_8_0ToV9_7_0.py +++ b/src/daEficas/traduitADAOV7_7_0ToV9_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V9_7_0" +version_out = "V9_8_0" usage="""Usage: python %(prog)s [args] diff --git a/src/daEficas/traduitADAOV8_1_0ToV9_7_0.py b/src/daEficas/traduitADAOV7_8_0ToV9_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV8_1_0ToV9_7_0.py rename to src/daEficas/traduitADAOV7_8_0ToV9_8_0.py index 9936a22..0a16ea8 100644 --- a/src/daEficas/traduitADAOV8_1_0ToV9_7_0.py +++ b/src/daEficas/traduitADAOV7_8_0ToV9_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V9_7_0" +version_out = "V9_8_0" usage="""Usage: python %(prog)s [args] diff --git a/src/daEficas/traduitADAOV7_6_0ToV9_7_0.py b/src/daEficas/traduitADAOV8_1_0ToV9_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_6_0ToV9_7_0.py rename to src/daEficas/traduitADAOV8_1_0ToV9_8_0.py index 9936a22..0a16ea8 100644 --- a/src/daEficas/traduitADAOV7_6_0ToV9_7_0.py +++ b/src/daEficas/traduitADAOV8_1_0ToV9_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V9_7_0" +version_out = "V9_8_0" usage="""Usage: python %(prog)s [args] diff --git a/src/daEficas/traduitADAOV8_2_0ToV9_7_0.py b/src/daEficas/traduitADAOV8_2_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV8_2_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV8_2_0ToV9_8_0.py b/src/daEficas/traduitADAOV8_2_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV8_2_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV8_3_0ToV9_7_0.py b/src/daEficas/traduitADAOV8_3_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV8_3_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV8_3_0ToV9_8_0.py b/src/daEficas/traduitADAOV8_3_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV8_3_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV8_4_0ToV9_7_0.py b/src/daEficas/traduitADAOV8_4_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV8_4_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV8_4_0ToV9_8_0.py b/src/daEficas/traduitADAOV8_4_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV8_4_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV8_5_0ToV9_7_0.py b/src/daEficas/traduitADAOV8_5_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV8_5_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV8_5_0ToV9_8_0.py b/src/daEficas/traduitADAOV8_5_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV8_5_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV8_6_0ToV9_7_0.py b/src/daEficas/traduitADAOV8_6_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV8_6_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV8_6_0ToV9_8_0.py b/src/daEficas/traduitADAOV8_6_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV8_6_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV9_2_0ToV9_7_0.py b/src/daEficas/traduitADAOV9_2_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV9_2_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV9_2_0ToV9_8_0.py b/src/daEficas/traduitADAOV9_2_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV9_2_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV9_3_0ToV9_7_0.py b/src/daEficas/traduitADAOV9_3_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV9_3_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV9_3_0ToV9_8_0.py b/src/daEficas/traduitADAOV9_3_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV9_3_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV9_4_0ToV9_7_0.py b/src/daEficas/traduitADAOV9_4_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV9_4_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV9_4_0ToV9_8_0.py b/src/daEficas/traduitADAOV9_4_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV9_4_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV9_5_0ToV9_7_0.py b/src/daEficas/traduitADAOV9_5_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV9_5_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV9_5_0ToV9_8_0.py b/src/daEficas/traduitADAOV9_5_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV9_5_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV9_6_0ToV9_7_0.py b/src/daEficas/traduitADAOV9_6_0ToV9_7_0.py deleted file mode 100644 index 9936a22..0000000 --- a/src/daEficas/traduitADAOV9_6_0ToV9_7_0.py +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2008-2018 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import argparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V9_7_0" - -usage="""Usage: python %(prog)s [args] - -Typical use is: - python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - with open(outfile,'w') as f: - f.write( fsrc ) - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = argparse.ArgumentParser(usage=usage) - - parser.add_argument('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - args = parser.parse_args() - if len(args.infile) == 0: - print("") - parser.print_help() - print("") - sys.exit(1) - - traduc(args.infile,args.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV9_6_0ToV9_8_0.py b/src/daEficas/traduitADAOV9_6_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV9_6_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOV9_7_0ToV9_8_0.py b/src/daEficas/traduitADAOV9_7_0ToV9_8_0.py new file mode 100644 index 0000000..0a16ea8 --- /dev/null +++ b/src/daEficas/traduitADAOV9_7_0ToV9_8_0.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008-2018 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import argparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V9_8_0" + +usage="""Usage: python %(prog)s [args] + +Typical use is: + python %(prog)s --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + with open(outfile,'w') as f: + f.write( fsrc ) + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = argparse.ArgumentParser(usage=usage) + + parser.add_argument('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_argument('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + args = parser.parse_args() + if len(args.infile) == 0: + print("") + parser.print_help() + print("") + sys.exit(1) + + traduc(args.infile,args.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOsansToV9_7_0.py b/src/daEficas/traduitADAOsansToV9_8_0.py similarity index 99% rename from src/daEficas/traduitADAOsansToV9_7_0.py rename to src/daEficas/traduitADAOsansToV9_8_0.py index 36aad6a..d8718da 100644 --- a/src/daEficas/traduitADAOsansToV9_7_0.py +++ b/src/daEficas/traduitADAOsansToV9_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V9_7_0" +version_out = "V9_8_0" usage="""Usage: python %(prog)s [args] -- 2.39.2