Switched to using rhspin helper functions to access NPD id and name

@@ -16,7 +16,7 @@
 		let:completeDate="{# SELECT ?completeDate WHERE {?wb ep-well:wellBoreCompletedAt ?completeDate}}"
 		>
 		
-		<h1>Summary report Wellbore: {# SELECT ?wbName WHERE {?wb npd:name ?wbName}}</h1>
+		<h1>Summary report Wellbore: {= rhspin:npdName(?wb) }</h1>
 		<div>End time: <ui:if ui:condition="{= bound(?activityEnd) }">{= spif:dateFormat(?activityEnd, 'yyyy-MM-dd HH:mm') }</ui:if></div>
 		<hr /> 
 		<table>
@@ -24,10 +24,10 @@
 		<tr>
 			<td class="ddrSummaryLeft">
 				<rhswp:NameValuePair arg:name="Report Number:" 				arg:value="{# SELECT ?repNum WHERE {?report ep-report:dailyDrillingReportNumber ?repNum}}"  />
-				<rhswp:NameValuePair arg:name="Wellbore:" 					arg:value="{# SELECT ?wbName WHERE {?wb npd:name ?wbName}}" />
+				<rhswp:NameValuePair arg:name="Wellbore:" 					arg:value="{= rhspin:npdName(?wb) }" />
 				<rhswp:NameValuePair arg:name="Status:" 					arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType rdfs:label ?repTypeName}}" />
 				<rhswp:NameValuePair arg:name="Operator:" 					arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}"  />
-				<rhswp:NameValuePair arg:name="Rig name:" 					arg:value="{# SELECT ?rigName WHERE {?rig npd:name ?rigName}}"  />
+				<rhswp:NameValuePair arg:name="Rig name:" 					arg:value="{= rhspin:npdName(?rig) }"  />
 				<rhswp:NameValuePair arg:name="Spud date:" 					arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MM-dd'), ?unbound) }"  />
 				<rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" 		arg:value="{# SELECT ?kellyElevVMeas WHERE {?activity ep-activity:onRig ?rigState . ?rigState ep-core:hasPart ?kellyBushing . ?kellyBushing a ep-eqt:KellyBushing . ?kellyBushing ep-eqt:elevationOfKellyBushing ?kellyElev . ?kellyElev ep-core:metre ?kellyElevMeas}}" />
 				<rhswp:NameValuePair arg:name="Tight well:" 				arg:value="{# SELECT ?wbTightTypeLabel WHERE { ?statusActivityWb a ?wbTightType . ?wbTightType a ep-well:WellBoreTightnessType . ?wbTightType rdfs:label ?wbTightTypeLabel} }"  />
@@ -46,10 +46,10 @@
 				<rhswp:NameValuePair arg:name="Period:" 					arg:value="{= fn:concat(spif:dateFormat(?activityStart, 'yyyy-MM-dd HH:mm'), ' - ', spif:dateFormat(?activityEnd, 'yyyy-MM-dd HH:mm')) }" />
 	
 			
-				<rhswp:NameValuePair arg:name="Wellbore Id:" 				arg:value="{# SELECT DISTINCT ?wbID WHERE {?wb npd:id ?wbID}}" />
+				<rhswp:NameValuePair arg:name="Wellbore Id:" 				arg:value="{= rhspin:npdId(?wb) }" />
 				<rhswp:NameValuePair arg:name="Created date:"				arg:value="{= IF(bound(?createdAt), spif:dateFormat(?createdAt, 'yyyy-MM-dd HH:mm'), ?unbound) }" />
 				<rhswp:NameValuePair arg:name="Drilling contractor:" 		arg:value="{# SELECT ?contractorName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:name ?contractorName}}" />
-				<rhswp:NameValuePair arg:name="NPD Rig Id:" 				arg:value="{= spl:object(?rig, npd:id) }" />
+				<rhswp:NameValuePair arg:name="NPD Rig Id:" 				arg:value="{= rhspin:npdId(?rig) }" />
 				<rhswp:NameValuePair arg:name="Date Well Complete:" 		arg:value="{= IF(bound(?completeDate), spif:dateFormat(?completeDate, 'yyyy-MM-dd'), ?unbound) }"  />
 				<rhswp:NameValuePair arg:name="Water depth MSL m:" 			arg:value="{# SELECT ?waterDepthVal WHERE {?activity ep-activity:onRig ?rigState . ?rigState a ep-fac:TemporalPartOfARig . ?rigState ep-core:hasPart ?water . ?water a ep-fac:SurroundingWater . ?water ep-fac:depthOfSurroundingWater ?waterDepth . ?waterDepth ep-core:metre ?waterDepthVal}}"  />
 				<rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{# SELECT ?wbPTTypeLabel WHERE { ?statusActivityWb a ?wbPTType . ?wbPTType a ep-well:WellBoreHphtType . ?wbPTType rdfs:label ?wbPTTypeLabel} }" />