gnue/appserver/src frontend.py

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       03/05/22 16:04:54

Modified files:
        appserver/src  : frontend.py 

Log message:
        Updated to expect "fetch" to deliver a list of lists instead of a list 
of
        dictionaries

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/frontend.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gnue/appserver/src/frontend.py
diff -c gnue/appserver/src/frontend.py:1.11 gnue/appserver/src/frontend.py:1.12
*** gnue/appserver/src/frontend.py:1.11 Thu May 22 15:06:49 2003
--- gnue/appserver/src/frontend.py      Thu May 22 16:04:54 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: frontend.py,v 1.11 2003/05/22 19:06:49 reinhard Exp $
  
  import os, getpass
  from gnue.common.apps import GClientApp
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: frontend.py,v 1.12 2003/05/22 20:04:54 reinhard Exp $
  
  import os, getpass
  from gnue.common.apps import GClientApp
***************
*** 126,139 ****
        maxcount = self.server.count (self.session, self.list) - start
  
      count = askint ("Number of objects to display", "%d" % maxcount)
      rset = self.server.fetch (self.session, self.list, start, count)
  
      for index in range (0, count):
        object = rset [index]
!       print "* Object number %d with id %s:" % (start + index,
!                                                 object ["gnue_id"])
!       for property in self.propertylist:
!         print "*   " + property + ":", object [property]
  
    # 
---------------------------------------------------------------------------
    # Display more data
--- 126,142 ----
        maxcount = self.server.count (self.session, self.list) - start
  
      count = askint ("Number of objects to display", "%d" % maxcount)
+ 
+     # now, fetch the data from the server
      rset = self.server.fetch (self.session, self.list, start, count)
  
      for index in range (0, count):
        object = rset [index]
!       # "object" now holds a list of strings, where item number 0 is always
!       # the gnue_id, and items 1-n are the values of the properties.
!       print "* Object number %d with id %s:" % (start + index, object [0])
!       for i in range (0, len (self.propertylist)):
!         print "*   " + self.propertylist [i] + ":", object [i + 1]
  
    # 
---------------------------------------------------------------------------
    # Display more data
***************
*** 168,174 ****
      object_ids = []
      for index in range (0, count):
        object = rset [index]
!       object_ids.append (object ["gnue_id"])
  
      # now, we have all object_ids and we can use "load" to get the data
      rset = self.server.load (self.session, self.classname, object_ids,
--- 171,177 ----
      object_ids = []
      for index in range (0, count):
        object = rset [index]
!       object_ids.append (object [0])
  
      # now, we have all object_ids and we can use "load" to get the data
      rset = self.server.load (self.session, self.classname, object_ids,
***************
*** 177,184 ****
        object = rset [index]
        print "* Object number %d with id %s:" % (start + index,
                                                  object_ids [index])
!       for property in propertylist:
!         print "*   " + property + ":", object [property]
  
    # 
---------------------------------------------------------------------------
    # Modify objects
--- 180,187 ----
        object = rset [index]
        print "* Object number %d with id %s:" % (start + index,
                                                  object_ids [index])
!       for i in range (0, len (propertylist)):
!         print "*   " + propertylist [i] + ":", object [i]
  
    # 
---------------------------------------------------------------------------
    # Modify objects
***************
*** 213,219 ****
      object_ids = []
      for index in range (0, count):
        object = rset [index]
!       object_ids.append (object ["gnue_id"])
  
      # Now, we have all object_ids and we can use "load" to get the data.
      # This is not necessary for the subsequent call of "store", it's just
--- 216,222 ----
      object_ids = []
      for index in range (0, count):
        object = rset [index]
!       object_ids.append (object [0])
  
      # Now, we have all object_ids and we can use "load" to get the data.
      # This is not necessary for the subsequent call of "store", it's just
***************
*** 226,233 ****
        print "* Object number %d with id %s:" % (start + index,
                                                  object_ids [index])
        row = []
!       for property in propertylist:
!         row.append (ask (property, object [property]))
        data.append (row)
  
      # Now, we have the new data in our 2-dimensional array and we can call
--- 229,236 ----
        print "* Object number %d with id %s:" % (start + index,
                                                  object_ids [index])
        row = []
!       for i in range (0, len (propertylist)):
!         row.append (ask (propertylist [i], object [i]))
        data.append (row)
  
      # Now, we have the new data in our 2-dimensional array and we can call
***************
*** 283,289 ****
      object_ids = []
      for index in range (0, count):
        object = rset [index]
!       object_ids.append (object ["gnue_id"])
  
      # Now, delete the objects
      self.server.delete (self.session, self.classname, object_ids)
--- 286,292 ----
      object_ids = []
      for index in range (0, count):
        object = rset [index]
!       object_ids.append (object [0])
  
      # Now, delete the objects
      self.server.delete (self.session, self.classname, object_ids)