[Zapp-cvs-commit] ZApp/leverMethods/PG insertItemLever.plain,1.11,1.12 updateItemLever.plain,1.7,1.8

[<ssp...@us...>]

Update of /cvsroot/zapp/ZApp/leverMethods/PG
In directory sc8-pr-cvs1:/tmp/cvs-serv24686/leverMethods/PG

Modified Files:
	insertItemLever.plain updateItemLever.plain 
Log Message:
some ref integrity refinements for PG levers

Index: insertItemLever.plain
===================================================================
RCS file: /cvsroot/zapp/ZApp/leverMethods/PG/insertItemLever.plain,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** insertItemLever.plain	18 Jun 2003 02:39:12 -0000	1.11
--- insertItemLever.plain	8 Jan 2004 22:24:43 -0000	1.12
***************
*** 15,18 ****
--- 15,19 ----
  specialist = context.aq_parent
  primaryKey = specialist.getPrimaryKey()
+ refLookup = specialist.ZApp_getReferenceLookup()
  
  typeLookups = {
***************
*** 40,44 ****
      itemID = item['id']
      theType = typeLookups.get(dbType, dbType)
- 
      if mode:
          columnList.append(itemID)
--- 41,44 ----
***************
*** 48,52 ****
              itemList.append(fmtString)
          else:
!             itemList.append('<dtml-sqlvar %s  type="%s">' % (item['id'], theType))
  
  templateString = templateString % (specialist.id, string.join(columnList, ',\n'), string.join(itemList,',\n'))
--- 48,56 ----
              itemList.append(fmtString)
          else:
!             refList = refLookup.get(itemID,[])
!             if len(refList) >= 2:
!                 itemList.append('<dtml-if %s><dtml-sqlvar %s  type="%s"><dtml-else>NULL</dtml-if>' % (itemID, itemID, theType))
!             else:
!                 itemList.append('<dtml-sqlvar %s  type="%s">' % (itemID, theType))
  
  templateString = templateString % (specialist.id, string.join(columnList, ',\n'), string.join(itemList,',\n'))

Index: updateItemLever.plain
===================================================================
RCS file: /cvsroot/zapp/ZApp/leverMethods/PG/updateItemLever.plain,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** updateItemLever.plain	18 Jun 2003 02:39:12 -0000	1.7
--- updateItemLever.plain	8 Jan 2004 22:24:43 -0000	1.8
***************
*** 15,18 ****
--- 15,19 ----
  specialist = context.aq_parent
  primaryKey = specialist.getPrimaryKey()
+ refLookup = specialist.ZApp_getReferenceLookup()
  
  typeLookups = {
***************
*** 52,56 ****
              else:
                  theType = typeLookups.get(dbType, dbType)
!                 itemString = '%s = <dtml-sqlvar %s  type="%s">' % (itemID, itemID, theType)
  
          itemList.append( itemString )
--- 53,61 ----
              else:
                  theType = typeLookups.get(dbType, dbType)
!                 refList = refLookup.get(itemID,[])
!                 if len(refList) >= 2:
!                     itemString = '%s = <dtml-if %s><dtml-sqlvar %s  type="%s"><dtml-else>NULL</dtml-if>' % (itemID, itemID, itemID, theType)
!                 else:
!                     itemString = '%s = <dtml-sqlvar %s  type="%s">' % (itemID, itemID, theType)
  
          itemList.append( itemString )