r5068 - trunk/gnue-appserver/src/language

[johannes]

Author: johannes
Date: 2004-02-05 06:26:19 -0600 (Thu, 05 Feb 2004)
New Revision: 5068

Modified:
   trunk/gnue-appserver/src/language/Object.py
   trunk/gnue-appserver/src/language/ObjectList.py
Log:
ObjectList is an immutable sequence now.
Object returns None on access to an unloadable property.


Modified: trunk/gnue-appserver/src/language/Object.py
===================================================================
--- trunk/gnue-appserver/src/language/Object.py 2004-02-05 09:55:20 UTC (rev 
5067)
+++ trunk/gnue-appserver/src/language/Object.py 2004-02-05 12:26:19 UTC (rev 
5068)
@@ -62,9 +62,14 @@
       sid  = self.__session.getSessionId ()
 
       if self.objectId:
-        res = sm.load (sid, self.__class, [self.objectId, ''], [name])
-        (value, datatype) = (res [0][0], res [1][0])
+        try:
+          res = sm.load (sid, self.__class, [self.objectId, ''], [name])
+          (value, datatype) = (res [0][0], res [1][0])
 
+        except:
+          # TODO: use a more specific exception 
+          return None
+
       # if no objectId is available we assume it's a new object
       else:
         res = sm.load (sid, self.__class, [''], [name])
@@ -85,8 +90,8 @@
       sm   = self.__session.getSessionManager ()
       sid  = self.__session.getSessionId ()
 
-      res = sm.store (sid, self.__class, [self.objectId], name,
-                      [self.__native_to_rpc (value)])
+      res = sm.store (sid, self.__class, [self.objectId], [name],
+                      [[self.__native_to_rpc (value)]])
       self.objectId = res [0]
 
     else:

Modified: trunk/gnue-appserver/src/language/ObjectList.py
===================================================================
--- trunk/gnue-appserver/src/language/ObjectList.py     2004-02-05 09:55:20 UTC 
(rev 5067)
+++ trunk/gnue-appserver/src/language/ObjectList.py     2004-02-05 12:26:19 UTC 
(rev 5068)
@@ -105,41 +105,3 @@
     # return number of updated rows
     return len (rset)
     
-
-  # -------------------------------------------------------------------------
-  # Append an item to the sequence
-  # -------------------------------------------------------------------------
-  def append (self, value):
-    self.__list.append (value)
-
-
-  # -------------------------------------------------------------------------
-  # Extend the sequence by another list
-  # -------------------------------------------------------------------------
-  def extend (self, alist):
-    self.__list.extend (alist)
-
-
-  # -------------------------------------------------------------------------
-  # Returns the index of the first element with a matching key-value-pair
-  # -------------------------------------------------------------------------
-  def index (self, key, value):
-    idx = 0
-    for item in self.__list:
-      if item.key == value:
-        return idx
-      idx += 1
-
-    raise ValueError, "No %s.%s with a value of '%s' found." % \
-                      (self.classname, key, value)
-
-
-  # -------------------------------------------------------------------------
-  # Returns the number of elements with a matching key-value-pair
-  # -------------------------------------------------------------------------
-  def count (self, key, value):
-    num = 0
-    for item in self.__list:
-      if item.key == value:
-        num += 1
-    return num