OLE-9456 : Full export splits e-holding into two fields

openlibraryenvironment · Jul 12, 2021 · afa80cc · afa80cc
1 parent 87b57d9
commit afa80cc
Showing 1 changed file with 33 additions and 25 deletions.
diff --git a/ole-app/olefs/src/main/java/org/kuali/ole/oleng/helper/ExportEholdingsMappingHelper.java b/ole-app/olefs/src/main/java/org/kuali/ole/oleng/helper/ExportEholdingsMappingHelper.java
@@ -452,33 +452,41 @@ protected void generateSubFieldsForEHolding(Holdings holdings, Map<String, Strin
     private void generateLinkFields(OleHoldings oleHoldings, Map<String, String> dataFieldLinkUrlMap) throws Exception {
         DataField dataField;
         for (Map.Entry<String, String> entry : dataFieldLinkUrlMap.entrySet()) {
-            if (entry.getValue().equalsIgnoreCase(OLEConstants.OLEBatchProcess.DESTINATION_FIELD_LINK_URL)) {
-                for (Link link : oleHoldings.getLink()) {
-                    if (StringUtils.isNotEmpty(link.getUrl())) {
-                        //dataField = checkDataField(dataFieldList, StringUtils.trim(entry.getKey()).substring(0, 3));
-                        dataField = getDataField(entry);
-                        generateLink(oleHoldings, link, getCode(entry.getKey()), dataField);
-
-                        for (Map.Entry<String, String> dataMapEntry : dataFieldLinkUrlMap.entrySet()) {
-                            if (dataMapEntry.getValue().equalsIgnoreCase(OLEConstants.OLEBatchProcess.DESTINATION_FIELD_LINK_TEXT)) {
-                                if (StringUtils.isNotEmpty(link.getText())) {
-                                    generateLinkText(oleHoldings, link, getCode(dataMapEntry.getKey()), dataField);
-                                }
-                            }
-                            if (dataMapEntry.getValue().equalsIgnoreCase(OLEConstants.OLEBatchProcess.DESTINATION_FIELD_HOLDINGS_URI_ID)) {
-                                if (StringUtils.isNotEmpty(link.getText())) {
-                                    generateLinkId(oleHoldings, link, getCode(dataMapEntry.getKey()), dataField);
-                                }
-                            }
-                        }
-
-                        if (!dataField.getSubfields().isEmpty()) dataFieldList.add(dataField);
-                    }
-                }
-                break;
+                                for (Link link : oleHoldings.getLink()) {
+                                        if (StringUtils.isNotEmpty(link.getUrl())) {
+                                                dataField = checkDataField(dataFieldList, StringUtils.trim(entry.getKey()).substring(0, 3));
+                                                if (dataField == null) {
+                                                        dataField = getDataField(entry);
+                                                        generateLink(oleHoldings, link, getCode(entry.getKey()), dataField);
+                                                        if (dataFieldLinkUrlMap.containsValue(OLEConstants.OLEBatchProcess.DESTINATION_FIELD_LINK_TEXT)) {
+                                                                for (Map.Entry<String, String> dataMapEntry : dataFieldLinkUrlMap.entrySet()) {
+                                                                        if (dataMapEntry.getValue().equalsIgnoreCase(OLEConstants.OLEBatchProcess.DESTINATION_FIELD_LINK_TEXT)) {
+                                                                                if (StringUtils.isNotEmpty(link.getText())) {
+                                                                                        generateLinkText(oleHoldings, link, getCode(dataMapEntry.getKey()), dataField);
+                                                                                        break;
+                                                                                    }
+                                                                            }
+                                                                    }
+                                                            }
+                                                        if (!dataField.getSubfields().isEmpty()) dataFieldList.add(dataField);
+                                                    } else {
+                                                        generateLink(oleHoldings, link, getCode(entry.getKey()), dataField);
+                                                        if (dataFieldLinkUrlMap.containsValue(OLEConstants.OLEBatchProcess.DESTINATION_FIELD_LINK_TEXT)) {
+                                                                for (Map.Entry<String, String> dataMapEntry : dataFieldLinkUrlMap.entrySet()) {
+                                                                        if (dataMapEntry.getValue().equalsIgnoreCase(OLEConstants.OLEBatchProcess.DESTINATION_FIELD_LINK_TEXT)) {
+                                                                                if (StringUtils.isNotEmpty(link.getText())) {
+                                                                                        generateLinkText(oleHoldings, link, getCode(dataMapEntry.getKey()), dataField);
+                                                                                        break;
+                                                                                    }
+                                                                            }
+                                                                    }
+                                                            }
+                                                    }
+                                            }
+                                    }
+            break;
             }
         }
-    }
 
     private void generateCoverageFields(OleHoldings oleHoldings, Map<String, String> dataFieldCoverageMap) throws Exception {
         List<DataField> coverageFieldList = new ArrayList<>();