From 7623b61135e4d25ca703bea3a93d3e6398934fcd Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Mon, 23 May 2016 09:13:57 +0200 Subject: [PATCH] Compatibility correction of conversion from previous versions --- src/daEficas/Makefile.am | 13 +-- ...V7_7_0.py => traduitADAOV7_4_0ToV7_8_0.py} | 2 +- ...V7_7_0.py => traduitADAOV7_5_0ToV7_8_0.py} | 2 +- ...V7_7_0.py => traduitADAOV7_5_1ToV7_8_0.py} | 2 +- ...V7_7_0.py => traduitADAOV7_6_0ToV7_8_0.py} | 2 +- src/daEficas/traduitADAOV7_7_0ToV7_8_0.py | 98 +++++++++++++++++++ ...ToV7_7_0.py => traduitADAOsansToV7_8_0.py} | 2 +- 7 files changed, 110 insertions(+), 11 deletions(-) rename src/daEficas/{traduitADAOV7_4_0ToV7_7_0.py => traduitADAOV7_4_0ToV7_8_0.py} (99%) rename src/daEficas/{traduitADAOV7_5_0ToV7_7_0.py => traduitADAOV7_5_0ToV7_8_0.py} (99%) rename src/daEficas/{traduitADAOV7_5_1ToV7_7_0.py => traduitADAOV7_5_1ToV7_8_0.py} (99%) rename src/daEficas/{traduitADAOV7_6_0ToV7_7_0.py => traduitADAOV7_6_0ToV7_8_0.py} (99%) create mode 100644 src/daEficas/traduitADAOV7_7_0ToV7_8_0.py rename src/daEficas/{traduitADAOsansToV7_7_0.py => traduitADAOsansToV7_8_0.py} (99%) diff --git a/src/daEficas/Makefile.am b/src/daEficas/Makefile.am index 5009ab9..f7a41c4 100644 --- a/src/daEficas/Makefile.am +++ b/src/daEficas/Makefile.am @@ -19,7 +19,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D include $(top_srcdir)/adm_local/make_common_starter.am @@ -32,10 +32,11 @@ mypkgpython_PYTHON = \ __init__.py \ prefs_ADAO.py \ prefs.py \ - traduitADAOsansToV7_7_0.py \ - traduitADAOV7_4_0ToV7_7_0.py \ - traduitADAOV7_5_0ToV7_7_0.py \ - traduitADAOV7_5_1ToV7_7_0.py \ - traduitADAOV7_6_0ToV7_7_0.py + traduitADAOsansToV7_8_0.py \ + traduitADAOV7_4_0ToV7_8_0.py \ + traduitADAOV7_5_0ToV7_8_0.py \ + traduitADAOV7_5_1ToV7_8_0.py \ + traduitADAOV7_6_0ToV7_8_0.py \ + traduitADAOV7_7_0ToV7_8_0.py EXTRA_DIST = prefs_ADAO.py.in diff --git a/src/daEficas/traduitADAOV7_4_0ToV7_7_0.py b/src/daEficas/traduitADAOV7_4_0ToV7_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_4_0ToV7_7_0.py rename to src/daEficas/traduitADAOV7_4_0ToV7_8_0.py index 770fb79..c1099d7 100644 --- a/src/daEficas/traduitADAOV7_4_0ToV7_7_0.py +++ b/src/daEficas/traduitADAOV7_4_0ToV7_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V7_7_0" +version_out = "V7_8_0" usage="""Usage: python %prog [options] diff --git a/src/daEficas/traduitADAOV7_5_0ToV7_7_0.py b/src/daEficas/traduitADAOV7_5_0ToV7_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_5_0ToV7_7_0.py rename to src/daEficas/traduitADAOV7_5_0ToV7_8_0.py index 770fb79..c1099d7 100644 --- a/src/daEficas/traduitADAOV7_5_0ToV7_7_0.py +++ b/src/daEficas/traduitADAOV7_5_0ToV7_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V7_7_0" +version_out = "V7_8_0" usage="""Usage: python %prog [options] diff --git a/src/daEficas/traduitADAOV7_5_1ToV7_7_0.py b/src/daEficas/traduitADAOV7_5_1ToV7_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_5_1ToV7_7_0.py rename to src/daEficas/traduitADAOV7_5_1ToV7_8_0.py index 770fb79..c1099d7 100644 --- a/src/daEficas/traduitADAOV7_5_1ToV7_7_0.py +++ b/src/daEficas/traduitADAOV7_5_1ToV7_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V7_7_0" +version_out = "V7_8_0" usage="""Usage: python %prog [options] diff --git a/src/daEficas/traduitADAOV7_6_0ToV7_7_0.py b/src/daEficas/traduitADAOV7_6_0ToV7_8_0.py similarity index 99% rename from src/daEficas/traduitADAOV7_6_0ToV7_7_0.py rename to src/daEficas/traduitADAOV7_6_0ToV7_8_0.py index 0c7bf1b..bb1f43c 100644 --- a/src/daEficas/traduitADAOV7_6_0ToV7_7_0.py +++ b/src/daEficas/traduitADAOV7_6_0ToV7_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V7_7_0" +version_out = "V7_8_0" usage="""Usage: python %prog [options] diff --git a/src/daEficas/traduitADAOV7_7_0ToV7_8_0.py b/src/daEficas/traduitADAOV7_7_0ToV7_8_0.py new file mode 100644 index 0000000..bb1f43c --- /dev/null +++ b/src/daEficas/traduitADAOV7_7_0ToV7_8_0.py @@ -0,0 +1,98 @@ +#-*-coding:iso-8859-1-*- +# +# Copyright (C) 2008-2016 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 optparse +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 = "V7_8_0" + +usage="""Usage: python %prog [options] + +Typical use is: + python %prog --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: + f=open(outfile,'w') + f.write( fsrc ) + f.close() + 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 = optparse.OptionParser(usage=usage) + + parser.add_option('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_option('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + options, args = parser.parse_args() + if len(options.infile) == 0: + print + parser.print_help() + print + sys.exit(1) + + traduc(options.infile,options.outfile) + +if __name__ == '__main__': + main() diff --git a/src/daEficas/traduitADAOsansToV7_7_0.py b/src/daEficas/traduitADAOsansToV7_8_0.py similarity index 99% rename from src/daEficas/traduitADAOsansToV7_7_0.py rename to src/daEficas/traduitADAOsansToV7_8_0.py index 770fb79..c1099d7 100644 --- a/src/daEficas/traduitADAOsansToV7_7_0.py +++ b/src/daEficas/traduitADAOsansToV7_8_0.py @@ -32,7 +32,7 @@ from Traducteur.inseremocle import * from Traducteur.movemocle import * from Traducteur.renamemocle import * -version_out = "V7_7_0" +version_out = "V7_8_0" usage="""Usage: python %prog [options] -- 2.39.2