Merge pull request #20 from TAMULib/catalog-service-updates

Catalog Service compatibility and other updates

Author: jsavell

src/main/java/edu/tamu/app/service/CatalogService.java

@@ -72,7 +72,7 @@ public List<CatalogHolding> getHoldingsByBibId(String catalogName, String bibId)
         parameters.put("bibId", bibId);
         parameters.put("catalogName", catalogName);
         try {
-            return objectMapper.readValue(getData("get-holdings", parameters).get("ArrayList<CatalogHolding>").toString(), new TypeReference<List<CatalogHolding>>() {});
+            return objectMapper.readValue(getData("get-holdings", parameters).get("ArrayList<HoldingsRecord>").toString(), new TypeReference<List<CatalogHolding>>() {});
         } catch (IOException e) {
             logger.error("Unable to retrieve Holdings from Catalog Service");
             e.printStackTrace();

src/main/java/edu/tamu/app/service/GetItForMeService.java

@@ -281,17 +281,25 @@ public Map<String,ButtonPresentation> getButtonDataByBibId(String catalogName, S
                                 currentLocation = itemData.get("tempLocationCode");
                             } else if (itemData.containsKey("permLocationCode")) {
                                 currentLocation = itemData.get("permLocationCode");
+                            } else if (itemData.containsKey("locationCode")) {
+                                currentLocation = itemData.get("locationCode");
                             } else {
                                 currentLocation = holding.getFallbackLocationCode();
                             }
+
                             logger.debug("Current Location is: " + currentLocation);
                             //check if the global override blocks buttons for this item
                             if (!skipAllButtons(currentLocation, itemData)) {
                                 // check all registered button for each item
                                 for (GetItForMeButton button : this.getRegisteredButtons(catalogName)) {
                                     logger.debug("Analyzing: " + button.toString());
 
-                                    String itemStatusCode = itemData.containsKey("itemStatusCode") ? itemData.get("itemStatusCode"):null;
+                                    String itemStatusCode = null;
+                                    if (itemData.containsKey("itemStatusCode")) {
+                                        itemStatusCode = itemData.get("itemStatusCode");
+                                    } else if (itemData.containsKey("status")) {
+                                        itemStatusCode = itemData.get("status");
+                                    }
 
                                     logger.debug("Location: " + currentLocation + ": "
                                             + button.fitsLocation(currentLocation));
@@ -313,8 +321,9 @@ public Map<String,ButtonPresentation> getButtonDataByBibId(String catalogName, S
 
                                         for (String parameterKey : parameterKeys) {
                                             if (parameterKey.equals("sid")) {
-                                                parameters.put(parameterKey, getCatalogConfigurationByName(catalogName).get("sidPrefix")
-                                                        + ":" + button.getSID());
+                                                String fullSid = (getCatalogConfigurationByName(catalogName) != null ? getCatalogConfigurationByName(catalogName).get("sidPrefix")
+                                                        + ":":"") + button.getSID();
+                                                parameters.put(parameterKey, fullSid);
                                             } else {
                                                 parameters.put(parameterKey, itemData.get(parameterKey));
                                             }
@@ -327,7 +336,7 @@ public Map<String,ButtonPresentation> getButtonDataByBibId(String catalogName, S
                                         Map<String, String> buttonContent = new HashMap<String,String>();
                                         if (holding.isMultiVolume()) {
                                             logger.debug("Generating a multi volume button");
-                                            parameters.put("edition", itemData.get("enumeration") + " " + itemData.get("chron"));
+                                            parameters.put("edition", itemData.getOrDefault("enumeration","") + " " + itemData.getOrDefault("chron",""));
                                             buttonContent = ButtonLinkPresentation.buildMultiVolumeButtonProperties(parameters, button);
                                         } else {
                                             logger.debug("Generating a single item button");