/[papo]/gnue/common/src/GDataObjects.py
ViewVC logotype

Diff of /gnue/common/src/GDataObjects.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.6.2.2 by apronotti, Wed May 21 18:03:04 2003 UTC revision 1.6.2.3 by apronotti, Thu May 22 15:58:05 2003 UTC
# Line 142  class DataObject: Line 142  class DataObject:
142      self._emptyResultSet._defaultValues = {}      self._emptyResultSet._defaultValues = {}
143      self._emptyResultSet._recordCount = 0      self._emptyResultSet._recordCount = 0
144      self._emptyResultSet.current = None      self._emptyResultSet.current = None
145        self._emptyResultSet._masterRecordSet = masterRecordSet
146        self._emptyResultSet._readOnly = readOnly
147      return self._emptyResultSet      return self._emptyResultSet
148                
149    
# Line 259  class DataObject: Line 261  class DataObject:
261      if (not master.current._cachedDetailResultSets.has_key(self)) or \      if (not master.current._cachedDetailResultSets.has_key(self)) or \
262          ( not int(gConfig('CacheDetailRecords')) and \          ( not int(gConfig('CacheDetailRecords')) and \
263            not master.current._cachedDetailResultSets[self].isPending() ):            not master.current._cachedDetailResultSets[self].isPending() ):
       hasNullPk = 0  
264        for i in range(0, len(self._masterfields)):        for i in range(0, len(self._masterfields)):
265          GDebug.printMesg(10,"Adding criteria")          GDebug.printMesg(10,"Adding criteria")
266          value = master.current.getField(string.strip(self._masterfields[i]))          criteria[string.strip(self._detailfields[i])] = master.current.getField(string.strip(self._masterfields[i]))
         if not value:  
           hasNullPk = 1  
           break  
         criteria[string.strip(self._detailfields[i])] = value  
267          GDebug.printMesg(10,master.current.getField(self._masterfields[i]))          GDebug.printMesg(10,master.current.getField(self._masterfields[i]))
268        if hasNullPk:  
269          master.current.addDetailResultSet(self.createEmptyResultSet(readOnly=0, masterRecordSet=master.current))        master.current.addDetailResultSet(self.createResultSet(\
       else:  
         master.current.addDetailResultSet(self.createResultSet(\  
270               conditions=criteria, masterRecordSet=master.current))               conditions=criteria, masterRecordSet=master.current))
271    
272  ##    ##  

Legend:
Removed from v.1.6.2.2  
changed lines
  Added in v.1.6.2.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26