[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj DBObject.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv17077/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj

Modified Files:
	DBObject.java 
Log Message:
deleteDetails() and deleteAll() should copy criteria fields to 'search' objects only when those fields have been set in the parent object


Index: DBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java,v
retrieving revision 1.197
retrieving revision 1.198
diff -C2 -d -r1.197 -r1.198
*** DBObject.java	12 Jul 2004 22:46:56 -0000	1.197
--- DBObject.java	16 Jul 2004 01:30:27 -0000	1.198
***************
*** 1895,1899 ****
                  }
              } else {
!                 testObject.setField(fieldName, getField(fieldName));
              }
          }
--- 1895,1905 ----
                  }
              } else {
!                 // does local field have a value set?
!                 DataField datafield = getDataField(fieldName);
!                 // ignore this field if no setting
!                 if (!datafield.isValueSet()) continue;
! 
!                 // use 'raw' value in data field
!                 testObject.setField(fieldName, datafield.getValue().toString());
              }
          }
***************
*** 1994,2001 ****
                  String foreignField = stkForeign.nextToken();
  
                  // only set field if we have a value
!                 String value = getField(localField);
                  if (value != null && value.length() > 0) {
!                     detailObj.setField(foreignField, getField(localField));
                      foundValues = true;
                  }
--- 2000,2011 ----
                  String foreignField = stkForeign.nextToken();
  
+                 // does local field have a value set?
+                 DataField datafield = getDataField(localField);
+                 if ( !datafield.isValueSet() ) continue;
+ 
                  // only set field if we have a value
!                 String value = datafield.getValue().toString();
                  if (value != null && value.length() > 0) {
!                     detailObj.setField(foreignField, value);
                      foundValues = true;
                  }