Add licenses on images

OA.html

@@ -256,6 +256,20 @@
 													</div>
 													<div class="col" id="identifier"></div>
 												</div>
+
+												<div class="row mb-2" id="IMG_PRO" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Provenienza Immagine:</span>
+													</div>
+													<div class="col" id="imageInstitute"></div>
+												</div>
+
+												<div class="row mb-2" id="CC_OA" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Licenza Immagine:</span>
+													</div>
+													<div class="col" id="license"></div>
+												</div>
 											</div>
 
 											<div id="catalogo_info" style="display:none;">
@@ -295,6 +309,18 @@
 													</div>
 													<div class="col" id="catalog_nota">Immagine digitalizzata dall'Archivio di Stato di Prato</div>
 												</div>
+												<div class="row mb-2" id="CAT_PRO" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Provenienza Immagine:</span>
+													</div>
+													<div class="col" id="catalogueInstitute"></div>
+												</div>
+												<div class="row mb-2" id="CC_CAT" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Licenza Immagine:</span>
+													</div>
+													<div class="col" id="license_cat"></div>
+												</div>
 											</div>
 
 											<div id="scheda_info" style="display:none;">
@@ -322,6 +348,18 @@
 													</div>
 													<div class="col" id="scheda_description">Scheda storica 1970-1990</div>
 												</div>
+												<div class="row mb-2" id="CAT_SC" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Provenienza Immagine:</span>
+													</div>
+													<div class="col" id="cardInstitute"></div>
+												</div>
+												<div class="row mb-2" id="CC_SC" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Licenza Immagine:</span>
+													</div>
+													<div class="col" id="license_card"></div>
+												</div>
 											</div>
 
 											<!-- GUASTI 1858 -->
@@ -351,6 +389,18 @@
 													</div>
 													<div class="col" id="guasti1858_description"></div>
 												</div>
+												<div class="row mb-2" id="G1_PRO" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Provenienza Immagine:</span>
+													</div>
+													<div class="col" id="guasti1Institute"></div>
+												</div>
+												<div class="row mb-2" id="CC_G1" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Licenza Immagine:</span>
+													</div>
+													<div class="col" id="license_g1"></div>
+												</div>
 											</div>
 
 											<!-- GUASTI 1888 -->
@@ -380,6 +430,18 @@
 													</div>
 													<div class="col" id="guasti1888_description"></div>
 												</div>
+												<div class="row mb-2" id="G2_PRO" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Provenienza Immagine:</span>
+													</div>
+													<div class="col" id="guasti2Institute"></div>
+												</div>
+												<div class="row mb-2" id="CC_G2" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Licenza Immagine:</span>
+													</div>
+													<div class="col" id="license_g2"></div>
+												</div>
 											</div>
 
 											<!-- PAPINI 1912 -->
@@ -409,6 +471,18 @@
 													</div>
 													<div class="col" id="papini1912_description"></div>
 												</div>
+												<div class="row mb-2" id="PAP_PRO" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Provenienza Immagine:</span>
+													</div>
+													<div class="col" id="papiniInstitute"></div>
+												</div>
+												<div class="row mb-2" id="CC_PAP" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Licenza Immagine:</span>
+													</div>
+													<div class="col" id="license_pap"></div>
+												</div>
 											</div>
 
 											<!-- MARCHINI 1956 -->
@@ -444,6 +518,18 @@
 													</div>
 													<div class="col" id="marchini1956_nota">Immagine digitalizzata dall'Archivio di Stato di Prato</div>
 												</div>
+												<div class="row mb-2" id="M2_PRO" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Provenienza Immagine:</span>
+													</div>
+													<div class="col" id="marchini2Institute"></div>
+												</div>
+												<div class="row mb-2" id="CC_M2" style="display:none;">
+													<div class="col-sm-4">
+														<span class="label">Licenza Immagine:</span>
+													</div>
+													<div class="col" id="license_m2"></div>
+												</div>
 											</div>
 
 										</div>

index.html

@@ -140,7 +140,7 @@
           </div>-->
         </div>
         <div class="row mb-sm-5">
-          <div onclick="location.href='http://restore.ovi.cnr.it/';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 mb-sm-0">
+          <div onclick="location.href='progetto.html';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 mb-sm-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
                 <img class="ico-img" src="img/progetto.png" />

js/OA.js

