From 763a5e6c013d079f36eb1cced99743f7142261ed Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Mon, 9 Aug 2010 20:01:06 +0000 Subject: [PATCH] CSPACE-2601: Checking in Laramie's set of changes to ten files - nearly all in sdk, sample, and import modules, which are built under a separate Maven profile - to reflect changes to object records that made object name fields repeatable as a group. --- .../importer/LocationAuthorityBaseImport.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/services/location/import/src/main/java/org/collectionspace/services/location/importer/LocationAuthorityBaseImport.java b/services/location/import/src/main/java/org/collectionspace/services/location/importer/LocationAuthorityBaseImport.java index 4b2b703f3..b4b22f745 100644 --- a/services/location/import/src/main/java/org/collectionspace/services/location/importer/LocationAuthorityBaseImport.java +++ b/services/location/import/src/main/java/org/collectionspace/services/location/importer/LocationAuthorityBaseImport.java @@ -73,14 +73,15 @@ public class LocationAuthorityBaseImport { if(logger.isDebugEnabled()){ logger.debug("Import: Create locationAuthority: \"" + locationAuthorityName +"\""); } - String baseLocationRefName = - LocationAuthorityClientUtils.createLocationAuthRefName(locationAuthorityName, false); - String fullLocationRefName = - LocationAuthorityClientUtils.createLocationAuthRefName(locationAuthorityName, true); - MultipartOutput multipart = - LocationAuthorityClientUtils.createLocationAuthorityInstance( - locationAuthorityName, fullLocationRefName, client.getCommonPartName()); - ClientResponse res = client.create(multipart); + + + + String displaySuffix = "displayName-" + System.currentTimeMillis(); //TODO: this is just made-up. Laramie20100728 temp fix, made-up displaySuffix. + String baseLocationRefName = LocationAuthorityClientUtils.createLocationAuthRefName(locationAuthorityName, displaySuffix);//TODO: make displaySuffix correct. Laramie20100729 temp fix, made-up displaySuffix. was (locationAuthorityName, false); + String fullLocationRefName = LocationAuthorityClientUtils.createLocationAuthRefName(locationAuthorityName, displaySuffix);//TODO: make displaySuffix correct. Laramie20100729 temp fix, made-up displaySuffix. was (locationAuthorityName, true); + + MultipartOutput multipart = LocationAuthorityClientUtils.createLocationAuthorityInstance(locationAuthorityName, fullLocationRefName, client.getCommonPartName()); + ClientResponse res = client.create(multipart); int statusCode = res.getStatus(); @@ -118,6 +119,9 @@ public class LocationAuthorityBaseImport { shortName, longName, nameAdditions, contactName, foundingDate, dissolutionDate, foundingPlace, function, description */ + + + /* TODO: Laramie20100728 This is broken. Removing for now. Map johnWayneMap = new HashMap(); johnWayneMap.put(LocationJAXBSchema.FORE_NAME, "John"); johnWayneMap.put(LocationJAXBSchema.SUR_NAME, "Wayne"); @@ -149,7 +153,8 @@ public class LocationAuthorityBaseImport { Arrays.asList(johnWayneMap, patrickSchmitzMap, janeDoeMap ); pabi.createLocationAuthority(demoLocationAuthorityName, locationsMaps); - + */ + logger.info("LocationAuthorityBaseImport test is empty because LocationJAXBSchema had code changes. See org.collectionspace.services.location.importer.LocationAuthorityBaseImport"); logger.info("LocationAuthorityBaseImport complete."); } } -- 2.47.3