[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-appserver/src geasInstance.py geasList.py ...
|
From: |
Reinhard Mueller |
|
Subject: |
gnue-appserver/src geasInstance.py geasList.py ... |
|
Date: |
Mon, 01 Sep 2003 14:24:15 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-appserver
Branch:
Changes by: Reinhard Mueller <address@hidden> 03/09/01 14:24:15
Modified files:
src : geasInstance.py geasList.py geasSession.py
geasSessionManager.py
Log message:
Cleanup of geasInstance.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasInstance.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasList.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasSession.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasSessionManager.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
Patches:
Index: gnue-appserver/src/geasInstance.py
diff -c gnue-appserver/src/geasInstance.py:1.15
gnue-appserver/src/geasInstance.py:1.16
*** gnue-appserver/src/geasInstance.py:1.15 Mon Sep 1 14:01:45 2003
--- gnue-appserver/src/geasInstance.py Mon Sep 1 14:24:15 2003
***************
*** 19,25 ****
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: geasInstance.py,v 1.15 2003/09/01 18:01:45 reinhard Exp $
#
=============================================================================
# Instance class
--- 19,25 ----
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: geasInstance.py,v 1.16 2003/09/01 18:24:15 reinhard Exp $
#
=============================================================================
# Instance class
***************
*** 40,46 ****
# Get the value of a property
#
---------------------------------------------------------------------------
! def get (self, propertyname):
propertydef = self._classdef.properties [propertyname]
if propertydef.gnue_type == "id" or \
propertydef.gnue_type == "string" or \
--- 40,46 ----
# Get the value of a property
#
---------------------------------------------------------------------------
! def _get (self, propertyname):
propertydef = self._classdef.properties [propertyname]
if propertydef.gnue_type == "id" or \
propertydef.gnue_type == "string" or \
***************
*** 59,71 ****
raise Exception, "Field type '%s' not defined." % propertydef.gnue_type
#
---------------------------------------------------------------------------
# Set the value of a property
#
---------------------------------------------------------------------------
! def put (self, propertyname, value):
propertydef = self._classdef.properties [propertyname]
# TODO: from property type, check if the new value is valid
self._record.setField (propertydef.column, value)
#
---------------------------------------------------------------------------
# Delete this instance
--- 59,95 ----
raise Exception, "Field type '%s' not defined." % propertydef.gnue_type
#
---------------------------------------------------------------------------
+ # Get the values of a list of properties
+ #
---------------------------------------------------------------------------
+
+ def get (self, propertylist):
+ result = []
+ for property in propertylist:
+ value = self._get (property)
+ # transfer None as ""
+ if value == None:
+ value = ""
+ result.append (value)
+ return result
+
+ #
---------------------------------------------------------------------------
# Set the value of a property
#
---------------------------------------------------------------------------
! def _put (self, propertyname, value):
propertydef = self._classdef.properties [propertyname]
# TODO: from property type, check if the new value is valid
self._record.setField (propertydef.column, value)
+
+ #
---------------------------------------------------------------------------
+ # Set the values of a list of properties
+ #
---------------------------------------------------------------------------
+
+ def put (self, propertylist, valuelist):
+ i = 0
+ for property in propertylist:
+ self._put (property, valuelist [i])
+ i += 1
#
---------------------------------------------------------------------------
# Delete this instance
Index: gnue-appserver/src/geasList.py
diff -c gnue-appserver/src/geasList.py:1.27 gnue-appserver/src/geasList.py:1.28
*** gnue-appserver/src/geasList.py:1.27 Mon Sep 1 14:01:45 2003
--- gnue-appserver/src/geasList.py Mon Sep 1 14:24:15 2003
***************
*** 19,25 ****
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: geasList.py,v 1.27 2003/09/01 18:01:45 reinhard Exp $
from gnue.common.datasources import GDataSource, GConditions
import geasInstance
--- 19,25 ----
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: geasList.py,v 1.28 2003/09/01 18:24:15 reinhard Exp $
from gnue.common.datasources import GDataSource, GConditions
import geasInstance
***************
*** 132,151 ****
start = self.count () + start
result = []
c = 0
! object = self.firstInstance ()
! while (object != None) and (c < start + count):
if c >= start:
! row = []
! # add values in prefetch order (gnue_id, propertylist1, ...)
! for property in self._prefetch:
! value = object.get (property)
! # transfer None as ""
! if value == None:
! value = ""
! row.append (value)
! result.append (row)
c += 1
! object = self.nextInstance ()
return result
#
---------------------------------------------------------------------------
--- 132,143 ----
start = self.count () + start
result = []
c = 0
! instance = self.firstInstance ()
! while (instance != None) and (c < start + count):
if c >= start:
! result.append (instance.get (self._prefetch))
c += 1
! instance = self.nextInstance ()
return result
#
---------------------------------------------------------------------------
Index: gnue-appserver/src/geasSession.py
diff -c gnue-appserver/src/geasSession.py:1.34
gnue-appserver/src/geasSession.py:1.35
*** gnue-appserver/src/geasSession.py:1.34 Mon Sep 1 14:01:45 2003
--- gnue-appserver/src/geasSession.py Mon Sep 1 14:24:15 2003
***************
*** 19,25 ****
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: geasSession.py,v 1.34 2003/09/01 18:01:45 reinhard Exp $
import geasList
import classrep
--- 19,25 ----
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: geasSession.py,v 1.35 2003/09/01 18:24:15 reinhard Exp $
import geasList
import classrep
***************
*** 189,203 ****
list.setConditions ([['eq', ''], ['field', 'gnue_id'],
['const', object_id]])
list.populate ()
! object = list.firstInstance ()
! row = []
! for property in propertylist:
! value = object.get (property)
! # transfer None as ""
! if value == None:
! value = ""
! row.append (value)
! result.append (row)
return result
#
---------------------------------------------------------------------------
--- 189,196 ----
list.setConditions ([['eq', ''], ['field', 'gnue_id'],
['const', object_id]])
list.populate ()
! instance = list.firstInstance ()
! result.append (instance.get (propertylist))
return result
#
---------------------------------------------------------------------------
***************
*** 220,236 ****
['const', object_id]])
list.populate ()
if object_id:
! object = list.firstInstance ()
result.append (object_id)
else:
! object = list.insertNewInstance ()
! object.put ("gnue_id", new_object_id ())
! result.append (object.get ("gnue_id"))
! row = data [i]
! j = 0
! for property in propertylist:
! object.put (property, row [j])
! j += 1
i += 1
return result
--- 213,226 ----
['const', object_id]])
list.populate ()
if object_id:
! instance = list.firstInstance ()
result.append (object_id)
else:
! instance = list.insertNewInstance ()
! newid = new_object_id ()
! instance.put (["gnue_id"], [newid])
! result.append (newid)
! instance.put (propertylist, data [i])
i += 1
return result
***************
*** 268,272 ****
['const', object_id]])
list.populate ()
object = list.firstInstance ()
! result.append (object.call (methodname, parameters))
return result
--- 258,262 ----
['const', object_id]])
list.populate ()
object = list.firstInstance ()
! result.append (object.call (procedurename, parameters))
return result
Index: gnue-appserver/src/geasSessionManager.py
diff -c gnue-appserver/src/geasSessionManager.py:1.14
gnue-appserver/src/geasSessionManager.py:1.15
*** gnue-appserver/src/geasSessionManager.py:1.14 Mon Sep 1 14:01:45 2003
--- gnue-appserver/src/geasSessionManager.py Mon Sep 1 14:24:15 2003
***************
*** 19,25 ****
#
# Copyright 2001-2003 Free Software Foundation
#
! # $Id: geasSessionManager.py,v 1.14 2003/09/01 18:01:45 reinhard Exp $
import geasSession
import geasAuthentication
--- 19,25 ----
#
# Copyright 2001-2003 Free Software Foundation
#
! # $Id: geasSessionManager.py,v 1.15 2003/09/01 18:24:15 reinhard Exp $
import geasSession
import geasAuthentication
***************
*** 58,65 ****
def _buildInternalSession (self):
self._internalSession = geasSession.geasSession (self._connections,
!
geasAuthentication.geasAuthAgent(),
! None)
self._internalSession.login (None,None) # fake login
self._sessions [self._internalSession] = self._internalSession
--- 58,64 ----
def _buildInternalSession (self):
self._internalSession = geasSession.geasSession (self._connections,
!
geasAuthentication.geasAuthAgent())
self._internalSession.login (None,None) # fake login
self._sessions [self._internalSession] = self._internalSession
- gnue-appserver/src geasInstance.py geasList.py ...,
Reinhard Mueller <=