Changed the bean CatalogueItem by adding itemId
This commit is contained in:
parent
e29cff8296
commit
5917f8de5e
6
pom.xml
6
pom.xml
|
@ -15,7 +15,7 @@
|
|||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>ckan2zenodo-publisher-widget</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>0.1.0</version>
|
||||
<version>0.1.0-SNAPSHOT</version>
|
||||
|
||||
<description>
|
||||
gCube Ckan2Zenodo Publisher widget allows to publish D4Science catalogue's items on Zenodo
|
||||
|
@ -65,13 +65,13 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>switch-button-widget</artifactId>
|
||||
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
|
||||
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.data.publishing</groupId>
|
||||
<artifactId>ckan2zenodo-library</artifactId>
|
||||
<version>[0.0.1, 1.0.0-SNAPSHOT)</version>
|
||||
<version>[0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
|
|
|
@ -67,7 +67,7 @@ public class CkanToZendoPublisherWidget {
|
|||
*/
|
||||
public void publishOnZenodo(final CatalogueItem item) {
|
||||
|
||||
modal.setTitle("Upload to Zenodo...");
|
||||
modal.setTitle("Upload to Zenodo");
|
||||
modal.addStyleName("ckan2zenodo-modal-style");
|
||||
modal.setCloseVisible(true);
|
||||
buttonPublish.setEnabled(false);
|
||||
|
|
|
@ -147,10 +147,10 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
|||
}
|
||||
|
||||
//Get a preview of the deposition to be published
|
||||
ZenodoDeposition zdPreview=loadItemPreviewFromService(item.getItemName());
|
||||
ZenodoDeposition zdPreview=loadItemPreviewFromService(item.getItemId());
|
||||
|
||||
//Loading Filtered resources according to VRE policies
|
||||
List<CkanResource> filteredResources = loadFilterResources(item.getItemName());
|
||||
List<CkanResource> filteredResources = loadFilterResources(item.getItemId());
|
||||
LOG.debug("Loaded filtered resources: "+filteredResources);
|
||||
|
||||
//Converting ZenodoDeposition to ZenodoItem
|
||||
|
@ -160,13 +160,15 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
|||
List<ZenodoFile> resources = ItemToZenodoConverter.toZenodoFiles(filteredResources, false);
|
||||
zenodoItem.addFiles(resources);
|
||||
|
||||
zenodoItem.setName(item.getItemName());
|
||||
//I'M SETTING THE ID BECAUSE THE NAME IS NULL INTO BEAN PASSED FROM PORTLET SIDE
|
||||
//TODO I'M WAITING FOR itemName retrieved from ckan2zenodo library
|
||||
zenodoItem.setName(item.getItemId());
|
||||
|
||||
LOG.debug("Returning item: "+zenodoItem);
|
||||
return zenodoItem;
|
||||
|
||||
} catch (Exception e) {
|
||||
String error = "Error on converting the catalogue item: "+item.getItemName();
|
||||
String error = "Error on converting the catalogue item with id: "+item.getItemId();
|
||||
LOG.error(error, e);
|
||||
String clientError = String.format("%s. %s", error, e.getMessage());
|
||||
throw new Exception(clientError);
|
||||
|
|
|
@ -265,6 +265,7 @@ public class ItemToZenodoConverter {
|
|||
zm.setTitle(depositionMetadata.getTitle());
|
||||
zm.setVersion(depositionMetadata.getVersion());
|
||||
zm.setNotes(depositionMetadata.getNotes());
|
||||
|
||||
return zm;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ public class CatalogueItem implements Serializable{
|
|||
*/
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
String itemId;
|
||||
String itemName;
|
||||
String itemURL;
|
||||
ITEM_TYPE itemType;
|
||||
|
@ -26,12 +26,21 @@ public class CatalogueItem implements Serializable{
|
|||
|
||||
public CatalogueItem() {}
|
||||
|
||||
public CatalogueItem(String itemName, String itemURL, ITEM_TYPE itemType) {
|
||||
public CatalogueItem(String itemId, String itemName, String itemURL, ITEM_TYPE itemType) {
|
||||
this.itemId = itemId;
|
||||
this.itemName = itemName;
|
||||
this.itemURL = itemURL;
|
||||
this.itemType = itemType;
|
||||
}
|
||||
|
||||
public String getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
public void setItemId(String itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public String getItemName() {
|
||||
return itemName;
|
||||
}
|
||||
|
@ -59,7 +68,9 @@ public class CatalogueItem implements Serializable{
|
|||
@Override
|
||||
public String toString() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.append("CatalogueItem [itemName=");
|
||||
builder.append("CatalogueItem [itemId=");
|
||||
builder.append(itemId);
|
||||
builder.append(", itemName=");
|
||||
builder.append(itemName);
|
||||
builder.append(", itemURL=");
|
||||
builder.append(itemURL);
|
||||
|
@ -68,6 +79,6 @@ public class CatalogueItem implements Serializable{
|
|||
builder.append("]");
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue