diff --git a/script.js b/script.js
index a1315f0..137bfdc 100644
--- a/script.js
+++ b/script.js
@@ -1,379 +1,391 @@
-/**
- * EntityShape.js adds an input box to a wikidata page wherein you can enter an entityschema
- * (such as E10). When you click "Check", checks whether each statement and property conforms
- * to the schema. It then displays a summary at the top of the item for each property indicating
- * whether they conform or not. It also adds a badge to each statement and each property on the
- * page indicating whether they conform or not.
- **/
-
-(function() {
-let entityschema_stylesheet = entityschema_getStylesheet();
-$('html > head').append("");
-let entityschema_list = [];
-let value = window.localStorage.getItem("entityschema-auto");
-let schema = window.localStorage.getItem("entityschema");
-
-$(document).ready(function(){
- let property_list = [];
- let item_list = [];
- let entityID = mw.config.get( 'wbEntityId' );
-
- if (value == "true") {
- $("#entityschema-checkbox").prop('checked', true);
- } else {
- $("#entityschema-checkbox").prop('checked', false);
- }
-
- if (entityID) {
- let url = "https://www.wikidata.org/w/api.php?action=wbgetentities&props=claims&format=json&ids=" + entityID;
- $.ajax({
- type: "GET",
- dataType: "json",
- url: url,
- success: function(data){
- let claims = data["entities"][entityID]["claims"];
- for (let claim in claims) {
- property_list.push(claim);
- let statements = claims[claim];
- for (let statement in statements) {
- let mainsnak = statements[statement]["mainsnak"];
- if (mainsnak["datatype"] == "wikibase-item") {
- if (!item_list.includes(mainsnak["datavalue"]["value"]["id"])) {
- item_list.push(mainsnak["datavalue"]["value"]["id"]);
- }
- }
- }
- }
- },
- complete: function() {
- check_entity_for_schemas(item_list)
- check_entity_for_schemas(property_list)
- }
- });
- }
-});
-
-function check_entity_for_schemas(entity_list) {
- for (let item in entity_list) {
- let url = "https://www.wikidata.org/w/api.php?action=wbgetclaims&property=P12861&format=json&entity=" + entity_list[item];
- $.ajax({
- type: "GET",
- dataType: "json",
- url: url,
- success: function(data) {
- if (data["claims"].hasOwnProperty("P12861")) {
- entityschema_list.push(data["claims"]["P12861"][0]["mainsnak"]["datavalue"]["value"]["id"]);
- }
- },
- });
- }
-}
-
-$(document).ajaxStop(function () {
- if (value == "true" && mw.config.get( 'wbEntityId' )) {
- entityschema_update()
- }
- $("#entityschema-entityToCheck:text").val(schema);
- $(this).unbind('ajaxStop');
-});
-
-let entityschema_conditions = ["/wiki/Q", "/wiki/P", "/wiki/L"];
-if (entityschema_conditions.some(el => document.location.pathname.includes(el))) {
- let entityschema_entity_html = '';
- $(entityschema_entity_html).insertAfter("#siteSub");
- $("#entityschema-schemaSearchButton").click(function(){ entityschema_update() });
- $("#entityschema-checkbox").click(function() { entityschema_checkbox() })
-}
-
-$("#entityschema-entityToCheck").on("keyup", function(event){
- if (event.key === "Enter") {
- event.preventDefault();
- $("#entityschema-schemaSearchButton").click();
- return false;
- }
-});
-
-function entityschema_update() {
- let entityschema_entitySchema = $("#entityschema-entityToCheck")[0].value.toUpperCase();
- if (entityschema_entitySchema.length == 0) {
- entityschema_entitySchema = entityschema_list.join(", ")
- window.localStorage.setItem("entityschema", "");
- } else {
- window.localStorage.setItem("entityschema", entityschema_entitySchema);
- }
- if (entityschema_entitySchema.length == 0) {
- $("#entityschemaResponse").append( 'No schemas entered and could not automatically determine schemas to check' );
- } else {
- let entityschema_entityName = document.location.pathname.substring(6);
- let lang = mw.config.get( 'wgUserLanguage' );
- entityschema_checkEntity(entityschema_entityName, entityschema_entitySchema, lang);
- }
-}
-
-function entityschema_checkbox() {
- if ($('#entityschema-checkbox').is(":checked")) {
- window.localStorage.setItem("entityschema-auto", true);
- } else {
- window.localStorage.setItem("entityschema-auto", false);
- }
-}
-
-function entityschema_checkEntity(entity, entitySchema, language) {
- $("#entityschemaResponse").contents().remove();
- $(".entityschema-property").remove();
- $(".entityschema-span").remove();
-
- let url = "https://entityshape.toolforge.org/api/v2?entityschema=" + entitySchema + "&entity=" + entity + "&language=" + language;
- // let url = "http://127.0.0.1:5000/api/v2 ?entityschema=" + entitySchema + "&entity=" + entity + "&language=" + language;
- $.ajax({
- type: "GET",
- dataType: "json",
- url: url,
- beforeSend: function() {
- $(".entityshape-spinner").show();
- },
- success: function(data){
- let html = "";
- for (let i = 0; i < data.schema.length; i++ ) {
- if (data.properties[i]) {
- for (let key in data.properties[i]) {
- let response1 = data.properties[i][key].response;
- let response_class = "";
- switch (response1) {
- case "present":
- response_class = "present";
- break;
- case "correct":
- response_class = "correct";
- break;
- case "missing":
- response_class = "missing";
- break;
- default:
- response_class = "wrong";
- break;
- }
- if (data.properties[i][key].necessity == "absent") {
- if (response1 == "too many statements") {
- response1 = "not allowed";
- }
- }
- if (!response1) {
- response1 = "Not in schema";
- response_class = "notinschema";
- }
- if (response1 == null) {
- response1 = "Not in schema";
- response_class = "notinschema";
- }
- if ($("#" + key)[0]) {
- $("#" + key + " .wikibase-statementgroupview-property-label").append("
" + data.schema[i] + ": " + response1 + "
");
- }
- }
- }
-
- if (data.statements[i]) {
- for (let statement in data.statements[i]) {
- let response2 = data.statements[i][statement].response;
- if (response2 != "not in schema") {
- html = "
" + data.schema[i] + ": " + response2 + "";
- $("div[id='" + statement + "'] .wikibase-toolbar-button-edit").append(html);
- }
- }
- }
- if (data.general[i]) {
- if (data.general[i].language) {
- let response3 = data.general[i].language;
- if (response3 != "not in schema") {
- html = "" + response3 + "";
- $("span[class='language-lexical-category-widget_language']").append(html);
- }
- }
- if (data.general[i].lexicalCategory) {
- let response4 = data.general[i].lexicalCategory;
- if (response4 != "not in schema") {
- html = "" + response4 + "";
- $("span[class='language-lexical-category-widget_lexical-category']").append(html);
- }
- }
- }
- }
-
- const combined_properties = {}
- for (let i = 0; i < data.schema.length; i++ ) {
- for (let key in data.properties[i]) {
- if(!combined_properties.hasOwnProperty(key)){ combined_properties[key] = {}; }
- combined_properties[key]["name"] = data.properties[i][key]["name"]
- if(!combined_properties[key].hasOwnProperty("response")) { combined_properties[key]["response"] = {}; }
- combined_properties[key]["response"][data.schema[i]] = data.properties[i][key]["response"]
- if(!combined_properties[key].hasOwnProperty("necessity")) { combined_properties[key]["necessity"] = {}; }
- combined_properties[key]["necessity"][data.schema[i]] = data.properties[i][key]["necessity"]
- }
- }
-
- for (let key in combined_properties) {
- let necessity = "absent"
- let response = ""
- let response_key = combined_properties[key]["response"]
- let necessity_key = combined_properties[key]["necessity"]
-
- if (Object.values(necessity_key).includes("required")) {
- necessity = "required";
- } else if (Object.values(necessity_key).includes("optional")) {
- necessity = "optional";
- }
-
- if (Object.values(response_key).includes("incorrect")) {
- response = "incorrect";
- } else if (Object.values(response_key).includes("missing")) {
- response = "missing";
- } else if (Object.values(response_key).includes("too many statements")) {
- response = "too many statements";
- } else if (Object.values(response_key).includes("not enough statements")) {
- response = "not enough statements";
- } else if (Object.values(response_key).includes("correct")) {
- response = "correct";
- } else if (Object.values(response_key).includes("present")) {
- response = "present";
- } else if (Object.values(response_key).includes("allowed")) {
- response = "present";
- }
-
- combined_properties[key]["response"]["combined"] = response
- combined_properties[key]["necessity"]["combined"] = necessity;
- }
-
- html += "
Checking against "
- for (let schema in data.schema) {
- html += "" + data.schema[schema] + ":" + data.name[schema] + ' '
- }
- html += ':'
-
- html += '';
- html += '| Required properties | ';
- html += 'Optional properties | ';
- html += 'Other properties | ';
-
- let required_html = '| ';
- let optional_html = ' | ';
- let absent_html = ' | ';
- if (combined_properties) {
- for (let key in combined_properties) {
- let shape_html = "";
- let response1 = combined_properties[key].response.combined;
- let response_class = "";
- switch (response1) {
- case "present":
- response_class = "present";
- break;
- case "allowed":
- response_class = "present";
- break;
- case "correct":
- response_class = "correct";
- break;
- case "missing":
- response_class = "missing";
- break;
- default:
- response_class = "wrong";
- break;
- }
- if (combined_properties[key].necessity.combined == "absent") {
- if (response1 == "too many statements") {
- response1 = "not allowed";
- }
- }
- if (!response1) {
- response1 = "Not in schema";
- response_class = "notinschema";
- }
- if (response1 == null) {
- response1 = "";
- shape_html += ''+ key + " - " + combined_properties[key].name + '
';
- } else {
- shape_html += '' + response1 + ''+ key + " - " + combined_properties[key].name + '
';
- }
- switch (combined_properties[key].necessity.combined){
- case "required":
- required_html += shape_html;
- break;
- case "optional":
- optional_html += shape_html;
- break;
- default:
- absent_html += shape_html;
- break;
- }
- }
- }
- required_html += " | ";
- optional_html += "";
- absent_html += "";
- html += required_html + optional_html + absent_html;
- html += '
" + data.schema[i] + ": " + response1 + "
");
+ }
+ }
+ }
+
+ if (data.statements[i]) {
+ for (let statement in data.statements[i]) {
+ let response2 = data.statements[i][statement].response;
+ if (response2 != "not in schema") {
+ html = "
" + data.schema[i] + ": " + response2 + "";
+ $("div[id='" + statement + "'] .wikibase-toolbar-button-edit").append(html);
+ }
+ }
+ }
+ if (data.general[i]) {
+ if (data.general[i].language) {
+ let response3 = data.general[i].language;
+ if (response3 != "not in schema") {
+ html = "" + response3 + "";
+ $("span[class='language-lexical-category-widget_language']").append(html);
+ }
+ }
+ if (data.general[i].lexicalCategory) {
+ let response4 = data.general[i].lexicalCategory;
+ if (response4 != "not in schema") {
+ html = "" + response4 + "";
+ $("span[class='language-lexical-category-widget_lexical-category']").append(html);
+ }
+ }
+ }
+ }
+
+ const combined_properties = {}
+ for (let i = 0; i < data.schema.length; i++ ) {
+ for (let key in data.properties[i]) {
+ if(!combined_properties.hasOwnProperty(key)){ combined_properties[key] = {}; }
+ combined_properties[key]["name"] = data.properties[i][key]["name"]
+ if(!combined_properties[key].hasOwnProperty("response")) { combined_properties[key]["response"] = {}; }
+ combined_properties[key]["response"][data.schema[i]] = data.properties[i][key]["response"]
+ if(!combined_properties[key].hasOwnProperty("necessity")) { combined_properties[key]["necessity"] = {}; }
+ combined_properties[key]["necessity"][data.schema[i]] = data.properties[i][key]["necessity"]
+ }
+ }
+
+ for (let key in combined_properties) {
+ let necessity = "absent"
+ let response = ""
+ let response_key = combined_properties[key]["response"]
+ let necessity_key = combined_properties[key]["necessity"]
+
+ if (Object.values(necessity_key).includes("required")) {
+ necessity = "required";
+ } else if (Object.values(necessity_key).includes("optional")) {
+ necessity = "optional";
+ }
+
+ if (Object.values(response_key).includes("incorrect")) {
+ response = "incorrect";
+ } else if (Object.values(response_key).includes("missing")) {
+ response = "missing";
+ } else if (Object.values(response_key).includes("too many statements")) {
+ response = "too many statements";
+ } else if (Object.values(response_key).includes("not enough statements")) {
+ response = "not enough statements";
+ } else if (Object.values(response_key).includes("correct")) {
+ response = "correct";
+ } else if (Object.values(response_key).includes("present")) {
+ response = "present";
+ } else if (Object.values(response_key).includes("allowed")) {
+ response = "present";
+ }
+
+ combined_properties[key]["response"]["combined"] = response
+ combined_properties[key]["necessity"]["combined"] = necessity;
+ }
+
+ html += "
Checking against "
+ for (let schema in data.schema) {
+ html += "" + data.schema[schema] + ":" + data.name[schema] + ' '
+ }
+ html += ':'
+
+ html += '';
+ html += '| Required properties | ';
+ html += 'Optional properties | ';
+ html += 'Other properties | ';
+
+ let required_html = '| ';
+ let optional_html = ' | ';
+ let absent_html = ' | ';
+ if (combined_properties) {
+ let other_array = []
+ let other_array_names = []
+ for (let key in combined_properties) {
+ let shape_html = "";
+ let response1 = combined_properties[key].response.combined;
+ let response_class = "";
+ switch (response1) {
+ case "present":
+ response_class = "present";
+ break;
+ case "allowed":
+ response_class = "present";
+ break;
+ case "correct":
+ response_class = "correct";
+ break;
+ case "missing":
+ response_class = "missing";
+ break;
+ default:
+ response_class = "wrong";
+ break;
+ }
+ if (combined_properties[key].necessity.combined == "absent") {
+ if (response1 == "too many statements") {
+ response1 = "not allowed";
+ }
+ }
+ if (!response1) {
+ response1 = "Not in schema";
+ response_class = "notinschema";
+ }
+ if (response1 == null) {
+ response1 = "";
+ shape_html += ''+ key + " - " + combined_properties[key].name + '
';
+ } else if (response1 == "Not in schema") {
+ other_array.push(key)
+ other_array_names.push(combined_properties[key].name)
+ } else {
+ shape_html += '' + response1 + ''+ key + " - " + combined_properties[key].name + '
';
+ }
+ switch (combined_properties[key].necessity.combined) {
+ case "required":
+ required_html += shape_html;
+ break;
+ case "optional":
+ optional_html += shape_html;
+ break;
+ default:
+ absent_html += shape_html;
+ break;
+ }
+ }
+ let other_html = "" + other_array.length + " properties not in any schema checked | ";
+ optional_html += "";
+ absent_html += "";
+ html += required_html + optional_html + absent_html;
+ html += '