@@ -168,6 +168,8 @@ function handle_Picture(json) {
   var picture = "";
   const tavole = [];
   var tiles2 = [];
+  var provenienza = "";
+  var licenza = "";
 
   $.each(
       json['results']['bindings'],
@@ -179,6 +181,16 @@ function handle_Picture(json) {
           tipo = value['type']['value'];
         }
 
+        if (value.hasOwnProperty('provenienza')) {
+          $("#IMG_PRO").css("display", "flex");
+          provenienza = value['provenienza']['value'];
+        }
+
+        if (value.hasOwnProperty('license')) {
+          $("#CC_OA").css("display", "flex");
+          licenza = '<img src="' + value['license']['value'] + '" width="100" height="auto">';
+        }
+
         let tv = [src_picture, tipo];
         tavole.push(tv);
 
@@ -196,6 +208,8 @@ function handle_Picture(json) {
       });
 
       runOpenseadragon(img_pic);
+      document.getElementById("imageInstitute").innerHTML = provenienza;
+      document.getElementById("license").innerHTML = licenza;
 
       /*var front_pic = "";
 
@@ -325,6 +339,14 @@ function handle_Bibliography(json) {
   var n_g1858 = 0;
   var n_g1888 = 0;
   var n_p1912 = 0;
+  var provenienzaCat = "";
+  var provenienzaG1858 = "";
+  var provenienzaG1888 = "";
+  var provenienzaP1912 = "";
+  var licenzaCat = "";
+  var licenzaG1858 = "";
+  var licenzaG1888 = "";
+  var licenzaP1912 = "";
 
   $.each(
       json['results']['bindings'],
@@ -357,6 +379,15 @@ function handle_Bibliography(json) {
                 });
 
             }
+            if (value.hasOwnProperty('provenienza')) {
+              $("#CAT_PRO").css("display", "flex");
+              provenienzaCat = value['provenienza']['value'];
+            }
+    
+            if (value.hasOwnProperty('license')) {
+              $("#CC_CAT").css("display", "flex");
+              licenzaCat = '<img src="' + value['license']['value'] + '" width="100" height="auto">';
+            }
           }
           
 
@@ -375,6 +406,15 @@ function handle_Bibliography(json) {
                 });
 
             }
+            if (value.hasOwnProperty('provenienza')) {
+              $("#G1_PRO").css("display", "flex");
+              provenienzaG1858 = value['provenienza']['value'];
+            }
+    
+            if (value.hasOwnProperty('license')) {
+              $("#CC_G1").css("display", "flex");
+              licenzaG1858 = '<img src="' + value['license']['value'] + '" width="100" height="auto">';
+            }
           }
 
           if (type == "Guida Guasti 1888") {
@@ -391,6 +431,15 @@ function handle_Bibliography(json) {
                   url: "http://restore.ovi.cnr.it/beta/" + img_guasti1888 
                 });
             }
+            if (value.hasOwnProperty('provenienza')) {
+              $("#G2_PRO").css("display", "flex");
+              provenienzaG1888 = value['provenienza']['value'];
+            }
+    
+            if (value.hasOwnProperty('license')) {
+              $("#CC_G2").css("display", "flex");
+              licenzaG1888 = '<img src="' + value['license']['value'] + '" width="100" height="auto">';
+            }
           }
 
           if (type == "Catalogo Papini 1912") {
@@ -408,6 +457,15 @@ function handle_Bibliography(json) {
                 });
 
             }
+            if (value.hasOwnProperty('provenienza')) {
+              $("#PAP_PRO").css("display", "flex");
+              provenienzaP1912 = value['provenienza']['value'];
+            }
+    
+            if (value.hasOwnProperty('license')) {
+              $("#CC_PAP").css("display", "flex");
+              licenzaP1912 = '<img src="' + value['license']['value'] + '" width="100" height="auto">';
+            }
           }
 
         }
@@ -432,6 +490,16 @@ function handle_Bibliography(json) {
       document.getElementById("guasti1888_description").innerHTML = g1888Cit;
       document.getElementById("papini1912_description").innerHTML = p1912Cit;
 
+      document.getElementById("catalogueInstitute").innerHTML = provenienzaCat;
+      document.getElementById("guasti1Institute").innerHTML = provenienzaG1858;
+      document.getElementById("guasti2Institute").innerHTML = provenienzaG1858;
+      document.getElementById("papiniInstitute").innerHTML = provenienzaP1912;
+
+      document.getElementById("license_cat").innerHTML = licenzaCat;
+      document.getElementById("license_g1").innerHTML = licenzaG1858;
+      document.getElementById("license_g2").innerHTML = licenzaG1888;
+      document.getElementById("license_pap").innerHTML = licenzaP1912;
+
       if (n_cat == 0) {
         $("#btn_catalogo").css("display", "none");
       } 
@@ -478,6 +546,10 @@ function handle_SchedeStoriche(json) {
   const schede = [];
   var m1956Img = "";
   var n_m1956 = 0;
+  var provenienzaScheda = "";
+  var provenienzaM1956 = "";
+  var licenzaScheda = "";
+  var licenzaM1956 = "";
 
   let suffix = ["0", "1", "2", "3", "4", "5"];
 
@@ -501,6 +573,16 @@ function handle_SchedeStoriche(json) {
             var image_scheda = "img/schedeStoriche/" + sc + "/" + ss + ".jpg";
             createScheda(image_scheda);
           }
+
+          if (value.hasOwnProperty('provenienza')) {
+            $("#CAT_SC").css("display", "flex");
+            provenienzaScheda = value['provenienza']['value'];
+          }
+  
+          if (value.hasOwnProperty('license')) {
+            $("#CC_SC").css("display", "flex");
+            licenzaScheda = '<img src="' + value['license']['value'] + '" width="100" height="auto">';
+          }
         }
 
        /* img_sc = "img/mpp_img/" + scheda;
@@ -524,10 +606,24 @@ function handle_SchedeStoriche(json) {
                 url: "http://restore.ovi.cnr.it/beta/" + img_marchini1956 
               });
           }
+          if (value.hasOwnProperty('provenienza')) {
+            $("#M2_PRO").css("display", "flex");
+            provenienzaM1956 = value['provenienza']['value'];
+          }
+  
+          if (value.hasOwnProperty('license')) {
+            $("#CC_M2").css("display", "flex");
+            licenzaM1956 = '<img src="' + value['license']['value'] + '" width="100" height="auto">';
+          }
         }
         
       });
 
+  document.getElementById("cardInstitute").innerHTML = provenienzaScheda;
+  document.getElementById("marchini2Institute").innerHTML = provenienzaM1956;
+  document.getElementById("license_card").innerHTML = licenzaScheda;
+  document.getElementById("license_m2").innerHTML = licenzaM1956;
+
   if (schede.length = 0) {
     $("#btn_schedastorica").css("display", "none");
   }
@@ -593,7 +689,7 @@ function show_CAT(){
   document.getElementById("guasti1888_info").style.display = "none";
   document.getElementById("papini1912_info").style.display = "none";
   document.getElementById("marchini1956_info").style.display = "none";
-  document.getElementById("img_title").innerHTML = "Guida Marchini 1958";
+  document.getElementById("img_title").innerHTML = "Guida 1958";
   clearViewer();
   runOpenseadragon(img_cat);
 }
@@ -619,7 +715,7 @@ function show_G1858(){
   document.getElementById("guasti1888_info").style.display = "none";
   document.getElementById("papini1912_info").style.display = "none";
   document.getElementById("marchini1956_info").style.display = "none";
-  document.getElementById("img_title").innerHTML = "Guida Guasti 1858";
+  document.getElementById("img_title").innerHTML = "Guida 1858";
   clearViewer();
   runOpenseadragon(img_g1858);
 }
@@ -632,7 +728,7 @@ function show_G1888(){
   document.getElementById("guasti1888_info").style.display = "block";
   document.getElementById("papini1912_info").style.display = "none";
   document.getElementById("marchini1956_info").style.display = "none";
-  document.getElementById("img_title").innerHTML = "Guida Guasti 1888";
+  document.getElementById("img_title").innerHTML = "Guida 1888";
   clearViewer();
   runOpenseadragon(img_g1888);
 }
@@ -645,7 +741,7 @@ function show_P1912(){
   document.getElementById("guasti1888_info").style.display = "none";
   document.getElementById("papini1912_info").style.display = "block";
   document.getElementById("marchini1956_info").style.display = "none";
-  document.getElementById("img_title").innerHTML = "Catalogo Papini 1912";
+  document.getElementById("img_title").innerHTML = "Guida 1912";
   clearViewer();
   runOpenseadragon(img_p1912);
 }
@@ -658,7 +754,7 @@ function show_M1956(){
   document.getElementById("guasti1888_info").style.display = "none";
   document.getElementById("papini1912_info").style.display = "none";
   document.getElementById("marchini1956_info").style.display = "block";
-  document.getElementById("img_title").innerHTML = "Marchini 1956";
+  document.getElementById("img_title").innerHTML = "Inventario 1956";
   clearViewer();
   runOpenseadragon(img_m1956);
   //document.getElementById("expandedImg").src = img_m1956;

js/object.js

@@ -164,7 +164,6 @@ var tiles = [];
 function handle_contrassegni(json) {
 
   console.log(json);
-  var tiles2;
 
   var uri = "";
   var graph = "";
@@ -174,6 +173,7 @@ function handle_contrassegni(json) {
   var gettatello = "";
   var Images = "";
   let markImg = [];
+  let imgMark = [];
 
   $.each(
     json['results']['bindings'],
@@ -188,20 +188,23 @@ function handle_contrassegni(json) {
 
       if (immagine != "") {
         $("#IMM").css("display", "flex");
+
+        var cos_image = "http://restore.ovi.cnr.it/beta/img/contrassegni/" + immagine;
         
         let imgs = immagine.split("_");
+        console.log(immagine);
+        tiles.push({
+          type: "image",
+          url: cos_image 
+        });
         const suffix = ["_a", "_b", "_c", "_a_2", "_a1", "_a2"];
 
         for (var k=0; k<suffix.length; k++) {
 
           var image_url = "http://restore.ovi.cnr.it/beta/img/contrassegni/" + imgs[0] + suffix[k] + ".jpg";
           markImg.push(image_url);
-          tiles.push({
-            type: "image",
-            url: image_url 
-          });
+        }
       }
-    }
       
     });
 
@@ -233,14 +236,30 @@ function handle_contrassegni(json) {
 
 }
 
-function createImage(image, tiles3) {
+function organizeImages(images) {
+  console.log(images);
+  var tiles2 = [];
+
+  for (var i=0; i<images.length; i++) {
+    tiles2.push({
+      type: "image",
+      url: images[i] 
+    });
+  }
+  
+  runOpenseadragon(tiles2);
+}
+
+function createImage(image) {
   checkIfImageExists(image, (exists) => {
     if (exists) {
       console.log(image);
-      tiles.push({
+      var tile = {
         type: "image",
-        url: image 
-      });
+        url: images[i] 
+      };
+
+      viewer.add-item(tile);
       /*var Image = '<div class="singleImg"> \
       <img src="' + image + '" alt="contrassegno" style="width:100%" onclick="expandImg(this);"> \
       </div>';

js/query/managerQuery.js

@@ -957,16 +957,20 @@ var queryManager = {
             ?uriRole rdfs:label ?role} \
             }",
 
-            queryPicture : " SELECT DISTINCT ?picture ?type \
+            queryPicture : " SELECT DISTINCT ?picture ?provenienza ?license \
             WHERE { \
             VALUES ?uri {<{URI}>} \
             ?uri_tavola crm:P138_represents ?uri ; \
             crm:P1_is_identified_by ?tavola_id . \
             ?tavola_id rdfs:label ?picture . \
-            OPTIONAL {?uri_tavola crm:P3_has_note ?type .} \
+            ?uri_tavola crm:P3_has_note ?uri_note . \
+            ?uri_note crm:P2_has_type 'Provenienza immagine' ; \
+            crm:P1_is_identified_by ?provenienza . \
+            ?uri_tavola crm:P104_is_subject_to ?uri_licence . \
+            ?uri_licence crm:P1_is_identified_by ?license \
             }",
 
-            queryBibliography : " SELECT DISTINCT ?bibliography ?pages ?type (group_concat(distinct ?catalog ;separator=', ') as ?catalog) \
+            queryBibliography : " SELECT DISTINCT ?bibliography ?pages ?type (group_concat(distinct ?catalog ;separator=', ') as ?catalog) ?provenienza ?license \
             WHERE { \
             VALUES ?uri {<{URI}>} \
             ?uri crm:P128_carries ?infObj . \
@@ -978,10 +982,15 @@ var queryManager = {
             OPTIONAL {?uri_catalog crm:P138_represents ?document ; \
             crm:P2_has_type ?type ; \
             crm:P1_is_identified_by ?catalog_id . \
-            ?catalog_id rdfs:label ?catalog .} \
+            ?catalog_id rdfs:label ?catalog . \
+            ?uri_catalog crm:P3_has_note ?uri_note . \
+            ?uri_note crm:P2_has_type 'Provenienza immagine' ; \
+            crm:P1_is_identified_by ?provenienza . \
+            ?uri_catalog crm:P104_is_subject_to ?uri_licence . \
+            ?uri_licence crm:P1_is_identified_by ?license} \
             }",
 
-            querySchedeStoriche : " SELECT DISTINCT ?scheda ?type \
+            querySchedeStoriche : " SELECT DISTINCT ?scheda ?type ?provenienza ?license \
             WHERE { \
             VALUES ?uri {<{URI}>} \
             ?uri crm:P128_carries ?InfObj . \
@@ -989,6 +998,11 @@ var queryManager = {
             crm:P2_has_type ?type ; \
             crm:P1_is_identified_by ?scheda_id . \
             ?scheda_id rdfs:label ?scheda . \
+            OPTIONAL {?uri_scheda crm:P3_has_note ?uri_note . \
+            ?uri_note crm:P2_has_type 'Provenienza immagine' ; \
+            crm:P1_is_identified_by ?provenienza} \
+            OPTIONAL {?uri_scheda crm:P104_is_subject_to ?uri_licence . \
+            ?uri_licence crm:P1_is_identified_by ?license} \
             }"
     },
 

js/utilities.js

@@ -208,6 +208,6 @@ function runOpenseadragon(tiles) {
     sequenceMode:           true,
     showReferenceStrip:     true,
     autoHideControls:       false,
-    tileSources: tiles
+    tileSources: tiles,
   });
 }

object.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html>        
 
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />