[cvs] Expresso commit by mtraum: skip virtual field importing
JCorporate Ltd
jcorp at jcorp2.servlets.net
Mon Oct 4 14:17:13 PDT 2004
Log Message:
-----------
skip virtual field importing
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/dbobj:
XMLImportDocument.java
Revision Data
-------------
Index: XMLImportDocument.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/dbobj/XMLImportDocument.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/dbobj/XMLImportDocument.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/dbobj/XMLImportDocument.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/dbobj/XMLImportDocument.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/dbobj/XMLImportDocument.java
@@ -205,9 +205,19 @@
} else if (rawname.equals("FieldValue")) {
if (myDBObject != null) {
try {
- myDBObject.set(currentFieldName,
- URLUTF8Encoder.decode(
- theData.toString()));
+ if (myDBObject.getFieldMetaData(currentFieldName) == null) {
+ throw new SAXException(myName + ":Error setting field " +
+ currentFieldName + ":" +
+ "Field does not exist");
+ }
+ else if (myDBObject.getFieldMetaData(currentFieldName).isVirtual()) {
+ log.debug("Skipping virtual field " + currentFieldName);
+ }
+ else {
+ myDBObject.set(currentFieldName,
+ URLUTF8Encoder.decode(
+ theData.toString()));
+ }
} catch (DBException de) {
throw new SAXException(myName + ":Error setting field " +
currentFieldName + ":" +
More information about the cvs
mailing list