Fix “NSF award in db” check

src/main/resources/checks/nsf.award.number.in.db.xml

@@ -10,6 +10,7 @@
 	<environment>rscript</environment>
 	<code><![CDATA[
 library(httr)
+library(stringr)
 NSFawardLength <- 7
 
 if (is.null(awards)) {
@@ -19,14 +20,16 @@ if (is.null(awards)) {
 } else {
   # Clean up each award string so we can pass it to the HTTP API
   awards <- trimws(gsub("nsf award", "", tolower(awards)))
+  # Extract the integer funding numbers from any other character left in the 'funding' element.
+  awards <- str_extract(awards, "\\d+")
   # Make sure that all award numbers are the correct number of characters
   # The number may have been stripped of leading zeros, so add them back
   # in if necessary.
   awardFormat <- paste0("%0", NSFawardLength, "d")
   awards <- lapply(awards, function(x) {
     award <- x
     if(nchar(x) < NSFawardLength) {
-        award <- sprintf(awardFormat, as.integer(x)) 
+        award <- sprintf(awardFormat, as.integer(x))
     }
     as.character(award)
   })
@@ -62,6 +65,6 @@ if (is.null(awards)) {
 ]]></code>
 	<selector>
 		<name>awards</name>
-		<xpath>/eml/dataset/project/funding//para | /eml/dataset/project/funding</xpath>
+		<xpath>/*[local-name() = 'eml']/dataset/project/funding//text()[normalize-space()]</xpath>
 	</selector>
 </mdq:check>