gCubeSystem
/
rmp-common-library
15
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Resource Management / Monitor wrong generic resource query Fixed 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/rmp-common-library@114051 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2015-04-15 10:08:23 +00:00
parent 1337834b56
commit 01db133d00
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -30,7 +30,6 @@
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>
<!-- Don't let your Mac use a crazy non-standard encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>

3
src/main/java/org/gcube/resourcemanagement/support/client/utils/CurrentStatus.java
View File

@ -25,6 +25,7 @@ import org.gcube.resourcemanagement.support.shared.types.UserGroup;
import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.HandlerManager; import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.user.client.Window;
/** /**
* @author Daniele Strollo (ISTI-CNR) * @author Daniele Strollo (ISTI-CNR)
@ -65,7 +66,7 @@ public final class CurrentStatus implements Serializable {
return currentScope; return currentScope;
} }
public void setCurrentResourceType(final String resType) { public void setCurrentResourceType(String resType) {
if (resType != null) { if (resType != null) {
currentResourceType = resType.trim(); currentResourceType = resType.trim();
} else { } else {

3
src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getResourceByID.xq
View File

@ -1,3 +1,4 @@
for $resource in collection('/db/Profiles/<RES_TYPE ISdefault ='' />')//Resource declare namespace ic = 'http://gcube-system.org/namespaces/informationsystem/registry';
for $resource in collection('/db/Profiles/<RES_TYPE ISdefault ='' />')//Document/Data/ic:Profile/Resource
where $resource/ID/string() eq '<RES_ID/>' where $resource/ID/string() eq '<RES_ID/>'
return $resource return $resource

6
src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getTypes.xq
View File

@ -1,4 +1,4 @@
declare namespace ic = 'http://gcube-system.org/namespaces/informationsystem/registry';
let $entry0ValueAuth := collection("/db/Profiles")//Resource let $entry0ValueAuth := collection("/db/Profiles")//Document/Data/ic:Profile/Resource
for $types in distinct-values($entry0ValueAuth//Resource/Type/text()) for $types in distinct-values($entry0ValueAuth/Type/text())
return <type>{$types}</type> return <type>{$types}</type>

5
src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GenericResource.xq
View File

@ -1,6 +1,7 @@
for $profiles in collection('/db/Profiles/GenericResource')//Resource declare namespace ic = 'http://gcube-system.org/namespaces/informationsystem/registry';
for $profiles in collection('/db/Profiles/GenericResource')//Document/Data/ic:Profile/Resource
let $scopes := string-join( $profiles/Scopes//Scope/text(), ';') let $scopes := string-join( $profiles/Scopes//Scope/text(), ';')
let $subtype := $profiles//Resource/Profile/SecondaryType/text() let $subtype := $profiles/Profile/SecondaryType/text()
<RES_SUBTYPE ISdefault =''/> <RES_SUBTYPE ISdefault =''/>
return return
<RESOURCE/> <RESOURCE/>