CSPACE-2601: Checking in Laramie's set of changes to ten files - nearly all in sdk...

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 4b2b703f307444394634a3dc1245dd573bc90bff..b4b22f745955aefbe8facb0fde916866763aec78 100644 (file)
--- 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<Response> 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<Response> 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<String, String> johnWayneMap = new HashMap<String,String>();
         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.");
        }
 }