Create Datalet Fix

OPSILab · Sep 21, 2018 · f67bd30 · f67bd30
1 parent 14e2f0f
commit f67bd30
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Idra/src/main/java/it/eng/idra/api/AdministrationAPI.java b/Idra/src/main/java/it/eng/idra/api/AdministrationAPI.java
@@ -1024,7 +1024,7 @@ public Response deleteDataletFromDistribution(@Context HttpServletRequest httpRe
 
 			List<Datalet> remainingDatalet = jpa.jpaGetDataletByDistributionID(distributionID);
 			if (remainingDatalet.size() == 0) {
-				DCATDataset dataset = MetadataCacheManager.getDataset(Integer.parseInt(nodeID), datasetID);
+				DCATDataset dataset = MetadataCacheManager.getDatasetByID(datasetID);
 				dataset.getDistributions().stream().filter(x -> x.getId().equals(distributionID)).findFirst().get()
 						.setHasDatalets(false);
 				MetadataCacheManager.updateDatasetInsertDatalet(Integer.parseInt(nodeID), dataset);

diff --git a/Idra/src/main/java/it/eng/idra/api/ClientAPI.java b/Idra/src/main/java/it/eng/idra/api/ClientAPI.java
@@ -620,7 +620,7 @@ public Response createDataletFromDistribution(@Context HttpServletRequest httpRe
 
 			List<Datalet> existingDatalets = null;
 
-			DCATDataset dataset = MetadataCacheManager.getDataset(Integer.parseInt(nodeID), datasetID);
+			DCATDataset dataset = MetadataCacheManager.getDatasetByID(datasetID);
 			boolean updateSolr = false;
 			for (DCATDistribution d : dataset.getDistributions()) {
 				if (d.getId().equals(distributionID)) {

diff --git a/Idra/src/main/java/it/eng/idra/cache/MetadataCacheManager.java b/Idra/src/main/java/it/eng/idra/cache/MetadataCacheManager.java
@@ -90,15 +90,15 @@ private MetadataCacheManager() {
 	 * @throws DatasetNotFoundException
 	 * @returns DCatDataset The dataset matching id
 	 */
-	public static DCATDataset getDataset(int nodeID, String id)
+	public static DCATDataset getDatasetByIdentifier(int nodeID, String id)
 			throws DatasetNotFoundException, IOException, SolrServerException {
 
 		SolrQuery query = new SolrQuery();
 		QueryResponse rsp;
 
 		// Don't touch
 		//query.setQuery("(id:\"" + id + "\" or legacyIdentifier:\"" + id + "\") and nodeID:" + nodeID);
-		query.setQuery("(id:\"" + id + "\" or identifier:\"" + id + "\") and nodeID:" + nodeID);
+		query.setQuery("(identifier:\"" + id + "\") and nodeID:" + nodeID);
 
 		query.set("parent_filter", "content_type:" + CacheContentType.dataset);
 		query.set("defType", "edismax");
@@ -269,7 +269,7 @@ public static void deleteDataset(int nodeID, DCATDataset dataset)
 
 		// Deletes dataset from DB
 		//DCATDataset matchingDataset = getDataset(nodeID, dataset.getLegacyIdentifier());
-		DCATDataset matchingDataset = getDataset(nodeID, dataset.getIdentifier().getValue());
+		DCATDataset matchingDataset = getDatasetByIdentifier(nodeID, dataset.getIdentifier().getValue());
 		jpaInstance.jpaDeleteDataset(matchingDataset);
 
 		// Deletes dataset from SOLR server
@@ -407,7 +407,7 @@ public static void updateDataset(int nodeID, DCATDataset dataset)
 		// DCATDataset matchingDataset = getDataset(dataset.getId(),false);
 		//DCATDataset matchingDataset = getDataset(nodeID, dataset.getOtherIdentifier().get(0).getValue());
 		//DCATDataset matchingDataset = getDataset(nodeID, dataset.getLegacyIdentifier());
-		DCATDataset matchingDataset = getDataset(nodeID, dataset.getIdentifier().getValue());
+		DCATDataset matchingDataset = getDatasetByIdentifier(nodeID, dataset.getIdentifier().getValue());
 
 		//Settiamo i vecchi id e seoid
 		dataset.setId(matchingDataset.getId());

diff --git a/Idra/src/main/java/it/eng/idra/odfscheduler/job/ODMSSynchJob.java b/Idra/src/main/java/it/eng/idra/odfscheduler/job/ODMSSynchJob.java
@@ -344,7 +344,7 @@ static int addDataset(ODMSCatalogue node, DCATDataset dataset) {
 		logger.info("\n--- Creating dataset ---" + dataset.getId() + " " + dataset.getTitle().getValue() + "\n");
 		try {
 			// MetadataCacheManager.getDataset(dataset.getId(),false);
-			MetadataCacheManager.getDataset(node.getId(), dataset.getIdentifier().getValue());
+			MetadataCacheManager.getDatasetByIdentifier(node.getId(), dataset.getIdentifier().getValue());
 			logger.info("Dataset is already present");
 		} catch (DatasetNotFoundException ex) {
 			// If a dataset is not found, create one