@@ -131,14 +131,8 @@ DataTable FillDescribeTerms(DataTable qResultTable)
131131
132132 if ( datasource . IsFederation ( ) )
133133 {
134- foreach ( RDFDataSource fedDataSource in ( RDFFederation ) datasource )
135- {
136- //Ensure to skip tricky empty federations
137- if ( fedDataSource . IsFederation ( ) && ( ( RDFFederation ) fedDataSource ) . DataSourcesCount == 0 )
138- continue ;
139-
134+ foreach ( RDFDataSource fedDataSource in ( ( RDFFederation ) datasource ) . Where ( fedDataSource => ! fedDataSource . IsFederation ( ) || ( ( RDFFederation ) fedDataSource ) . DataSourcesCount != 0 ) )
140135 resultTable . Merge ( DescribeTerms ( describeQuery , fedDataSource , qResultTable ) , true , MissingSchemaAction . Add ) ;
141- }
142136 }
143137 else
144138 resultTable = DescribeTerms ( describeQuery , datasource , qResultTable ) ;
@@ -735,7 +729,7 @@ RDFSelectQuery BuildFederationOrSPARQLEndpointQuery()
735729 //FEDERATION / SPARQL ENDPOINT
736730 default :
737731 RDFSelectQuery query = BuildFederationOrSPARQLEndpointQuery ( ) ;
738- RDFSelectQueryResult queryResults =
732+ RDFSelectQueryResult queryResults =
739733 dataSource . IsSPARQLEndpoint ( ) ? query . ApplyToSPARQLEndpoint ( ( RDFSPARQLEndpoint ) dataSource )
740734 : query . ApplyToFederation ( ( RDFFederation ) dataSource ) ;
741735 result . Merge ( queryResults . SelectResults , true , MissingSchemaAction . Add ) ;
@@ -1240,7 +1234,6 @@ void AdjustVariableColumnNames(DataTable qrTable)
12401234 switch ( sparqlEndpointQueryOptions . QueryMethod )
12411235 {
12421236 //query via GET with URL-encoded querystring
1243- default :
12441237 case RDFQueryEnums . RDFSPARQLEndpointQueryMethods . Get :
12451238 //Handle user-provided parameters
12461239 webClient . QueryString . Add ( "query" , HttpUtility . UrlEncode ( query ) ) ;
0 commit comments