Solr fix

Idra/src/main/java/it/eng/idra/beans/dcat/DCTLicenseDocument.java

@@ -146,7 +146,8 @@ public static Resource getRDFClass() {
 
 	public SolrInputDocument toDoc(CacheContentType contentType) {
 		SolrInputDocument doc = new SolrInputDocument();
-		doc.addField("id", UUID.randomUUID().toString());
+		doc.addField("id", this.id);
+		doc.addField("nodeID", this.nodeID);
 		doc.addField("content_type", contentType.toString());
 		doc.addField("uri", StringUtils.isNotBlank(this.uri) ? this.uri : "");
 		doc.addField("name", this.name != null ? this.name.getValue() : "");

Idra/src/main/java/it/eng/idra/beans/dcat/DCTLocation.java

@@ -138,7 +138,8 @@ public static Resource getRDFClass() {
 
 	public SolrInputDocument toDoc(CacheContentType contentType) {
 		SolrInputDocument doc = new SolrInputDocument();
-		doc.addField("id", UUID.randomUUID().toString());
+		doc.addField("id", this.id);
+		doc.addField("nodeID", this.nodeID);
 		doc.addField("content_type", contentType.toString());
 		doc.addField("geographicalIdentifier",
 				this.geographicalIdentifier != null ? this.geographicalIdentifier.getValue() : "");

Idra/src/main/java/it/eng/idra/beans/dcat/DCTPeriodOfTime.java

@@ -124,7 +124,8 @@ public static Resource getRDFClass() {
 
 	public SolrInputDocument toDoc(CacheContentType contentType) {
 		SolrInputDocument doc = new SolrInputDocument();
-		doc.addField("id", UUID.randomUUID().toString());
+		doc.addField("id", this.id);
+		doc.addField("nodeID", this.nodeID);
 		doc.addField("content_type", contentType.toString());
 		doc.addField("startDate", this.startDate != null ? this.startDate.getValue() : "");
 		doc.addField("endDate", this.endDate != null ? this.endDate.getValue() : "");

Idra/src/main/java/it/eng/idra/beans/dcat/DCTStandard.java

@@ -180,7 +180,8 @@ public static Resource getRDFClass() {
 
 	public SolrInputDocument toDoc(CacheContentType contentType) {
 		SolrInputDocument doc = new SolrInputDocument();
-		doc.addField("id", UUID.randomUUID().toString());
+		doc.addField("id", this.id);
+		doc.addField("nodeID", this.nodeID);
 		doc.addField("content_type", contentType.toString());
 		doc.addField("uri", this.uri);
 		doc.addField("identifier", this.getIdentifier().getValue());

Idra/src/main/java/it/eng/idra/beans/dcat/FOAFAgent.java

@@ -209,14 +209,16 @@ public void setIdentifier(DCATProperty identifier) {
 	public SolrInputDocument toDoc(CacheContentType contentType) {
 
 		SolrInputDocument doc = new SolrInputDocument();
-		doc.addField("id", UUID.randomUUID().toString());
+		doc.addField("id", this.id);
+		doc.addField("nodeID", this.nodeID);
 		doc.addField("content_type", contentType.toString());
 		doc.addField("resourceUri", this.resourceUri);
 		doc.addField("identifier", this.getIdentifier().getValue());
 		doc.addField("name", this.getName().getValue());
 		doc.addField("mbox", this.getMbox().getValue());
 		doc.addField("homepage", this.getHomepage().getValue());
 		doc.addField("type", this.getType().getValue());
+
 		return doc;
 	}
 

Idra/src/main/java/it/eng/idra/beans/dcat/SKOSConcept.java

@@ -165,7 +165,8 @@ public void setPrefLabel(List<SKOSPrefLabel> prefLabel) {
 	public SolrInputDocument toDoc(CacheContentType contentType) {
 
 		SolrInputDocument doc = new SolrInputDocument();
-		doc.addField("id", UUID.randomUUID().toString());
+		doc.addField("id", this.id);
+		doc.addField("nodeID", this.nodeID);
 		doc.addField("content_type", contentType.toString());
 		doc.addField("resourceUri", this.resourceUri);
 

Idra/src/main/java/it/eng/idra/beans/dcat/SKOSPrefLabel.java

@@ -115,7 +115,8 @@ public void setValue(String value) {
 	public SolrInputDocument toDoc(CacheContentType contentType) {
 
 		SolrInputDocument doc = new SolrInputDocument();
-		doc.addField("id", UUID.randomUUID().toString());
+		doc.addField("id", this.id);
+		doc.addField("nodeID", this.nodeID);
 		doc.addField("content_type", contentType.toString());
 		doc.addField("value", this.getValue());
 		doc.addField("language", this.getLanguage());

Idra/src/main/java/it/eng/idra/beans/dcat/SPDXChecksum.java

@@ -117,7 +117,8 @@ public void setChecksumValue(DCATProperty checksumValue) {
 
 	public SolrInputDocument toDoc(CacheContentType contentType) {
 		SolrInputDocument doc = new SolrInputDocument();
-		doc.addField("id", UUID.randomUUID().toString());
+		doc.addField("id", this.id);
+		doc.addField("nodeID", this.nodeID);
 		doc.addField("content_type", contentType.toString());
 		doc.addField("algorithm", this.algorithm != null ? this.algorithm.getValue() : "");
 		doc.addField("checksumValue", this.checksumValue != null ? this.checksumValue.getValue() : "");

Idra/src/main/java/it/eng/idra/beans/dcat/VCardOrganization.java

@@ -181,6 +181,7 @@ public void setHasTelephoneType(DCATProperty hasTelephoneType) {
 	public SolrInputDocument toDoc(CacheContentType contentType) {
 		SolrInputDocument doc = new SolrInputDocument();
 		doc.addField("id", this.id);
+		doc.addField("nodeID", this.nodeID);
 		doc.addField("content_type", contentType.toString());
 		doc.addField("resourceUri", this.resourceUri);
 		doc.addField("fn", this.getFn().getValue());

Idra/src/main/java/it/eng/idra/cache/MetadataCacheManager.java

@@ -1065,6 +1065,7 @@ public static void init(boolean createCache, String configPath) {
 			try {
 				// Clean previous index data
 				server.deleteByQuery("*:*");
+				server.commit();
 
 				/*
 				 *

Idra/src/main/java/it/eng/idra/odfscheduler/ODFScheduler.java

@@ -160,7 +160,7 @@ public void rescheduleJob(String jobName,ODMSCatalogue node) {
 				Trigger newTrigger = TriggerBuilder
 	                    .newTrigger()
 	                    .withIdentity(Integer.toString(node.getId()), "triggers")
-	                    .startAt(Date.from(node.getRegisterDate().toInstant()))
+	                    .startAt(Date.from(node.getRegisterDate().toInstant().plusSeconds(node.getRefreshPeriod())))
 	                    .withSchedule(simpleSchedule().repeatForever()
 	                    		.withIntervalInSeconds(node.getRefreshPeriod())
 	                    		.withMisfireHandlingInstructionNextWithExistingCount())
@@ -247,7 +247,8 @@ public void startCataloguesSynchJob(ODMSCatalogue node,boolean startNow) {
     					.withIdentity(Integer.toString(node.getId()), "jobs").usingJobData("nodeID",node.getId()).
     					build();
 
-    			Date d = Date.from(node.getRegisterDate().toInstant());
+
+    			Date d = Date.from(node.getRegisterDate().toInstant().plusSeconds(node.getRefreshPeriod()));
 
     			Trigger trigger = TriggerBuilder
     					.newTrigger()

IdraPortal/src/main/webapp/catalogues/ViewCatalogues.html

@@ -143,7 +143,7 @@
             <span class="md-headline"><span ng-show="node.country!='' && node.country!=undefined" 
             style="border-style: solid;border-width: 1px;border-color: rgba(0,0,0,0.1)" class="flag-icon " 
             ng-class="'flag-icon-'+node.country.toLowerCase()"></span>  
-            <a href="{{node.host}}" target="_blank">{{node.name}}</a>
+            <a href="{{node.homepage}}" target="_blank">{{node.name}}</a>
             <a href="javascript:void(0)" class="btn-flat mdi-material-deep-orange"
 			ng-click="showDatasets(node)"><i class="mdi-action-search"></i>
 			<md-tooltip>Show Datasets</md-tooltip></a>  

IdraPortal/src/main/webapp/catalogues/remote_catalogues.js

@@ -74,6 +74,10 @@ angular.module("IdraPlatform").controller('RemoteCataloguesController',["$scope"
 				delete node.sitemap.navigationParameter.id;
 			}
 
+			if(!node.hasOwnProperty("homepage")){
+				node.homepage=node.host;
+			}
+
 			var fd = new FormData();  
 			fd.append("node",JSON.stringify(node));
 			fd.append("dump",'');