Add guides and catalogs to OA

OA.html

@@ -125,8 +125,21 @@
 											<button id="btn_schedastorica" type="button" class="nav-link" data-toggle="tab" onClick="show_INV()">Scheda Storica</button>
 										</li>
 										<li class="nav-item infoChoice">
-											<button id="btn_catalogo" type="button" class="nav-link" data-toggle="tab" onClick="show_CAT()">Catalogo Marchini</button>
+											<button id="btn_guasti1858" type="button" class="nav-link" data-toggle="tab" onClick="show_G1858()">Guida Guasti 1858</button>
 										</li>
+										<li class="nav-item infoChoice">
+											<button id="btn_guasti1888" type="button" class="nav-link" data-toggle="tab" onClick="show_G1888()">Guida Guasti 1888</button>
+										</li>
+										<li class="nav-item infoChoice">
+											<button id="btn_papini1912" type="button" class="nav-link" data-toggle="tab" onClick="show_P1912()">Catalogo Papini 1912</button>
+										</li>
+										<li class="nav-item infoChoice">
+											<button id="btn_marchini1956" type="button" class="nav-link" data-toggle="tab" onClick="show_M1956()">Marchini 1956</button>
+										</li>
+										<li class="nav-item infoChoice">
+											<button id="btn_catalogo" type="button" class="nav-link" data-toggle="tab" onClick="show_CAT()">Guida Marchini 1958</button>
+										</li>
+										
 									</ul>
 					
 
@@ -273,6 +286,12 @@
 													</div>
 													<div class="col" id="catalog_description"></div>
 												</div>
+												<div class="row mb-2" id="CAT_CIT">
+													<div class="col-sm-4">
+														<span class="label">Nota:</span>
+													</div>
+													<div class="col" id="catalog_nota">Immagine digitalizzata dall'Archivio di Stato di Prato</div>
+												</div>
 											</div>
 
 											<div id="scheda_info" style="display:none;">
@@ -302,6 +321,128 @@
 												</div>
 											</div>
 
+											<!-- GUASTI 1858 -->
+
+											<div id="guasti1858_info" style="display:none;">
+												<div class="row mb-2" id="G1858_aut">
+													<div class="col-sm-4">
+														<span class="label">Autore:</span>
+													</div>
+													<div class="col author" id="guasti1858_author"></div>
+												</div>
+												<div class="row mb-2" id="G1858_date">
+													<div class="col-sm-4">
+														<span class="label">Data:</span>
+													</div>
+													<div class="col date" id="guasti1858_time"></div>
+												</div>
+												<div class="row mb-2" id="G1858_sub">
+													<div class="col-sm-4">
+														<span class="label">Soggetto:</span>
+													</div>
+													<div class="col subject" id="guasti1858_subject"></div>
+												</div>
+												<div class="row mb-2" id="G1858_des">
+													<div class="col-sm-4">
+														<span class="label">Descrizione:</span>
+													</div>
+													<div class="col" id="guasti1858_description"></div>
+												</div>
+											</div>
+
+											<!-- GUASTI 1888 -->
+
+											<div id="guasti1888_info" style="display:none;">
+												<div class="row mb-2" id="G1888_aut">
+													<div class="col-sm-4">
+														<span class="label">Autore:</span>
+													</div>
+													<div class="col author" id="guasti1888_suthor"></div>
+												</div>
+												<div class="row mb-2" id="G1888_date">
+													<div class="col-sm-4">
+														<span class="label">Data:</span>
+													</div>
+													<div class="col date" id="guasti1888_time"></div>
+												</div>
+												<div class="row mb-2" id="G1888_sub">
+													<div class="col-sm-4">
+														<span class="label">Soggetto:</span>
+													</div>
+													<div class="col subject" id="guasti1888_subject"></div>
+												</div>
+												<div class="row mb-2" id="G1888_des">
+													<div class="col-sm-4">
+														<span class="label">Descrizione:</span>
+													</div>
+													<div class="col" id="guasti1888_description"></div>
+												</div>
+											</div>
+
+											<!-- PAPINI 1912 -->
+
+											<div id="papini1912_info" style="display:none;">
+												<div class="row mb-2" id="P1912_aut">
+													<div class="col-sm-4">
+														<span class="label">Autore:</span>
+													</div>
+													<div class="col author" id="papini1912_author"></div>
+												</div>
+												<div class="row mb-2" id="P1912_date">
+													<div class="col-sm-4">
+														<span class="label">Data:</span>
+													</div>
+													<div class="col date" id="papini1912_time"></div>
+												</div>
+												<div class="row mb-2" id="P1912_sub">
+													<div class="col-sm-4">
+														<span class="label">Soggetto:</span>
+													</div>
+													<div class="col subject" id="papini1912_subject"></div>
+												</div>
+												<div class="row mb-2" id="P1912_des">
+													<div class="col-sm-4">
+														<span class="label">Descrizione:</span>
+													</div>
+													<div class="col" id="papini1912_description"></div>
+												</div>
+											</div>
+
+											<!-- MARCHINI 1956 -->
+
+											<div id="marchini1956_info" style="display:none;">
+												<div class="row mb-2" id="M1956_aut">
+													<div class="col-sm-4">
+														<span class="label">Autore:</span>
+													</div>
+													<div class="col author" id="marchini1956_author"></div>
+												</div>
+												<div class="row mb-2" id="M1956_date">
+													<div class="col-sm-4">
+														<span class="label">Data:</span>
+													</div>
+													<div class="col date" id="marchini1956_time"></div>
+												</div>
+												<div class="row mb-2" id="M1956_sub">
+													<div class="col-sm-4">
+														<span class="label">Soggetto:</span>
+													</div>
+													<div class="col subject" id="marchini1956_subject"></div>
+												</div>
+												<div class="row mb-2" id="M1956_des">
+													<div class="col-sm-4">
+														<span class="label">Descrizione:</span>
+													</div>
+													<div class="col" id="marchini1956_description">Marchini 1956</div>
+												</div>
+												<div class="row mb-2" id="M1956_note">
+													<div class="col-sm-4">
+														<span class="label">Nota:</span>
+													</div>
+													<div class="col" id="marchini1956_nota">Immagine digitalizzata dall'Archivio di Stato di Prato</div>
+												</div>
+											</div>
+
 										</div>
 									</div>
 								</div>
@@ -321,17 +462,19 @@
 										<div id="images_container" class="row border-grey center">
 											<div class="col-2" id="image_min">
 												<div class="row">
-													<div id="image_artwork_min" class="col">
-
-													</div>
+													<div id="image_artwork_min" class="col"></div>
 												
-													<div id="image_scheda_min" class="col" style="display:none;">
-															
-													</div>
+													<div id="image_scheda_min" class="col" style="display:none;"></div>
 												
-													<div class="col" id="image_catalog_min" style="display:none;">
+													<div class="col" id="image_catalog_min" style="display:none;"></div>
 													
-												</div>
+													<div class="col" id="image_guasti1858_min" style="display:none;"></div>
+
+													<div class="col" id="image_guasti1888_min" style="display:none;"></div>
+
+													<div class="col" id="image_papini1912_min" style="display:none;"></div>
+
+													<div class="col" id="image_marchini1956_min" style="display:none;"></div>
 												</div>
 											</div>
 											

Persona.html

@@ -300,6 +300,14 @@
 										</div>
 										<div class="col" id="bioghist"></div>
 									</div>
+
+									<div class="row mb-2" id="REF" style="display:none;">
+										<div class="col-sm-4">
+											<span class="label">Riferimenti esterni:</span>
+										</div>
+										<div class="col" id="same_as"></div>
+									</div>
+
 								</div>
 
 								<div class="col-sm-5 col-md-4 col-lg-3 box-info-image" id="mark_image" style="display:none;">

js/OA.js

@@ -23,6 +23,9 @@ doJsonQuery(queryIcon).done(function(data) { handle_Iconclass(data); });
 var img_pic = "";
 var img_cat = "";
 var img_sc = "";
+var img_g1858 = "";
+var img_g1888 = "";
+var img_p1912 = "";
 
 function handle_OAdata(json) {
 
@@ -126,6 +129,12 @@ function handle_OAdata(json) {
           }
         }
 
