Update of /cvsroot/jcframework/dotnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9213
Modified Files:
CCriteriaCondition.vb CDeleteCriteria.vb CPersistenceBroker.vb
Log Message:
Fixed problem in CDeleteCriteria
Index: CPersistenceBroker.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CPersistenceBroker.vb,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** CPersistenceBroker.vb 7 Oct 2004 05:57:33 -0000 1.61
--- CPersistenceBroker.vb 8 Oct 2004 00:06:25 -0000 1.62
***************
*** 1120,1129 ****
'Creamos un RetrieveCriteria para obtener el objeto a eliminar
! Dim retrieveCriteria As CRetrieveCriteria
! retrieveCriteria = New CRetrieveCriteria
! retrieveCriteria.Criteria = pCriteria.Criteria
!
! Dim statement As CSqlStatement
! 'Set statement = retrieveCriteria.getSqlStatement
conn.startTransaction()
--- 1120,1126 ----
'Creamos un RetrieveCriteria para obtener el objeto a eliminar
! Dim retrieveCriteria As New CRetrieveCriteria
! retrieveCriteria.ClassMap = pCriteria.ClassMap
! retrieveCriteria.WhereCondition = pCriteria.WhereCondition
conn.startTransaction()
***************
*** 1138,1144 ****
--- 1135,1143 ----
Try
Do While cursor.hasElements And Not cursor.EOF
+ persObj = pCriteria.ClassMap.CreateObjectInstance
cursor.loadProxy(persObj)
deletePrivateObject(persObj, conn, False)
contador = contador + 1
+ cursor.nextCursor()
Loop
conn.commit()
Index: CCriteriaCondition.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CCriteriaCondition.vb,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CCriteriaCondition.vb 27 Sep 2004 02:39:31 -0000 1.14
--- CCriteriaCondition.vb 8 Oct 2004 00:06:25 -0000 1.15
***************
*** 615,622 ****
End Function
! Public Function addSelectlike(ByVal Name As String, ByVal ValueA As Object) As CSelectionCriteria
Return addSelectlike(Name, ValueA, "", False)
End Function
! Public Function addSelectlike(ByVal Name As String, ByVal ValueA As Object, ByVal useOr As Boolean) As CSelectionCriteria
Return addSelectlike(Name, ValueA, "", useOr)
End Function
--- 615,622 ----
End Function
! Public Function addSelectLike(ByVal Name As String, ByVal ValueA As Object) As CSelectionCriteria
Return addSelectlike(Name, ValueA, "", False)
End Function
! Public Function addSelectLike(ByVal Name As String, ByVal ValueA As Object, ByVal useOr As Boolean) As CSelectionCriteria
Return addSelectlike(Name, ValueA, "", useOr)
End Function
***************
*** 636,640 ****
''' </history>
'''-----------------------------------------------------------------------------
! Public Function addSelectlike(ByVal Name As String, ByVal ValueA As Object, ByVal tblAlias As String, ByVal useOr As Boolean) As CSelectionCriteria
Dim selCri As New CLikeCriteria
selCri.AddUsingOr = useOr
--- 636,640 ----
''' </history>
'''-----------------------------------------------------------------------------
! Public Function addSelectLike(ByVal Name As String, ByVal ValueA As Object, ByVal tblAlias As String, ByVal useOr As Boolean) As CSelectionCriteria
Dim selCri As New CLikeCriteria
selCri.AddUsingOr = useOr
Index: CDeleteCriteria.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CDeleteCriteria.vb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CDeleteCriteria.vb 21 Jul 2004 02:55:38 -0000 1.5
--- CDeleteCriteria.vb 8 Oct 2004 00:06:25 -0000 1.6
***************
*** 34,41 ****
''' </history>
'''-----------------------------------------------------------------------------
! Public Function perform() As CCursor
Static persistentBroker As CPersistenceBroker
persistentBroker = getPersistenceBrokerInstance()
! persistentBroker.Instance.processDeleteCriteria(Me)
End Function
--- 34,41 ----
''' </history>
'''-----------------------------------------------------------------------------
! Public Function perform() As Integer
Static persistentBroker As CPersistenceBroker
persistentBroker = getPersistenceBrokerInstance()
! Return persistentBroker.Instance.processDeleteCriteria(Me)
End Function
|
