Fix for & in MARC conversion for URL

Author: omuzzyEBSCO

Koha/Plugin/EDS.pm

@@ -34,7 +34,7 @@ our $MAJOR_VERSION = "23.11";
 our $SUB_VERSION = "001";
 our $VERSION = $MAJOR_VERSION . "" . $SUB_VERSION;
 our $SHA_ADD = "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json";
-our $DATE_UPDATE = '2024-12-10';
+our $DATE_UPDATE = '2024-12-11';
 ######################################################
 
 ## Here is our metadata, some keys are required, some are optional

Koha/Plugin/EDS/admin/release_notes.xml

@@ -3,9 +3,9 @@
 <kohaplugin>
 	<latestversion>23.11.001</latestversion>
 	<download>https://github.com/ebsco/edsapi-koha-plugin</download>
-	<lastupdated>2024/12/10</lastupdated>
+	<lastupdated>2024/12/11</lastupdated>
 	<releasenotes>
-		<release version="23.11.001" date="2024/12/10">
+		<release version="23.11.001" date="2024/12/11">
 			<note id="1" author="omuzzy@ebsco.com">fixes issue where EDS items cannot be sent from cart</note>
 			<note id="2" author="omuzzy@ebsco.com">fixes issue where EDS items cannot be downloaded from cart</note>
 			<note id="3" author="omuzzy@ebsco.com">fixes other minor 23.11 errors</note>

Koha/Plugin/EDS/opac/eds-methods.pl

@@ -597,10 +597,8 @@ sub ProcessEDSCartItems
 		#URL
 		try{
 				my $EDSRecordURL = $record->{Record}->{PLink};
-				$recordXML .= '  <datafield tag="856" ind1="0" ind2="0">
+				$recordXML .= '  <datafield tag="856" ind1="4" ind2="0">
 									<subfield code="u" label="Accession Number">'.$EDSRecordURL.'</subfield>
-									<subfield code="y" label="Accession Number">'.$EDSRecordURL.'</subfield>
-									<subfield code="z" label="Accession Number">'.$EDSRecordURL.'</subfield>
 								  </datafield>
 								  ';
 		}catch{};
@@ -669,7 +667,7 @@ sub ProcessEDSCartItems
 
 		$recordJSON .= "}";
 		$recordXML .= '</record>';
-		$recordXML=~s/\&/and/g; # avoid error when converting to marc
+		$recordXML=~s/\&/\&amp;/g; # avoid error when converting to marc
 		$dat = from_json($recordJSON); # used instead of decode_json and encode('utf-8',$recordJSON) first.
 
 		$record = eval { MARC::Record::new_from_xml( $recordXML, "utf8", C4::Context->preference('marcflavour') ) };

Koha/Plugin/EDS/opac/templates/eds-methods.tt

@@ -629,11 +629,9 @@ sub ProcessEDSCartItems
 
 		#URL
 		try{
-				my $EDSRecordURL = $record->{Record}->{PLink};
-				$recordXML .= '  <datafield tag="856" ind1="0" ind2="0">
+				my $EDSRecordURL = $record->{Record}->{PLink};				
+				$recordXML .= '  <datafield tag="856" ind1="4" ind2="0">
 									<subfield code="u" label="Accession Number">'.$EDSRecordURL.'</subfield>
-									<subfield code="y" label="Accession Number">'.$EDSRecordURL.'</subfield>
-									<subfield code="z" label="Accession Number">'.$EDSRecordURL.'</subfield>
 								  </datafield>
 								  ';
 		}catch{};
@@ -702,7 +700,7 @@ sub ProcessEDSCartItems
 
 		$recordJSON .= "}";
 		$recordXML .= '</record>';
-		$recordXML=~s/\&/and/g; # avoid error when converting to marc
+		$recordXML=~s/\&/\&amp;/g; # avoid error when converting to marc
 		$dat = from_json($recordJSON); # used instead of decode_json and encode('utf-8',$recordJSON) first.
 
 		$record = eval { MARC::Record::new_from_xml( $recordXML, "utf8", C4::Context->preference('marcflavour') ) };