after copy

gadelrab · May 7, 2019 · c2288d2 · c2288d2
1 parent f87499e
commit c2288d2
Show file tree

Hide file tree

Showing 193 changed files with 17,045 additions and 99 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.gitmodules b/.gitmodules
diff --git a/Api/pom.xml b/Api/pom.xml
diff --git a/Api/src/main/java/dictionaries/elastic/Entities.java b/Api/src/main/java/dictionaries/elastic/Entities.java
diff --git a/Api/src/main/java/web/data/Paraphrase.java b/Api/src/main/java/web/data/Paraphrase.java
diff --git a/Api/src/main/java/web/data/Query.java b/Api/src/main/java/web/data/Query.java
@@ -21,8 +21,8 @@ public class Query /*extends QueryExplanations*/{
     String rules;
 
     List<String> kgs=new ArrayList<>();
-    List<String> text=new ArrayList<>();
-    List<String> textWeight=new ArrayList<>();
+    List<TextualSource> textualSources=new ArrayList<>();
+
 
     int numOfRules=5;
     int numOfexplan=5;
@@ -39,13 +39,11 @@ public void setKgs(List<String> kgs) {
         this.kgs = kgs;
     }
 
-    public void setText(List<String> text) {
-        this.text = text;
-    }
 
-    public void setTextWeight(List<String> textWeight) {
-        this.textWeight = textWeight;
-    }
+
+//    public void setTextWeight(List<String> textWeight) {
+//        this.textWeight = textWeight;
+//    }
 
     public void setNumOfRules(int numOfRules) {
         this.numOfRules = numOfRules;
@@ -59,14 +57,19 @@ public List<String> getKgs() {
         return kgs;
     }
 
-    public List<String> getText() {
-        return text;
+
+    public void setTextualSources(List<TextualSource> textualSources) {
+        this.textualSources = textualSources;
     }
 
-    public List<String> getTextWeight() {
-        return textWeight;
+    public List<TextualSource> getTextualSources() {
+        return textualSources;
     }
 
+//    public List<String> getTextWeight() {
+//        return textWeight;
+//    }
+
     public int getNumOfRules() {
         return numOfRules;
     }
@@ -104,6 +107,14 @@ public Query(int id, String name, String subject, String predicate, String objec
 
     }
 
+    public void addKg(String kgName){
+        kgs.add(kgName);
+    }
+
+    public void addTextualSource(TextualSource textualSource){
+        textualSources.add(textualSource);
+    }
+
     public Query() {
     }
 

diff --git a/Api/src/main/java/web/data/TextualSource.java b/Api/src/main/java/web/data/TextualSource.java
@@ -0,0 +1,12 @@
+package web.data;
+
+public class TextualSource {
+
+    String sourceName;
+    Double weight;
+
+    public TextualSource(String sourceName, Double weight) {
+        this.sourceName = sourceName;
+        this.weight = weight;
+    }
+}
diff --git a/Client/pom.xml b/Client/pom.xml
diff --git a/Client/src/main/java/client/explain/ExplanationExtractorClient.java b/Client/src/main/java/client/explain/ExplanationExtractorClient.java
diff --git a/Client/src/main/resources/server.cofig b/Client/src/main/resources/server.cofig
diff --git a/Extras/pom.xml b/Extras/pom.xml
diff --git a/Extras/src/main/java/de/mpii/exfakt/dictionary/builder/ExtractorCLI.java b/Extras/src/main/java/de/mpii/exfakt/dictionary/builder/ExtractorCLI.java
diff --git a/Extras/src/main/java/de/mpii/exfakt/dictionary/builder/extractors/LabelsExtractor.java b/Extras/src/main/java/de/mpii/exfakt/dictionary/builder/extractors/LabelsExtractor.java
diff --git a/...s/src/main/java/de/mpii/exfakt/dictionary/builder/extractors/LabelsExtractorWikidata.java b/...s/src/main/java/de/mpii/exfakt/dictionary/builder/extractors/LabelsExtractorWikidata.java
diff --git a/Extras/src/main/java/de/mpii/exfakt/dictionary/builder/extractors/LabelsExtractorYago.java b/Extras/src/main/java/de/mpii/exfakt/dictionary/builder/extractors/LabelsExtractorYago.java
diff --git a/Extras/src/main/java/de/mpii/exfakt/dictionary/builder/extractors/wikidata/Helper.java b/Extras/src/main/java/de/mpii/exfakt/dictionary/builder/extractors/wikidata/Helper.java
diff --git a/Extras/src/main/resources/dictionary_mapping.json b/Extras/src/main/resources/dictionary_mapping.json
diff --git a/QueryRewriting/libs/iris-api-0.8.2.jar b/QueryRewriting/libs/iris-api-0.8.2.jar
diff --git a/QueryRewriting/libs/iris-impl-0.8.2.jar b/QueryRewriting/libs/iris-impl-0.8.2.jar
diff --git a/QueryRewriting/libs/iris-parser-0.8.2.jar b/QueryRewriting/libs/iris-parser-0.8.2.jar
diff --git a/QueryRewriting/pom.xml b/QueryRewriting/pom.xml
diff --git a/QueryRewriting/src/main/java/DocumentCollector.java b/QueryRewriting/src/main/java/DocumentCollector.java
diff --git a/QueryRewriting/src/main/java/JSONConverter.java b/QueryRewriting/src/main/java/JSONConverter.java
diff --git a/QueryRewriting/src/main/java/MainCLI.java b/QueryRewriting/src/main/java/MainCLI.java
diff --git a/QueryRewriting/src/main/java/checker/ExplanationsExtractor.java b/QueryRewriting/src/main/java/checker/ExplanationsExtractor.java
diff --git a/QueryRewriting/src/main/java/checker/FactChecker.java b/QueryRewriting/src/main/java/checker/FactChecker.java
diff --git a/QueryRewriting/src/main/java/checker/IDeepChecker.java b/QueryRewriting/src/main/java/checker/IDeepChecker.java
diff --git a/QueryRewriting/src/main/java/config/Configuration.java b/QueryRewriting/src/main/java/config/Configuration.java
diff --git a/QueryRewriting/src/main/java/datastructure/CorrectnessInfo.java b/QueryRewriting/src/main/java/datastructure/CorrectnessInfo.java
diff --git a/QueryRewriting/src/main/java/experiments/DatalogProgramExecuter.java b/QueryRewriting/src/main/java/experiments/DatalogProgramExecuter.java
diff --git a/QueryRewriting/src/main/java/experiments/EvaluateLabels.java b/QueryRewriting/src/main/java/experiments/EvaluateLabels.java
diff --git a/QueryRewriting/src/main/java/experiments/TruthAssessmentNadpaDataset.java b/QueryRewriting/src/main/java/experiments/TruthAssessmentNadpaDataset.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/CostAccumulator.java b/QueryRewriting/src/main/java/extendedsldnf/CostAccumulator.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/EvaluatorFactory.java b/QueryRewriting/src/main/java/extendedsldnf/EvaluatorFactory.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/ExtendedSLDNFEvaluationStrategy.java b/QueryRewriting/src/main/java/extendedsldnf/ExtendedSLDNFEvaluationStrategy.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/ExtendedSLDNFEvaluationStrategyFactory.java b/QueryRewriting/src/main/java/extendedsldnf/ExtendedSLDNFEvaluationStrategyFactory.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/FactsUtils.java b/QueryRewriting/src/main/java/extendedsldnf/FactsUtils.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/IExplanationGenerator.java b/QueryRewriting/src/main/java/extendedsldnf/IExplanationGenerator.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/ItrSLDEvaluator.java b/QueryRewriting/src/main/java/extendedsldnf/ItrSLDEvaluator.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/OptimizedLiteralSelector.java b/QueryRewriting/src/main/java/extendedsldnf/OptimizedLiteralSelector.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/RecSLDEvaluator.java b/QueryRewriting/src/main/java/extendedsldnf/RecSLDEvaluator.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/AbstractQueriesPool.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/AbstractQueriesPool.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/DFSQueriesPool.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/DFSQueriesPool.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/EvidenceNode.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/EvidenceNode.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/Explanation.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/Explanation.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/ExtQuerySubs.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/ExtQuerySubs.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/ExtendedFacts.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/ExtendedFacts.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/HeuristicBasedQueriesPool.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/HeuristicBasedQueriesPool.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/IExtendedFacts.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/IExtendedFacts.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/IQueriesPool.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/IQueriesPool.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/IQueryExplanations.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/IQueryExplanations.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/InputQuery.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/InputQuery.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/QueriesPoolFactory.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/QueriesPoolFactory.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/QueryExplanations.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/QueryExplanations.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/facts/FactsLoaderFactory.java b/QueryRewriting/src/main/java/extendedsldnf/facts/FactsLoaderFactory.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/facts/IFactsLoader.java b/QueryRewriting/src/main/java/extendedsldnf/facts/IFactsLoader.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/facts/IRISFactsLoader.java b/QueryRewriting/src/main/java/extendedsldnf/facts/IRISFactsLoader.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/facts/RDFFactsLoader.java b/QueryRewriting/src/main/java/extendedsldnf/facts/RDFFactsLoader.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/rules/IRulesSelector.java b/QueryRewriting/src/main/java/extendedsldnf/rules/IRulesSelector.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/rules/SimpleRuleSelector.java b/QueryRewriting/src/main/java/extendedsldnf/rules/SimpleRuleSelector.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/viewing/ExecutionNode.java b/QueryRewriting/src/main/java/extendedsldnf/viewing/ExecutionNode.java
diff --git a/QueryRewriting/src/main/java/extendedsldnf/viewing/ExecutionTree.java b/QueryRewriting/src/main/java/extendedsldnf/viewing/ExecutionTree.java
diff --git a/QueryRewriting/src/main/java/text/FactSpottingConnector.java b/QueryRewriting/src/main/java/text/FactSpottingConnector.java
diff --git a/QueryRewriting/src/main/java/text/FactSpottingResult.java b/QueryRewriting/src/main/java/text/FactSpottingResult.java
diff --git a/QueryRewriting/src/main/java/text/ITextConnector.java b/QueryRewriting/src/main/java/text/ITextConnector.java
diff --git a/QueryRewriting/src/main/java/utils/Converter.java b/QueryRewriting/src/main/java/utils/Converter.java
diff --git a/QueryRewriting/src/main/java/utils/DataUtils.java b/QueryRewriting/src/main/java/utils/DataUtils.java
diff --git a/QueryRewriting/src/main/java/utils/Enums.java b/QueryRewriting/src/main/java/utils/Enums.java
diff --git a/QueryRewriting/src/main/java/utils/RelativeRulesCollector.java b/QueryRewriting/src/main/java/utils/RelativeRulesCollector.java
diff --git a/QueryRewriting/src/main/java/utils/RulesSyntaxChecker.java b/QueryRewriting/src/main/java/utils/RulesSyntaxChecker.java
diff --git a/QueryRewriting/src/main/java/utils/StringUtils.java b/QueryRewriting/src/main/java/utils/StringUtils.java
diff --git a/QueryRewriting/src/main/java/utils/SyncCounter.java b/QueryRewriting/src/main/java/utils/SyncCounter.java
diff --git a/QueryRewriting/src/main/java/utils/eval/QueryExplanationsStats.java b/QueryRewriting/src/main/java/utils/eval/QueryExplanationsStats.java
diff --git a/QueryRewriting/src/main/java/utils/eval/ResultsEvaluator.java b/QueryRewriting/src/main/java/utils/eval/ResultsEvaluator.java
diff --git a/QueryRewriting/src/main/java/utils/eval/WebResults.java b/QueryRewriting/src/main/java/utils/eval/WebResults.java
diff --git a/QueryRewriting/src/main/java/utils/json/CustomGson.java b/QueryRewriting/src/main/java/utils/json/CustomGson.java
diff --git a/QueryRewriting/src/main/java/utils/json/adapters/ILiteralAdapter.java b/QueryRewriting/src/main/java/utils/json/adapters/ILiteralAdapter.java
diff --git a/QueryRewriting/src/main/java/utils/json/adapters/IQueryAdapter.java b/QueryRewriting/src/main/java/utils/json/adapters/IQueryAdapter.java
diff --git a/QueryRewriting/src/main/java/utils/json/adapters/IRuleAdapter.java b/QueryRewriting/src/main/java/utils/json/adapters/IRuleAdapter.java
diff --git a/QueryRewriting/src/main/java/utils/json/adapters/ITermJsonAdapter.java b/QueryRewriting/src/main/java/utils/json/adapters/ITermJsonAdapter.java
diff --git a/QueryRewriting/src/main/java/utils/json/adapters/IVariableJsonAdapter.java b/QueryRewriting/src/main/java/utils/json/adapters/IVariableJsonAdapter.java
diff --git a/QueryRewriting/src/main/java/utils/json/adapters/SpottedEvidenceJsonAdapter.java b/QueryRewriting/src/main/java/utils/json/adapters/SpottedEvidenceJsonAdapter.java
diff --git a/QueryRewriting/src/main/java/utils/json/adapters/TActionTypeIntHashMapAdapter.java b/QueryRewriting/src/main/java/utils/json/adapters/TActionTypeIntHashMapAdapter.java
diff --git a/QueryRewriting/src/main/resources/fact_checking_rewriting.properties b/QueryRewriting/src/main/resources/fact_checking_rewriting.properties
diff --git a/QueryRewriting/src/main/resources/fact_checking_rewriting.properties.bac_may b/QueryRewriting/src/main/resources/fact_checking_rewriting.properties.bac_may
diff --git a/QueryRewriting/src/main/resources/fact_checking_rewriting.properties.backup b/QueryRewriting/src/main/resources/fact_checking_rewriting.properties.backup
diff --git a/QueryRewriting/src/main/resources/log4j.properties b/QueryRewriting/src/main/resources/log4j.properties
diff --git a/QueryRewriting/src/main/resources/log4j2.properties b/QueryRewriting/src/main/resources/log4j2.properties
diff --git a/QueryRewriting/src/main/resources/simple.properties b/QueryRewriting/src/main/resources/simple.properties
diff --git a/README.md b/README.md
diff --git a/WebService/LICENSE b/WebService/LICENSE
diff --git a/WebService/README.md b/WebService/README.md
diff --git a/WebService/app/EbeanServerProvider.java b/WebService/app/EbeanServerProvider.java
diff --git a/WebService/app/Module.java b/WebService/app/Module.java
diff --git a/WebService/app/controllers/AsyncController.java b/WebService/app/controllers/AsyncController.java
diff --git a/WebService/app/controllers/Evaluation.java b/WebService/app/controllers/Evaluation.java
diff --git a/WebService/app/controllers/Explanations.java b/WebService/app/controllers/Explanations.java
diff --git a/WebService/app/views/eval_main.scala.html b/WebService/app/views/eval_main.scala.html
diff --git a/WebService/app/views/evaluation.scala.html b/WebService/app/views/evaluation.scala.html
diff --git a/WebService/app/views/explain_form.scala.html b/WebService/app/views/explain_form.scala.html
diff --git a/WebService/app/views/explan_card.scala.html b/WebService/app/views/explan_card.scala.html
diff --git a/WebService/app/views/explans.scala.html b/WebService/app/views/explans.scala.html
diff --git a/WebService/app/views/index.scala.html b/WebService/app/views/index.scala.html
diff --git a/WebService/app/views/main.scala.html b/WebService/app/views/main.scala.html
diff --git a/WebService/build.sbt b/WebService/build.sbt
diff --git a/WebService/conf/application.conf b/WebService/conf/application.conf
diff --git a/WebService/conf/ebean.properties b/WebService/conf/ebean.properties
diff --git a/WebService/conf/fact_checking_rewriting.properties b/WebService/conf/fact_checking_rewriting.properties
diff --git a/WebService/conf/log4j2.properties b/WebService/conf/log4j2.properties
diff --git a/WebService/conf/logback.xml b/WebService/conf/logback.xml
diff --git a/WebService/conf/routes b/WebService/conf/routes
diff --git a/WebService/pom.xml b/WebService/pom.xml
diff --git a/WebService/project/build.properties b/WebService/project/build.properties
diff --git a/WebService/project/plugins.sbt b/WebService/project/plugins.sbt
diff --git a/WebService/public/images/external.png b/WebService/public/images/external.png
diff --git a/WebService/public/images/favicon.png b/WebService/public/images/favicon.png
diff --git a/WebService/public/images/header-pattern.png b/WebService/public/images/header-pattern.png
diff --git a/WebService/public/javascripts/hello.js b/WebService/public/javascripts/hello.js
diff --git a/WebService/public/stylesheets/main.css b/WebService/public/stylesheets/main.css
diff --git a/WebService/public/stylesheets/theme.css b/WebService/public/stylesheets/theme.css
diff --git a/WebService/public/stylesheets/theme.scss b/WebService/public/stylesheets/theme.scss
diff --git a/WebService/test/BrowserTest.java b/WebService/test/BrowserTest.java
diff --git a/WebService/test/FunctionalTest.java b/WebService/test/FunctionalTest.java
diff --git a/WebService/test/UnitTest.java b/WebService/test/UnitTest.java
diff --git a/WebService2/app/Module.java b/WebService2/app/Module.java
diff --git a/WebService2/app/controllers/AsyncController.java b/WebService2/app/controllers/AsyncController.java
diff --git a/WebService2/app/controllers/Evaluation.java b/WebService2/app/controllers/Evaluation.java
diff --git a/WebService2/app/controllers/Explanations.java b/WebService2/app/controllers/Explanations.java
diff --git a/WebService2/app/views/eval_main.scala.html b/WebService2/app/views/eval_main.scala.html
diff --git a/WebService2/app/views/evaluation.scala.html b/WebService2/app/views/evaluation.scala.html
diff --git a/WebService2/app/views/explain_form.scala.html b/WebService2/app/views/explain_form.scala.html
diff --git a/WebService2/app/views/explan_card.scala.html b/WebService2/app/views/explan_card.scala.html
diff --git a/WebService2/app/views/explans.scala.html b/WebService2/app/views/explans.scala.html
diff --git a/WebService2/app/views/index.scala.html b/WebService2/app/views/index.scala.html
diff --git a/WebService2/app/views/main.scala.html b/WebService2/app/views/main.scala.html
diff --git a/WebService2/build.gradle b/WebService2/build.gradle
diff --git a/WebService2/build.sbt b/WebService2/build.sbt
diff --git a/WebService2/conf/application.conf b/WebService2/conf/application.conf
diff --git a/WebService2/conf/exfakt_demo.properties b/WebService2/conf/exfakt_demo.properties
diff --git a/WebService2/conf/exfakt_local.properties b/WebService2/conf/exfakt_local.properties
diff --git a/WebService2/conf/factspotting_demo.properties b/WebService2/conf/factspotting_demo.properties
diff --git a/WebService2/conf/log4j2.properties b/WebService2/conf/log4j2.properties
diff --git a/WebService2/conf/logback.xml b/WebService2/conf/logback.xml
diff --git a/WebService2/conf/routes b/WebService2/conf/routes
diff --git a/WebService2/conf/webservice.properties b/WebService2/conf/webservice.properties
diff --git a/WebService2/gradle/wrapper/gradle-wrapper.properties b/WebService2/gradle/wrapper/gradle-wrapper.properties
diff --git a/WebService2/gradlew b/WebService2/gradlew
diff --git a/WebService2/gradlew.bat b/WebService2/gradlew.bat
@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/WebService2/pom.xml b/WebService2/pom.xml
diff --git a/WebService2/project/build.properties b/WebService2/project/build.properties
diff --git a/WebService2/project/plugins.sbt b/WebService2/project/plugins.sbt
diff --git a/WebService2/project/scaffold.sbt b/WebService2/project/scaffold.sbt
diff --git a/WebService2/public/images/favicon.png b/WebService2/public/images/favicon.png
diff --git a/WebService2/public/javascripts/main.js b/WebService2/public/javascripts/main.js
diff --git a/WebService2/public/stylesheets/main.css b/WebService2/public/stylesheets/main.css
diff --git a/WebService2/public/stylesheets/theme.css b/WebService2/public/stylesheets/theme.css
diff --git a/WebService2/public/stylesheets/theme.scss b/WebService2/public/stylesheets/theme.scss
diff --git a/WebService2/sbt-dist/bin/sbt-launch.jar b/WebService2/sbt-dist/bin/sbt-launch.jar
diff --git a/WebService2/sbt-dist/bin/sbt.bat b/WebService2/sbt-dist/bin/sbt.bat
diff --git a/WebService2/sbt-dist/conf/sbtconfig.txt b/WebService2/sbt-dist/conf/sbtconfig.txt
diff --git a/WebService2/sbt-dist/conf/sbtopts b/WebService2/sbt-dist/conf/sbtopts
diff --git a/WebService2/sbt.bat b/WebService2/sbt.bat
@@ -1,3 +1,3 @@
-@REM SBT launcher script
-
-.\sbt-dist\bin\sbt.bat %*
+@REM SBT launcher script
+
+.\sbt-dist\bin\sbt.bat %*
diff --git a/WebService2/test/controllers/HomeControllerTest.java b/WebService2/test/controllers/HomeControllerTest.java
diff --git a/data/bingResults.csv b/data/bingResults.csv
@@ -0,0 +1,93 @@
+query,result_size,documents
+Albert Einstein was born in  Ulm,5,"<div>
+<p>
+  <b><a href=\""www.einstein-website.de/z_biography/ulm-e.html\"">&#57344;Albert Einstein&#57345; &#57344;in Ulm&#57345;</a></b>
+  <br/>
+&#57344;ALBERT EINSTEIN&#57345; &#57344;IN ULM&#57345;, 1879 - 1880. Hermann &#57344;Einstein&#57345; (1847-1902), &#57344;born&#57345; in Buchau on the Federsee and merchant &#57344;in Ulm&#57345;, married 18 year-old Pauline Koch (1858-1920) from Cannstatt, the daughter of a purveyor to the royal household and corn-merchant in Stuttgart, on August 8, 1876.
+  <br/>
+  <b><a href=\""www.einstein-website.de/z_biography/ulm-e.html\"">www.einstein-website.de/z_biography/ulm-e.html</a></b>
+  </p>
+</div>
+<div>
+<p>
+  <b><a href=\""https://en.wikipedia.org/wiki/Albert_Einstein\"">&#57344;Albert Einstein&#57345; - &#57344;Wikipedia&#57345;</a></b>
+  <br/>
+&#57344;Albert Einstein was born in Ulm&#57345;, in the Kingdom of W&uuml;rttemberg in the German Empire, on 14 March 1879. His parents were Hermann &#57344;Einstein&#57345;, a salesman and engineer, and Pauline Koch.
+  <br/>
+  <b><a href=\""https://en.wikipedia.org/wiki/Albert_Einstein\"">https://en.wikipedia.org/wiki/Albert_Einstein</a></b>
+  </p>
+</div>
+<div>
+<p>
+  <b><a href=\""https://www.biography.com/people/albert-einstein-9285408\"">&#57344;Albert Einstein&#57345; &#57344;Biography&#57345; - &#57344;Biography&#57345;</a></b>
+  <br/>
+&#57344;Biography.com&#57345; offers a glimpse into the life of &#57344;Albert Einstein&#57345;, the most influential physicist of the 20th century who developed the theory of relativity.
+  <br/>
+  <b><a href=\""https://www.biography.com/people/albert-einstein-9285408\"">https://www.biography.com/people/albert-einstein-9285408</a></b>
+  </p>
+</div>
+<div>
+<p>
+  <b><a href=\""https://www.history.com/this-day-in-history/albert-einstein-born\"">&#57344;Albert&#57345; &#57344;Einstein&#57345; &#57344;born&#57345; - Mar 14, 1879 - &#57344;HISTORY.com&#57345;</a></b>
+  <br/>
+On this day in History, &#57344;Albert&#57345; &#57344;Einstein&#57345; &#57344;born&#57345; on Mar 14, 1879. Learn more about what happened today on History.
+  <br/>
+  <b><a href=\""https://www.history.com/this-day-in-history/albert-einstein-born\"">https://www.history.com/this-day-in-history/albert-einstein-born</a></b>
+  </p>
+</div>
+<div>
+<p>
+  <b><a href=\""www.imdb.com/name/nm0251868/bio\"">&#57344;Albert Einstein&#57345; - Biography - &#57344;IMDb&#57345;</a></b>
+  <br/>
+&#57344;Albert Einstein was born in Ulm&#57345;, Kingdom of W&uuml;rttemberg, to a German Jewish family. He was the son of Pauline (Koch) and Hermann &#57344;Einstein&#57345;, a ...
+  <br/>
+  <b><a href=\""www.imdb.com/name/nm0251868/bio\"">www.imdb.com/name/nm0251868/bio</a></b>
+  </p>
+</div>
+"
+Barak Obama was born in  U S A,5,"<div>
+<p>
+  <b><a href=\""https://en.wikipedia.org/wiki/Barack_Obama\"">&#57344;Barack Obama&#57345; - &#57344;Wikipedia&#57345;</a></b>
+  <br/>
+The &#57344;Obama&#57345; Presidential Center is the planned presidential library of &#57344;Barack Obama&#57345;. The center will be hosted by the University of Chicago, ...
+  <br/>
+  <b><a href=\""https://en.wikipedia.org/wiki/Barack_Obama\"">https://en.wikipedia.org/wiki/Barack_Obama</a></b>
+  </p>
+</div>
+<div>
+<p>
+  <b><a href=\""https://en.wikipedia.org/wiki/Barack_Obama_citizenship_conspiracy...\"">&#57344;Barack Obama&#57345; citizenship conspiracy theories - &#57344;Wikipedia&#57345;</a></b>
+  <br/>
+During Barack &#57344;Obama&#57345;'&#57344;s&#57345; campaign for president in 2008, throughout his presidency, and afterwards, a number of conspiracy theories falsely asserted &#57344;Obama&#57345; was ineligible to be President of the United States because he was not a natural-&#57344;born&#57345; citizen of the United States as required by Article Two of the &#57344;U&#57345;.&#57344;S&#57345;. Constitution.
+  <br/>
+  <b><a href=\""https://en.wikipedia.org/wiki/Barack_Obama_citizenship_conspiracy...\"">https://en.wikipedia.org/wiki/Barack_Obama_citizenship_conspiracy...</a></b>
+  </p>
+</div>
+<div>
+<p>
+  <b><a href=\""https://www.newsmax.com/FastFeatures/Barack-Obama-Citizenship...\"">Citizenship Scandal: 7 Facts About Barack &#57344;Obama&#57345;'&#57344;s&#57345; Birth ...</a></b>
+  <br/>
+PLEASE NOTE: All information presented on &#57344;Newsmax.com&#57345; is for informational purposes only. It is not specific medical advice for any individual.
+  <br/>
+  <b><a href=\""https://www.newsmax.com/FastFeatures/Barack-Obama-Citizenship...\"">https://www.newsmax.com/FastFeatures/Barack-Obama-Citizenship...</a></b>
+  </p>
+</div>
+<div>
+<p>
+  <b><a href=\""https://www.youtube.com/watch?v=cQcd41RO25k\"">Barack &#57344;Obama&#57345; Admits he &#57344;was born&#57345; in Kenya Speech - &#57344;YouTube&#57345;</a></b>
+  <br/>
+Want music and videos with zero ads? Get &#57344;YouTube&#57345; Red. Working... Not now Try it free. Find out why Close. Barack &#57344;Obama&#57345; Admits he &#57344;was born&#57345; in Kenya Speech
+  <br/>
+  <b><a href=\""https://www.youtube.com/watch?v=cQcd41RO25k\"">https://www.youtube.com/watch?v=cQcd41RO25k</a></b>
+  </p>
+</div>
+<div>
+<p>
+  <b><a href=\""https://www.history.com/topics/us-presidents/barack-obama\"">Barack &#57344;Obama&#57345; - &#57344;U&#57345;.&#57344;S&#57345;. Presidents - &#57344;HISTORY.com&#57345;</a></b>
+  <br/>
+Find out more about the history of Barack &#57344;Obama&#57345;, including videos, interesting articles, pictures, historical features and more. Get all the facts on &#57344;HISTORY.com&#57345;
+  <br/>
+  <b><a href=\""https://www.history.com/topics/us-presidents/barack-obama\"">https://www.history.com/topics/us-presidents/barack-obama</a></b>
+  </p>
+</div>
+"
diff --git a/data/exper2_queries.tsv b/data/exper2_queries.tsv