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