+        var subjects = document.getElementsByClassName("subject");
+
+        for (i in subjects) {
+          subjects[i].innerHTML = subject;
+        }
+
         var Buttons = '<button title="Apri risorsa originale" class="btn btn-default" type="button" onclick="schedaASPO(\'' + uri + '\')"> \
         <i class="fas fa-external-link-alt" aria-hidden="true"></i></button> \
         <button title="Citazione" type="button" value="artwork" id="' + uri + '" class="cit btn btn-default" alt="scheda" title="Citazione"><i class="fa fa-quote-right"></i></button> \
@@ -138,7 +147,6 @@ function handle_OAdata(json) {
         document.getElementById("identifier").innerHTML = identifier;
         document.getElementById("type").innerHTML = type;
         document.getElementById("owner").innerHTML = current_owner;
-        document.getElementById("subject").innerHTML = subject;
         document.getElementById("connected_subject").innerHTML = conn_subject;
         document.getElementById("dimensions").innerHTML = dimensions + unit;
         document.getElementById("materials").innerHTML = materials;
@@ -296,21 +304,33 @@ function handle_Bibliography(json) {
 
   var Biblio = "";
   var bibCit = "";
+  var g1858Cit = "";
+  var g1888Cit = "";
+  var p1912Cit = "";
   const bibArray = [];
   var catImg = "";
+  var g1858Img = "";
+  var g1888Img = "";
+  var p1912Img = "";
+  var img_m1956 = "";
 
   $.each(
       json['results']['bindings'],
       function (index, value) {
         var bib = value['bibliography']['value'];
-        var pages = "";  
+        var pages = ""; 
 
         if (value.hasOwnProperty('pages')) {
           pages = value['pages']['value'];
         }
 
         if (value.hasOwnProperty('catalog')) {
-          if (value['catalog']['value'] != "") {
+          var type = "";
+          if (value.hasOwnProperty('type')) {
+            type = value['type']['value'];
+          }
+
+          if (type == "Guida Marchini 1958") {
             bibCit = value['bibliography']['value'] + " " + pages;
             cc = value['catalog']['value'];
             cat = cc.split(", ");
@@ -322,6 +342,47 @@ function handle_Bibliography(json) {
                           </div>';
             }
           }
+          
+
+          if (type == "Guida Guasti 1858") {
+            g1858Cit = value['bibliography']['value'] + " " + pages;
+            cc1858 = value['catalog']['value'];
+            cat1858 = cc1858.split(", ");
+            for (i in cat1858) {
+                var guasti1858 = cat1858[i];
+                img_g1858 = "img/MPP_Guasti_1858/" + guasti1858;
+                g1858Img += '<div class="row"> \
+                              <img class="minImage viewImage" src="img/MPP_Guasti_1858/' + guasti1858 + '" onclick="expandImg(this);" /> \
+                          </div>';
+            }
+          }
+
+          if (type == "Guida Guasti 1888") {
+            g1888Cit = value['bibliography']['value'] + " " + pages;
+            cc1888 = value['catalog']['value'];
+            cat1888 = cc1888.split(", ");
+            for (i in cat1888) {
+                var guasti1888 = cat1888[i];
+                img_g1888 = "img/MPP_Guasti_1888/" + guasti1888;
+                g1888Img += '<div class="row"> \
+                              <img class="minImage viewImage" src="img/MPP_Guasti_1888/' + guasti1888 + '" onclick="expandImg(this);" /> \
+                          </div>';
+            }
+          }
+
+          if (type == "Catalogo Papini 1912") {
+            p1912Cit = value['bibliography']['value'] + " " + pages;
+            cc1912 = value['catalog']['value'];
+            cat1912 = cc1912.split(", ");
+            for (i in cat1912) {
+                var papini1912 = cat1912[i];
+                img_p1912 = "img/MPP_Papini_1912/" + papini1912;
+                p1912Img += '<div class="row"> \
+                              <img class="minImage viewImage" src="img/MPP_Papini_1912/' + papini1912 + '" onclick="expandImg(this);" /> \
+                          </div>';
+            }
+          }
+
         }
 
         
@@ -340,11 +401,30 @@ function handle_Bibliography(json) {
 
       document.getElementById("bibliography").innerHTML = Biblio;
       document.getElementById("catalog_description").innerHTML = bibCit;
+      document.getElementById("guasti1858_description").innerHTML = g1858Cit;
+      document.getElementById("guasti1888_description").innerHTML = g1888Cit;
+      document.getElementById("papini1912_description").innerHTML = p1912Cit;
+
       if (catImg == "") {
         $("#btn_catalogo").css("display", "none");
       } else {
         document.getElementById("image_catalog_min").innerHTML = catImg;
       }
+      if (g1858Img == "") {
+        $("#btn_guasti1858").css("display", "none");
+      } else {
+        document.getElementById("image_guasti1858_min").innerHTML = g1858Img;
+      }
+      if (g1888Img == "") {
+        $("#btn_guasti1888").css("display", "none");
+      } else {
+        document.getElementById("image_guasti1888_min").innerHTML = g1888Img;
+      }
+      if (p1912Img == "") {
+        $("#btn_papini1912").css("display", "none");
+      } else {
+        document.getElementById("image_papini1912_min").innerHTML = p1912Img;
+      }
   
 }
 
@@ -380,19 +460,28 @@ function handle_SchedeStoriche(json) {
 
   let suffix = ["0", "1", "2", "3", "4", "5"];
 
+  var m1956Img = "";
+
   $.each(
       json['results']['bindings'],
       function (index, value) {
+
+        var type = value['type']['value'];
         var scheda = value['scheda']['value'];
-        var sc = scheda.replace(".jpg", "");
-        schede.push(scheda); 
 
-        img_sc = "img/schedeStoriche/" + sc + "/0.jpg";;
+        console.log([type, scheda]);
+
+        if (type == "Scheda Storica") {
+          var sc = scheda.replace(".jpg", "");
+          schede.push(scheda); 
+
+          img_sc = "img/schedeStoriche/" + sc + "/0.jpg";;
 
-        for (i in suffix) {
-          ss = suffix[i];
-          var image_scheda = "img/schedeStoriche/" + sc + "/" + ss + ".jpg";
-          createScheda(image_scheda);
+          for (i in suffix) {
+            ss = suffix[i];
+            var image_scheda = "img/schedeStoriche/" + sc + "/" + ss + ".jpg";
+            createScheda(image_scheda);
+          }
         }
 
        /* img_sc = "img/mpp_img/" + scheda;
@@ -402,6 +491,18 @@ function handle_SchedeStoriche(json) {
 
         var dir = "img/schedeStoriche/" + scheda + "/";
         console.log(files);*/
+
+        if (type == "Marchini 1956") {
+          cc1956 = scheda;
+          cat1956 = cc1956.split(", ");
+          for (i in cat1956) {
+              var marchini1956 = cat1956[i];
+              img_m1956 = "img/MPP_Marchini_1956/" + marchini1956;
+              m1956Img += '<div class="row"> \
+                              <img class="minImage viewImage" src="img/MPP_Marchini_1956/' + marchini1956 + '" onclick="expandImg(this);" /> \
+                          </div>';
+          }
+        }
         
       });
 
@@ -412,6 +513,14 @@ function handle_SchedeStoriche(json) {
   }/* else {
     document.getElementById("image_scheda_min").innerHTML = schede;
   }*/
+
+  
+  if (m1956Img == "") {
+    $("#btn_marchini1956").css("display", "none");
+  } else {
+    document.getElementById("image_papini1912_min").innerHTML = m1956Img;
+  }
+
   
 }
 
@@ -451,9 +560,17 @@ function show_OA(){
   document.getElementById("OA_info").style.display = "block";
   document.getElementById("catalogo_info").style.display = "none";
   document.getElementById("scheda_info").style.display = "none";
+  document.getElementById("guasti1858_info").style.display = "none";
+  document.getElementById("guasti1888_info").style.display = "none";
+  document.getElementById("papini1912_info").style.display = "none";
+  document.getElementById("marchini1956_info").style.display = "none";
   document.getElementById("image_artwork_min").style.display = "block";
   document.getElementById("image_catalog_min").style.display = "none";
   document.getElementById("image_scheda_min").style.display = "none";
+  document.getElementById("image_guasti1858_min").style.display = "none";
+  document.getElementById("image_guasti1888_min").style.display = "none";
+  document.getElementById("image_papini1912_min").style.display = "none";
+  document.getElementById("image_marchini1956_min").style.display = "none";
   document.getElementById("img_title").innerHTML = "Opera";
   document.getElementById("expandedImg").src = img_pic;
 }
@@ -462,10 +579,18 @@ function show_CAT(){
   document.getElementById("OA_info").style.display = "none";
   document.getElementById("catalogo_info").style.display = "block";
   document.getElementById("scheda_info").style.display = "none";
+  document.getElementById("guasti1858_info").style.display = "none";
+  document.getElementById("guasti1888_info").style.display = "none";
+  document.getElementById("papini1912_info").style.display = "none";
+  document.getElementById("marchini1956_info").style.display = "none";
   document.getElementById("image_artwork_min").style.display = "none";
   document.getElementById("image_catalog_min").style.display = "block";
   document.getElementById("image_scheda_min").style.display = "none";
-  document.getElementById("img_title").innerHTML = "Catalogo";
+  document.getElementById("image_guasti1858_min").style.display = "none";
+  document.getElementById("image_guasti1888_min").style.display = "none";
+  document.getElementById("image_papini1912_min").style.display = "none";
+  document.getElementById("image_marchini1956_min").style.display = "none";
+  document.getElementById("img_title").innerHTML = "Guida Marchini 1958";
   document.getElementById("expandedImg").src = img_cat;
 }
 
@@ -473,13 +598,97 @@ function show_INV(){
   document.getElementById("OA_info").style.display = "none";
   document.getElementById("catalogo_info").style.display = "none";
   document.getElementById("scheda_info").style.display = "block";
+  document.getElementById("guasti1858_info").style.display = "none";
+  document.getElementById("guasti1888_info").style.display = "none";
+  document.getElementById("papini1912_info").style.display = "none";
+  document.getElementById("marchini1956_info").style.display = "none";
   document.getElementById("image_artwork_min").style.display = "none";
   document.getElementById("image_catalog_min").style.display = "none";
   document.getElementById("image_scheda_min").style.display = "block";
+  document.getElementById("image_guasti1858_min").style.display = "none";
+  document.getElementById("image_guasti1888_min").style.display = "none";
+  document.getElementById("image_papini1912_min").style.display = "none";
+  document.getElementById("image_marchini1956_min").style.display = "none";
   document.getElementById("img_title").innerHTML = "Scheda Storica";
   document.getElementById("expandedImg").src = img_sc;
 }
 
+function show_G1858(){
+  document.getElementById("OA_info").style.display = "none";
+  document.getElementById("catalogo_info").style.display = "none";
+  document.getElementById("scheda_info").style.display = "none";
+  document.getElementById("guasti1858_info").style.display = "block";
+  document.getElementById("guasti1888_info").style.display = "none";
+  document.getElementById("papini1912_info").style.display = "none";
+  document.getElementById("marchini1956_info").style.display = "none";
+  document.getElementById("image_artwork_min").style.display = "none";
+  document.getElementById("image_catalog_min").style.display = "none";
+  document.getElementById("image_scheda_min").style.display = "none";
+  document.getElementById("image_guasti1858_min").style.display = "block";
+  document.getElementById("image_guasti1888_min").style.display = "none";
+  document.getElementById("image_papini1912_min").style.display = "none";
+  document.getElementById("image_marchini1956_min").style.display = "none";
+  document.getElementById("img_title").innerHTML = "Guida Guasti 1858";
+  document.getElementById("expandedImg").src = img_g1858;
+}
+
+function show_G1888(){
+  document.getElementById("OA_info").style.display = "none";
+  document.getElementById("catalogo_info").style.display = "none";
+  document.getElementById("scheda_info").style.display = "none";
+  document.getElementById("guasti1858_info").style.display = "none";
+  document.getElementById("guasti1888_info").style.display = "block";
+  document.getElementById("papini1912_info").style.display = "none";
+  document.getElementById("marchini1956_info").style.display = "none";
+  document.getElementById("image_artwork_min").style.display = "none";
+  document.getElementById("image_catalog_min").style.display = "none";
+  document.getElementById("image_scheda_min").style.display = "none";
+  document.getElementById("image_guasti1858_min").style.display = "none";
+  document.getElementById("image_guasti1888_min").style.display = "block";
+  document.getElementById("image_papini1912_min").style.display = "none";
+  document.getElementById("image_marchini1956_min").style.display = "none";
+  document.getElementById("img_title").innerHTML = "Guida Guasti 1888";
+  document.getElementById("expandedImg").src = img_g1888;
+}
+
+function show_P1912(){
+  document.getElementById("OA_info").style.display = "none";
+  document.getElementById("catalogo_info").style.display = "none";
+  document.getElementById("scheda_info").style.display = "none";
+  document.getElementById("guasti1858_info").style.display = "none";
+  document.getElementById("guasti1888_info").style.display = "none";
+  document.getElementById("papini1912_info").style.display = "block";
+  document.getElementById("marchini1956_info").style.display = "none";
+  document.getElementById("image_artwork_min").style.display = "none";
+  document.getElementById("image_catalog_min").style.display = "none";
+  document.getElementById("image_scheda_min").style.display = "none";
+  document.getElementById("image_guasti1858_min").style.display = "none";
+  document.getElementById("image_guasti1888_min").style.display = "none";
+  document.getElementById("image_papini1912_min").style.display = "block";
+  document.getElementById("image_marchini1956_min").style.display = "none";
+  document.getElementById("img_title").innerHTML = "Catalogo Papini 1912";
+  document.getElementById("expandedImg").src = img_p1912;
+}
+
+function show_M1956(){
+  document.getElementById("OA_info").style.display = "none";
+  document.getElementById("catalogo_info").style.display = "none";
+  document.getElementById("scheda_info").style.display = "none";
+  document.getElementById("guasti1858_info").style.display = "none";
+  document.getElementById("guasti1888_info").style.display = "none";
+  document.getElementById("papini1912_info").style.display = "none";
+  document.getElementById("marchini1956_info").style.display = "block";
+  document.getElementById("image_artwork_min").style.display = "none";
+  document.getElementById("image_catalog_min").style.display = "none";
+  document.getElementById("image_scheda_min").style.display = "none";
+  document.getElementById("image_guasti1858_min").style.display = "none";
+  document.getElementById("image_guasti1888_min").style.display = "none";
+  document.getElementById("image_papini1912_min").style.display = "none";
+  document.getElementById("image_marchini1956_min").style.display = "block";
+  document.getElementById("img_title").innerHTML = "Marchini 1956";
+  document.getElementById("expandedImg").src = img_p1912;
+}
+
 
 function magnify(imgID, zoom) {
   var img, glass, w, h, bw;

js/people.js

@@ -39,6 +39,9 @@ doJsonQuery(queryEv).done(function(data) { handle_Events(data); });
 queryCon = prefixes + (queryManager['querySchedaPersona']['queryContrassegni']).replace('{URI}', link);
 doJsonQuery(queryCon).done(function(data) { handle_Contrassegni(data); });
 
+queryRif = prefixes + (queryManager['querySchedaPersona']['queryRiferimenti']).replace('{URI}', link);
+doJsonQuery(queryRif).done(function(data) { handle_Riferimenti(data); });
+
 
 var labelName = "";
 
@@ -1009,6 +1012,26 @@ function handle_Other_Documents(json) {
 
 }
 
+function handle_Riferimenti(json) {
+
+  var uri_same = "";
+
+  $.each(
+    json['results']['bindings'],
+    function (index, value) {
+      if (value.hasOwnProperty('uri_same')) {
+        $("#REF").css("display", "flex");
+        uri_same += '<a href="' + value['uri_same']['value'] + '">' + value['uri_same']['value'] + '</a><br />';
+      }
+ 
+    });
+
+    console.log(uri_same);
+    document.getElementById("same_as").innerHTML = uri_same;
+
+  
+}
+
 function handle_map(json) {
   //console.log(json);
 
@@ -1029,8 +1052,8 @@ function handle_map(json) {
         var uri = value['place']['value'];
         var label = value['label']['value'];
         var coord = value['coordinates']['value'];
-        var evento = value['tipo']['value']
-        var count = value['count']['value']
+        var evento = value['tipo']['value'];
+        var count = value['count']['value'];
         place_events.push([uri, evento, count]);
         if (!place_names.includes(uri)) {
           place_names.push(uri);

js/query/managerQuery.js

@@ -42,10 +42,12 @@ var queryManager = {
         }"
     }, 
     queryINF: { 
-        queryContenuti1: " SELECT DISTINCT ?g AS ?graph ?Physical_Object ?subject ?label ?id (group_concat(distinct ?type ;separator=', ') as ?types) (SAMPLE(?object_Label) AS ?text) \
+        queryContenuti1: " SELECT DISTINCT ?g AS ?graph ?Physical_Object ?typeObj ?subject ?label ?id (group_concat(distinct ?type ;separator=', ') as ?types) (SAMPLE(?object_Label) AS ?text) \
         WHERE { <{GRAPH}> \
         GRAPH ?g {?subject rdf:type crm:E73_Information_Object ; \
         rdfs:label ?label .} \
+        OPTIONAL {?mmo crm:P128_carries ?subject ; \
+        crm:P2_has_type ?typeObj . } \
         OPTIONAL {?Physical_Object crm:P128_carries ?subject .} \
         OPTIONAL {?subject crm:P1_is_identified_by ?id_subject . \
         ?id_subject rdfs:label ?id ; \
@@ -93,7 +95,7 @@ var queryManager = {
         GRAPH ?g { ?subject ?property ?object . } \
         ?subject rdf:type crm:E21_Person ; \
         foaf:name ?name . \
-        ?name bif:contains <{WORD}> . \
+        <{WORD}> \
         } ",
 
         queryNote: " SELECT DISTINCT ?g AS ?graph ?subject ?name ?note \
@@ -102,7 +104,7 @@ var queryManager = {
         ?subject rdf:type crm:E21_Person ; \
         foaf:name ?name . \
         ?subject crm:P3_has_note ?note . \
-        ?note bif:contains <{WORD}> . \
+        <{WORD}> \
         }",
 
         queryOccupazione: " SELECT DISTINCT ?g AS ?graph ?subject ?name ?occupation \
@@ -112,7 +114,7 @@ var queryManager = {
         foaf:name ?name . \
         ?subject schema:hasOccupation ?uri_occupation . \
         ?uri_occupation rdfs:label ?occupation . \
-        ?occupation bif:contains <{WORD}> . \
+        <{WORD}> \
         }"
     },
     queryLG: {
@@ -122,7 +124,7 @@ var queryManager = {
         ?subject rdfs:label ?label ; \
         rdf:type crm:E53_Place ; \
         crm:P168_place_is_defined_by ?coords . \
-        ?label bif:contains <{WORD}> . \
+        <{WORD}> \
         }"
     },
 
@@ -315,6 +317,12 @@ var queryManager = {
                 } \
             }",
 
+            queryRiferimenti : " SELECT DISTINCT ?uri_same \
+            WHERE { \
+            VALUES ?uri {<{URI}>} \
+            ?uri owl:sameAs ?uri_same \
+            }",
+
             queryInfo : " SELECT DISTINCT ?uri ?graph ?label ?identifier ?id_type ?name ?givenName ?familyName ?relative2 ?relative3 ?provenienza (GROUP_CONCAT(DISTINCT CONCAT(?variant, '| ', ?otherName) ; SEPARATOR = ';') AS ?variants) ?gender ?Birth_Date ?Birth_Place ?Death_Date ?Death_Place ?patronymic ?occupation ?qualification ?group \
             WHERE { \
             VALUES ?uri {<{URI}>} \
@@ -947,7 +955,7 @@ var queryManager = {
             OPTIONAL {?uri_tavola crm:P3_has_note ?type .} \
             }",
 
-            queryBibliography : " SELECT DISTINCT ?bibliography ?pages (group_concat(distinct ?catalog ;separator=', ') as ?catalog) \
+            queryBibliography : " SELECT DISTINCT ?bibliography ?pages ?type (group_concat(distinct ?catalog ;separator=', ') as ?catalog) \
             WHERE { \
             VALUES ?uri {<{URI}>} \
             ?uri crm:P128_carries ?infObj . \
@@ -957,15 +965,17 @@ var queryManager = {
             rdfs:label ?bibliography ; \
             crm:P2_has_type 'Bibliografia' . \
             OPTIONAL {?uri_catalog crm:P138_represents ?document ; \
+            crm:P2_has_type ?type ; \
             crm:P1_is_identified_by ?catalog_id . \
             ?catalog_id rdfs:label ?catalog .} \
             }",
 
-            querySchedeStoriche : " SELECT DISTINCT ?scheda \
+            querySchedeStoriche : " SELECT DISTINCT ?scheda ?type \
             WHERE { \
             VALUES ?uri {<{URI}>} \
             ?uri crm:P128_carries ?InfObj . \
             ?uri_scheda crm:P138_represents ?InfObj ; \
+            crm:P2_has_type ?type ; \
             crm:P1_is_identified_by ?scheda_id . \
             ?scheda_id rdfs:label ?scheda . \
             }"

js/search.js

@@ -14,6 +14,10 @@ $(document).ready(function () {
 	var Label = "";
 	var object_Label = "";
 	var id_label = "";
+	var name_per = "";
+	var note_per = "";
+	var occupation_per = "";
+	var place_search = "";
 	var testo = "";
 
 
@@ -57,11 +61,20 @@ $(document).ready(function () {
 			Label = " ?label bif:contains  "+ search_name + "  . ";
 			object_Label = " ?object_Label bif:contains "+ search_name + " . ";
 			id_label = " ?id bif:contains "+ search_name + " . ";
+			name_per = "?name bif:contains "+ search_name + " . ";
+			note_per = " ?note bif:contains " + search_name + " . ";
+			occupation_per = " ?occupation bif:contains " + search_name + " . ";
+			place_search = " ?label bif:contains" + search_name + " . ";
+
 		}
 		else {
 			Label = "";
 			object_Label = "";
 			id_label = "";
+			name_per = "";
+			note_per = "";
+			place_search = "";
+			occupation_per = "";
 		}
 
 		var g = document.getElementById("graph_selector");
@@ -79,10 +92,10 @@ $(document).ready(function () {
 		var query4 = pref + (queryManager['queryINF']['queryContenuti1']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', object_Label);
 		var query5 = pref + (queryManager['queryINF']['queryContenuti2']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', object_Label);
 		var query6 = pref + (queryManager['queryINF']['queryContenuti3']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', object_Label);
-		var query7 = pref + (queryManager['queryPER']['queryNome']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', search_name);
-		var query8 = pref + (queryManager['queryPER']['queryNote']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', search_name);
-		var query9 = pref + (queryManager['queryPER']['queryOccupazione']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', search_name);
-		var query10 = pref + (queryManager['queryLG']['queryLuoghi']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', search_name);
+		var query7 = pref + (queryManager['queryPER']['queryNome']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', name_per);
+		var query8 = pref + (queryManager['queryPER']['queryNote']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', note_per);
+		var query9 = pref + (queryManager['queryPER']['queryOccupazione']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', occupation_per);
+		var query10 = pref + (queryManager['queryLG']['queryLuoghi']).replace('<{GRAPH}>', search_graph).replace('<{WORD}>', place_search);
 		
 		
 		// la funzione doJsonQuery restituisce direttamente l'oggetto della chiamata ajax in json.
@@ -189,6 +202,9 @@ function rewrite_graph(graph) {
 	else if (graph ==  "http://dev.restore.ovi.cnr.it:8890/aspo/onomastica/gruppi") {
 		graph_name = "Archivio di Stato di Prato - Onomastica Datini";
 	}
+	else if (graph ==  "http://dev.restore.ovi.cnr.it:8890/mpp/autori") {
+		graph_name = "Museo di Palazzo Pretorio";
+	}
 	else {graph_name = graph;
 	}
 
@@ -733,7 +749,8 @@ function getGraph(graph1, graph2) {
 			if (graph1 == "MPP") {
 				search_graph = "VALUES ?g {<http://dev.restore.ovi.cnr.it:8890/mpp/martini> \
 					<http://dev.restore.ovi.cnr.it:8890/mpp/ospedale> \
-					<http://dev.restore.ovi.cnr.it:8890/mpp/datini> }";
+					<http://dev.restore.ovi.cnr.it:8890/mpp/datini> \
+					<http://dev.restore.ovi.cnr.it:8890/mpp/autori> }";
 			}
 			if (graph1 == "OVI") {
 				search_graph = "VALUES ?g {<http://dev.restore.ovi.cnr.it:8890/ovi/datini>}";