Merge pull request #526 from litvinovg/option-disable-language-filtering

Option to disable language filtering in data distributors

Author: chenejac

api/src/main/java/edu/cornell/library/scholars/webapp/controller/api/distribute/rdf/SelectFromContentDistributor.java

@@ -7,7 +7,10 @@
 import java.io.OutputStream;
 
 import edu.cornell.library.scholars.webapp.controller.api.distribute.DataDistributorContext;
+import edu.cornell.library.scholars.webapp.controller.api.distribute.rdf.graphbuilder.GraphBuilderUtilities;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.RequestModelAccess;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService.ResultFormat;
 import edu.cornell.mannlib.vitro.webapp.utils.configuration.Property;
 import edu.cornell.mannlib.vitro.webapp.utils.sparqlrunner.QueryHolder;
@@ -93,7 +96,14 @@ public String getContentType() throws DataDistributorException {
     public void writeOutput(OutputStream output) throws DataDistributorException {
         QueryHolder boundQuery = binder.bindValuesToQuery(uriBindingNames, literalBindingNames,
                 new QueryHolder(rawQuery));
-        createSelectQueryContext(this.models.getRDFService(), boundQuery).execute().writeToOutput(output,
+        RDFService rdfService;
+        if (GraphBuilderUtilities.isLanguageFilteringDisabledForRequest(ddContext)) {
+            rdfService = ModelAccess.getInstance().getRDFService();
+        } else {
+            rdfService = this.models.getRDFService();
+        }
+
+        createSelectQueryContext(rdfService, boundQuery).execute().writeToOutput(output,
                 ResultFormat.valueOf(resultFormat));
     }
 

api/src/main/java/edu/cornell/library/scholars/webapp/controller/api/distribute/rdf/graphbuilder/ConstructQueryGraphBuilder.java

@@ -11,6 +11,7 @@
 import edu.cornell.library.scholars.webapp.controller.api.distribute.DataDistributor.DataDistributorException;
 import edu.cornell.library.scholars.webapp.controller.api.distribute.DataDistributorContext;
 import edu.cornell.library.scholars.webapp.controller.api.distribute.rdf.SelectFromContentDistributor;
+import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.utils.configuration.Property;
 import edu.cornell.mannlib.vitro.webapp.utils.sparqlrunner.QueryHolder;
@@ -97,8 +98,12 @@ public void addRawQuery(String query) {
     @Override
     public Model buildGraph(DataDistributorContext ddContext) throws DataDistributorException {
         log.debug("Parameters: " + formatParameters(ddContext));
-
-        RDFService rdfService = ddContext.getRequestModels().getRDFService();
+        RDFService rdfService;
+        if (GraphBuilderUtilities.isLanguageFilteringDisabledForRequest(ddContext)) {
+            rdfService = ModelAccess.getInstance().getRDFService();
+        } else {
+            rdfService = ddContext.getRequestModels().getRDFService();
+        }
         Model m = ModelFactory.createDefaultModel();
 
         for (String rawQuery : rawQueries) {
@@ -109,4 +114,5 @@ public Model buildGraph(DataDistributorContext ddContext) throws DataDistributor
         }
         return m;
     }
+
 }

api/src/main/java/edu/cornell/library/scholars/webapp/controller/api/distribute/rdf/graphbuilder/GraphBuilderUtilities.java

@@ -94,4 +94,9 @@ public boolean isAuthorized(AuthorizationRequest actions) {
         }
 
     }
+
+    public static boolean isLanguageFilteringDisabledForRequest(DataDistributorContext ddContext) {
+        String[] lang = ddContext.getRequestParameters().get("lang");
+        return lang != null && lang.length == 1 && "*".equals(lang[0]);
+    }
 }