X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FVerima%2FBase%2FtableVersions.py;h=3342e6859b942b488e79044b2b611b0942ee0fe2;hp=02d23516e2ccd4c9b0a06008086cfea20a3688a3;hb=499f29d24922cec66e41b41a0039a954993bc6df;hpb=2d16118826a6b7874b3093ed11284cfbb30a5efa

diff --git a/src/Tools/Verima/Base/tableVersions.py b/src/Tools/Verima/Base/tableVersions.py
index 02d23516e..3342e6859 100644
--- a/src/Tools/Verima/Base/tableVersions.py
+++ b/src/Tools/Verima/Base/tableVersions.py
@@ -1,73 +1,60 @@
-from PyQt4 import QtSql, QtCore
-from tableDeBase import TableDeBase
+# Copyright (C) 2013-2022  EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+from qtsalome import QSqlQuery
+from Base.tableDeBase import TableDeBase
 
 class TableVersions (TableDeBase):
-	def __init__(self):
-            TableDeBase.__init__(self,"Versions")
-            self.setField(("id","nomVersion","Reference"))
-            self.setTypeField(('int','str','str'),("id"))
-            self.cols=" (nomVersion, ref) "
-
-        def createSqlTable(self):
-            query=QtSql.QSqlQuery()
-            texteQuery ="create table Versions(id integer primary key autoincrement, nomVersion varchar(10),"
-            texteQuery+="ref varchar(3));"
-            print "Creation de TableVersions : " , query.exec_(texteQuery)
-
-        def dejaRemplie(self):
-            texteQuery="select * from  Versions where nomVersion='Salome6.6';"
-            maQuery=QtSql.QSqlQuery()
-            maQuery.exec_(texteQuery)
-            nb=0
-            while(maQuery.next()): nb=nb+1
-            return nb
-
-        def remplit(self):
-#PN         pour tester
-            if self.dejaRemplie():
-               print "Table des Versions deja initialisee"
-               return
-            self.insereLigneAutoId(('Salome6.6','non'))
-            self.insereLigneAutoId(('Salome7.3','oui'))
-
-        def creeVersion(self,version):
-            self.insereLigneAutoId((version,'non'))
-
-        
-        def chercheVersion(self,version):
-            query=QtSql.QSqlQuery()
-            version=str(version)
-            if QtCore.QString(version).toInt()[1]==True :
-               texteQuery ="select id, nomVersion from Versions where id = " + str(version) +";"
-            else:
-               texteQuery ="select id, nomVersion from Versions where nomVersion ='" + version +"' ;"
-            query.exec_(texteQuery)
-            nb=0
-            while(query.next()):
-               nb=nb+1
-               id=query.value(0).toInt()[0]
-               nom=query.value(1).toString()
-            if nb != 1 : return 0, 0, ""
-            return  1, id, nom
-
-        def remplaceVersion(self,version):
-            bOk,versionId,versionName = self.chercheVersion(version)
-            if bOk == 0 : return "La version choisie comme version de reference n est pas dans la base"
-            query=QtSql.QSqlQuery()
-            texteQuery ='update Versions set ref="non" where ref="oui";'
-            query.exec_(texteQuery)
-            texteQuery ='update Versions set ref="oui"where id='+str(versionId)+";"
-            query.exec_(texteQuery)
-            return "changement effectue"
-           
-        def getVersionRef(self):
-            query=QtSql.QSqlQuery()
-            texteQuery ='select id from Versions  where ref="oui";'
-            query.exec_(texteQuery)
-            while (query.next()) : 
-               id=query.value(0).toInt()[0]
-            while (query.next()) :
-               print "Base corrompue : plusieurs versions de reference"
-               exit()
-            return id
-
+    def __init__(self):
+        TableDeBase.__init__(self,"Versions")
+        self.setField(("id","nomVersion","commentaire"))
+        self.setTypeField(('int','str','str'),('id',))
+        self.cols=" (nomVersion, commentaire) "
+
+    def createSqlTable(self):
+        query=QSqlQuery()
+        texteQuery ="create table Versions(id integer primary key autoincrement, nomVersion varchar(10),"
+        texteQuery+="commentaire varchar(30));"
+        print("Creation de TableVersions : " , query.exec_(texteQuery))
+
+
+    def remplit(self):
+        self.insereLigneAutoId(('Salome7.2.0',''))
+        self.insereLigneAutoId(('Salome7.3.0',''))
+        self.insereLigneAutoId(('Salome7.4.0',''))
+
+    def creeVersion(self,version,commentaire=""):
+        self.insereLigneAutoId((version,commentaire))
+
+
+    def chercheVersion(self,version):
+        query=QSqlQuery()
+        version=str(version)
+        if bool(version) == True :
+            texteQuery ="select id, nomVersion from Versions where id = " + str(version) +";"
+        else:
+            texteQuery ="select id, nomVersion from Versions where nomVersion ='" + version +"' ;"
+        query.exec_(texteQuery)
+        nb=0
+        while(query.next()):
+            nb=nb+1
+            id=query.value(0).toInt()[0]
+            nom=query.value(1).toString()
+        if nb != 1 : return 0, 0, ""
+        return  1, id, nom