From b80e5becc9e761ac10b9b037e549b7a6f45c9a6f Mon Sep 17 00:00:00 2001 From: Patrick Schmitz Date: Tue, 24 Aug 2010 01:18:57 +0000 Subject: [PATCH] CSPACE-2663, CSPACE-2664. Added new fields to the summary list payloads for Loansin and Loansout. --- .../services/LoaninListItemJAXBSchema.java | 3 ++- .../loanin/jaxb/src/main/resources/loansin-common.xsd | 2 ++ .../services/loanin/nuxeo/LoaninDocumentModelHandler.java | 8 ++++++-- .../services/LoanoutListItemJAXBSchema.java | 1 + .../loanout/jaxb/src/main/resources/loansout-common.xsd | 2 ++ .../loanout/nuxeo/LoanoutDocumentModelHandler.java | 7 +++++-- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninListItemJAXBSchema.java b/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninListItemJAXBSchema.java index 34285605c..7fa960175 100644 --- a/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninListItemJAXBSchema.java +++ b/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninListItemJAXBSchema.java @@ -2,7 +2,8 @@ package org.collectionspace.services; public interface LoaninListItemJAXBSchema { final static String LOAN_IN_NUMBER = "loaninNumber"; - final static String LOAN_RETURN_DATE = "loanReturnDate"; + final static String LENDER = "lender"; + final static String LOAN_RETURN_DATE = "loanReturnDate"; final static String CSID = "csid"; final static String URI = "url"; } diff --git a/services/loanin/jaxb/src/main/resources/loansin-common.xsd b/services/loanin/jaxb/src/main/resources/loansin-common.xsd index b03aac010..26e3095c6 100644 --- a/services/loanin/jaxb/src/main/resources/loansin-common.xsd +++ b/services/loanin/jaxb/src/main/resources/loansin-common.xsd @@ -69,6 +69,8 @@ + diff --git a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java index 0b51c77fc..bee2c58f7 100644 --- a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java +++ b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java @@ -27,6 +27,7 @@ import java.util.Iterator; import java.util.List; import org.collectionspace.services.LoaninJAXBSchema; +import org.collectionspace.services.LoaninListItemJAXBSchema; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.loanin.LoansinCommon; import org.collectionspace.services.loanin.LoansinCommonList; @@ -120,12 +121,15 @@ public class LoaninDocumentModelHandler LoansinCommonList coList = extractPagingInfo(new LoansinCommonList(), wrapDoc); List list = coList.getLoaninListItem(); Iterator iter = wrapDoc.getWrappedObject().iterator(); + String label = getServiceContext().getCommonPartLabel(); while(iter.hasNext()){ DocumentModel docModel = iter.next(); LoaninListItem ilistItem = new LoaninListItem(); - ilistItem.setLoanInNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + ilistItem.setLoanInNumber((String) docModel.getProperty(label, LoaninJAXBSchema.LOAN_IN_NUMBER)); - ilistItem.setLoanReturnDate((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + ilistItem.setLender((String) docModel.getProperty(label, + LoaninListItemJAXBSchema.LENDER)); + ilistItem.setLoanReturnDate((String) docModel.getProperty(label, LoaninJAXBSchema.LOAN_RETURN_DATE)); String id = NuxeoUtils.extractId(docModel.getPathAsString()); ilistItem.setUri(getServiceContextPath() + id); diff --git a/services/loanout/jaxb/src/main/java/org/collectionspace/services/LoanoutListItemJAXBSchema.java b/services/loanout/jaxb/src/main/java/org/collectionspace/services/LoanoutListItemJAXBSchema.java index c49599415..5c3b95c11 100644 --- a/services/loanout/jaxb/src/main/java/org/collectionspace/services/LoanoutListItemJAXBSchema.java +++ b/services/loanout/jaxb/src/main/java/org/collectionspace/services/LoanoutListItemJAXBSchema.java @@ -2,6 +2,7 @@ package org.collectionspace.services; public interface LoanoutListItemJAXBSchema { final static String LOAN_OUT_NUMBER = "loanoutNumber"; + final static String BORROWER = "borrower"; final static String LOAN_RETURN_DATE = "loanReturnDate"; final static String CSID = "csid"; final static String URI = "url"; diff --git a/services/loanout/jaxb/src/main/resources/loansout-common.xsd b/services/loanout/jaxb/src/main/resources/loansout-common.xsd index 3a5f5f139..df1b4a654 100644 --- a/services/loanout/jaxb/src/main/resources/loansout-common.xsd +++ b/services/loanout/jaxb/src/main/resources/loansout-common.xsd @@ -75,6 +75,8 @@ + diff --git a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java index bbf1deb94..1007ef117 100644 --- a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java +++ b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java @@ -131,12 +131,15 @@ public class LoanoutDocumentModelHandler LoansoutCommonList coList = extractPagingInfo(new LoansoutCommonList(), wrapDoc); List list = coList.getLoanoutListItem(); Iterator iter = wrapDoc.getWrappedObject().iterator(); + String label = getServiceContext().getCommonPartLabel(); while(iter.hasNext()){ DocumentModel docModel = iter.next(); LoanoutListItem ilistItem = new LoanoutListItem(); - ilistItem.setLoanOutNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + ilistItem.setLoanOutNumber((String) docModel.getProperty(label, LoanoutJAXBSchema.LOAN_OUT_NUMBER)); - ilistItem.setLoanReturnDate((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + ilistItem.setBorrower((String) docModel.getProperty(label, + LoanoutJAXBSchema.BORROWER)); + ilistItem.setLoanReturnDate((String) docModel.getProperty(label, LoanoutJAXBSchema.LOAN_RETURN_DATE)); String id = NuxeoUtils.extractId(docModel.getPathAsString()); ilistItem.setUri(getServiceContextPath() + id); -- 2.47.3