From 5f5a2a7c0ede65ddb41402e12ead6729b569c1d9 Mon Sep 17 00:00:00 2001 From: Laramie Crocker Date: Thu, 19 May 2011 14:23:06 +0000 Subject: [PATCH] CSPACE-3994 migrating logging code for objectName and objectNumber in RelationDocumentModelHandler from branch 1.7 to trunk --- .../nuxeo/RelationDocumentModelHandler.java | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java index 92b0737f7..e83b1e831 100644 --- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java +++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java @@ -214,20 +214,37 @@ public class RelationDocumentModelHandler //TODO: ensure that itemDocType is really the entry point, i.e. servicename==doctype //ServiceBindingType itemSbt2 = tReader.getServiceBinding(ctx.getTenantId(), itemDocType); + String propName = "ERROR-FINDING-PROP-VALUE"; ServiceBindingType itemSbt = tReader.getServiceBindingForDocType(ctx.getTenantId(), itemDocType); try { + propName = ServiceBindingUtils.getPropertyValue(itemSbt, ServiceBindingUtils.OBJ_NAME_PROP); String itemDocname = ServiceBindingUtils.getMappedFieldInDoc(itemSbt, ServiceBindingUtils.OBJ_NAME_PROP, itemDocModel); - item.setName(itemDocname); - //System.out.println("\r\n\r\n\r\n=================\r\n~~found prop : "+ServiceBindingUtils.OBJ_NAME_PROP+" in :"+itemDocname); + if (propName==null || itemDocname==null){ + System.out.println("=== prop NOT found: "+ServiceBindingUtils.OBJ_NAME_PROP+"::"+propName+"="+itemDocname+" documentType: "+documentType); + } else{ + item.setName(itemDocname); + System.out.println("=== found prop : "+ServiceBindingUtils.OBJ_NAME_PROP+"::"+propName+"="+itemDocname+" documentType: "+documentType); + } } catch (Throwable t){ - System.out.println("\r\n\r\n\r\n=================\r\n NOTE: "+itemDocModel+" field "+ServiceBindingUtils.OBJ_NAME_PROP+" not found in DocModel: "+itemDocModel.getName()+" inner: "+t.getMessage()); + System.out.println("====Error finding objectNameProperty: "+itemDocModel+" field "+ServiceBindingUtils.OBJ_NAME_PROP+"="+propName + +" not found in itemDocType: "+itemDocType+" inner: "+t.getMessage()); } + propName = "ERROR-FINDING-PROP-VALUE"; try { + propName = ServiceBindingUtils.getPropertyValue(itemSbt, ServiceBindingUtils.OBJ_NUMBER_PROP); String itemDocnumber = ServiceBindingUtils.getMappedFieldInDoc(itemSbt, ServiceBindingUtils.OBJ_NUMBER_PROP, itemDocModel); - item.setNumber(itemDocnumber); - //System.out.println("\r\n\r\n\r\n=================\r\n~~found prop : "+ServiceBindingUtils.OBJ_NUMBER_PROP+" in :"+itemDocnumber); + + if (propName==null || itemDocnumber==null){ + System.out.println("=== prop NOT found: "+ServiceBindingUtils.OBJ_NUMBER_PROP+"::"+propName+"="+itemDocnumber + +" documentType: "+documentType); + } else { + item.setNumber(itemDocnumber); + System.out.println("============ found prop : "+ServiceBindingUtils.OBJ_NUMBER_PROP+"::"+propName+"="+itemDocnumber + +" documentType: "+documentType); + } } catch (Throwable t){ - System.out.println("\r\n\r\n\r\n=================\r\n NOTE: field "+ServiceBindingUtils.OBJ_NUMBER_PROP+" not found in DocModel: "+itemDocModel.getName()+" inner: "+t.getMessage()); + System.out.println("====Error finding objectNumberProperty: "+ServiceBindingUtils.OBJ_NUMBER_PROP+"="+propName + +" not found in itemDocType: "+itemDocType+" inner: "+t.getMessage()); } } else { item.setError("INVALID: related object is absent"); -- 2.47.3