Merge pull request #16 from MrIbrahem/update

z

Author: MrIbrahem

.gitignore

@@ -20,3 +20,4 @@ python/src/no_data_tab.json
 public_html/web.config
 /public_html
 python/src/static/js/duplicate_lemmas2.js
+python/src/static/js/‏‏duplicate_lemmas - نسخة.js

python/src/static/js/duplicate_lemmas.js

@@ -106,7 +106,6 @@ async function get_wdresult(same_category = false) {
             WHERE {
             {
                 SELECT DISTINCT *
-                #?1_item ?2_item ?lemma ?1_category ?2_category
                         WHERE
                         {
                         # values ?lemma {"أنتما"@ar }
@@ -155,7 +154,7 @@ async function get_wdresult(same_category = false) {
 async function get_data_dup(same_category) {
     let wdresult = await get_wdresult(same_category);
     // ---
-    console.table(wdresult);
+    // console.table(wdresult);
     // ---
     wdresult = convertData(wdresult);
     // ---

python/src/static/js/lex/find_labels.js

@@ -1,20 +1,95 @@
+
+let urls_types = {
+    // "P": "https://www.wikidata.org/w/rest.php/wikibase/v1/entities/properties/$1/labels", // {"ar": "", "en": ""}
+    "Q": "https://www.wikidata.org/w/rest.php/wikibase/v1/entities/items/$1/labels",     // {"ar": "", "en": ""}
+    "L": "https://www.wikidata.org/wiki/Special:EntityData/$1.json",                      // entities.lemmas
+};
+
 async function find_labels() {
+    const spans = document.querySelectorAll("span[find-label]");
+    console.log(`find_labels: ${spans.length}`);
+
+    spans.forEach(async (span) => {
+        const qid = span.getAttribute("find-label");
+        const both = span.getAttribute("find-label-both");
+        const noCache = span.getAttribute("no-cache");
+        if (!qid) return;
+
+        const cached = localStorage.getItem(`wikidata-label-2-${qid}`);
+        if (cached && !noCache) {
+            span.textContent = cached;
+            return;
+        }
+
+        try {
+            const prefix = qid.charAt(0).toUpperCase();
+            const urlTemplate = urls_types[prefix] || urls_types["L"];
+            const url = urlTemplate.replace("$1", qid);
+
+            let urls_load = $("#urls_load");
+            if (urls_load.length) {
+                let link = `<a href="${url}" target="_blank">${url}</a>`;
+                urls_load.append(`<li>${link}</li>`);
+            }
+
+            const response = await fetch(url);
+            if (!response.ok) throw new Error("فشل في جلب البيانات");
+
+            const data = await response.json();
+
+            let labelAr;
+
+            if (urls_types[prefix] && (prefix === "Q" || prefix === "P")) {
+                labelAr = data?.ar || data?.en || data?.mul || qid;
+            } else {
+                const entity = data.entities[qid];
+                if (entity?.type === "lexeme") {
+                    labelAr = Object.values(entity.lemmas || {})
+                        .map(l => l.value)
+                        .filter(Boolean)
+                        .join(" / ") || "(غير متوفر)";
+                } else {
+                    let labels = entity?.labels || {};
+                    labelAr = labels?.ar?.value || labels?.en?.value || labels?.mul?.value ||  "(غير متوفر)";
+                }
+            }
+
+            if (labelAr) {
+                const labelFinal = both ? `${labelAr} (${qid})` : labelAr;
+                span.textContent = labelFinal;
+                localStorage.setItem(`wikidata-label-2-${qid}`, labelFinal);
+            }
+
+        } catch (error) {
+            console.error(`خطأ في جلب الاسم لـ ${qid}:`, error);
+        }
+    });
+}
+
+async function find_labels_old() {
     const spans = document.querySelectorAll("span[find-label]");
     console.log(`find_labels: ${spans.length}`)
     spans.forEach(async (span) => {
         const qid = span.getAttribute("find-label");
         const both = span.getAttribute("find-label-both");
+        const noCache = span.getAttribute("no-cache");
         if (!qid) return;
 
         // حاول الحصول على الاسم من localStorage أولاً
         const cached = localStorage.getItem(`wikidata-label-2-${qid}`);
-        if (cached) {
+        if (cached && !noCache) {
             span.textContent = cached;
             return;
         }
 
         try {
             const url = `https://www.wikidata.org/wiki/Special:EntityData/${qid}.json`;
+            let urls_load = $("#urls_load");
+            if (urls_load.length) {
+                let link = `<a href="${url}" target="_blank">${qid}</a>`;
+                urls_load.append(`<li>${link}</li>`);
+            }
+
             const response = await fetch(url);
             if (!response.ok) throw new Error("فشل في جلب البيانات");
 
@@ -40,3 +115,4 @@ async function find_labels() {
         }
     });
 }
+

python/src/static/js/lex/lex.js

@@ -446,9 +446,7 @@ async function Q24905(entity) {
         // display_mt_cells[verb] = [number, row, col, gender].includes("");
         display_mt_cells[verb] = [number, col, gender].includes("");
         //
-        if (display_mt_cells[verb]) {
-            console.table(form.id);
-        }
+        // if (display_mt_cells[verb]) { console.table(form.id); }
     }
     // ---
     let result = "";