gCubeSystem
/
ckan-metadata-publisher-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor fixes 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@129078 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2016-06-13 10:29:50 +00:00
parent ec90991661
commit e80da80e69
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
View File

@ -66,23 +66,23 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
*/ */
private String getCurrentScope(){ private String getCurrentScope(){
if(isWithinPortal()) //if(isWithinPortal())
return ScopeProvider.instance.get(); return ScopeProvider.instance.get();
else // else
return "/gcube"; // Development // return "/gcube"; // Development
} }
/** // /**
* Get the scope in which we look for metadata // * Get the scope in which we look for metadata
* @return // * @return
*/ // */
private String getMetadataScope(){ // private String getMetadataScope(){
if(isWithinPortal()) // if(isWithinPortal())
return ScopeProvider.instance.get(); // return ScopeProvider.instance.get();
else // else
return "/gcube/devsec/devVRE"; // Development // return "/gcube/devsec/devVRE"; // Development
} // }
/** /**
* Return the ckan catalogue url for this scope. * Return the ckan catalogue url for this scope.
@ -184,7 +184,6 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
try { try {
ScopeProvider.instance.set(getMetadataScope()); // TODO remove
DataCalogueMetadataFormatReader reader = new DataCalogueMetadataFormatReader(); DataCalogueMetadataFormatReader reader = new DataCalogueMetadataFormatReader();
for (MetadataType mt : reader.getListOfMetadataTypes()) { for (MetadataType mt : reader.getListOfMetadataTypes()) {
@ -333,7 +332,6 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
bean.setOwnerIdentifier(owner); bean.setOwnerIdentifier(owner);
if(folderId != null && !folderId.isEmpty()){ if(folderId != null && !folderId.isEmpty()){
ScopeProvider.instance.set("/gcube");
Workspace ws = HomeLibrary Workspace ws = HomeLibrary
.getHomeManagerFactory() .getHomeManagerFactory()
@ -480,7 +478,6 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
try{ try{
ScopeProvider.instance.set("/gcube");
Workspace ws = HomeLibrary Workspace ws = HomeLibrary
.getHomeManagerFactory() .getHomeManagerFactory()
.getHomeManager() .getHomeManager()