gnue designer/src/forms/wizards/AddDropDown.py ...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  02/10/08 16:39:19

Modified files:
        designer/src/forms/wizards: AddDropDown.py 
        common/src     : GDataSource.py 
        common/src/dbdrivers/_static: DBdriver.py 
Added files:
        samples/testcases/datasource: static.gfd 

Log message:
        fix static datasource for dropdown wizard <2>
        add static datasource sample

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/samples/testcases/datasource/static.gfd?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddDropDown.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataSource.py.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_static/DBdriver.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/common/src/GDataSource.py
diff -c gnue/common/src/GDataSource.py:1.40 gnue/common/src/GDataSource.py:1.41
*** gnue/common/src/GDataSource.py:1.40 Tue Oct  8 14:17:00 2002
--- gnue/common/src/GDataSource.py      Tue Oct  8 16:39:19 2002
***************
*** 141,151 ****
  
    def initialize(self):
      if not self.database:
!       # We are a connectionless datasource (virtual?)
!       # We have to bind to something, so bind to empty driver
!       from gnue.common.dbdrivers._empty import DBdriver
!       GDebug.printMesg (7, 'Using empty data driver')
!       dataObject = DBdriver.supportedDataObjects['object']()
  
      elif self._connections:
        self.database = string.lower(self.database)
--- 141,163 ----
  
    def initialize(self):
      if not self.database:
!       # We are a connectionless datasource (virtual?)      
!       # We have to bind to something, so bind to empty or static driver
!       if not self.type=="static":
!         from gnue.common.dbdrivers._empty import DBdriver
!         GDebug.printMesg (7, 'Using empty data driver')
!         dataObject = DBdriver.supportedDataObjects['object']()
!         
!       else:
!         from gnue.common.dbdrivers._static import DBdriver
!         GDebug.printMesg (7, 'Using static data driver')
!         dataObject = DBdriver.supportedDataObjects['static']()
!         
!         for child in self._children:
!           if isinstance(child, GStaticSet):
!             dataObject._staticSet = child
!             break
!         
  
      elif self._connections:
        self.database = string.lower(self.database)
***************
*** 399,404 ****
--- 411,423 ----
           'ParentTags': ('staticset',) },
        'staticsetfield': {
           'BaseClass': GStaticSetField,
+          'Attributes': {
+             'name':        {
+                'Typecast': GTypecast.text,
+                'Required': 1 },
+             'value':        {
+                'Typecast': GTypecast.text,
+                'Required': 1 } },
           'ParentTags': ('staticsetrow',) },
    }
  
Index: gnue/common/src/dbdrivers/_static/DBdriver.py
diff -c gnue/common/src/dbdrivers/_static/DBdriver.py:1.4 
gnue/common/src/dbdrivers/_static/DBdriver.py:1.5
*** gnue/common/src/dbdrivers/_static/DBdriver.py:1.4   Thu Jul 25 01:36:08 2002
--- gnue/common/src/dbdrivers/_static/DBdriver.py       Tue Oct  8 16:39:19 2002
***************
*** 44,49 ****
--- 44,50 ----
      DataObject.__init__(self)
      self.triggerExtensions = TriggerExtensions(self)
  
+   
    def _createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None):
      return STATIC_ResultSet(self, masterRecordSet=masterRecordSet)
  
***************
*** 53,58 ****
--- 54,62 ----
  
    # We don't do connections (we are connectionless)
    def connect(self, connectData={}):
+     # build field list
+     self._fieldReferences=string.split(self._staticSet.fields,",")
+ 
      self._postConnect()
  
    # We don't do commits
***************
*** 75,83 ****
    def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None):
      ResultSet.__init__(self, dataObject, \
              cursor, defaultValues, masterRecordSet)
      self._recordSetClass = STATIC_RecordSet
  
- 
    # Returns 1=DataObject has uncommitted changes
    def isPending(self):
      return 0    # Static DataObjects cannot have pending changes :)
--- 79,87 ----
    def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None):
      ResultSet.__init__(self, dataObject, \
              cursor, defaultValues, masterRecordSet)
+     
      self._recordSetClass = STATIC_RecordSet
  
    # Returns 1=DataObject has uncommitted changes
    def isPending(self):
      return 0    # Static DataObjects cannot have pending changes :)
***************
*** 89,106 ****
      for record in (self._cachedRecords):
        record.post()
  
-   # Returns 1=Field is bound to a database field
-   def isFieldBound(self, fieldName):
-     return 0
- 
    # Load cacheCount number of new records
    def _loadNextRecord(self):
!     return 0
  
  
    # Create an empty record
    def _createEmptyRecord(self, masterRecordSet=None): 
!     return self._recordSetClass(self, masterRecordSet=masterRecordSet)
  
  
  ###########################################################
--- 93,123 ----
      for record in (self._cachedRecords):
        record.post()
  
    # Load cacheCount number of new records
    def _loadNextRecord(self):
!     if hasattr(self,"_alldataloaded"):
!       return 0
!     
!     # Load static data
!     for row in self._dataObject._staticSet._children:
!       dict = {}
!       for field in row._children:
!         dict[field.name] = field.value
! 
!       record=self._recordSetClass(parent=self,initialData=dict)
!       
!       self._cachedRecords.append (record)
!       
!       self._recordCount=self._recordCount+1
! 
!     self._alldataloaded = 1
!       
!     return 1
  
  
    # Create an empty record
    def _createEmptyRecord(self, masterRecordSet=None): 
!     return self._recordSetClass(self, None)
  
  
  ###########################################################
***************
*** 116,121 ****
--- 133,140 ----
    # Post any changes to database
    def _postChanges(self): 
      return 1
+ 
+   
  
  
  
Index: gnue/designer/src/forms/wizards/AddDropDown.py
diff -c gnue/designer/src/forms/wizards/AddDropDown.py:1.7 
gnue/designer/src/forms/wizards/AddDropDown.py:1.8
*** gnue/designer/src/forms/wizards/AddDropDown.py:1.7  Mon Oct  7 22:07:05 2002
--- gnue/designer/src/forms/wizards/AddDropDown.py      Tue Oct  8 16:39:19 2002
***************
*** 268,275 ****
          except ValueError:
            pass
          ssr = self.AddElement('staticsetrow', ss)
!         self.AddElement('staticsetfield',ssr,{'_content_': key})
!         self.AddElement('staticsetfield',ssr,{'_content_': descr})
  
  
      #
--- 268,275 ----
          except ValueError:
            pass
          ssr = self.AddElement('staticsetrow', ss)
!         self.AddElement('staticsetfield',ssr,{'name': 'key','value': key})
!         self.AddElement('staticsetfield',ssr,{'name': 'descr','value': descr})
  
  
      #