diff --git a/.gitignore b/.gitignore
index 73b934c14d4dd0941bbbe3e438546524adeacd67..20742656b914e4af764599873a85644e5b2a4ce2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ src/generated
gradle.properties
/out
/build
+/bin
+.classpath
+.project
+.settings/
InstanceSettings.xml
-dependencies.txt
-/webapps
diff --git a/build.gradle b/build.gradle
index 45afa1f18801119db8abb6c77098f7e2004984c2..2e3efa7c6772f8a3c2d074fd0bdc1ab303023f74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
def vXnat = '1.7.0-SNAPSHOT'
def vXnatPipeline = vXnat
def vSpring = '4.2.5.RELEASE'
-def vSpringSecurity = '4.0.3.RELEASE'
+def vSpringSecurity = '4.0.4.RELEASE'
def vSwagger = '2.3.1'
def vHibernate = '4.3.11.Final'
def vEhcache = '2.6.11'
@@ -34,19 +34,16 @@ buildscript {
jcenter()
}
dependencies {
- classpath "org.nrg.xnat.build:gradle-xnat-plugin:1.7.0-SNAPSHOT"
classpath "com.bmuschko:gradle-cargo-plugin:2.2.2"
classpath "com.bmuschko:gradle-tomcat-plugin:2.2.4"
}
}
-apply plugin: 'xnat'
apply plugin: 'groovy'
apply plugin: 'java'
apply plugin: 'war'
apply plugin: 'maven'
apply plugin: 'maven-publish'
-apply plugin: 'ivy-publish'
apply plugin: 'com.bmuschko.tomcat'
apply plugin: 'com.bmuschko.cargo'
apply plugin: 'idea'
@@ -82,7 +79,7 @@ configurations {
if (hasProperty("archiveName")) {
war.archiveName = archiveName.endsWith(".war") ? archiveName : "${archiveName}.war"
} else {
- war.baseName = "xnat-web"
+war.baseName = "xnat-web"
}
sourceSets {
@@ -238,6 +235,9 @@ configurations {
dependencies {
// NRG dependencies first.
compile "org.nrg.xnat:spawner:${vXnat}"
+ compile("org.nrg.xnat:xnat-data-models:${vXnat}"){
+ transitive = false
+ }
compile "org.nrg.xdat:core:${vXnat}"
compile "org.nrg:framework:${vXnat}"
compile "org.nrg:transaction:${vXnat}"
diff --git a/src/main/java/org/nrg/dcm/id/RoutedStudyDicomProjectIdentifier.java b/src/main/java/org/nrg/dcm/id/RoutedStudyDicomProjectIdentifier.java
index 50bd47cfde866988f5996f748ae08ad8521dc2b2..60e00a80970901fffabcc977cef8c44616242a96 100644
--- a/src/main/java/org/nrg/dcm/id/RoutedStudyDicomProjectIdentifier.java
+++ b/src/main/java/org/nrg/dcm/id/RoutedStudyDicomProjectIdentifier.java
@@ -15,7 +15,7 @@ import java.util.SortedSet;
import javax.inject.Inject;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.dcm4che2.data.DicomObject;
import org.dcm4che2.data.Tag;
import org.nrg.xdat.om.XnatProjectdata;
diff --git a/src/main/java/org/nrg/dcm/id/ScriptedSessionAssignmentExtractor.java b/src/main/java/org/nrg/dcm/id/ScriptedSessionAssignmentExtractor.java
index 6f54c07cb4ba0210425df021f3f0df84c0440bf4..47188bf1ee4c5f86ee5ec6788da2e96be416cbae 100644
--- a/src/main/java/org/nrg/dcm/id/ScriptedSessionAssignmentExtractor.java
+++ b/src/main/java/org/nrg/dcm/id/ScriptedSessionAssignmentExtractor.java
@@ -1,6 +1,6 @@
package org.nrg.dcm.id;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.dcm4che2.data.DicomObject;
import org.nrg.automation.entities.Script;
import org.nrg.automation.services.ScriptRunnerService;
diff --git a/src/main/java/org/nrg/pipeline/XnatPipelineLauncher.java b/src/main/java/org/nrg/pipeline/XnatPipelineLauncher.java
index 61640916b8871943146daa3d1afc49953ee54f6c..c3d6e8fc6c0ca0b4d57ead33ea8aec964ffde91e 100644
--- a/src/main/java/org/nrg/pipeline/XnatPipelineLauncher.java
+++ b/src/main/java/org/nrg/pipeline/XnatPipelineLauncher.java
@@ -11,7 +11,7 @@
package org.nrg.pipeline;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.pipeline.client.XNATPipelineLauncher;
diff --git a/src/main/java/org/nrg/xapi/model/users/User.java b/src/main/java/org/nrg/xapi/model/users/User.java
index ae714c01c28daa5d6a1fbd542211510bcc597af5..862323e04ba8fb73dbd31cacdddd77fd5ffb6273 100644
--- a/src/main/java/org/nrg/xapi/model/users/User.java
+++ b/src/main/java/org/nrg/xapi/model/users/User.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.om.XdatUser;
import org.nrg.xdat.om.base.auto.AutoXdatUser;
import org.nrg.xdat.security.XDATUser;
diff --git a/src/main/java/org/nrg/xapi/rest/dicomscp/DicomSCPApi.java b/src/main/java/org/nrg/xapi/rest/dicomscp/DicomSCPApi.java
index 60c151817753a7403dbae71850d3a3025110de2e..d005355000c4a03b326eda906bec6e66930817ed 100644
--- a/src/main/java/org/nrg/xapi/rest/dicomscp/DicomSCPApi.java
+++ b/src/main/java/org/nrg/xapi/rest/dicomscp/DicomSCPApi.java
@@ -3,6 +3,7 @@ package org.nrg.xapi.rest.dicomscp;
import io.swagger.annotations.*;
import org.nrg.dcm.DicomSCPManager;
import org.nrg.dcm.preferences.DicomSCPInstance;
+import org.nrg.framework.annotations.XapiRestController;
import org.nrg.framework.exceptions.NrgServiceException;
import org.nrg.xapi.rest.NotFoundException;
import org.nrg.xdat.rest.AbstractXnatRestApi;
@@ -15,10 +16,8 @@ import org.springframework.web.bind.annotation.*;
import javax.inject.Inject;
import java.util.List;
-// @XnatRestlet({"/services/dicomscp", "/services/dicomscp/instance/{SCP_ID}", "/services/dicomscp/instance/{SCP_ID}/{ACTION}", "/services/dicomscp/{ACTION}"})
-
@Api(description = "XNAT DICOM SCP management API")
-@RestController
+@XapiRestController
@RequestMapping(value = "/dicomscp")
public class DicomSCPApi extends AbstractXnatRestApi {
private static final Logger _log = LoggerFactory.getLogger(DicomSCPApi.class);
diff --git a/src/main/java/org/nrg/xapi/rest/theme/ThemeApi.java b/src/main/java/org/nrg/xapi/rest/theme/ThemeApi.java
index 94c12a0c52eda64d18740dab85a51ae9b4c5bde9..deea66e3e5f31938f58654b7ea812e3608f362fd 100644
--- a/src/main/java/org/nrg/xapi/rest/theme/ThemeApi.java
+++ b/src/main/java/org/nrg/xapi/rest/theme/ThemeApi.java
@@ -13,6 +13,7 @@ package org.nrg.xapi.rest.theme;
import io.swagger.annotations.*;
import org.apache.commons.io.FileUtils;
+import org.nrg.framework.annotations.XapiRestController;
import org.nrg.xapi.rest.NotFoundException;
import org.nrg.xdat.entities.ThemeConfig;
import org.nrg.xdat.security.XDATUser;
@@ -33,7 +34,7 @@ import java.util.ArrayList;
import java.util.List;
@Api(description = "XNAT Theme Management API")
-@RestController
+@XapiRestController
@RequestMapping(value = "/theme")
public class ThemeApi {
private static final Logger _log = LoggerFactory.getLogger(ThemeApi.class);
diff --git a/src/main/java/org/nrg/xapi/rest/users/UsersApi.java b/src/main/java/org/nrg/xapi/rest/users/UsersApi.java
index 83adf8bec14a3763714b4df255e46c030cd60d9d..80691aef62ff33a548583777bc9c3204dbb4a1b4 100644
--- a/src/main/java/org/nrg/xapi/rest/users/UsersApi.java
+++ b/src/main/java/org/nrg/xapi/rest/users/UsersApi.java
@@ -2,6 +2,7 @@ package org.nrg.xapi.rest.users;
import io.swagger.annotations.*;
import org.apache.commons.lang3.StringUtils;
+import org.nrg.framework.annotations.XapiRestController;
import org.nrg.xapi.model.users.User;
import org.nrg.xapi.rest.NotFoundException;
import org.nrg.xdat.rest.AbstractXnatRestApi;
@@ -21,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
@Api(description = "The XNAT POC User Management API")
-@RestController
+@XapiRestController
@RequestMapping(value = "/users")
public class UsersApi extends AbstractXnatRestApi {
private static final Logger _log = LoggerFactory.getLogger(UsersApi.class);
@@ -169,7 +170,7 @@ public class UsersApi extends AbstractXnatRestApi {
}
@ApiOperation(value = "Sets the user's verified state.", notes = "Sets the verified state of the user with the specified user ID to the value of the flag parameter.", response = Boolean.class)
- @ApiResponses({@ApiResponse(code = 200, message = "User verified status successfully set."), @ApiResponse(code = 401, message = "Must be authenticated to access the XNAT REST API."), @ApiResponse(code = 403, message = "Not authorized to verify or unverify this user."), @ApiResponse(code = 404, message = "User not found."), @ApiResponse(code = 500, message = "Unexpected error")})
+ @ApiResponses({@ApiResponse(code = 200, message = "User verified status successfully set."), @ApiResponse(code = 401, message = "Must be authenticated to access the XNAT REST API."), @ApiResponse(code = 403, message = "Not authorized to verify or un-verify this user."), @ApiResponse(code = 404, message = "User not found."), @ApiResponse(code = 500, message = "Unexpected error")})
@RequestMapping(value = {"/{id}/verified/{flag}"}, produces = {"application/json"}, method = {RequestMethod.PUT})
public ResponseEntity<Boolean> usersIdVerifiedFlagPut(@ApiParam(value = "ID of the user to fetch", required = true) @PathVariable("id") String id, @ApiParam(value = "The value to set for the verified status.", required = true) @PathVariable("flag") Boolean flag) {
HttpStatus status = isPermitted(id);
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcArchivespecification.java b/src/main/java/org/nrg/xdat/om/base/BaseArcArchivespecification.java
deleted file mode 100644
index 836846330a196c0e52fb747d97c7006c13760082..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcArchivespecification.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcArchivespecification
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.nrg.mail.api.NotificationSubscriberProvider;
-import org.nrg.mail.api.NotificationType;
-import org.nrg.xdat.model.ArcArchivespecificationNotificationTypeI;
-
-import org.nrg.xdat.model.ArcPathinfoI;
-import org.nrg.xdat.model.ArcProjectI;
-import org.nrg.xdat.om.ArcProject;
-import org.nrg.xdat.om.base.auto.AutoArcArchivespecification;
-import org.nrg.xdat.turbine.utils.AdminUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcArchivespecification extends AutoArcArchivespecification implements NotificationSubscriberProvider {
-
- public BaseArcArchivespecification(ItemI item)
- {
- super(item);
- injectProvider();
- }
-
- public BaseArcArchivespecification(UserI user)
- {
- super(user);
- injectProvider();
- }
-
- /*
- * @deprecated Use BaseArcArchivespecification(UserI user)
- **/
- public BaseArcArchivespecification()
- {}
-
- public BaseArcArchivespecification(Hashtable properties, UserI user)
- {
- super(properties,user);
- injectProvider();
- }
-
- public String[] getSubscribers(NotificationType notificationType) {
- for (ArcArchivespecificationNotificationTypeI type : getNotificationTypes_notificationType()) {
- if (type.getNotificationType().equalsIgnoreCase(notificationType.id())) {
- String[] addresses = type.getEmailAddresses().split("[\\s]*,[\\s]*");
- if (ArrayUtils.isEmpty(addresses)) {
- return null;
- }
- return addresses;
- }
- }
-
- return null;
- }
-
- public String getGlobalArchivePath(){
- String path = null;
- ArcPathinfoI pathInfo= this.getGlobalpaths();
- if (pathInfo!=null){
- path=pathInfo.getArchivepath();
- }
- if (path==null){
- path =".";
- }
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- }
-
- public String getGlobalPrearchivePath(){
- String path = null;
- ArcPathinfoI pathInfo= this.getGlobalpaths();
- if (pathInfo!=null){
- path=pathInfo.getPrearchivepath();
- }
- if (path==null){
- path =".";
- }
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- }
-
- public String getGlobalCachePath(){
- String path = null;
- ArcPathinfoI pathInfo= this.getGlobalpaths();
- if (pathInfo!=null){
- path=pathInfo.getCachepath();
- }
- if (path==null){
- path =".";
- }
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- }
-
- public String getGlobalBuildPath(){
- String path = null;
- ArcPathinfoI pathInfo= this.getGlobalpaths();
- if (pathInfo!=null){
- path=pathInfo.getBuildpath();
- }
- if (path==null){
- path =".";
- }
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- }
-
- private String addEndingSlash(String path){
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- }
-
- public String getArchivePathForProject(String id){
- String path = null;
- List<ArcProjectI> projects=this.getProjects_project();
- for (ArcProjectI p : projects){
- if (p.getId().equals(id)){
- ArcPathinfoI pathInfo= p.getPaths();
- if (pathInfo!=null){
- path=pathInfo.getArchivepath();
- }
- break;
- }
- }
- if (path==null || path.trim().equals("")){
- ArcPathinfoI pathInfo= this.getGlobalpaths();
- if (pathInfo!=null){
- path=addEndingSlash(pathInfo.getArchivepath())+id;
- }
- }
- if (path==null){
- path =addEndingSlash(".")+id;
- }
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- }
-
- public String getCachePathForProject(String id){
- String path = null;
- List<ArcProjectI> projects=this.getProjects_project();
- for (ArcProjectI p : projects){
- if (p.getId().equals(id)){
- ArcPathinfoI pathInfo= p.getPaths();
- if (pathInfo!=null){
- path=pathInfo.getCachepath();
- }
- break;
- }
- }
- if (path==null || path.trim().equals("")){
- ArcPathinfoI pathInfo= this.getGlobalpaths();
- if (pathInfo!=null){
- path=addEndingSlash(pathInfo.getCachepath())+id;
- }
- }
- if (path==null){
- path =addEndingSlash(".")+id;
- }
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- }
-
- public Integer getPrearchiveCodeForProject(String id){
- List<ArcProjectI> projects=this.getProjects_project();
- for (ArcProjectI p : projects){
- if (p.getId().equals(id)){
- return p.getPrearchiveCode();
- }
- }
- return null;
- }
-
- public Integer getAutoQuarantineCodeForProject(String id){
- List<ArcProjectI> projects=this.getProjects_project();
- for (ArcProjectI p : projects){
- if (p.getId().equals(id)){
- return p.getQuarantineCode();
- }
- }
- return null;
- }
-
- public String getPrearchivePathForProject(String id){
- String path = null;
- List<ArcProjectI> projects=this.getProjects_project();
- for (ArcProjectI p : projects){
- if (p.getId().equals(id)){
- ArcPathinfoI pathInfo= p.getPaths();
- if (pathInfo!=null){
- path=pathInfo.getPrearchivepath();
- }
- break;
- }
- }
- if (path==null || path.trim().equals("")){
- ArcPathinfoI pathInfo= this.getGlobalpaths();
- if (pathInfo!=null){
- path=addEndingSlash(pathInfo.getPrearchivepath())+id;
- }
- }
- if (path==null){
- path =addEndingSlash(".")+id;
- }
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- }
-
- public String getBuildPathForProject(String id){
- String path = null;
- List<ArcProjectI> projects=this.getProjects_project();
- for (ArcProjectI p : projects){
- if (p.getId().equals(id)){
- ArcPathinfoI pathInfo= p.getPaths();
- if (pathInfo!=null){
- path=pathInfo.getBuildpath();
- }
- break;
- }
- }
- if (path==null || path.trim().equals("")){
- ArcPathinfoI pathInfo= this.getGlobalpaths();
- if (pathInfo!=null){
- path=pathInfo.getBuildpath();
- }
- }
- if (path==null){
- path =".";
- }
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- }
-
- public ArcProject getProjectArc(String id){
- List<ArcProjectI> projects=getProjects_project();
- for (ArcProjectI p : projects){
- if (p.getId().equals(id)){
- return (ArcProject)p;
- }
- }
- return null;
- }
-
- public boolean isComplete(){
- if (this.getSiteId()==null || this.getSiteId().equals("")){
- return false;
- }
-
- if (this.getSiteAdminEmail()==null || this.getSiteAdminEmail().equals("")){
- return false;
- }
-
- if (this.getGlobalpaths()==null){
- return false;
- }
-
- if (this.getGlobalpaths().getArchivepath()==null || this.getGlobalpaths().getArchivepath().equals("")){
- return false;
- }
-
- if (this.getGlobalpaths().getPrearchivepath()==null || this.getGlobalpaths().getPrearchivepath().equals("")){
- return false;
- }
-
- if (this.getGlobalpaths().getCachepath()==null || this.getGlobalpaths().getCachepath().equals("")){
- return false;
- }
-
- if (this.getGlobalpaths().getBuildpath()==null || this.getGlobalpaths().getBuildpath().equals("")){
- return false;
- }
-
- if (this.getGlobalpaths().getFtppath()==null || this.getGlobalpaths().getFtppath().equals("")){
- return false;
- }
-
- return true;
- }
-
- /**
- * This is very low-rent dependency injection.
- */
- private void injectProvider() {
- if (AdminUtils.getNotificationSubscriberProvider() == null) {
- AdminUtils.setNotificationSubscriberProvider(this);
-}
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcArchivespecificationNotificationType.java b/src/main/java/org/nrg/xdat/om/base/BaseArcArchivespecificationNotificationType.java
deleted file mode 100644
index 40d2f31404d9eda2e8d4ce04c3be82000ed05cdf..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcArchivespecificationNotificationType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcArchivespecificationNotificationType
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoArcArchivespecificationNotificationType;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcArchivespecificationNotificationType extends AutoArcArchivespecificationNotificationType {
-
- public BaseArcArchivespecificationNotificationType(ItemI item)
- {
- super(item);
- }
-
- public BaseArcArchivespecificationNotificationType(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcArchivespecificationNotificationType(UserI user)
- **/
- public BaseArcArchivespecificationNotificationType()
- {}
-
- public BaseArcArchivespecificationNotificationType(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcFieldspecification.java b/src/main/java/org/nrg/xdat/om/base/BaseArcFieldspecification.java
deleted file mode 100644
index 65f10048757d49fae5a43cf1df7cc868f5364499..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcFieldspecification.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcFieldspecification
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoArcFieldspecification;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcFieldspecification extends AutoArcFieldspecification {
-
- public BaseArcFieldspecification(ItemI item)
- {
- super(item);
- }
-
- public BaseArcFieldspecification(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcFieldspecification(UserI user)
- **/
- public BaseArcFieldspecification()
- {}
-
- public BaseArcFieldspecification(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcPathinfo.java b/src/main/java/org/nrg/xdat/om/base/BaseArcPathinfo.java
deleted file mode 100644
index d4b704f77fdb8fab61544ea4ba449748b700164d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcPathinfo.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcPathinfo
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoArcPathinfo;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcPathinfo extends AutoArcPathinfo {
-
- public BaseArcPathinfo(ItemI item)
- {
- super(item);
- }
-
- public BaseArcPathinfo(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcPathinfo(UserI user)
- **/
- public BaseArcPathinfo()
- {}
-
- public BaseArcPathinfo(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getArchivepath(){
- try{
- String path = super.getArchivepath();
-
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- } catch (Throwable e1) {logger.error(e1);return null;}
- }
- /**
- * @return Returns the prearchivePath.
- */
- public String getPrearchivepath(){
- try{
- String path = super.getPrearchivepath();
-
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- } catch (Throwable e1) {logger.error(e1);return null;}
- }
-
- /**
- * @return Returns the cachePath.
- */
- public String getCachepath(){
- try{
- String path = super.getCachepath();
-
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- } catch (Throwable e1) {logger.error(e1);return null;}
- }
-
- /**
- * @return Returns the buildPath.
- */
- public String getBuildpath(){
- try{
- String path = super.getBuildpath();
-
- path = path.replace('\\', '/');
- if (!path.endsWith("/")){
- path = path +"/";
- }
- return path;
- } catch (Throwable e1) {logger.error(e1);return null;}
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcPipelinedata.java b/src/main/java/org/nrg/xdat/om/base/BaseArcPipelinedata.java
deleted file mode 100644
index 749adef8ab2f7e968f5f7c8ee26e80e61dfea692..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcPipelinedata.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcPipelinedata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.ArcPipelineparameterdataI;
-import org.nrg.xdat.om.ArcPipelineparameterdata;
-import org.nrg.xdat.om.base.auto.AutoArcPipelinedata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-import org.nrg.xft.exception.ElementNotFoundException;
-import org.nrg.xft.exception.FieldNotFoundException;
-import org.nrg.xft.exception.XFTInitException;
-import org.nrg.xft.security.UserI;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcPipelinedata extends AutoArcPipelinedata {
-
- public BaseArcPipelinedata(ItemI item)
- {
- super(item);
- }
-
- public BaseArcPipelinedata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcPipelinedata(UserI user)
- **/
- public BaseArcPipelinedata()
- {}
-
- public BaseArcPipelinedata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getCommand(XFTItem itemOfExpectedXsiType) throws ElementNotFoundException, FieldNotFoundException, XFTInitException {
- String rtn = "";
- if (getLocation() != null) {
- rtn = " -pipeline " + getLocation() + " " ;
- }
- //rtn += getName();
- List<ArcPipelineparameterdataI> parameters = this.getParameters_parameter();
- for (int i = 0; i < parameters.size(); i++) {
- ArcPipelineparameterdata param = (ArcPipelineparameterdata) parameters.get(i);
- String schemaLink = param.getSchemalink();
- String values = null;
- if (schemaLink != null) {
- Object o = itemOfExpectedXsiType.getProperty(schemaLink, true);
- if (o != null && values == null ) values = "";
- try {
- ArrayList<XFTItem> matches = (ArrayList<XFTItem>) o;
- for (int j = 0; j < matches.size(); j++) {
- values += matches.get(j) + ",";
- }
- }catch(ClassCastException cce) {
- values += o + ",";
- }
- if (values != null && values.endsWith(",")) {
- values = values.substring(0, values.length() -1);
- }
- }else {
- values = param.getCsvvalues();
- }
- if (values != null) {
- rtn += " -parameter " + param.getName() + "=" + values;
- }
- }
- return rtn;
- }
-
- public boolean hasCutomwebpage() {
- boolean rtn = false;
- if (getCustomwebpage() !=null)
- rtn = true;
- return rtn;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcPipelineparameterdata.java b/src/main/java/org/nrg/xdat/om/base/BaseArcPipelineparameterdata.java
deleted file mode 100644
index 50bf784e27cbafe4a643f9667930a981253d7a34..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcPipelineparameterdata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcPipelineparameterdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoArcPipelineparameterdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcPipelineparameterdata extends AutoArcPipelineparameterdata {
-
- public BaseArcPipelineparameterdata(ItemI item)
- {
- super(item);
- }
-
- public BaseArcPipelineparameterdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcPipelineparameterdata(UserI user)
- **/
- public BaseArcPipelineparameterdata()
- {}
-
- public BaseArcPipelineparameterdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcProject.java b/src/main/java/org/nrg/xdat/om/base/BaseArcProject.java
deleted file mode 100644
index 26c27dc91e6e16cbdfe719321ef09d9e3c008596..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcProject.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcProject
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.apache.commons.lang.StringUtils;
-import org.nrg.pipeline.PipelineRepositoryManager;
-import org.nrg.xdat.model.ArcPipelinedataI;
-import org.nrg.xdat.model.ArcProjectDescendantI;
-import org.nrg.xdat.model.ArcProjectDescendantPipelineI;
-import org.nrg.xdat.model.ArcProjectPipelineI;
-import org.nrg.xdat.om.ArcProjectDescendant;
-import org.nrg.xdat.om.ArcProjectDescendantPipeline;
-import org.nrg.xdat.om.ArcProjectPipeline;
-import org.nrg.xdat.om.base.auto.AutoArcProject;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.exceptions.PipelineNotFoundException;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcProject extends AutoArcProject {
-
- public BaseArcProject(ItemI item)
- {
- super(item);
- }
-
- public BaseArcProject(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcProject(UserI user)
- **/
- public BaseArcProject()
- {}
-
- public BaseArcProject(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- @Override
- public Integer getPrearchiveCode() {
- Integer i= super.getPrearchiveCode();
- if(i==null){
- return new Integer(0);
- }else{
- return i;
- }
- }
-
- @Override
- public Integer getQuarantineCode() {
- Integer i= super.getQuarantineCode();
- if(i==null){
- return new Integer(0);
- }else{
- return i;
- }
- }
-
- public List<ArcProjectDescendantPipelineI> getPipelinesForDescendant(String xsiType) {
- List<ArcProjectDescendantPipelineI>rtn = new ArrayList<ArcProjectDescendantPipelineI>();
- List<ArcProjectDescendant> descendants = getPipelines_descendants_descendant();
- if (xsiType == null || descendants == null) return rtn;
- for (int i = 0; i < descendants.size(); i++) {
- if (xsiType.equals(descendants.get(i).getXsitype()) || PipelineRepositoryManager.ALL_DATA_TYPES.equals(descendants.get(i).getXsitype())) {
- List<ArcProjectDescendantPipelineI> pipelines = descendants.get(i).getPipeline();
- if (pipelines != null && pipelines.size() > 0)
- rtn.addAll(pipelines);
- }
- }
- return rtn;
- }
-
-
- public ArrayList<ArcPipelinedataI> getPipelinesForDescendantLikeStepId(String xsiType, String pipelineStep) throws PipelineNotFoundException {
- ArrayList<ArcPipelinedataI> rtn = new ArrayList<ArcPipelinedataI>();
- List<ArcProjectDescendantPipelineI> descendantPipelines = getPipelinesForDescendant(xsiType);
- for (int i = 0; i < descendantPipelines.size(); i++) {
- if (descendantPipelines.get(i).getStepid()!=null && descendantPipelines.get(i).getStepid().startsWith(pipelineStep)) {
- rtn.add(((ArcProjectDescendantPipeline)descendantPipelines.get(i)).getPipelinedata());
- }
- }
- //if (rtn.size() == 0) throw new PipelineNotFoundException("A Pipeline identified by " + pipelineStep + " could not be found for " + xsiType + " for project " + getId());
- return rtn;
- }
-
- public ArrayList<ArcPipelinedataI> getPipelinesForDescendant(String xsiType, String pipelineStep, String match) throws PipelineNotFoundException {
- ArrayList<ArcPipelinedataI> rtn = new ArrayList<ArcPipelinedataI>();
- if (match.equalsIgnoreCase("EXACT")) {
- ArcPipelinedataI pipeline = getPipelineForDescendant(xsiType, pipelineStep);
- rtn.add(pipeline);
- }else if (match.equalsIgnoreCase("LIKE")) {
- rtn = getPipelinesForDescendantLikeStepId(xsiType, pipelineStep);
- }
- //if (rtn.size() == 0) throw new PipelineNotFoundException("A Pipeline identified by " + pipelineStep + " could not be found for " + xsiType + " for project " + getId());
- return rtn;
-
- }
-
- public ArcPipelinedataI getPipelineForDescendant(String xsiType, String pipelineStep) throws PipelineNotFoundException {
- ArcPipelinedataI rtn = null;
- List<ArcProjectDescendantPipelineI> descendantPipelines = getPipelinesForDescendant(xsiType);
- for (int i = 0; i < descendantPipelines.size(); i++) {
- if (descendantPipelines.get(i).getStepid().equals(pipelineStep)) {
- rtn = ((ArcProjectDescendantPipeline)descendantPipelines.get(i)).getPipelinedata();
- break;
- }
- }
- if (rtn == null) throw new PipelineNotFoundException("A Pipeline identified by " + pipelineStep + " could not be found for " + xsiType + " for project " + getId());
- return rtn;
- }
-
- public ArcPipelinedataI getPipelineForDescendantByPath(String xsiType, String pipelinePath) throws PipelineNotFoundException {
- ArcPipelinedataI rtn = null;
- List<ArcProjectDescendantPipelineI> descendantPipelines = getPipelinesForDescendant(xsiType);
- for (int i = 0; i < descendantPipelines.size(); i++) {
- if (descendantPipelines.get(i).getLocation().equals(pipelinePath)) {
- rtn = ((ArcProjectDescendantPipeline)descendantPipelines.get(i)).getPipelinedata();
- break;
- }
- }
- if (rtn == null) throw new PipelineNotFoundException("A Pipeline identified by " + pipelinePath + " could not be found for " + xsiType + " for project " + getId());
- return rtn;
- }
-
- public ArcProjectDescendantPipeline getPipelineForDescendantEltByPath(String xsiType, String pipelinePath) throws PipelineNotFoundException {
- ArcProjectDescendantPipeline rtn = null;
- List<ArcProjectDescendantPipelineI> descendantPipelines = getPipelinesForDescendant(xsiType);
- for (int i = 0; i < descendantPipelines.size(); i++) {
- if (descendantPipelines.get(i).getLocation().equals(pipelinePath)) {
- rtn =((ArcProjectDescendantPipeline)descendantPipelines.get(i));
- break;
- }
- }
- if (rtn == null) throw new PipelineNotFoundException("A Pipeline identified by " + pipelinePath + " could not be found for " + xsiType + " for project " + getId());
- return rtn;
- }
-
- public int getPipelineForDescendantIndexByPath(String xsiType, String pipelinePath) throws PipelineNotFoundException {
- int rtn = -1;
- List<ArcProjectDescendantPipelineI> descendantPipelines = getPipelinesForDescendant(xsiType);
- for (int i = 0; i < descendantPipelines.size(); i++) {
- if (descendantPipelines.get(i).getLocation().equals(pipelinePath)) {
- rtn = i;
- break;
- }
- }
- if (rtn == -1) throw new PipelineNotFoundException("A Pipeline identified by " + pipelinePath + " could not be found for " + xsiType + " for project " + getId());
- return rtn;
- }
-
-
- public ArcPipelinedataI getPipeline(String pipelineStep) throws PipelineNotFoundException {
- ArcPipelinedataI rtn = null;
- List<ArcProjectPipelineI> pipelines =getPipelines_pipeline();
- for (int i = 0; i < pipelines.size(); i++) {
- if (pipelines.get(i).getStepid().equals(pipelineStep)) {
- rtn = ((ArcProjectPipeline)pipelines.get(i)).getPipelinedata();
- break;
- }
- }
- if (rtn == null) throw new PipelineNotFoundException("A Pipeline identified by " + pipelineStep + " could not be found for project " + getId());
- return rtn;
- }
-
- /**
- * Return root level pipeline with matching location and stepId (or null)
- * @param location
- * @param stepId
- * @return
- */
- public ArcProjectPipelineI getPipeline(String location, String stepId){
- for (ArcProjectPipelineI pipe:getPipelines_pipeline()) {
- if (StringUtils.equals(pipe.getLocation(),location) && StringUtils.equals(pipe.getStepid(),stepId)) {
- return pipe;
- }
- }
-
- return null;
- }
-
- /**
- * Return descendant pipeline with matching xsiType, location and stepId (or null)
- * @param xsiType
- * @param location
- * @param stepId
- * @return
- */
- public ArcProjectDescendantPipelineI getDescendantPipeline(String xsiType, String location, String stepId){
- for (final ArcProjectDescendantPipelineI pipe: getPipelinesForDescendant(xsiType)) {
- if (StringUtils.equals(pipe.getLocation(),location) && StringUtils.equals(pipe.getStepid(),stepId)) {
- return pipe;
- }
- }
-
- return null;
- }
-
-
- public ArcProjectPipeline getProjectPipeline(String pipelineStep) throws PipelineNotFoundException {
- ArcProjectPipeline rtn = null;
- List<ArcProjectPipelineI> pipelines =getPipelines_pipeline();
- for (int i = 0; i < pipelines.size(); i++) {
- if (pipelines.get(i).getStepid().equals(pipelineStep)) {
- return ((ArcProjectPipeline)pipelines.get(i));
- }
- }
- return null;
- }
-
-
-
- public ArcPipelinedataI getPipelineByPath(String pipelinePath) throws PipelineNotFoundException {
- ArcPipelinedataI rtn = null;
- List<ArcProjectPipelineI> pipelines =getPipelines_pipeline();
- for (int i = 0; i < pipelines.size(); i++) {
- if (pipelines.get(i).getLocation().equals(pipelinePath)) {
- rtn = ((ArcProjectPipeline)pipelines.get(i)).getPipelinedata();
- break;
- }
- }
- if (rtn == null) throw new PipelineNotFoundException("A Pipeline identified by " + pipelinePath + " could not be found for project " + getId());
- return rtn;
- }
-
- public ArcProjectPipeline getPipelineEltByPath(String pipelinePath) throws PipelineNotFoundException {
- ArcProjectPipeline rtn = null;
- List<ArcProjectPipelineI> pipelines =getPipelines_pipeline();
- for (int i = 0; i < pipelines.size(); i++) {
- if (pipelines.get(i).getLocation().equals(pipelinePath)) {
- rtn = (ArcProjectPipeline)pipelines.get(i);
- break;
- }
- }
- if (rtn == null) throw new PipelineNotFoundException("A Pipeline identified by " + pipelinePath + " could not be found for project " + getId());
- return rtn;
- }
-
- public int getPipelineIndexByPath(String pipelinePath) throws PipelineNotFoundException {
- int rtn = -1;
- List<ArcProjectPipelineI> pipelines =getPipelines_pipeline();
- for (int i = 0; i < pipelines.size(); i++) {
- if (pipelines.get(i).getLocation().equals(pipelinePath)) {
- rtn = i;
- break;
- }
- }
- if (rtn == -1) throw new PipelineNotFoundException("A Pipeline identified by " + pipelinePath + " could not be found for project " + getId());
- return rtn;
- }
-
-
- public ArcProjectDescendant getDescendant(String xsiType) {
- ArcProjectDescendant rtn = null;
- List<ArcProjectDescendantI> descendants = getPipelines_descendants_descendant();
- if (xsiType == null || descendants == null) return rtn;
- for (int i = 0; i < descendants.size(); i++) {
- if (descendants.get(i).getXsitype().equals(xsiType)) {
- rtn = (ArcProjectDescendant)descendants.get(i);
- break;
- }
- }
- return rtn;
- }
-
- public void removeAllDescendantPipelines() {
- List<ArcProjectDescendantI> descendants = getPipelines_descendants_descendant();
- if (descendants.size() > 0) {
- int i = 0;
- Iterator iter = descendants.iterator();
- while (iter.hasNext()) {
- removePipelines_descendants_descendant(i);
- descendants = getPipelines_descendants_descendant();
- iter = descendants.iterator();
- }
- }
- }
-
- public void removeAllPipelines() {
- removeAllDescendantPipelines();
- removeAllProjectPipelines();
- }
-
- public void removeAllProjectPipelines() {
- List<ArcProjectPipelineI> projPipeline = getPipelines_pipeline();
- if (projPipeline.size() > 0) {
- int i = 0;
- Iterator iter = projPipeline.iterator();
- while (iter.hasNext()) {
- this.removePipelines_pipeline(i);
- projPipeline = getPipelines_pipeline();
- iter = projPipeline.iterator();
- }
- }
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcProjectDescendant.java b/src/main/java/org/nrg/xdat/om/base/BaseArcProjectDescendant.java
deleted file mode 100644
index cd18839711d41117d75ec7a6a4414203a16ca340..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcProjectDescendant.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcProjectDescendant
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.ArcProjectDescendantPipelineI;
-import org.nrg.xdat.om.ArcProjectDescendantPipeline;
-import org.nrg.xdat.om.base.auto.AutoArcProjectDescendant;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.exceptions.PipelineNotFoundException;
-
-import java.util.Hashtable;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcProjectDescendant extends AutoArcProjectDescendant {
-
- public BaseArcProjectDescendant(ItemI item)
- {
- super(item);
- }
-
- public BaseArcProjectDescendant(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcProjectDescendant(UserI user)
- **/
- public BaseArcProjectDescendant()
- {}
-
- public BaseArcProjectDescendant(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- public int getPipelineIndex(String pipelinePath) throws PipelineNotFoundException {
- int i = -1;
- List<ArcProjectDescendantPipelineI> pipelines = getPipeline();
- for (int j = 0; j <pipelines.size(); j++) {
- if (pipelines.get(j).getLocation().equals(pipelinePath)) {
- i = j;
- break;
- }
- }
- if (i == -1) throw new PipelineNotFoundException("Couldnt find pipelines located at " + pipelinePath + " for " + getXsitype());
- return i;
- }
-
- public ArcProjectDescendantPipeline getPipeline(String pipelinePath) throws PipelineNotFoundException {
- ArcProjectDescendantPipeline rtn = null;
- List<ArcProjectDescendantPipelineI> pipelines = getPipeline();
- for (int j = 0; j <pipelines.size(); j++) {
- if (pipelines.get(j).getLocation().equals(pipelinePath)) {
- rtn = (ArcProjectDescendantPipeline)pipelines.get(j);
- break;
- }
- }
- if (rtn == null) throw new PipelineNotFoundException("Couldnt find pipelines located at " + pipelinePath + " for " + getXsitype());
- return rtn;
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcProjectDescendantPipeline.java b/src/main/java/org/nrg/xdat/om/base/BaseArcProjectDescendantPipeline.java
deleted file mode 100644
index 850eb0f80bf6e4bdda3605f10299794761ef6a8b..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcProjectDescendantPipeline.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcProjectDescendantPipeline
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoArcProjectDescendantPipeline;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcProjectDescendantPipeline extends AutoArcProjectDescendantPipeline {
-
- public BaseArcProjectDescendantPipeline(ItemI item)
- {
- super(item);
- }
-
- public BaseArcProjectDescendantPipeline(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcProjectDescendantPipeline(UserI user)
- **/
- public BaseArcProjectDescendantPipeline()
- {}
-
- public BaseArcProjectDescendantPipeline(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public boolean hasCustomwebpage() {
- boolean rtn = false;
- if (getCustomwebpage() !=null)
- rtn = true;
- return rtn;
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcProjectPipeline.java b/src/main/java/org/nrg/xdat/om/base/BaseArcProjectPipeline.java
deleted file mode 100644
index afe4f33412967c28b91225b938ebbfb4c396fbe2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcProjectPipeline.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcProjectPipeline
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoArcProjectPipeline;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcProjectPipeline extends AutoArcProjectPipeline {
-
- public BaseArcProjectPipeline(ItemI item)
- {
- super(item);
- }
-
- public BaseArcProjectPipeline(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcProjectPipeline(UserI user)
- **/
- public BaseArcProjectPipeline()
- {}
-
- public BaseArcProjectPipeline(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public boolean hasCustomwebpage() {
- boolean rtn = false;
- if (getCustomwebpage()!= null) {
- rtn = true;
- }
- return rtn;
- }
-
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseArcProperty.java b/src/main/java/org/nrg/xdat/om/base/BaseArcProperty.java
deleted file mode 100644
index d949d7067f0035c07aa7e15e490f0ba66555559d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseArcProperty.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseArcProperty
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoArcProperty;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseArcProperty extends AutoArcProperty {
-
- public BaseArcProperty(ItemI item)
- {
- super(item);
- }
-
- public BaseArcProperty(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseArcProperty(UserI user)
- **/
- public BaseArcProperty()
- {}
-
- public BaseArcProperty(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BasePipePipelinedetails.java b/src/main/java/org/nrg/xdat/om/base/BasePipePipelinedetails.java
deleted file mode 100644
index bee5e284cfba17930f96ff9877d20e5221ca480d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BasePipePipelinedetails.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BasePipePipelinedetails
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoPipePipelinedetails;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BasePipePipelinedetails extends AutoPipePipelinedetails {
-
- public BasePipePipelinedetails(ItemI item)
- {
- super(item);
- }
-
- public BasePipePipelinedetails(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BasePipePipelinedetails(UserI user)
- **/
- public BasePipePipelinedetails()
- {}
-
- public BasePipePipelinedetails(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BasePipePipelinedetailsElement.java b/src/main/java/org/nrg/xdat/om/base/BasePipePipelinedetailsElement.java
deleted file mode 100644
index 61c76424f4663b04bafd46c0b9339778d512b4fd..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BasePipePipelinedetailsElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BasePipePipelinedetailsElement
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoPipePipelinedetailsElement;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BasePipePipelinedetailsElement extends AutoPipePipelinedetailsElement {
-
- public BasePipePipelinedetailsElement(ItemI item)
- {
- super(item);
- }
-
- public BasePipePipelinedetailsElement(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BasePipePipelinedetailsElement(UserI user)
- **/
- public BasePipePipelinedetailsElement()
- {}
-
- public BasePipePipelinedetailsElement(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BasePipePipelinedetailsParameter.java b/src/main/java/org/nrg/xdat/om/base/BasePipePipelinedetailsParameter.java
deleted file mode 100644
index 7c6e2ca1142a3407fc1f513d1e29089e60af77ee..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BasePipePipelinedetailsParameter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BasePipePipelinedetailsParameter
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoPipePipelinedetailsParameter;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BasePipePipelinedetailsParameter extends AutoPipePipelinedetailsParameter {
-
- public BasePipePipelinedetailsParameter(ItemI item)
- {
- super(item);
- }
-
- public BasePipePipelinedetailsParameter(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BasePipePipelinedetailsParameter(UserI user)
- **/
- public BasePipePipelinedetailsParameter()
- {}
-
- public BasePipePipelinedetailsParameter(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BasePipePipelinerepository.java b/src/main/java/org/nrg/xdat/om/base/BasePipePipelinerepository.java
deleted file mode 100644
index 353957d299f72f4f9533273cfeb602cc5c426d77..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BasePipePipelinerepository.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BasePipePipelinerepository
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.nrg.pipeline.PipelineRepositoryManager;
-import org.nrg.xdat.model.ArcProjectDescendantI;
-import org.nrg.xdat.model.ArcProjectDescendantPipelineI;
-import org.nrg.xdat.model.ArcProjectPipelineI;
-import org.nrg.xdat.model.PipePipelinedetailsElementI;
-import org.nrg.xdat.model.PipePipelinedetailsI;
-import org.nrg.xdat.model.PipePipelinedetailsParameterI;
-import org.nrg.xdat.om.ArcPipelinedata;
-import org.nrg.xdat.om.ArcPipelineparameterdata;
-import org.nrg.xdat.om.ArcProject;
-import org.nrg.xdat.om.ArcProjectDescendant;
-import org.nrg.xdat.om.ArcProjectDescendantPipeline;
-import org.nrg.xdat.om.ArcProjectPipeline;
-import org.nrg.xdat.om.PipePipelinedetails;
-import org.nrg.xdat.om.PipePipelinedetailsParameter;
-import org.nrg.xdat.om.XnatProjectdata;
-import org.nrg.xdat.om.base.auto.AutoPipePipelinerepository;
-import org.nrg.xdat.security.ElementSecurity;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTTable;
-import org.nrg.xft.event.EventUtils;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xnat.turbine.utils.ArcSpecManager;
-
-import com.google.common.collect.Lists;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BasePipePipelinerepository extends AutoPipePipelinerepository {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(BasePipePipelinerepository.class);
-
- public BasePipePipelinerepository(ItemI item)
- {
- super(item);
- }
-
- public BasePipePipelinerepository(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BasePipePipelinerepository(UserI user)
- **/
- public BasePipePipelinerepository()
- {}
-
- public BasePipePipelinerepository(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- /**
- * Helper method to output a list of the pipelines registered to this arcProject.
- *
- * [0]: Display name of XSI type
- * [1]: Elements generated by this pipeline
- * [2]: Pipeline name
- * [3]: Pipeline description
- * [4]: Pipeline location
- * [5]: Applies To
- * [6]: xsi:type
- * [7]: stepId
- *
- * @param arcProject
- * @return
- */
- public List<String[]> listPipelines(ArcProject arcProject){
- final List<String[]> _return=Lists.newArrayList();
- if(arcProject!=null){
- final List<ArcProjectPipelineI> pipelines = arcProject.getPipelines_pipeline();
- if (pipelines.size() > 0 ) {
- for (int i = 0; i < pipelines.size(); i++) {
- final PipePipelinedetails pipeline = getPipeline(pipelines.get(i).getLocation());
- //TODO fix bug in project pipeline delete (currently is not removed correctly from projects), until then, need this check
- if (pipeline != null) {
- final String[] rowEntries = new String[8];
- rowEntries[0] = getDisplayName(XnatProjectdata.SCHEMA_ELEMENT_NAME);
- rowEntries[1] = getElementsGeneratedBy(pipeline);
- rowEntries[2] = pipelines.get(i).getName();
- rowEntries[3] = pipeline.getDescription();
- rowEntries[4] = pipelines.get(i).getLocation();
- rowEntries[5] = pipeline.getAppliesto();
- rowEntries[6] = "";
- rowEntries[7] = pipelines.get(i).getStepid();
- _return.add(rowEntries);
- }
- }
- }
-
- final List<ArcProjectDescendantI> descendants = arcProject.getPipelines_descendants_descendant();
- if (descendants.size() > 0 ) {
- for (int i = 0; i < descendants.size(); i++) {
- final List<ArcProjectDescendantPipelineI> pipelinesDesc = descendants.get(i).getPipeline();
- for (int j = 0; j < pipelinesDesc.size(); j++) {
- final PipePipelinedetails pipeline = getPipeline(pipelinesDesc.get(j).getLocation());
- final String[] rowEntries = new String[8];
- rowEntries[0] = getDisplayName(descendants.get(i).getXsitype());
- rowEntries[1] = getElementsGeneratedBy(pipeline);
- rowEntries[2] = pipelinesDesc.get(j).getName();
- rowEntries[3] = pipeline.getDescription();
- rowEntries[4] = pipelinesDesc.get(j).getLocation();
- rowEntries[5] = pipeline.getAppliesto();
- rowEntries[6] = descendants.get(i).getXsitype();
- rowEntries[7] = pipelinesDesc.get(j).getStepid();
- _return.add(rowEntries);
- }
- }
- }
- }
- return _return;
- }
-
- public XFTTable toTable(ArcProject arcProject) {
- XFTTable table = new XFTTable();
- try {
- ArrayList<String> cols = new ArrayList<String>();
- cols.add("Applies To");
- cols.add("Generates"); cols.add("Name"); cols.add("Description"); cols.add("Path");
- cols.add("Datatype");
- table.initTable(cols);
- for(String[] pipeline: listPipelines(arcProject)){
- table.insertRow(pipeline);
- }
- }catch(Exception e) {
- logger.error("Encountered exception " + e);
- }
- return table;
- }
-
- public PipePipelinedetails getPipeline(String path) {
- PipePipelinedetails rtn = null;
- List<PipePipelinedetailsI> pipelines = getPipeline();
- for (int i = 0; i < pipelines.size(); i++) {
- PipePipelinedetails pipeline = (PipePipelinedetails)pipelines.get(i);
- if (pipeline.getPath().equals(path)) {
- rtn = pipeline;
- break;
- }
- }
- return rtn;
- }
-
-
-
- private Hashtable<String, ArrayList<PipePipelinedetails>> getPipelinesPerDataType() {
- Hashtable<String, ArrayList<PipePipelinedetails>> rtn = new Hashtable<String, ArrayList<PipePipelinedetails>>();
- List<PipePipelinedetailsI> pipelines = getPipeline();
- if (pipelines.size() > 0 ) {
- for (int i = 0; i < pipelines.size(); i++) {
- PipePipelinedetails pipeline = (PipePipelinedetails)pipelines.get(i);
- if (rtn.containsKey(pipeline.getAppliesto())) {
- ArrayList<PipePipelinedetails> groupedByAppliesTo = rtn.get(pipeline.getAppliesto());
- groupedByAppliesTo.add(pipeline);
- rtn.put(pipeline.getAppliesto(),groupedByAppliesTo );
- }else {
- ArrayList<PipePipelinedetails> groupedByAppliesTo = new ArrayList<PipePipelinedetails>();
- groupedByAppliesTo.add(pipeline);
- rtn.put(pipeline.getAppliesto(), groupedByAppliesTo);
- }
- }
- }
- return rtn;
- }
-
-
- public ArrayList<PipePipelinedetails> getAllPipelines(String dataType) {
- Hashtable<String, ArrayList<PipePipelinedetails>> repository = getPipelinesPerDataType();
- return repository.get(dataType);
- }
-
-
-
- public Hashtable<String, ArrayList<ArcPipelinedata>> getPipelinesForProject(XnatProjectdata project) throws Exception {
- Hashtable<String, ArrayList<ArcPipelinedata>> rtn = new Hashtable<String,ArrayList<ArcPipelinedata>>();
- if (project == null) return rtn;
- Hashtable<String, ArrayList<PipePipelinedetails>> repository = getPipelinesPerDataType();
- if (repository == null) return rtn;
- Enumeration<String> keys = repository.keys();
- while (keys.hasMoreElements()) {
- String xsiType = keys.nextElement();
- ArrayList pipelinesForDataType = new ArrayList();
- if (xsiType.equalsIgnoreCase(XnatProjectdata.SCHEMA_ELEMENT_NAME))
- pipelinesForDataType = getArcPipelinesForProject(repository.get(xsiType));
- else
- pipelinesForDataType = getArcPipelinesForDescendant(repository.get(xsiType));
- if (pipelinesForDataType.size() > 0) {
- ArrayList<ArcPipelinedata> values = pipelinesForDataType;
- if (rtn.containsKey(xsiType)) {
- values = rtn.get(xsiType);
- values.addAll(pipelinesForDataType);
- }
- rtn.put(xsiType, values);
- }
- }
-
- return rtn;
- }
-
-
- public ArrayList<ArcProjectPipeline> getArcPipelinesForProject(ArrayList<PipePipelinedetails> pipelines) throws Exception {
- ArrayList<ArcProjectPipeline> rtn = new ArrayList<ArcProjectPipeline>();
- if (pipelines == null || pipelines.size() < 1) {
- return rtn;
- }
- for (int i = 0; i < pipelines.size(); i++) {
- PipePipelinedetails pipeline = pipelines.get(i);
- ArcProjectPipeline pBean = new ArcProjectPipeline();
- String description = pipeline.getDescription();
- if (description != null)
- description += " XNAT DATATYPE: " +pipeline.getAppliesto() + " Applies To: " + getDisplayName(pipeline.getAppliesto()) + " Generates: " + getElementsGeneratedBy(pipeline);
- else
- description = " XNAT DATATYPE: " +pipeline.getAppliesto() +" Applies To: " + getDisplayName(pipeline.getAppliesto()) + " Generates: " + getElementsGeneratedBy(pipeline);
- pBean.setDescription(description);
- String path = pipeline.getPath();
- File pipelineDescriptor = new File(path);
- //if (pipelineDescriptor.exists()) {
- pBean.setName(pipelineDescriptor.getName());
- pBean.setLocation(path);
- pBean.setDisplaytext(pipelineDescriptor.getName());
- //}
- String customwebpage = pipeline.getCustomwebpage();
- if (customwebpage != null)
- pBean.setCustomwebpage(customwebpage);
- List<PipePipelinedetailsParameterI> parameters = pipeline.getParameters_parameter();
- if (parameters != null && parameters.size() > 0 ) {
- for (int j = 0; j < parameters.size(); j++) {
- PipePipelinedetailsParameterI parameter = parameters.get(j);
- ArcPipelineparameterdata paramData = new ArcPipelineparameterdata();
- paramData.setName(parameter.getName());
- description = parameter.getDescription();
- if (description != null) {
- paramData.setDescription(description);
- }
- String value = parameter.getValues_schemalink();
- if (value != null)
- paramData.setSchemalink(value);
- else {
- value = parameter.getValues_csvvalues();
- paramData.setCsvvalues(value);
- }
- pBean.setParameters_parameter(paramData);
- }
- }
- rtn.add(pBean);
- }
- return rtn;
- }
-
- public boolean delete(ArcProject arcProject, String pathToPipeline, String dataType, UserI user) throws Exception {
- boolean success = true;
- boolean save = false;
- try {
- if (dataType.equalsIgnoreCase(XnatProjectdata.SCHEMA_ELEMENT_NAME)) {
- List<ArcProjectPipelineI> pipelines = arcProject.getPipelines_pipeline();
- for (int i = 0; i < pipelines.size(); i++) {
- ArcProjectPipeline pipeline = (ArcProjectPipeline)pipelines.get(i);
- if (pipeline.getLocation().equals(pathToPipeline)) {
- arcProject.removePipelines_pipeline(i);
- save = true;
- break;
- }
- }
- }else {
- ArcProjectDescendant descendant = arcProject.getDescendant(dataType);
- if (descendant == null) success = false;
- else {
- List<ArcProjectDescendantPipelineI> pipelines = descendant.getPipeline();
- for (int i = 0; i < pipelines.size(); i++) {
- ArcProjectDescendantPipeline pipeline = (ArcProjectDescendantPipeline)pipelines.get(i);
- if (pipeline.getLocation().equals(pathToPipeline)) {
- descendant.removePipeline(i);
- save = true;
- break;
- }
- }
- }
- }
- if (save) {
- SaveItemHelper.authorizedSave(arcProject,user, false, true,EventUtils.newEventInstance(EventUtils.CATEGORY.PROJECT_ADMIN, EventUtils.TYPE.STORE_XML, "Modified project pipelines"));
-
- }
- }catch(Exception e) {
- success = false;
- throw e;
- }
- return success;
- }
-
-
- public ArrayList<ArcProjectDescendantPipeline> getArcPipelinesForDescendant(ArrayList<PipePipelinedetails> pipelines) throws Exception {
- ArrayList<ArcProjectDescendantPipeline> rtn = new ArrayList<ArcProjectDescendantPipeline>();
- if (pipelines == null || pipelines.size() < 1) {
- return rtn;
- }
- for (int i = 0; i < pipelines.size(); i++) {
- PipePipelinedetails pipeline = pipelines.get(i);
- ArcProjectDescendantPipeline pBean = new ArcProjectDescendantPipeline();
- String description = pipeline.getDescription();
- if (description != null)
- description += " XNAT DATATYPE: " +pipeline.getAppliesto() + " Applies To: " + getDisplayName(pipeline.getAppliesto()) + " Generates: " + getElementsGeneratedBy(pipeline);
- else
- description = " XNAT DATATYPE: " +pipeline.getAppliesto() + " Applies To: " + getDisplayName(pipeline.getAppliesto()) + " Generates: " + getElementsGeneratedBy(pipeline);
- pBean.setDescription(description);
- String path = pipeline.getPath();
- File pipelineDescriptor = new File(path);
- //if (pipelineDescriptor.exists()) {
- pBean.setName(pipelineDescriptor.getName());
- pBean.setLocation(path);
- pBean.setDisplaytext(pipelineDescriptor.getName());
- //}
- String customwebpage = pipeline.getCustomwebpage();
- if (customwebpage != null)
- pBean.setCustomwebpage(customwebpage);
- List<PipePipelinedetailsParameterI> parameters = pipeline.getParameters_parameter();
- if (parameters != null && parameters.size() > 0 ) {
- for (int j = 0; j < parameters.size(); j++) {
- PipePipelinedetailsParameter parameter = (PipePipelinedetailsParameter)parameters.get(j);
- ArcPipelineparameterdata paramData = new ArcPipelineparameterdata();
- paramData.setName(parameter.getName());
- description = parameter.getDescription();
- if (description != null) {
- paramData.setDescription(description);
- }
- String value = parameter.getValues_schemalink();
- if (value != null)
- paramData.setSchemalink(value);
- else {
- value = parameter.getValues_csvvalues();
- paramData.setCsvvalues(value);
- }
- pBean.setParameters_parameter(paramData);
- }
- }
- rtn.add(pBean);
- }
- return rtn;
- }
-
- public ArcPipelineparameterdata convertToArcPipelineParameter(PipePipelinedetailsParameter parameter) {
- ArcPipelineparameterdata paramData = new ArcPipelineparameterdata();
- paramData.setName(parameter.getName());
- String description = parameter.getDescription();
- if (description != null) {
- paramData.setDescription(description);
- }
- String value = parameter.getValues_schemalink();
- if (value != null)
- paramData.setSchemalink(value);
- else {
- value = parameter.getValues_csvvalues();
- paramData.setCsvvalues(value);
- }
- return paramData;
- }
-
- public Hashtable<String, String> getGeneratedElementsByAllPipelines() {
- Hashtable<String, String> rtn = new Hashtable<String, String>();
- Hashtable<String, ArrayList<PipePipelinedetails>> repository = getPipelinesPerDataType();
- Enumeration<String> enume = repository.keys();
- while (enume.hasMoreElements()) {
- String dataType = enume.nextElement();
- ArrayList<PipePipelinedetails> pipelinesForDataType = repository.get(dataType);
- for (int i = 0; i < pipelinesForDataType.size(); i++) {
- PipePipelinedetails pipeline = pipelinesForDataType.get(i);
- List<PipePipelinedetailsElementI> generatedElements = pipeline.getGenerateselements_element();
- if (generatedElements.size() > 0) {
- for (int j = 0; j < generatedElements.size(); j++) {
- rtn.put(generatedElements.get(j).getElement().trim(), "");
- }
- }
- }
- }
- return rtn;
- }
-
-
- private boolean exists(List<ArcProjectPipelineI> pipelines, String path) {
- boolean exists = false;
- if (pipelines == null || path == null || pipelines.size() == 0) return false;
- for (int i = 0; i < pipelines.size(); i++) {
- String pipelinePath = pipelines.get(i).getLocation(); // + File.separator + pipelines.get(i).getName();
- if (pipelinePath.equals(path)) {
- exists = true;
- break;
- }
- }
- return exists;
- }
-
- private boolean existsDesc(List<ArcProjectDescendantPipelineI> pipelines, String path) {
- boolean exists = false;
- if (pipelines == null || path == null || pipelines.size() == 0 ) return exists;
- for (int i = 0; i < pipelines.size(); i++) {
- String pipelinePath = pipelines.get(i).getLocation(); // + File.separator + pipelines.get(i).getName();
- if (pipelinePath.equals(path)) {
- exists = true;
- break;
- }
- }
- return exists;
- }
-
-
-
- public String getElementsGeneratedBy(PipePipelinedetails pipeline) {
- String rtn = "";
- List<PipePipelinedetailsElementI> generatedElements = pipeline.getGenerateselements_element();
- if (generatedElements.size() > 0) {
- for (int i = 0; i < generatedElements.size(); i++) {
- rtn +=getDisplayName(generatedElements.get(i).getElement()) + ",";
- }
- }
- if (rtn.endsWith(",")) rtn = rtn.substring(0, rtn.length() - 1);
- return rtn;
- }
-
- public String getDisplayName(String dataType) {
- String rtn = dataType;
- try {
- Hashtable<String,ElementSecurity> ess = ElementSecurity.GetElementSecurities();
- rtn = ess.get(dataType).getPluralDescription();
- }catch(Exception e) {}
- return rtn;
- }
-
-
-
-
-
- public ArcProject createNewArcProject(XnatProjectdata proj) throws Exception {
- ArcProject arcProject = new ArcProject();
- if (proj == null) return arcProject;
- Hashtable<String, ArrayList<ArcPipelinedata>> pipelinesHash = PipelineRepositoryManager.GetInstance().getPipelinesForProject(proj);
- if (pipelinesHash != null && pipelinesHash.size() > 0) {
- Enumeration<String> keys = pipelinesHash.keys();
- while (keys.hasMoreElements()) {
- String dataType = keys.nextElement();
- if (dataType.equals(XnatProjectdata.SCHEMA_ELEMENT_NAME)) {
- ArrayList<ArcPipelinedata> projectPipelines = pipelinesHash.get(XnatProjectdata.SCHEMA_ELEMENT_NAME);
- if (projectPipelines != null && projectPipelines.size() > 0) {
- for (int i = 0; i < projectPipelines.size(); i++) {
- arcProject.setPipelines_pipeline(projectPipelines.get(i));
- }
- }
- }else {
- ArrayList<ArcPipelinedata> projectPipelines = pipelinesHash.get(dataType);
- if (projectPipelines != null && projectPipelines.size() > 0) {
- ArcProjectDescendant arcProjectDesc = new ArcProjectDescendant();
- arcProjectDesc.setXsitype(dataType);
- for (int i = 0; i < projectPipelines.size(); i++) {
- arcProjectDesc.setPipeline(projectPipelines.get(i));
- }
- arcProject.setPipelines_descendants_descendant(arcProjectDesc);
- }
- }
- }
- }
- return arcProject;
- }
-
- public ArcProject getAdditionalPipelines(XnatProjectdata project) throws Exception{
- //ArcProject arcProject = new ArcProject();
- ArcProject rtn = new ArcProject();
- if (project == null) return new ArcProject();
- Hashtable<String, ArrayList<ArcPipelinedata>> pipelinesHash = getPipelinesForProject(project);
- ArcProject arcProjectFromSpec = ArcSpecManager.GetFreshInstance().getProjectArc(project.getId());
- if (arcProjectFromSpec == null) return createNewArcProject(project);
- rtn.setId(arcProjectFromSpec.getId());
- //arcProject.setItem((XFTItem)arcProjectFromSpec.getItem().clone());
- //rtn.setItem((XFTItem)arcProjectFromSpec.getItem().clone());
-
- //Clear all the existing pipelines as we want only the additional pipelines that are applicable for this project
- //rtn.removeAllPipelines();
- if (pipelinesHash != null && pipelinesHash.size() > 0) { //There are some site pipelines
- List<ArcProjectPipelineI> projectSelectedPipelines = arcProjectFromSpec.getPipelines_pipeline();
- //Gather only those pipelines which have not been selected.
- ArrayList<ArcPipelinedata> additionalPipelines = new ArrayList<ArcPipelinedata>();
- ArrayList<ArcPipelinedata> pipelines = pipelinesHash.get(XnatProjectdata.SCHEMA_ELEMENT_NAME);
- if (pipelines != null && pipelines.size() > 0) {
- for (int i = 0; i < pipelines.size(); i++) {
- String id = pipelines.get(i).getLocation();
- if (!exists(projectSelectedPipelines, id)) {
- additionalPipelines.add(pipelines.get(i));
- }
- }
- for (int i = 0; i < additionalPipelines.size(); i++) {
- rtn.setPipelines_pipeline(additionalPipelines.get(i));
- }
- }
- Hashtable<String, ArrayList<ArcPipelinedata>> additionalPipelineHash = new Hashtable<String,ArrayList<ArcPipelinedata>>();
- Enumeration<String> keys = pipelinesHash.keys();
- while (keys.hasMoreElements()) {
- String xsiType = keys.nextElement();
- if (xsiType.equals(XnatProjectdata.SCHEMA_ELEMENT_NAME))
- continue;
- ArrayList<ArcPipelinedata> descpipelines = pipelinesHash.get(xsiType);
- List<ArcProjectDescendantPipelineI> projectSelectedDescPipelines = arcProjectFromSpec.getPipelinesForDescendant(xsiType);
- ArrayList<ArcPipelinedata> additionalDescPipelines = new ArrayList<ArcPipelinedata>();
- if (descpipelines != null) {
- for (int j = 0; j < descpipelines.size() ; j++) {
- String id = descpipelines.get(j).getLocation();
- if (!existsDesc(projectSelectedDescPipelines, id)) {
- additionalDescPipelines.add(descpipelines.get(j));
- }
- }
- additionalPipelineHash.put(xsiType, additionalDescPipelines);
- }
- }
- Enumeration<String> dataTypes = additionalPipelineHash.keys();
- while (dataTypes.hasMoreElements()) {
- String dataType = dataTypes.nextElement();
- ArrayList<ArcPipelinedata> additionalDescPipelines = additionalPipelineHash.get(dataType);
- ArcProjectDescendant arcProjectDesc = new ArcProjectDescendant();
- arcProjectDesc.setXsitype(dataType);
- for (int i = 0; i < additionalDescPipelines.size(); i++) {
- arcProjectDesc.setPipeline(additionalDescPipelines.get(i));
- }
- rtn.setPipelines_descendants_descendant(arcProjectDesc);
- }
- }
- return rtn;
- }
-
- public List getAdditionalPipelinesForDatatype(XnatProjectdata project, String schemaType) throws Exception{
- List rtn = new ArrayList();
- ArcProject arcProject = getAdditionalPipelines(project);
- if (arcProject == null) return rtn;
- if (schemaType.equals(XnatProjectdata.SCHEMA_ELEMENT_NAME)) {
- rtn = arcProject.getPipelines_pipeline();
- }else {
- ArcProjectDescendant desc = arcProject.getDescendant(schemaType);
- if (desc == null) {
- return rtn;
- }
- rtn = desc.getPipeline();
- }
- return rtn;
- }
-
-
-
-
-
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseProvProcess.java b/src/main/java/org/nrg/xdat/om/base/BaseProvProcess.java
deleted file mode 100644
index e0765d39c09766fc890dafc2f83d80358c416421..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseProvProcess.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseProvProcess
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoProvProcess;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseProvProcess extends AutoProvProcess {
-
- public BaseProvProcess(ItemI item)
- {
- super(item);
- }
-
- public BaseProvProcess(UserI user)
- {
- super(user);
- }
-
- public BaseProvProcess()
- {}
-
- public BaseProvProcess(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseProvProcessstep.java b/src/main/java/org/nrg/xdat/om/base/BaseProvProcessstep.java
deleted file mode 100644
index f96ca43148e564fa95888c93e49d299e2d1b9c74..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseProvProcessstep.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseProvProcessstep
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoProvProcessstep;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseProvProcessstep extends AutoProvProcessstep {
-
- public BaseProvProcessstep(ItemI item)
- {
- super(item);
- }
-
- public BaseProvProcessstep(UserI user)
- {
- super(user);
- }
-
- public BaseProvProcessstep()
- {}
-
- public BaseProvProcessstep(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseProvProcessstepLibrary.java b/src/main/java/org/nrg/xdat/om/base/BaseProvProcessstepLibrary.java
deleted file mode 100644
index a17a3ab23be65b38cf7f121757b1157fa64bfefe..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseProvProcessstepLibrary.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseProvProcessstepLibrary
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoProvProcessstepLibrary;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseProvProcessstepLibrary extends AutoProvProcessstepLibrary {
-
- public BaseProvProcessstepLibrary(ItemI item)
- {
- super(item);
- }
-
- public BaseProvProcessstepLibrary(UserI user)
- {
- super(user);
- }
-
- public BaseProvProcessstepLibrary()
- {}
-
- public BaseProvProcessstepLibrary(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseScrScreeningassessment.java b/src/main/java/org/nrg/xdat/om/base/BaseScrScreeningassessment.java
deleted file mode 100644
index d20c50972822721814d0bb27593d855d3ef1678e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseScrScreeningassessment.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseScrScreeningassessment
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-import org.nrg.xdat.model.ScrScreeningscandataI;
-import org.nrg.xdat.om.ScrScreeningscandata;
-import org.nrg.xdat.om.base.auto.AutoScrScreeningassessment;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.scanAssessors.ScanAssessorI;
-import org.nrg.xnat.scanAssessors.ScanAssessorScanI;
-
-import java.util.Hashtable;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseScrScreeningassessment extends AutoScrScreeningassessment implements ScanAssessorI {
-
- public BaseScrScreeningassessment(ItemI item)
- {
- super(item);
- }
-
- public BaseScrScreeningassessment(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseScrScreeningassessment(UserI user)
- **/
- public BaseScrScreeningassessment()
- {}
-
- public BaseScrScreeningassessment(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public ScrScreeningscandata getScanScreeningAssessment(String scanId){
- ScrScreeningscandata rtn = null;
- if (scanId == null) throw new NullPointerException("Expected a non-null value for the scan id input parameter");
- List<ScrScreeningscandataI> scans = super.getScans_scan();
- if (scans != null && scans.size() > 0) {
- for (int i=0; i< scans.size(); i++) {
- ScrScreeningscandata aScan = (ScrScreeningscandata)scans.get(i);
- if (aScan.getImagescanId().equals(scanId)) {
- rtn = aScan;
- break;
- }
- }
- }
- if (rtn == null) throw new NullPointerException("Couldnt find screening assessment for scan id " + scanId);
- return rtn;
- }
-
- public ScanAssessorScanI getScanById(String id){
- return this.getScanScreeningAssessment(id);
- }
-
- public String getHeader(){
- return "Screening Assess";
- }
-
- public int getPrecedence(){
- return 1;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseScrScreeningscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseScrScreeningscandata.java
deleted file mode 100644
index 8d17797a7607c3c19c4477992ff3a8b726a86505..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseScrScreeningscandata.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseScrScreeningscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoScrScreeningscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.scanAssessors.ScanAssessorScanI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseScrScreeningscandata extends AutoScrScreeningscandata implements ScanAssessorScanI {
-
- public BaseScrScreeningscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseScrScreeningscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseScrScreeningscandata(UserI user)
- **/
- public BaseScrScreeningscandata()
- {}
-
- public BaseScrScreeningscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- public String getSummary(){
- String status = getPass();
- String summary = "<span>Unknown</span>";
- if(status!=null){
- if(status.equals("1")||status.equalsIgnoreCase("pass")){
- summary = "<span style=\"color:green\">Passed</span>";
- }
- else if(status.equals("0")||status.equalsIgnoreCase("fail")){
- summary = "<span style=\"color:red\">Failed</span>";
- }
- }
- return summary;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseValAdditionalval.java b/src/main/java/org/nrg/xdat/om/base/BaseValAdditionalval.java
deleted file mode 100644
index 562d5052b2e4378c7e0d6862087328c6fb07188c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseValAdditionalval.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseValAdditionalval
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoValAdditionalval;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseValAdditionalval extends AutoValAdditionalval {
-
- public BaseValAdditionalval(ItemI item)
- {
- super(item);
- }
-
- public BaseValAdditionalval(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseValAdditionalval(UserI user)
- **/
- public BaseValAdditionalval()
- {}
-
- public BaseValAdditionalval(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldata.java b/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldata.java
deleted file mode 100644
index ef78ac9a29e38febeed8bcfebf0e1e7353e10461..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldata.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseValProtocoldata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.ValProtocoldataScanCheckI;
-import org.nrg.xdat.om.ValProtocoldataScanCheck;
-import org.nrg.xdat.om.base.auto.AutoValProtocoldata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.scanAssessors.ScanAssessorI;
-import org.nrg.xnat.scanAssessors.ScanAssessorScanI;
-
-import java.util.Hashtable;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseValProtocoldata extends AutoValProtocoldata implements ScanAssessorI{
-
- public BaseValProtocoldata(ItemI item)
- {
- super(item);
- }
-
- public BaseValProtocoldata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseValProtocolvalidationdata(UserI user)
- **/
- public BaseValProtocoldata()
- {}
-
- public BaseValProtocoldata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public ValProtocoldataScanCheck getScanProtocolValidation(String scanId) throws NullPointerException {
- ValProtocoldataScanCheck rtn = null;
- if (scanId == null) throw new NullPointerException("Expected a non-null value for the scan id input parameter");
- List<ValProtocoldataScanCheckI> scans = super.getScans_scanCheck();
- if (scans != null && scans.size() > 0) {
- for (int i=0; i< scans.size(); i++) {
- ValProtocoldataScanCheck aScan = (ValProtocoldataScanCheck)scans.get(i);
- if (aScan.getScanId().equals(scanId)) {
- rtn = aScan;
- break;
- }
- }
- }
- if (rtn == null) throw new NullPointerException("Couldnt find scan protocol validation for scan id " + scanId);
- return rtn;
- }
-
- public ScanAssessorScanI getScanById(String id){
- return this.getScanProtocolValidation(id);
- }
-
- public String getHeader(){
- return "Protocol Val";
- }
-
- public int getPrecedence(){
- return 0;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataComment.java b/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataComment.java
deleted file mode 100644
index cb00e888d39353e328e8bc79647b17cd16cce765..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataComment.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseValProtocoldataComment
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoValProtocoldataComment;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseValProtocoldataComment extends AutoValProtocoldataComment {
-
- public BaseValProtocoldataComment(ItemI item)
- {
- super(item);
- }
-
- public BaseValProtocoldataComment(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseValProtocoldataComment(UserI user)
- **/
- public BaseValProtocoldataComment()
- {}
-
- public BaseValProtocoldataComment(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataCondition.java b/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataCondition.java
deleted file mode 100644
index 04511c7d153c8407142546c770ab423b3a2009ad..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataCondition.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseValProtocoldataCondition
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoValProtocoldataCondition;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseValProtocoldataCondition extends AutoValProtocoldataCondition {
-
- public BaseValProtocoldataCondition(ItemI item)
- {
- super(item);
- }
-
- public BaseValProtocoldataCondition(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseValProtocoldataCondition(UserI user)
- **/
- public BaseValProtocoldataCondition()
- {}
-
- public BaseValProtocoldataCondition(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getExpectedValue() {
- String rtn ="";
- String diagnosis = getDiagnosis();
- int expectedIndex = diagnosis.indexOf("Expected:");
- if (expectedIndex != -1) {
- int foundIndex = diagnosis.indexOf("Found:");
- if (foundIndex != -1) {
- rtn = diagnosis.substring(expectedIndex + 9 ,foundIndex);
- }else {
- rtn = diagnosis.substring(expectedIndex + 9);
- }
- }
- return rtn.trim();
- }
-
- public String getFoundValue() {
- String rtn ="";
- String diagnosis = getDiagnosis();
- int foundIndex = diagnosis.indexOf("Found:");
- if (foundIndex != -1) {
- rtn = diagnosis.substring(foundIndex + 6);
- }
- return rtn.trim();
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataScanCheck.java b/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataScanCheck.java
deleted file mode 100644
index 9a3ed6a4bb22849349a10c6c7ba696d8c99dbbe1..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataScanCheck.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseValProtocoldataScanCheck
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoValProtocoldataScanCheck;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.scanAssessors.ScanAssessorScanI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseValProtocoldataScanCheck extends AutoValProtocoldataScanCheck implements ScanAssessorScanI{
-
- public BaseValProtocoldataScanCheck(ItemI item)
- {
- super(item);
- }
-
- public BaseValProtocoldataScanCheck(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseValProtocoldataScanCheck(UserI user)
- **/
- public BaseValProtocoldataScanCheck()
- {}
-
- public BaseValProtocoldataScanCheck(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getSummary(){
- String status = getStatus();
- String summary = "<span>Unknown</span>";
- if(status!=null){
- if(status.equals("1")||status.equalsIgnoreCase("pass")){
- summary = "<span style=\"color:green\">Passed</span>";
- }
- else if(status.equals("0")||status.equalsIgnoreCase("fail")){
- summary = "<span style=\"color:red\">Failed</span>";
- }
- }
- return summary;
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataScanCheckComment.java b/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataScanCheckComment.java
deleted file mode 100644
index c5e1ce8035ef3e84aafb9e9695a2537800e1b1be..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataScanCheckComment.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseValProtocoldataScanCheckComment
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoValProtocoldataScanCheckComment;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseValProtocoldataScanCheckComment extends AutoValProtocoldataScanCheckComment {
-
- public BaseValProtocoldataScanCheckComment(ItemI item)
- {
- super(item);
- }
-
- public BaseValProtocoldataScanCheckComment(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseValProtocoldataScanCheckComment(UserI user)
- **/
- public BaseValProtocoldataScanCheckComment()
- {}
-
- public BaseValProtocoldataScanCheckComment(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataScanCheckCondition.java b/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataScanCheckCondition.java
deleted file mode 100644
index 80e49e69c131338f14cd7c77e7f6c56fa0506d27..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseValProtocoldataScanCheckCondition.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseValProtocoldataScanCheckCondition
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoValProtocoldataScanCheckCondition;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseValProtocoldataScanCheckCondition extends AutoValProtocoldataScanCheckCondition {
-
- public BaseValProtocoldataScanCheckCondition(ItemI item)
- {
- super(item);
- }
-
- public BaseValProtocoldataScanCheckCondition(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseValProtocoldataScanCheckCondition(UserI user)
- **/
- public BaseValProtocoldataScanCheckCondition()
- {}
-
- public BaseValProtocoldataScanCheckCondition(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getExpectedValue() {
- String rtn ="";
- String diagnosis = getDiagnosis();
- int expectedIndex = diagnosis.indexOf("Expected:");
- if (expectedIndex != -1) {
- int foundIndex = diagnosis.indexOf("Found:");
- if (foundIndex != -1) {
- rtn = diagnosis.substring(expectedIndex + 9 ,foundIndex);
- }else {
- rtn = diagnosis.substring(expectedIndex + 9);
- }
- }
- return rtn.trim();
- }
-
- public String getFoundValue() {
- String rtn ="";
- String diagnosis = getDiagnosis();
- int foundIndex = diagnosis.indexOf("Found:");
- if (foundIndex != -1) {
- rtn = diagnosis.substring(foundIndex + 6);
- }
- return rtn.trim();
- }
-
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseWrkAbstractexecutionenvironment.java b/src/main/java/org/nrg/xdat/om/base/BaseWrkAbstractexecutionenvironment.java
deleted file mode 100644
index 6f157b52a95bf4e9cc28af3bda02e0b741b0b2f3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseWrkAbstractexecutionenvironment.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseWrkAbstractexecutionenvironment
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoWrkAbstractexecutionenvironment;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseWrkAbstractexecutionenvironment extends AutoWrkAbstractexecutionenvironment {
-
- public BaseWrkAbstractexecutionenvironment(ItemI item)
- {
- super(item);
- }
-
- public BaseWrkAbstractexecutionenvironment(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseWrkAbstractexecutionenvironment(UserI user)
- **/
- public BaseWrkAbstractexecutionenvironment()
- {}
-
- public BaseWrkAbstractexecutionenvironment(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseWrkWorkflowdata.java b/src/main/java/org/nrg/xdat/om/base/BaseWrkWorkflowdata.java
deleted file mode 100755
index 4ce46d05245d8b25db280cb6e2e67d1c036c08ae..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseWrkWorkflowdata.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseWrkWorkflowdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 8/12/13 9:39 AM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.pipeline.XnatPipelineLauncher;
-import org.nrg.xdat.model.WrkAbstractexecutionenvironmentI;
-import org.nrg.xdat.om.WrkWorkflowdata;
-import org.nrg.xdat.om.WrkXnatexecutionenvironment;
-import org.nrg.xdat.om.base.auto.AutoWrkWorkflowdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-import org.nrg.xft.db.PoolDBUtils;
-import org.nrg.xft.event.XftEventService;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.event.EventUtils.CATEGORY;
-import org.nrg.xft.event.EventUtils.TYPE;
-import org.nrg.xft.event.WorkflowStatusEvent;
-import org.nrg.xft.event.persist.PersistentWorkflowI;
-import org.nrg.xft.exception.ElementNotFoundException;
-import org.nrg.xft.exception.XFTInitException;
-import org.nrg.xft.schema.Wrappers.GenericWrapper.GenericWrapperElement;
-import org.nrg.xft.search.CriteriaCollection;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseWrkWorkflowdata extends AutoWrkWorkflowdata implements PersistentWorkflowI{
-
- public static final String AWAITING_ACTION = "AWAITING ACTION";
- public static final String FAILED = "FAILED";
- public static final String RUNNING = "RUNNING";
- public static final String COMPLETE = "COMPLETE";
- public static final String ERROR = "ERROR";
- public static final String QUEUED = "QUEUED";
- public static final String FAILED_DISMISSED = "FAILED (DISMISSED)";
-
- public BaseWrkWorkflowdata(ItemI item)
- {
- super(item);
- }
-
- public BaseWrkWorkflowdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseWrkWorkflowdata(UserI user)
- **/
- public BaseWrkWorkflowdata()
- {}
-
- public BaseWrkWorkflowdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- public boolean isActive(){
- if(this.getStatus().equalsIgnoreCase(COMPLETE))
- return false;
- if(this.getStatus().equalsIgnoreCase(ERROR))
- return false;
- if(this.getStatus().equalsIgnoreCase(FAILED))
- return false;
- if(this.getStatus().equalsIgnoreCase(FAILED_DISMISSED))
- return false;
-
- return true;
- }
-
- public static ArrayList getWrkWorkflowdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad, String sortField, String sortOrder)
- {
- ArrayList al = new ArrayList();
- try {
- org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
- Iterator iter = null;
- if (sortField != null && sortOrder != null) {
- iter = items.getItems(sortField,sortOrder).iterator();
- }else {
- iter = items.getItemIterator();
- }
- while (iter.hasNext())
- {
- WrkWorkflowdata vrc = new WrkWorkflowdata((XFTItem)iter.next());
- al.add(vrc);
- }
- } catch (Exception e) {
- logger.error("",e);
- }
-
- al.trimToSize();
- return al;
- }
-
- public String getOnlyPipelineName() {
- String rtn = getPipelineName();
- if (rtn.endsWith(File.separator)) rtn = rtn.substring(0,rtn.length());
- int lastIndexOfSlash = rtn.lastIndexOf(File.separator);
- if (lastIndexOfSlash != -1) {
- rtn = rtn.substring(lastIndexOfSlash + 1);
- }else {
- lastIndexOfSlash = rtn.lastIndexOf("/");
- if (lastIndexOfSlash != -1)
- rtn = rtn.substring(lastIndexOfSlash + 1);
- }
- int lastIndexOfDot = rtn.lastIndexOf(".");
- if (lastIndexOfDot != -1 ) {
- rtn = rtn.substring(0,lastIndexOfDot);
- }
- return rtn;
- }
-
-
- /**
- * Constructs the XnatPipelineLauncher object for the most recent pipeline entry
- *
- * @param id The id that needs to be relaunched
- * @param dataType The Datatype of the id
- * @param pipeline The pipeline which needs to be launched
- * @param user The user who needs to relaunch the pipeline
- * @return XnatPipelineLauncher to relaunch the pipeline or null if the pipeline is not waiting
- */
-
-
- public XnatPipelineLauncher getLatestLauncherByStatus(UserI user) {
- XnatPipelineLauncher rtn = null;
- //Look for the latest workflow entry for this pipeline
- //If its status is matches then construct the workflow
- String _status = getStatus();
- WrkAbstractexecutionenvironmentI absExecutionEnv = getExecutionenvironment();
- try {
- WrkXnatexecutionenvironment xnatExecutionEnv = (WrkXnatexecutionenvironment)absExecutionEnv;
- rtn = xnatExecutionEnv.getLauncher(user);
- if (_status.equalsIgnoreCase(AWAITING_ACTION)) {
- rtn.setStartAt(getNextStepId());
- }
- }catch(ClassCastException cse) {
-
- }
- return rtn;
-
- }
-
- /**
- * Constructs the XnatPipelineLauncher object to be used to restart a FAILED pipeline
- *
- * @param id The Workflow id that needs to be restarted
- * @param dataType The Datatype of the id
- * @param pipeline The pipeline which needs to be launched
- * @param user The user who needs to relaunch the pipeline
- * @return XnatPipelineLauncher to relaunch the pipeline or null if the pipeline hasnt failed
- */
-
- public XnatPipelineLauncher restartWorkflow(UserI user) {
- return getLatestLauncherByStatus(user);
- }
-
- /**
- * Constructs the XnatPipelineLauncher object to be used to resume an awaiting pipeline
- *
- * @param id The Workflow id that needs to be resumed
- * @param dataType The Datatype of the id
- * @param pipeline The pipeline which needs to be launched
- * @param user The user who needs to relaunch the pipeline
- * @return XnatPipelineLauncher to relaunch the pipeline or null if the pipeline is not waiting
- */
-
- public XnatPipelineLauncher resumeWorkflow(UserI user) {
- return getLatestLauncherByStatus(user);
- }
-
- /**
- * Returns the most recent workflow status
- * @param id
- * @param data_type
- * @param external_id
- * @param user
- * @return
- */
-
- public static String GetLatestWorkFlowStatus(String id, String data_type, String external_id,org.nrg.xft.security.UserI user) {
- ArrayList wrkFlows = GetWorkFlowsOrderByLaunchTimeDesc(id,data_type,external_id,null, user);
- String rtn = "";
- if (wrkFlows != null && wrkFlows.size() > 0) {
- rtn = ((WrkWorkflowdata)wrkFlows.get(0)).getStatus();
- }
- return rtn;
- }
-
- /**
- * Returns the most recent workflow status for a pipeline
- * @param id
- * @param data_type
- * @param external_id
- * @param user
- * @return
- */
-
- public static String GetLatestWorkFlowStatus(String id, String data_type, String external_id,String pipelineName,org.nrg.xft.security.UserI user) {
- ArrayList wrkFlows = GetWorkFlowsOrderByLaunchTimeDesc(id,data_type,external_id,pipelineName,user);
- String rtn = "";
- if (wrkFlows != null && wrkFlows.size() > 0) {
- rtn = ((WrkWorkflowdata)wrkFlows.get(0)).getStatus();
- }
- return rtn;
- }
-
- /**
- * Returns the most recent workflow status for a pipeline
- * @param id
- * @param data_type
- * @param external_id
- * @param user
- * @return
- */
-
- public static String GetLatestWorkFlowStatusByPipeline(String id, String data_type, String pipelineName, String external_id,org.nrg.xft.security.UserI user) {
- ArrayList wrkFlows = GetWorkFlowsOrderByLaunchTimeDesc(id,data_type,external_id, pipelineName,user);
- String rtn = "";
- if (wrkFlows != null && wrkFlows.size() > 0) {
- rtn = ((WrkWorkflowdata)wrkFlows.get(0)).getStatus();
- }
- return rtn;
- }
-
- public static ArrayList GetWorkFlowsOrderByLaunchTimeDesc(String id, String dataType, String externalId, String pipelineName, org.nrg.xft.security.UserI user) {
- ArrayList workflows = new ArrayList();
- org.nrg.xft.search.CriteriaCollection cc = new CriteriaCollection("AND");
- cc.addClause("wrk:workflowData.ID",id);
- cc.addClause("wrk:workflowData.data_type",dataType);
- if (externalId != null) cc.addClause("wrk:workflowData.ExternalID",externalId);
- if (pipelineName != null) cc.addClause("wrk:workflowData.pipeline_name",pipelineName);
- //Sort by Launch Time
- try {
- org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(cc,user,false);
- ArrayList workitems = items.getItems("wrk:workflowData.launch_time","DESC");
- Iterator iter = workitems.iterator();
- while (iter.hasNext())
- {
- WrkWorkflowdata vrc = new WrkWorkflowdata((XFTItem)iter.next());
- workflows.add(vrc);
- }
- }catch(Exception e) {
- logger.debug("",e);
- }
- logger.info("Workflows by Ordered by Launch Time " + workflows.size());
- return workflows;
- }
-
- public synchronized EventMetaI buildEvent(){
- Date d=Calendar.getInstance().getTime();
- return new WorkflowEvent((String)null,d,this.getUser(),this.getEventId(),FileUtils.getTimestamp(d));
- }
-
- public class WorkflowEvent implements EventMetaI, Serializable {
- private static final long serialVersionUID = 42L;
- final String message;
- final Date d;
- final UserI user;
- final Number id;
- final String timestamp;
-
- public WorkflowEvent(String message, Date d, UserI user, Number id,
- String timestamp) {
- super();
- this.message = message;
- this.d = d;
- this.user = user;
- this.id = id;
- this.timestamp = timestamp;
- }
-
- @Override
- public String getMessage() {
- return message;
- }
-
- @Override
- public Date getEventDate() {
- return d;
- }
-
- @Override
- public String getTimestamp() {
- return timestamp;
- }
-
- @Override
- public UserI getUser() {
- return user;
- }
-
- @Override
- public Number getEventId() {
- return id;
- }
-
- }
-
- public Number getEventId() {
- Number i= getWrkWorkflowdataId();
- if(i==null){
- try {
- i=(Number)getNextWorkflowID();
- setWrkWorkflowdataId(new Integer(i.intValue()));
- } catch (Exception e) {
- logger.error("",e);
- }
- }
-
- return i;
- }
-
-
- private static String __table=null;
- private static String __dbName=null;
- private static final String __pk="wrk_workflowData_id";
- private static String __sequence=null;
- private synchronized static Number getNextWorkflowID() throws Exception{
- if(__table==null){
- try {
- GenericWrapperElement element=GenericWrapperElement.GetElement(WrkWorkflowdata.SCHEMA_ELEMENT_NAME);
- __dbName=element.getDbName();
- __table=element.getSQLName();
- __sequence=element.getSequenceName();
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- }
- }
- return (Number)PoolDBUtils.GetNextID(__dbName, __table, __pk, __sequence);
- }
-
- @Override
- public Integer getWorkflowId() {
- return getWrkWorkflowdataId();
- }
-
- @Override
- public Date getLaunchTimeDate() {
- try {
- return getDateProperty("launch_time");
- } catch (Exception e) {
- logger.error("",e);
- return null;
- }
- }
-
- public String getUsername(){
- if(this.getInsertUser()!=null){
- return this.getInsertUser().getLogin();
- }else{
- return null;
- }
- }
-
- @Override
- public void setType(TYPE v) {
- this.setType(v.toString());
- }
-
- @Override
- public void setCategory(CATEGORY v) {
- this.setCategory(v.toString());
- }
-
-
- /*
- * This method is called anytime a workflow entry is saved to the database. It will trigger an event entry.
- */
- @Override
- public void postSave() throws Exception {
- postSave(true);
- }
-
- @Override
- public void postSave(boolean triggerEvent) throws Exception {
- super.postSave();
-
- if(getStatus()!=null){
- //status changed
- if(this.getWorkflowId()!=null && triggerEvent){
- XftEventService.getService().triggerEvent(WorkflowStatusEvent.class.getName() +
- ((this.getStatus()!=null) ? "." + this.getStatus() : ""),new WorkflowStatusEvent(this));
- }
- }
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseWrkXnatexecutionenvironment.java b/src/main/java/org/nrg/xdat/om/base/BaseWrkXnatexecutionenvironment.java
deleted file mode 100644
index 73a016bab3c815891a2f8fa70d30e8651ac2cfdb..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseWrkXnatexecutionenvironment.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseWrkXnatexecutionenvironment
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import java.util.Hashtable;
-import java.util.List;
-
-import org.nrg.pipeline.XnatPipelineLauncher;
-import org.nrg.xdat.model.WrkXnatexecutionenvironmentParameterI;
-import org.nrg.xdat.om.base.auto.AutoWrkXnatexecutionenvironment;
-import org.nrg.xdat.turbine.utils.AdminUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseWrkXnatexecutionenvironment extends AutoWrkXnatexecutionenvironment {
-
- public BaseWrkXnatexecutionenvironment(ItemI item)
- {
- super(item);
- }
-
- public BaseWrkXnatexecutionenvironment(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseWrkXnatexecutionenvironment(UserI user)
- **/
- public BaseWrkXnatexecutionenvironment()
- {}
-
- public BaseWrkXnatexecutionenvironment(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public XnatPipelineLauncher getLauncher(UserI user) {
- XnatPipelineLauncher xnatLauncher = new XnatPipelineLauncher((UserI)user);
- xnatLauncher.setPipelineName(getPipeline());
- xnatLauncher.setStartAt(getStartat());
- List parameters = getParameters_parameter();
- for (int i = 0; i < parameters.size(); i++) {
- WrkXnatexecutionenvironmentParameterI aParameter = (WrkXnatexecutionenvironmentParameterI)parameters.get(i);
- xnatLauncher.setParameter(aParameter.getName(), aParameter.getParameter());
- }
- List notified = getNotify();
- for (int i = 0; i < notified.size(); i++) {
- String notifiedEmailId = (String)notified.get(i);
- if (!notifiedEmailId.equals(user.getEmail()) && !notifiedEmailId.equals(AdminUtils.getAdminEmailId())) {
- xnatLauncher.notify(notifiedEmailId);
- }
- }
- xnatLauncher.setDataType(getDatatype());
- xnatLauncher.setId(getId());
- xnatLauncher.setSupressNotification(getSupressnotification());
- if (this.getParameterfile_path() != null) {
- xnatLauncher.setParameterFile(getParameterfile_path());
- }
- return xnatLauncher;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseWrkXnatexecutionenvironmentNotify.java b/src/main/java/org/nrg/xdat/om/base/BaseWrkXnatexecutionenvironmentNotify.java
deleted file mode 100644
index e5ff8ee63aedbaa803afc2f4d73fe659bc2d8b6f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseWrkXnatexecutionenvironmentNotify.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseWrkXnatexecutionenvironmentNotify
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoWrkXnatexecutionenvironmentNotify;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseWrkXnatexecutionenvironmentNotify extends AutoWrkXnatexecutionenvironmentNotify {
-
- public BaseWrkXnatexecutionenvironmentNotify(ItemI item)
- {
- super(item);
- }
-
- public BaseWrkXnatexecutionenvironmentNotify(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseWrkXnatexecutionenvironmentNotify(UserI user)
- **/
- public BaseWrkXnatexecutionenvironmentNotify()
- {}
-
- public BaseWrkXnatexecutionenvironmentNotify(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseWrkXnatexecutionenvironmentParameter.java b/src/main/java/org/nrg/xdat/om/base/BaseWrkXnatexecutionenvironmentParameter.java
deleted file mode 100644
index e485f2e6e6a7b478a986b562a9244a72510448ca..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseWrkXnatexecutionenvironmentParameter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseWrkXnatexecutionenvironmentParameter
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoWrkXnatexecutionenvironmentParameter;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseWrkXnatexecutionenvironmentParameter extends AutoWrkXnatexecutionenvironmentParameter {
-
- public BaseWrkXnatexecutionenvironmentParameter(ItemI item)
- {
- super(item);
- }
-
- public BaseWrkXnatexecutionenvironmentParameter(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseWrkXnatexecutionenvironmentParameter(UserI user)
- **/
- public BaseWrkXnatexecutionenvironmentParameter()
- {}
-
- public BaseWrkXnatexecutionenvironmentParameter(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractdemographicdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractdemographicdata.java
deleted file mode 100644
index d2ded9523ddbf58ae4fe06b3ed6bbc3b39f994bd..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractdemographicdata.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAbstractdemographicdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAbstractdemographicdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatAbstractdemographicdata extends AutoXnatAbstractdemographicdata {
-
- public BaseXnatAbstractdemographicdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAbstractdemographicdata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatAbstractdemographicdata()
- {}
-
- public BaseXnatAbstractdemographicdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractprotocol.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractprotocol.java
deleted file mode 100644
index 69ffd4c4507dd457d501163364cc8a9af65d84c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractprotocol.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAbstractprotocol
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.XdatSearchField;
-import org.nrg.xdat.om.XnatAbstractprotocol;
-import org.nrg.xdat.om.XnatProjectdata;
-import org.nrg.xdat.om.base.auto.AutoXnatAbstractprotocol;
-import org.nrg.xdat.schema.SchemaElement;
-import org.nrg.xdat.security.ElementSecurity;
-import org.nrg.xdat.security.XdatStoredSearch;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.exception.ElementNotFoundException;
-import org.nrg.xft.exception.FieldNotFoundException;
-import org.nrg.xft.exception.XFTInitException;
-import org.nrg.xft.schema.Wrappers.GenericWrapper.GenericWrapperElement;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatAbstractprotocol extends AutoXnatAbstractprotocol {
-
- public BaseXnatAbstractprotocol(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAbstractprotocol(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatAbstractprotocol(UserI user)
- **/
- public BaseXnatAbstractprotocol()
- {}
-
- public BaseXnatAbstractprotocol(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- public String getProject()
- {
- try {
- return this.getStringProperty("xnat_projectdata_id");
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (FieldNotFoundException e) {
- logger.error("",e);
- }
- return null;
- }
-
- public SchemaElement getDatatypeSchemaElement(){
- try {
- return SchemaElement.GetElement(this.getDataType());
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- }
-
- return null;
- }
-
- public XdatStoredSearch getDefaultSearch(XnatProjectdata project){
- XdatStoredSearch xss=null;
- try {
- xss=project.getDefaultSearch(this.getDataType(),this.getId());
-
- xss.setId(this.getId());
- if (this.getName()!=null)
- xss.setBriefDescription(this.getName());
- else{
- xss.setBriefDescription(ElementSecurity.GetElementSecurity(this.getDataType()).getPluralDescription());
- }
- if (this.getDescription()!=null)
- xss.setDescription(this.getDescription());
-
- xss.setSecure(true);
- xss.setAllowDiffColumns(false);
- xss.setTag(project.getId());
-
- UserI user = this.getUser();
-
- if (this.getDataType().equals("xnat:subjectData")){
- Iterator protocols2= project.getStudyprotocol().iterator();
- while(protocols2.hasNext()){
- XnatAbstractprotocol protocol2 = (XnatAbstractprotocol)protocols2.next();
- try {
- GenericWrapperElement e = GenericWrapperElement.GetElement(protocol2.getDataType());
- if (e.instanceOf("xnat:subjectAssessorData"))
- {
- XdatSearchField xsf = new XdatSearchField(user);
- xsf.setElementName("xnat:subjectData");
- xsf.setFieldId("SUB_EXPT_COUNT=" + protocol2.getDataType());
-
- xsf.setHeader(ElementSecurity.GetPluralDescription(protocol2.getDataType()));
- xsf.setType("integer");
- xsf.setSequence(xss.getSearchField().size());
- xsf.setValue(protocol2.getDataType());
- xss.setSearchField(xsf);
- }
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- }
-
- if (this.getDataType().equals("xnat:mrSessionData")){
- Iterator protocols2= project.getStudyprotocol().iterator();
- while(protocols2.hasNext()){
- XnatAbstractprotocol protocol2 = (XnatAbstractprotocol)protocols2.next();
- try {
- GenericWrapperElement e = GenericWrapperElement.GetElement(protocol2.getDataType());
- if (e.instanceOf("xnat:mrAssessorData"))
- {
- XdatSearchField xsf = new XdatSearchField(user);
- xsf.setElementName("xnat:mrSessionData");
- xsf.setFieldId("MR_EXPT_COUNT=" + protocol2.getDataType());
-
- xsf.setHeader(ElementSecurity.GetPluralDescription(protocol2.getDataType()));
- xsf.setType("integer");
- xsf.setSequence(xss.getSearchField().size());
- xsf.setValue(protocol2.getDataType());
- xss.setSearchField(xsf);
- }
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- }
-
- if (this.getDataType().equals("xnat:petSessionData")){
- Iterator protocols2= project.getStudyprotocol().iterator();
- while(protocols2.hasNext()){
- XnatAbstractprotocol protocol2 = (XnatAbstractprotocol)protocols2.next();
- try {
- GenericWrapperElement e = GenericWrapperElement.GetElement(protocol2.getDataType());
- if (e.instanceOf("xnat:petAssessorData"))
- {
- XdatSearchField xsf = new XdatSearchField(user);
- xsf.setElementName("xnat:petSessionData");
- xsf.setFieldId("PET_EXPT_COUNT=" + protocol2.getDataType());
-
- xsf.setHeader(ElementSecurity.GetPluralDescription(protocol2.getDataType()));
- xsf.setType("integer");
- xsf.setSequence(xss.getSearchField().size());
- xsf.setValue(protocol2.getDataType());
- xss.setSearchField(xsf);
- }
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- }
-
- } catch (Exception e) {
- logger.error("",e);
- }
- return xss;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractresource.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractresource.java
deleted file mode 100644
index b8c68ac22c70cb8155828fd6b6d2c6f1ba25acab..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractresource.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAbstractresource
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 11/18/13 9:35 AM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.XnatAbstractresourceTagI;
-import org.nrg.xdat.om.base.auto.AutoXnatAbstractresource;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xnat.utils.CatalogUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatAbstractresource extends AutoXnatAbstractresource {
-
- public BaseXnatAbstractresource(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAbstractresource(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatAbstractresource(UserI user)
- **/
- public BaseXnatAbstractresource()
- {}
-
- public BaseXnatAbstractresource(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- /**
- * Returns ArrayList of java.io.File objects
- * @return
- */
- public abstract ArrayList<File> getCorrespondingFiles(String rootPath);
-
-
- /**
- * Returns ArrayList of java.lang.String objects
- * @return
- */
- public abstract ArrayList getCorrespondingFileNames(String rootPath);
-
-
- Long size = null;
- public long getSize(String rootPath){
- if (size ==null){
- calculate(rootPath);
- }
- return size;
- }
-
- public String getReadableFileStats() {
- return CatalogUtils.formatFileStats(getLabel(), getFileCount(), getFileSize());
- }
-
- public String getReadableFileSize() {
- Object fileSize = getFileSize();
- if (fileSize == null) {
- return "Empty";
- }
- return CatalogUtils.formatSize((Long) fileSize);
- }
-
- public void calculate(String rootPath){
- long sizeI = 0;
- int countI = 0;
- for (File f : this.getCorrespondingFiles(rootPath)) {
- if (f.exists()){
- countI++;
- sizeI+=f.length();
- }
- }
-
- size = sizeI;
- count = countI;
- }
-
- Integer count = null;
- public Integer getCount(String rootPath){
- if (count ==null){
- calculate(rootPath);
- }
- return count;
- }
-
- /**
- * Prepends this path to the enclosed URI or path variables.
- * @param root
- */
- public abstract void prependPathsWith(String root);
-
- /**
- * Relatives this path from the first occurrence of the indexOf string.
- * @param indexOf
- */
- public abstract void relativizePaths(String indexOf, boolean caseSensitive);
-
- /**
- * Appends this path to the enclosed URI or path variables.
- * @param root
- */
- public abstract ArrayList<String> getUnresolvedPaths();
-
- public boolean isInRAWDirectory(){
- boolean hasRAW= false;
- for (String path : getUnresolvedPaths())
- {
- if (path.indexOf("RAW/")!=-1)
- {
- hasRAW=true;
- break;
- }
- if (path.indexOf("SCANS/")!=-1)
- {
- hasRAW=true;
- break;
- }
- }
- return hasRAW;
- }
-
- /**
- * Path to Files
- * @return
- */
- public String getFullPath(String rootPath){
- return "";
- }
-
- public String getContent(){
- return "";
- }
-
- public String getFormat(){
- return "";
- }
-
- public void deleteWithBackup(String rootPath, UserI user, EventMetaI c) throws Exception{
- deleteFromFileSystem(rootPath);
- }
-
- public void deleteFromFileSystem(String rootPath){
- ArrayList<File> files = this.getCorrespondingFiles(rootPath);
- for(File f: files){
- try {
- FileUtils.MoveToCache(f);
- if(FileUtils.CountFiles(f.getParentFile(),true)==0){
- FileUtils.DeleteFile(f.getParentFile());
- }
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- public String getTagString(){
- StringBuffer sb =new StringBuffer();
- for(XnatAbstractresourceTagI tag:this.getTags_tag()){
- if(sb.length()>0){
- sb.append(",");
- }
- if(tag.getName()!=null){
- sb.append(tag.getName()).append("=");
- }
- sb.append(tag.getTag());
- }
-
- return sb.toString();
- }
-
- private String base_URI=null;
- public String getBaseURI(){return base_URI;}
- public void setBaseURI(String b){
- if(b.startsWith("/REST") || b.startsWith("/data")){
- this.base_URI=b;
- }else{
- this.base_URI="/data" +b;
- }
- }
-
-
- public abstract void moveTo(File newSessionDir, String existingSessionDir,String rootPath,UserI user,EventMetaI ci) throws IOException,Exception;
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractresourceTag.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractresourceTag.java
deleted file mode 100644
index 79fc7bfd712188daa891b9da33a7f228a273a576..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractresourceTag.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAbstractresourceTag
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAbstractresourceTag;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatAbstractresourceTag extends AutoXnatAbstractresourceTag {
-
- public BaseXnatAbstractresourceTag(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAbstractresourceTag(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatAbstractresourceTag(UserI user)
- **/
- public BaseXnatAbstractresourceTag()
- {}
-
- public BaseXnatAbstractresourceTag(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractstatistics.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractstatistics.java
deleted file mode 100644
index 083cd9eece443e662aac0209a9e87ba8a69231b5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractstatistics.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAbstractstatistics
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAbstractstatistics;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatAbstractstatistics extends AutoXnatAbstractstatistics {
-
- public BaseXnatAbstractstatistics(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAbstractstatistics(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatAbstractstatistics(UserI user)
- **/
- public BaseXnatAbstractstatistics()
- {}
-
- public BaseXnatAbstractstatistics(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractsubjectmetadata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractsubjectmetadata.java
deleted file mode 100644
index 82ca7ddb64f361b2d9ea3403e89f4a4157409f30..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAbstractsubjectmetadata.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAbstractsubjectmetadata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAbstractsubjectmetadata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatAbstractsubjectmetadata extends AutoXnatAbstractsubjectmetadata {
-
- public BaseXnatAbstractsubjectmetadata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAbstractsubjectmetadata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatAbstractsubjectmetadata()
- {}
-
- public BaseXnatAbstractsubjectmetadata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAddfield.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAddfield.java
deleted file mode 100644
index 858e0d9be6e83932d18092d5cdb40bc2ffb16d55..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAddfield.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAddfield
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAddfield;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatAddfield extends AutoXnatAddfield {
-
- public BaseXnatAddfield(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAddfield(UserI user)
- {
- super(user);
- }
-
- public BaseXnatAddfield()
- {}
-
- public BaseXnatAddfield(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAscidresearchdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAscidresearchdata.java
deleted file mode 100644
index 0fc210711fea97c177b8fe8204af6ed8bdf10e17..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAscidresearchdata.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAscidresearchdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAscidresearchdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatAscidresearchdata extends AutoXnatAscidresearchdata {
-
- public BaseXnatAscidresearchdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAscidresearchdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatAscidresearchdata(UserI user)
- **/
- public BaseXnatAscidresearchdata()
- {}
-
- public BaseXnatAscidresearchdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
-
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAsideeffectspittsburghdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAsideeffectspittsburghdata.java
deleted file mode 100644
index 90367eb2ac2e67386960ca25ebbe107913591529..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAsideeffectspittsburghdata.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAsideeffectspittsburghdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAsideeffectspittsburghdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatAsideeffectspittsburghdata extends AutoXnatAsideeffectspittsburghdata {
-
- public BaseXnatAsideeffectspittsburghdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAsideeffectspittsburghdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatAsideeffectspittsburghdata(UserI user)
- **/
- public BaseXnatAsideeffectspittsburghdata()
- {}
-
- public BaseXnatAsideeffectspittsburghdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
-
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAupdrs3data.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAupdrs3data.java
deleted file mode 100644
index b52dfb62bf74b1a4f5b956b69000078105d0abaf..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAupdrs3data.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAupdrs3data
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAupdrs3data;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatAupdrs3data extends AutoXnatAupdrs3data {
-
- public BaseXnatAupdrs3data(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAupdrs3data(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatAupdrs3data(UserI user)
- **/
- public BaseXnatAupdrs3data()
- {}
-
- public BaseXnatAupdrs3data(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
-
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAybocsdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAybocsdata.java
deleted file mode 100644
index 6932b83ea6b138ff210d3a2bb611ab607b19cdfe..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAybocsdata.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAybocsdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAybocsdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatAybocsdata extends AutoXnatAybocsdata {
-
- public BaseXnatAybocsdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAybocsdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatAybocsdata(UserI user)
- **/
- public BaseXnatAybocsdata()
- {}
-
- public BaseXnatAybocsdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
-
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatAygtssdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatAygtssdata.java
deleted file mode 100644
index 037a0ae93ca44e26a479f409ea64f01c51d6ab20..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatAygtssdata.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatAygtssdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatAygtssdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatAygtssdata extends AutoXnatAygtssdata {
-
- public BaseXnatAygtssdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatAygtssdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatAygtssdata(UserI user)
- **/
- public BaseXnatAygtssdata()
- {}
-
- public BaseXnatAygtssdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
-
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatComputationdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatComputationdata.java
deleted file mode 100644
index b082cfc108df6feb84ecdae41a5b7fcbbf262ea0..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatComputationdata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatComputationdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatComputationdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatComputationdata extends AutoXnatComputationdata {
-
- public BaseXnatComputationdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatComputationdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatComputationdata(UserI user)
- **/
- public BaseXnatComputationdata()
- {}
-
- public BaseXnatComputationdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatContrastbolus.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatContrastbolus.java
deleted file mode 100644
index c11725683bf934d97e4bd612f1ec9de051fc5a56..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatContrastbolus.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatContrastbolus
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatContrastbolus;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatContrastbolus extends AutoXnatContrastbolus {
-
- public BaseXnatContrastbolus(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatContrastbolus(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatContrastbolus(UserI user)
- **/
- public BaseXnatContrastbolus()
- {}
-
- public BaseXnatContrastbolus(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatCrscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatCrscandata.java
deleted file mode 100644
index 9920efe58408d32fdeba3987715dd11cc94bb183..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatCrscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatCrscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatCrscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatCrscandata extends AutoXnatCrscandata {
-
- public BaseXnatCrscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatCrscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatCrscandata(UserI user)
- **/
- public BaseXnatCrscandata()
- {}
-
- public BaseXnatCrscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatCrsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatCrsessiondata.java
deleted file mode 100644
index 85e69d0411c06147d57ac02f9bead854d38b5e4f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatCrsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatCrsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatCrsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatCrsessiondata extends AutoXnatCrsessiondata {
-
- public BaseXnatCrsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatCrsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatCrsessiondata(UserI user)
- **/
- public BaseXnatCrsessiondata()
- {}
-
- public BaseXnatCrsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatCtscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatCtscandata.java
deleted file mode 100644
index 0d063b3d446824db133e12cdfb139db194464a41..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatCtscandata.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatCtscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatCtscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatCtscandata extends AutoXnatCtscandata {
-
- public BaseXnatCtscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatCtscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatCtscandata(UserI user)
- **/
- public BaseXnatCtscandata()
- {}
-
- public BaseXnatCtscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
-
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatCtscandataFocalspot.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatCtscandataFocalspot.java
deleted file mode 100644
index 08bc69a75c7ec5bee1cac8d667e13f5a68e05f28..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatCtscandataFocalspot.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatCtscandataFocalspot
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatCtscandataFocalspot;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatCtscandataFocalspot extends AutoXnatCtscandataFocalspot {
-
- public BaseXnatCtscandataFocalspot(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatCtscandataFocalspot(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatCtscandataFocalspot(UserI user)
- **/
- public BaseXnatCtscandataFocalspot()
- {}
-
- public BaseXnatCtscandataFocalspot(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
-
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatCtsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatCtsessiondata.java
deleted file mode 100644
index 501f2e4856e310e158b7c005bf9583dec9cafdc6..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatCtsessiondata.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatCtsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatCtsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatCtsessiondata extends AutoXnatCtsessiondata {
-
- public BaseXnatCtsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatCtsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatCtsessiondata(UserI user)
- **/
- public BaseXnatCtsessiondata()
- {}
-
- public BaseXnatCtsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
-
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatDatatypeprotocol.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatDatatypeprotocol.java
deleted file mode 100644
index dcb775cbd07d260e122ceda9632f6b5f96ae55cd..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatDatatypeprotocol.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatDatatypeprotocol
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.display.DisplayField;
-import org.nrg.xdat.model.XnatFielddefinitiongroupFieldI;
-import org.nrg.xdat.model.XnatFielddefinitiongroupI;
-import org.nrg.xdat.model.XnatProjectdataI;
-import org.nrg.xdat.om.XdatSearchField;
-import org.nrg.xdat.om.XnatProjectdata;
-import org.nrg.xdat.om.base.auto.AutoXnatDatatypeprotocol;
-import org.nrg.xdat.schema.SchemaElement;
-import org.nrg.xdat.security.XdatStoredSearch;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.exception.ElementNotFoundException;
-import org.nrg.xft.exception.XFTInitException;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatDatatypeprotocol extends AutoXnatDatatypeprotocol {
-
- public BaseXnatDatatypeprotocol(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatDatatypeprotocol(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatDatatypeprotocol(UserI user)
- **/
- public BaseXnatDatatypeprotocol()
- {}
-
- public BaseXnatDatatypeprotocol(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- public XdatStoredSearch getDefaultSearch(XnatProjectdataI project){
- XdatStoredSearch xss = super.getDefaultSearch((XnatProjectdata)project);
-
- for(XnatFielddefinitiongroupI group : this.getDefinitions_definition()){
- for(XnatFielddefinitiongroupFieldI field : group.getFields_field()){
-
- XdatSearchField xsf = new XdatSearchField(this.getUser());
- xsf.setElementName(this.getDataType());
- String fieldID=null;
- if (field.getType().equals("custom"))
- {
- fieldID=this.getDatatypeSchemaElement().getSQLName().toUpperCase() + "_FIELD_MAP="+field.getName().toLowerCase();
-
- }else{
- try {
- SchemaElement se=SchemaElement.GetElement(this.getDataType());
-
- try {
- DisplayField df=se.getDisplayFieldForXMLPath(field.getXmlpath());
- if (df!=null){
- fieldID=df.getId();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- }
- }
-
- if (fieldID!=null){
- xsf.setFieldId(fieldID);
-
- xsf.setHeader(field.getName());
- xsf.setType(field.getDatatype());
- xsf.setSequence(xss.getSearchField().size());
- if (field.getType().equals("custom"))xsf.setValue(field.getName().toLowerCase());
- try {
- xss.setSearchField(xsf);
- System.out.println("LOADED " + field.getXmlpath());
- } catch (Exception e) {
- logger.error("",e);
- System.out.println("FAILED to load " + field.getXmlpath());
- }
- }else{
- System.out.println("FAILED to load " + field.getXmlpath());
- }
- }
- }
-
-
-
- return xss;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatDemographicdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatDemographicdata.java
deleted file mode 100644
index 26163e365a2796047a2bd49f89a9611f7a7c90ab..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatDemographicdata.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatDemographicdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatDemographicdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatDemographicdata extends AutoXnatDemographicdata {
-
- public BaseXnatDemographicdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatDemographicdata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatDemographicdata()
- {}
-
- public BaseXnatDemographicdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatDeriveddata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatDeriveddata.java
deleted file mode 100644
index 9db7b9228ccad6eda24d079fa240f7fb99bf5ef0..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatDeriveddata.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatDeriveddata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatDeriveddata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatDeriveddata extends AutoXnatDeriveddata {
-
- public BaseXnatDeriveddata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatDeriveddata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatDeriveddata()
- {}
-
- public BaseXnatDeriveddata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatDicomseries.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatDicomseries.java
deleted file mode 100644
index d05c22e5d386352e96a07b2a76fc5a476abf4ddc..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatDicomseries.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatDicomseries
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 11/18/13 9:35 AM
- */
-package org.nrg.xdat.om.base;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.xdat.model.XnatDicomseriesImageI;
-import org.nrg.xdat.om.XnatDicomseriesImage;
-import org.nrg.xdat.om.base.auto.AutoXnatDicomseries;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.SaveItemHelper;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatDicomseries extends AutoXnatDicomseries {
-
- public BaseXnatDicomseries(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatDicomseries(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatDicomseries(UserI user)
- **/
- public BaseXnatDicomseries()
- {}
-
- public BaseXnatDicomseries(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- protected ArrayList files=null;
- protected ArrayList fileNames=null;
- /**
- * Returns ArrayList of java.io.File objects
- * @return
- */
- public ArrayList getCorrespondingFiles(String rootPath)
- {
- if (files==null)
- {
- files = new ArrayList();
-
- for (int i=0;i<this.getImageset_image().size();i++){
- org.nrg.xdat.om.XnatDicomseriesImage image = (org.nrg.xdat.om.XnatDicomseriesImage)this.getImageset_image().get(i);
- File f = image.getFile(rootPath);
- files.add(f);
- }
- }
- return files;
- }
-
- /**
- * Returns ArrayList of java.lang.String objects
- * @return
- */
- public ArrayList getCorrespondingFileNames(String rootPath)
- {
- if (fileNames==null)
- {
- fileNames = new ArrayList();
- for (int i=0;i<this.getImageset_image().size();i++){
- org.nrg.xdat.om.XnatDicomseriesImage image = (org.nrg.xdat.om.XnatDicomseriesImage)this.getImageset_image().get(i);
- File f = image.getFile(rootPath);
- fileNames.add(f.getName());
- }
- }
- return fileNames;
- }
-
-
- /**
- * Appends this path to the enclosed URI or path variables.
- * @param root
- */
- public void prependPathsWith(String root){
- for (int i=0;i<this.getImageset_image().size();i++){
- org.nrg.xdat.om.XnatDicomseriesImage image = (org.nrg.xdat.om.XnatDicomseriesImage)this.getImageset_image().get(i);
- image.prependPathsWith(root);
- }
- }
-
-
- /**
- * Relatives this path from the first occurrence of the indexOf string.
- * @param indexOf
- */
- public void relativizePaths(String indexOf, boolean caseSensitive){
- for (int i=0;i<this.getImageset_image().size();i++){
- org.nrg.xdat.om.XnatDicomseriesImage image = (org.nrg.xdat.om.XnatDicomseriesImage)this.getImageset_image().get(i);
- image.relativizePaths(indexOf,caseSensitive);
- }
- }
-
- /**
- * Appends this path to the enclosed URI or path variables.
- */
- public ArrayList<String> getUnresolvedPaths(){
- ArrayList<String> al = new ArrayList<String>();
- for (int i=0;i<this.getImageset_image().size();i++){
- org.nrg.xdat.om.XnatDicomseriesImage image = (org.nrg.xdat.om.XnatDicomseriesImage)this.getImageset_image().get(i);
- String p = image.getUri();
- p.replace('\\', '/');
- al.add(p);
- }
- return al;
- }
-
- public String getFullPath(String rootPath){
- String path = "";
-
- fileNames = new ArrayList();
- for (org.nrg.xdat.model.XnatDicomseriesImageI image:this.getImageset_image()){
- path = image.getUri();
- break;
- }
-
- String fullPath = StringUtils.replace(FileUtils.AppendRootPath(rootPath, path), "\\", "/");
- while (fullPath.indexOf("//")!=-1)
- {
- fullPath =StringUtils.replace(fullPath,"//","/");
- }
-
- if(!fullPath.endsWith("/"))
- {
- fullPath+="/";
- }
- return fullPath;
- }
-
-
-
-
- public String getLabel(){
- if (this.getDescription().length()>15)
- {
- return this.getDescription().substring(0,14);
- }else
- return this.getDescription();
- }
-
- public void moveTo(File newSessionDir,String existingSessionDir,String rootPath,UserI user,EventMetaI ci) throws IOException,Exception{
- for(XnatDicomseriesImageI img : this.getImageset_image()){
- ((XnatDicomseriesImage)img).moveTo(newSessionDir, existingSessionDir, rootPath, user,ci);
- }
- SaveItemHelper.authorizedSave(this, user, true, false, ci);
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatDicomseriesImage.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatDicomseriesImage.java
deleted file mode 100644
index 44fd166c88ebac477c95b0353cd9e64283365525..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatDicomseriesImage.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatDicomseriesImage
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 11/18/13 9:35 AM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatDicomseriesImage;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatDicomseriesImage extends AutoXnatDicomseriesImage {
-
- public BaseXnatDicomseriesImage(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatDicomseriesImage(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatDicomseriesImage(UserI user)
- **/
- public BaseXnatDicomseriesImage()
- {}
-
- public BaseXnatDicomseriesImage(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public java.io.File getFile(String rootPath){
- java.io.File f = new java.io.File(org.nrg.xft.utils.FileUtils.AppendRootPath(rootPath,this.getUri()));
- if (!f.exists() && !getUri().endsWith(".gz"))
- {
- f = new java.io.File(org.nrg.xft.utils.FileUtils.AppendRootPath(rootPath,this.getUri()) + ".gz");
- }
- return f;
- }
-
- /**
- * Appends this path to the enclosed URI or path variables.
- * @param root
- */
- public void prependPathsWith(String root){
- if (!FileUtils.IsAbsolutePath(this.getUri())){
- try {
- this.setUri(root + this.getUri());
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- }
-
- /**
- * Relatives this path from the first occurrence of the indexOf string.
- * @param indexOf
- */
- public void relativizePaths(String indexOf, boolean caseSensitive){
- String uri = this.getUri();
- uri= uri.replace('\\', '/');
- if (uri.indexOf(indexOf)==-1){
- if (!caseSensitive){
- int index = uri.toLowerCase().indexOf(indexOf.toLowerCase());
- if (index!=-1){
- this.setUri(uri.substring(index + 1));
- }
- }
- }else{
- this.setUri(uri.substring(uri.indexOf(indexOf) + 1));
- }
- }
-
- public void moveTo(File newSessionDir,String existingSessionDir,String rootPath,UserI user,EventMetaI ci) throws IOException,Exception{
- String uri = this.getUri();
-
- String relativePath=null;
- if(existingSessionDir!=null && uri.startsWith(existingSessionDir)){
- relativePath=uri.substring(existingSessionDir.length());
- }else{
- if(FileUtils.IsAbsolutePath(uri)){
- if(uri.indexOf("/")>0){
- relativePath=uri.substring(uri.indexOf("/")+1);
- }else if(uri.indexOf("\\")>0){
- relativePath=uri.substring(uri.indexOf("\\")+1);
- }else{
- relativePath=uri;
- }
- }
- }
-
- File newFile = new File(newSessionDir,relativePath);
- File parentDir=newFile.getParentFile();
- if(!parentDir.exists())
- {
- parentDir.mkdirs();
- }
-
- File f=this.getFile(rootPath);
- if(f !=null){
- FileUtils.MoveFile(f, newFile, true);
- }
-
- this.setUri(newFile.getAbsolutePath());
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatDx3dcraniofacialscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatDx3dcraniofacialscandata.java
deleted file mode 100644
index fee86fe1ae3579813c28f6cb437e03f7a0ffd1d5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatDx3dcraniofacialscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatDx3dcraniofacialscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatDx3dcraniofacialscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatDx3dcraniofacialscandata extends AutoXnatDx3dcraniofacialscandata {
-
- public BaseXnatDx3dcraniofacialscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatDx3dcraniofacialscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatDx3dcraniofacialscandata(UserI user)
- **/
- public BaseXnatDx3dcraniofacialscandata()
- {}
-
- public BaseXnatDx3dcraniofacialscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatDx3dcraniofacialsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatDx3dcraniofacialsessiondata.java
deleted file mode 100644
index 6ce8a990f983ebf9205abfb4474d39c7084da439..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatDx3dcraniofacialsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatDx3dcraniofacialsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatDx3dcraniofacialsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatDx3dcraniofacialsessiondata extends AutoXnatDx3dcraniofacialsessiondata {
-
- public BaseXnatDx3dcraniofacialsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatDx3dcraniofacialsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatDx3dcraniofacialsessiondata(UserI user)
- **/
- public BaseXnatDx3dcraniofacialsessiondata()
- {}
-
- public BaseXnatDx3dcraniofacialsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatDxscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatDxscandata.java
deleted file mode 100644
index bdb40f002801f849afab38d55747bfda7a131526..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatDxscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatDxscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatDxscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatDxscandata extends AutoXnatDxscandata {
-
- public BaseXnatDxscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatDxscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatDxscandata(UserI user)
- **/
- public BaseXnatDxscandata()
- {}
-
- public BaseXnatDxscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatDxsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatDxsessiondata.java
deleted file mode 100644
index f93f7c4b83468412d481fc3f1cdd41b50952a063..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatDxsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatDxsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatDxsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatDxsessiondata extends AutoXnatDxsessiondata {
-
- public BaseXnatDxsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatDxsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatDxsessiondata(UserI user)
- **/
- public BaseXnatDxsessiondata()
- {}
-
- public BaseXnatDxsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEcgscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEcgscandata.java
deleted file mode 100644
index 12db87eda29fbf7c6d16f76efab71c99d4fb6674..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEcgscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEcgscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEcgscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEcgscandata extends AutoXnatEcgscandata {
-
- public BaseXnatEcgscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEcgscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEcgscandata(UserI user)
- **/
- public BaseXnatEcgscandata()
- {}
-
- public BaseXnatEcgscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEcgsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEcgsessiondata.java
deleted file mode 100644
index a8b829bc3a5385e5869fc0b955118b3dbcecc384..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEcgsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEcgsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEcgsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEcgsessiondata extends AutoXnatEcgsessiondata {
-
- public BaseXnatEcgsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEcgsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEcgsessiondata(UserI user)
- **/
- public BaseXnatEcgsessiondata()
- {}
-
- public BaseXnatEcgsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEegscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEegscandata.java
deleted file mode 100644
index ef78834349dbe42226863373da737333c8cde714..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEegscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEegscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEegscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEegscandata extends AutoXnatEegscandata {
-
- public BaseXnatEegscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEegscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEcgscandata(UserI user)
- **/
- public BaseXnatEegscandata()
- {}
-
- public BaseXnatEegscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEegsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEegsessiondata.java
deleted file mode 100644
index 9e066f83a215f7f47c444aeafa38653df431466e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEegsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEegsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEegsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEegsessiondata extends AutoXnatEegsessiondata {
-
- public BaseXnatEegsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEegsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEcgsessiondata(UserI user)
- **/
- public BaseXnatEegsessiondata()
- {}
-
- public BaseXnatEegsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEpsscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEpsscandata.java
deleted file mode 100644
index 31b58d7ee34aa40c4d08de5514115eafbc5629fe..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEpsscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEpsscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEpsscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEpsscandata extends AutoXnatEpsscandata {
-
- public BaseXnatEpsscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEpsscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEpsscandata(UserI user)
- **/
- public BaseXnatEpsscandata()
- {}
-
- public BaseXnatEpsscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEpssessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEpssessiondata.java
deleted file mode 100644
index 521f493a2696f7e9c34d9cf473744488d74b6796..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEpssessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEpssessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEpssessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEpssessiondata extends AutoXnatEpssessiondata {
-
- public BaseXnatEpssessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEpssessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEpssessiondata(UserI user)
- **/
- public BaseXnatEpssessiondata()
- {}
-
- public BaseXnatEpssessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEsscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEsscandata.java
deleted file mode 100644
index 107ee57ec1be32d9a2a76fb49fc7574d0de85b07..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEsscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEsscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEsscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEsscandata extends AutoXnatEsscandata {
-
- public BaseXnatEsscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEsscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEsscandata(UserI user)
- **/
- public BaseXnatEsscandata()
- {}
-
- public BaseXnatEsscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEssessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEssessiondata.java
deleted file mode 100644
index fddbba3f214553b0913457efb8d3b53253e10d58..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEssessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEssessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEssessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEssessiondata extends AutoXnatEssessiondata {
-
- public BaseXnatEssessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEssessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEssessiondata(UserI user)
- **/
- public BaseXnatEssessiondata()
- {}
-
- public BaseXnatEssessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEsvscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEsvscandata.java
deleted file mode 100644
index baa78f0ec1ccd0e9524ce57c5d12c478b26abfca..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEsvscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEsvscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEsvscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEsvscandata extends AutoXnatEsvscandata {
-
- public BaseXnatEsvscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEsvscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEsvscandata(UserI user)
- **/
- public BaseXnatEsvscandata()
- {}
-
- public BaseXnatEsvscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatEsvsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatEsvsessiondata.java
deleted file mode 100644
index f09d5e0b1836209ac40ed70fbee2fe764d39f73d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatEsvsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatEsvsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatEsvsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatEsvsessiondata extends AutoXnatEsvsessiondata {
-
- public BaseXnatEsvsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatEsvsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatEsvsessiondata(UserI user)
- **/
- public BaseXnatEsvsessiondata()
- {}
-
- public BaseXnatEsvsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdata.java
deleted file mode 100644
index 329297815205323e5f242b345973d5a112f1cd4e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdata.java
+++ /dev/null
@@ -1,949 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatExperimentdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 9/20/13 2:34 PM
- */
-package org.nrg.xdat.om.base;
-
-import com.google.common.collect.Lists;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.action.ClientException;
-import org.nrg.xdat.XDAT;
-import org.nrg.xdat.base.BaseElement;
-import org.nrg.xdat.model.*;
-import org.nrg.xdat.om.*;
-import org.nrg.xdat.om.base.auto.AutoXnatExperimentdata;
-import org.nrg.xdat.schema.SchemaElement;
-import org.nrg.xdat.security.SecurityValues;
-import org.nrg.xdat.security.helpers.Permissions;
-import org.nrg.xdat.security.helpers.Users;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-import org.nrg.xft.XFTTable;
-import org.nrg.xft.db.MaterializedView;
-import org.nrg.xft.db.PoolDBUtils;
-import org.nrg.xft.event.EventDetails;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.event.persist.PersistentWorkflowI;
-import org.nrg.xft.event.persist.PersistentWorkflowUtils;
-import org.nrg.xft.exception.DBPoolException;
-import org.nrg.xft.exception.ElementNotFoundException;
-import org.nrg.xft.exception.InvalidPermissionException;
-import org.nrg.xft.exception.XFTInitException;
-import org.nrg.xft.identifier.IDGeneratorFactory;
-import org.nrg.xft.identifier.IDGeneratorI;
-import org.nrg.xft.search.CriteriaCollection;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xnat.exceptions.InvalidArchiveStructure;
-import org.nrg.xnat.turbine.utils.ArcSpecManager;
-import org.nrg.xnat.turbine.utils.ArchivableItem;
-import org.nrg.xnat.utils.WorkflowUtils;
-import org.restlet.data.Status;
-
-import java.io.File;
-import java.sql.SQLException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatExperimentdata extends AutoXnatExperimentdata implements ArchivableItem, MoveableI {
-
- private static final long serialVersionUID = -1237275273363081417L;
-
- public BaseXnatExperimentdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatExperimentdata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatExperimentdata()
- {}
-
- public BaseXnatExperimentdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getArchiveDirectoryName(){
- if(this.getLabel()!=null)
- return this.getLabel();
- else
- return this.getId();
- }
-
- @SuppressWarnings("unused")
- public String getFreeFormDate(String dateParam){
- try{
- Date now = Calendar.getInstance().getTime();
- DateFormat dateFormat = new SimpleDateFormat(dateParam);
- return dateFormat.format(now);
- } catch (Exception e1) {logger.error(e1);return null;}
- }
-
- Hashtable fieldsByName = null;
- public Hashtable getFieldsByName(){
- if (fieldsByName == null){
- fieldsByName=new Hashtable();
- for(final XnatExperimentdataFieldI field: this.getFields_field()){
- fieldsByName.put(field.getName(), field);
- }
- }
-
- return fieldsByName;
- }
-
- @SuppressWarnings("unused")
- public Object getFieldByName(final String s){
- XnatExperimentdataFieldI field = (XnatExperimentdataFieldI)getFieldsByName().get(s);
- if (field!=null){
- return field.getField();
- }else{
- return null;
- }
- }
-
- public String getIdentifier(String project){
- return getIdentifier(project,false);
- }
-
- public String getIdentifier(final String project,final boolean returnNULL){
- if (project!=null){
- if (this.getProject().equals(project)){
- if (this.getLabel()!=null){
- return this.getLabel();
- }
- }
-
- for (final XnatExperimentdataShareI pp : this.getSharing_share())
- {
- if (pp.getProject().equals(project))
- {
- if (pp.getLabel()!=null){
- return pp.getLabel();
- }
- }
- }
- }
-
- if (returnNULL){
- return null;
- }else{
- return getId();
- }
- }
-
- public XnatProjectdataI getProject(final String projectID, final boolean preLoad)
- {
- XnatExperimentdataShare ep = null;
- for (final XnatExperimentdataShareI pp : this.getSharing_share())
- {
- if (pp.getProject().equals(projectID))
- {
- ep=(XnatExperimentdataShare)pp;
- break;
- }
- }
-
- try {
- if (ep!=null){
- return XnatProjectdata.getXnatProjectdatasById(ep.getProject(), this.getUser(), preLoad);
- }else if (this.getProject().equals(projectID)){
- return XnatProjectdata.getXnatProjectdatasById(this.getProject(), this.getUser(), preLoad);
- }
- } catch (RuntimeException e) {
- logger.error("",e);
- }
-
- return null;
- }
-
- public XnatProjectdata getPrimaryProject(boolean preLoad){
- if (this.getProject()!=null){
- return XnatProjectdata.getXnatProjectdatasById(getProject(), this.getUser(), preLoad);
- }else{
- return (XnatProjectdata)getFirstProject();
- }
- }
-
-
- public XnatProjectdataI getFirstProject() {
- List<XnatExperimentdataShareI> shares = getSharing_share();
- if (!shares.isEmpty()){
- for (XnatExperimentdataShareI ep : shares) {
- if (ep != null) {
- try {
- // We'll return the first non-null project, i.e. the first shared project this user can access.
- XnatProjectdata project = XnatProjectdata.getXnatProjectdatasById(ep.getProject(), this.getUser(), false);
- if (project != null) {
- return project;
- }
- } catch (RuntimeException e) {
- logger.error("",e);
- }
- }
- }
- }
-
- return null;
- }
-
-
-
- public String getIdentifiers(){
- Hashtable ids = new Hashtable();
-
- if (this.getProject()!=null){
- if (this.getLabel()!=null){
- ids.put(this.getLabel(), this.getProject());
- }else{
- ids.put(this.getId(), this.getProject());
- }
- }
-
- for (final XnatExperimentdataShareI pp : this.getSharing_share())
- {
-
- if (pp.getLabel()!=null){
- if (ids.containsKey(pp.getLabel()))
- {
- ids.put(pp.getLabel(), ids.get(pp.getLabel()) + "," + pp.getProject());
- }else{
- ids.put(pp.getLabel(), pp.getProject());
- }
- }else{
- if (ids.containsKey(this.getId()))
- {
- ids.put(this.getId(), ids.get(this.getId()) + "," + pp.getProject());
- }else{
- ids.put(this.getId(), pp.getProject());
- }
- }
- }
-
- String identifiers = "";
-
- Enumeration keys = ids.keys();
- int counter=0;
- while (keys.hasMoreElements()){
- String key =(String) keys.nextElement();
- if (counter++>0)identifiers=identifiers + ", ";
- identifiers=identifiers + key + " ("+ ids.get(key) + ")";
- }
-
- return identifiers;
- }
-
-
-
-
- public String name = null;
- public String description = null;
- public String secondaryID = null;
- private boolean initd = false;
-
- public void loadProjectDetails(){
- if (!initd)
- {
- initd=true;
- Object[] row=this.loadProjectDetails(this.getProject());
- if (row!=null)
- {
- name = (String)row[0];
- description = (String)row[1];
- secondaryID = (String)row[2];
- }
- }
- }
-
- public Object[] loadProjectDetails(String s){
- try{
- XFTTable table = XFTTable.Execute("SELECT name,description,secondary_ID FROM xnat_projectData WHERE ID ='" + s + "';", this.getDBName(), null);
-
- if (table.size()>0)
- {
- return table.rows().get(0);
- }
- } catch (SQLException | DBPoolException e) {
- logger.error("",e);
- }
-
- return null;
- }
-
- public XnatProjectdata getProjectData(){
- return XnatProjectdata.getXnatProjectdatasById(this.getProject(), this.getUser(), false);
- }
-
-
- /**
- * @return the description
- */
- public String getDescription() {
- loadProjectDetails();
- return description;
- }
-
- /**
- * @return the name
- */
- public String getProjectName() {
- loadProjectDetails();
- return name;
- }
-
- /**
- * @return the secondaryID
- */
- public String getProjectSecondaryID() {
- loadProjectDetails();
- return secondaryID;
- }
-
-
-
- /**
- * @return the secondaryID
- */
- public String getProjectDisplayID() {
- loadProjectDetails();
- if (secondaryID!=null){
- return secondaryID;
- }else{
- return getProject();
- }
- }
-
- public Hashtable<XnatProjectdataI,String> getProjectDatas(){
- Hashtable<XnatProjectdataI,String> hash = new Hashtable<>();
- for(final XnatExperimentdataShareI pp : this.getSharing_share()){
- if (pp.getLabel()==null)
- if (this.getId()!=null)
- hash.put(((XnatExperimentdataShare)pp).getProjectData(), this.getId());
- else
- hash.put(((XnatExperimentdataShare)pp).getProjectData(), "");
- else
- hash.put(((XnatExperimentdataShare)pp).getProjectData(), pp.getLabel());
- }
- return hash;
- }
-
- @SuppressWarnings("unused")
- public Collection<XnatFielddefinitiongroup> getFieldDefinitionGroups(final String dataType, final String projectID) {
- final Hashtable<String, XnatFielddefinitiongroup> groups = new Hashtable<>();
- final Hashtable<XnatProjectdataI, String> projects = getProjectDatas();
- final XnatProjectdata primaryProject = getPrimaryProject(false);
- if (primaryProject != null) {
- projects.put(primaryProject, "");
-
- for (final Map.Entry<XnatProjectdataI, String> entry : projects.entrySet()) {
- final XnatAbstractprotocol prot = ((XnatProjectdata) entry.getKey()).getProtocolByDataType(dataType);
- if ((projectID != null && !projectID.isEmpty()) && !projectID.equals(entry.getKey().getId())) {
- continue;
- }
- if (prot != null && prot instanceof XnatDatatypeprotocol) {
- final XnatDatatypeprotocol dataProt = (XnatDatatypeprotocol) prot;
- for (final XnatFielddefinitiongroupI group : dataProt.getDefinitions_definition()) {
- groups.put(group.getId(), (XnatFielddefinitiongroup) group);
- }
- }
- }
- }
- return groups.values();
- }
-
- public static XnatExperimentdata GetExptByProjectIdentifier(String project, String identifier,UserI user,boolean preLoad){
- if(StringUtils.isBlank(identifier)){
- return null;
- }
-
- CriteriaCollection cc=new CriteriaCollection("OR");
-
- CriteriaCollection subcc1 = new CriteriaCollection("AND");
- subcc1.addClause("xnat:experimentData/project", project);
- subcc1.addClause("xnat:experimentData/label", identifier);
-
- cc.add(subcc1);
-
- CriteriaCollection subcc2 = new CriteriaCollection("AND");
- subcc2.addClause("xnat:experimentData/sharing/share/project", project);
- subcc2.addClause("xnat:experimentData/sharing/share/label", identifier);
-
- cc.add(subcc2);
-
- ArrayList al = XnatExperimentdata.getXnatExperimentdatasByField(cc, user, preLoad);
- al = BaseElement.WrapItems(al);
- if (al.size()>0){
- return (XnatExperimentdata)al.get(0);
- }else{
- return null;
- }
-
- }
-
- public static synchronized String CreateNewID() throws Exception{
- IDGeneratorI generator = IDGeneratorFactory.GetIDGenerator("org.nrg.xnat.turbine.utils.IDGenerator");
- assert generator != null;
- generator.setTable("xnat_experimentData");
- generator.setDigits(5);
- generator.setColumn("id");
- return generator.generateIdentifier();
- }
-
- /**
- * newlabel can be null defaults to this.getLabel(), if that is null this.getId()
- * @param newProject New project to move.
- * @param newLabel New label to set.
- * @param user User moving.
- * @throws Exception
- */
- public void moveToProject(XnatProjectdata newProject,String newLabel,UserI user,EventMetaI ci,List<String> assessors) throws Exception{
-
- if(!this.getProject().equals(newProject.getId()))
- {
-
- if (!MoverMaker.check(this, user)) {
- throw new InvalidPermissionException(this.getXSIType());
- }
- String existingRootPath=this.getProjectData().getRootArchivePath();
-
- if(newLabel==null)newLabel = this.getLabel();
- if(newLabel==null)newLabel = this.getId();
-
- // newSessionDir = /ARCHIVE/proj_x/arc001
- final File newSessionDir = new File(new File(newProject.getRootArchivePath(),newProject.getCurrentArc()),newLabel);
-
- // Label defaults to this.getId()
- String current_label=this.getLabel();
- if(current_label==null)current_label=this.getId();
-
-
- for(XnatAbstractresourceI abstRes:this.getResources_resource()){
- MoverMaker.moveResource(abstRes, current_label, this, newSessionDir, existingRootPath, user,ci);
- }
-
- MoverMaker.writeDB(this, newProject, newLabel, user,ci);
- MoverMaker.setLocal(this, newProject, newLabel);
- }
- }
-
- @SuppressWarnings("unused")
- public ArrayList getCatalogSummary() throws Exception{
- String query="SELECT xnat_abstractresource_id,label,element_name ";
- query+=", 'resources'::TEXT AS category, '" + this.getId()+"'::TEXT AS cat_id";
- query+=" FROM xnat_experimentdata_resource map " +
- " LEFT JOIN xnat_abstractresource abst ON map.xnat_abstractresource_xnat_abstractresource_id=abst.xnat_abstractresource_id" +
- " LEFT JOIN xdat_meta_element xme ON abst.extension=xme.xdat_meta_element_id";
- query+= " WHERE xnat_experimentdata_id='"+this.getId() + "'";
-
- XFTTable t = XFTTable.Execute(query, this.getDBName(), "system");
-
- return t.rowHashs();
- }
-
- public boolean hasProject(String proj_id){
- if (this.getProject() == null) {
- return false;
- }
- if(this.getProject().equals(proj_id)){
- return true;
- }else{
- for(XnatExperimentdataShareI pp: this.getSharing_share()){
- if(pp.getProject().equals(proj_id)){
- return true;
- }
- }
- }
-
- return false;
- }
-
-
-
- public String canDelete(BaseXnatProjectdata proj, UserI user) {
- BaseXnatExperimentdata expt=this;
- if(this.getItem().getUser()!=null){
- expt=new XnatExperimentdata(this.getCurrentDBVersion(true));
- }
- if(!expt.hasProject(proj.getId())){
- return null;
- }else {
-
- try {
- SecurityValues values = new SecurityValues();
- values.put(this.getXSIType() + "/project", proj.getId());
- SchemaElement se= SchemaElement.GetElement(this.getXSIType());
-
- if (!Permissions.canDelete(user,se,values))
- {
- return "User cannot delete experiments for project " + proj.getId();
- }
- } catch (Exception e1) {
- return "Unable to delete subject.";
- }
-
- }
- return null;
- }
-
- public String delete(BaseXnatProjectdata proj, UserI user, boolean removeFiles,EventMetaI c){
- BaseXnatExperimentdata expt=this;
- if(this.getItem().getUser()!=null){
- expt= (BaseXnatExperimentdata)BaseElement.GetGeneratedItem(expt.getItem());
- }
-
- String msg=expt.canDelete(proj,user);
-
- if(msg!=null){
- logger.error(msg);
- return msg;
- }
-
- if(expt.getProject() != null && !expt.getProject().equals(proj.getId())){
- try {
- SecurityValues values = new SecurityValues();
- values.put(this.getXSIType() + "/project", proj.getId());
-
- if (!Permissions.canDelete(user,expt) && !Permissions.canDelete(user,this.getSchemaElement(),values))
- {
- return "User cannot delete experiments for project " + proj.getId();
- }
-
-
- //unshare children before unsharing parent
- if(expt instanceof XnatImagesessiondata){
- final List<XnatImageassessordata> expts = ((XnatImagesessiondata)expt).getAssessors_assessor();
- for (XnatImageassessordataI exptI : expts){
- final XnatImageassessordata assess = (XnatImageassessordata)exptI;
- if(assess.getProject().equals(proj.getId())){
- return "This operation would delete an experiment (rather than un-share). Please move experiment ("+expt.getId()+") to another project or manually delete.";
-
- }
- msg= assess.delete(proj,user,false,c);
- if(msg!=null){
- return msg;
- }
- }
- }
-
- int index = 0;
- int match = -1;
- for(XnatExperimentdataShareI pp : expt.getSharing_share()){
- if(pp.getProject().equals(proj.getId())){
- SaveItemHelper.authorizedRemoveChild(expt.getItem(), "xnat:experimentData/sharing/share", ((XnatExperimentdataShare)pp).getItem(), user,c);
- match=index;
- break;
- }
- index++;
- }
-
- if(match==-1)return null;
-
- this.removeSharing_share(match);
- return null;
- } catch (SQLException e) {
- logger.error("",e);
- return e.getMessage();
- } catch (Exception e) {
- logger.error("",e);
- return e.getMessage();
- }
- }else{
-
- if(XDAT.getBoolSiteConfigurationProperty("security.prevent-data-deletion", false)){
- return "User account cannot delete experiments";
- }
- try {
-
- if(!Permissions.canDelete(user,this)){
- return "User account doesn't have permission to delete this experiment.";
- }
-
- if(removeFiles){
- this.deleteFiles(user,c);
- }
-
-
- SaveItemHelper.authorizedDelete(expt.getItem().getCurrentDBVersion(), user,c);
- Users.clearCache(user);
- MaterializedView.deleteByUser(user);
-
- } catch (SQLException e) {
- logger.error("",e);
- return org.apache.commons.lang.StringUtils.isBlank(e.getMessage()) ? ExceptionUtils.getStackTrace(e) : e.getMessage();
- } catch (Exception e) {
- logger.error("",e);
- return org.apache.commons.lang.StringUtils.isBlank(e.getMessage()) ? ExceptionUtils.getStackTrace(e) : e.getMessage();
- }
- }
- return null;
- }
-
- /**
- * This method looks for an existing session directory in the archive space.s
- * @return The file for the session directory.
- */
- public File getSessionDir(){
- final File archive=new File(ArcSpecManager.GetInstance().getArchivePathForProject(this.getProject()));
- if(archive.exists()){
- final File[] files = archive.listFiles();
- if (files != null) {
- for (final File arc : files) {
- if (!arc.getName().equals("subjects") && !arc.getName().equals("resources") && arc.isDirectory()) {
- final File[] archiveFiles = arc.listFiles();
- if (archiveFiles != null) {
- for (final File dir : archiveFiles) {
- if (dir.isDirectory() && dir.getName().equals(this.getArchiveDirectoryName())) {
- return dir;
- }
- }
- }
- }
- }
- }
- }
-
- return null;
- }
-
- public void deleteFiles(UserI u, EventMetaI ci) throws Exception{
- for(XnatAbstractresourceI abstRes:this.getResources_resource()){
- ((XnatAbstractresource)abstRes).deleteWithBackup(ArcSpecManager.GetInstance().getArchivePathForProject(this.getProject()), u,ci);
- }
-
- File dir=this.getSessionDir();
- if(dir!=null){
- FileUtils.MoveToCache(dir);
- }
- }
-
-
-
- public static String cleanValue(String v){
- v= StringUtils.replace(v, " ", "_");
- v= StringUtils.replace(v, "`", "_");
- v= StringUtils.replace(v, "~", "_");
- v= StringUtils.replace(v, "@", "_");
- v= StringUtils.replace(v, "#", "_");
- v= StringUtils.replace(v, "$", "_");
- v= StringUtils.replace(v, "%", "_");
- v= StringUtils.replace(v, "^", "_");
- v= StringUtils.replace(v, "&", "_");
- v= StringUtils.replace(v, "*", "_");
- v= StringUtils.replace(v, "(", "_");
- v= StringUtils.replace(v, ")", "_");
- v= StringUtils.replace(v, "+", "_");
- v= StringUtils.replace(v, "=", "_");
- v= StringUtils.replace(v, "[", "_");
- v= StringUtils.replace(v, "]", "_");
- v= StringUtils.replace(v, "{", "_");
- v= StringUtils.replace(v, "}", "_");
- v= StringUtils.replace(v, "|", "_");
- v= StringUtils.replace(v, "\\", "_");
- v= StringUtils.replace(v, "/", "_");
- v= StringUtils.replace(v, "?", "_");
- v= StringUtils.replace(v, ":", "_");
- v= StringUtils.replace(v, ";", "_");
- v= StringUtils.replace(v, "\"", "_");
- v= StringUtils.replace(v, "'", "_");
- v= StringUtils.replace(v, ",", "_");
- v= StringUtils.replace(v, ".", "_");
- v= StringUtils.replace(v, "<", "_");
- v= StringUtils.replace(v, ">", "_");
-
- return v;
- }
-
- /**
- * Gets root path to the primary project's archive space.
- * @return The path to the root folder of the experiment's primary project's archive space.
- */
- public String getArchiveRootPath() throws UnknownPrimaryProjectException{
- XnatProjectdata p=getPrimaryProject(false);
- if(p!=null){
- return p.getRootArchivePath();
- }else{
- throw new UnknownPrimaryProjectException();
- }
- }
-
- public static class UnknownPrimaryProjectException extends Exception{
-
- }
-
- /**
- * Gets root path to the primary project's cache space.
- * @return The path to the root folder of the subject's primary project's cache space.
- */
- public String getCachePath(){
- final XnatProjectdata primaryProject = getPrimaryProject(false);
- return primaryProject != null ? primaryProject.getCachePath() : "";
- }
-
- /**
- * Gets root path to the primary project's prearchive space.
- * @return The path to the root folder of the subject's primary project's prearchive space.
- */
- public String getPrearchivePath(){
- final XnatProjectdata primaryProject = getPrimaryProject(false);
- return primaryProject != null ? primaryProject.getPrearchivePath() : "";
- }
-
- /**
- * This returns the current sub folder within the project archive folder for placing sessions (ie arc001).
- * @return The path to the current sub folder within the subject's primary project's archive space for session storage.
- * @throws InvalidArchiveStructure
- */
- public String getCurrentArchiveFolder() throws InvalidArchiveStructure, UnknownPrimaryProjectException {
- final String arcpath = getArchiveRootPath();
- final File f = new File(arcpath);
-
- if (!f.exists()) {
- f.mkdir();
- }
-
- final XnatProjectdata primaryProject = getPrimaryProject(false);
- if (primaryProject == null) {
- return null;
- }
-
- String curA = primaryProject.getCurrentArc();
- if (curA == null) {
- return null;
- }
-
- logger.info("CURRENT_ARC:" + curA);
- if (!curA.endsWith("\\") && !curA.endsWith("/")) {
- curA += File.separator;
- }
-
- if (FileUtils.IsAbsolutePath(curA)) {
- final File currentArc = new File(curA);
- if (!currentArc.exists()) {
- currentArc.mkdirs();
- }
-
- int index = curA.indexOf(f.getName());
- if (index == -1) {
- throw new InvalidArchiveStructure(f.getName() + " does not exist in " + curA);
- } else {
- return curA.substring(index + f.getName().length() + 1);
- }
- } else {
- final File currentArc = new File(arcpath + curA);
- if (!currentArc.exists()) {
- currentArc.mkdirs();
- }
- return curA;
- }
- }
-
- /**
- * Returns path to the current archive folder for this experiment
- * @param absolute Indicates whether the path should be returned as an absolute path or relative to the
- * {@link #getArchiveRootPath() root archive path}.
- * @return The folder location for the current session.
- * @throws InvalidArchiveStructure
- */
- public String getCurrentSessionFolder(boolean absolute) throws InvalidArchiveStructure,UnknownPrimaryProjectException{
- String session_path;
-
- final String currentarc = this.getCurrentArchiveFolder();
- if (currentarc ==null){
- session_path = this.getArchiveDirectoryName() + "/";
- }else{
- session_path = currentarc.replace('\\', '/') + this.getArchiveDirectoryName() + "/";
- }
-
- if (absolute){
- session_path= FileUtils.AppendRootPath(this.getArchiveRootPath(), session_path);
- }
-
- return session_path;
- }
-
- /**
- * This method looks for an existing session directory in the archive space. If none is found, it returns the location where said directory would be created.
- * @return The folder in which the experiment is or should be located.
- */
- public File getExpectedSessionDir() throws InvalidArchiveStructure,UnknownPrimaryProjectException{
- final File sessionDIR=this.getSessionDir();
-
- if(sessionDIR==null){
- return new File(this.getCurrentSessionFolder(true));
- }
-
- return sessionDIR;
- }
-
- protected void checkIsValidID(String s) throws IllegalArgumentException{
-
- if(StringUtils.isBlank(s)){
- throw new IllegalArgumentException();
- }
-
- if(!XftStringUtils.IsAlphaNumericUnderscore(s)){
- throw new IllegalArgumentException("Identifiers cannot use special characters.");
- }
- }
-
- public void checkUniqueLabel() throws Exception{
- if(StringUtils.isNotBlank(this.getLabel())){
- Long count=(Long)PoolDBUtils.ReturnStatisticQuery(String.format("SELECT COUNT(*) FROM (SELECT label, ID FROM xnat_experimentData WHERE label='%1$s' AND ID !='%2$s' AND project='%3$s' UNION SELECT label, sharing_share_xnat_experimentda_id AS ID FROM xnat_experimentData_share WHERE label='%1$s' AND sharing_share_xnat_experimentda_id !='%2$s' AND project='%3$s') SRCH",this.getLabel(),this.getId(),this.getProject()), "count", this.getDBName(), "system");
- if(count>0){
- throw new ClientException(Status.CLIENT_ERROR_CONFLICT,"Conflict: Duplicate experiment label",new Exception());
- }
- }
- }
-
-
- @Override
- public void preSave() throws Exception{
- super.preSave();
-
- checkIsValidID(this.getId());
-
- checkIsValidID(this.getLabel());
-
- final XnatProjectdata proj = getPrimaryProject(false);
- if(proj==null){
- throw new Exception("Unable to identify project for:" + this.getProject());
- }
-
- checkUniqueLabel();
-
- final String expectedPath=this.getExpectedSessionDir().getAbsolutePath().replace('\\', '/');
-
- for(final XnatAbstractresourceI res: this.getResources_resource()){
- final String uri;
- if(res instanceof XnatResource){
- uri=((XnatResource)res).getUri();
- }else if(res instanceof XnatResourceseries){
- uri=((XnatResourceseries)res).getPath();
- }else{
- continue;
- }
-
- FileUtils.ValidateUriAgainstRoot(uri,expectedPath,"URI references data outside of the project:" + uri);
- }
- }
-
-
-
- public File getExpectedCurrentDirectory() throws InvalidArchiveStructure,UnknownPrimaryProjectException {
- return getExpectedSessionDir();
- }
-
- public String getResourceCatalogRootPathByLabel(final String label) {
- String rtn = null;
- for (final Object file : getResources_resource()) {
- if (file instanceof XnatResourcecatalog) {
- String tag = ((XnatResourcecatalog)file).getLabel();
- if (tag != null && tag.equals(label)) {
- rtn =((XnatResourcecatalog)file).getUri();
- int index = rtn.lastIndexOf("/");
- if (index != -1)
- rtn = rtn.substring(0, index);
- break;
- }
- }
- }
- return rtn;
- }
-
- public static void SaveSharedProject(XnatExperimentdataShare pp, XnatExperimentdata expt,UserI user,final EventDetails event) throws Exception{
- PersistentWorkflowI wrk= WorkflowUtils.buildOpenWorkflow(user, expt.getItem(),event);
- EventMetaI c=wrk.buildEvent();
- PersistentWorkflowUtils.save(wrk, c);
- try {
- SaveItemHelper.authorizedSave(pp,user,false,false,c);
- PersistentWorkflowUtils.complete(wrk, c);
- } catch (Exception e) {
- logger.error("",e);
- PersistentWorkflowUtils.fail(wrk, c);
- throw e;
- }
- }
-
- public static EventMetaI ChangePrimaryProject(UserI user, XnatExperimentdata assessor, XnatProjectdata newProject, String newLabel, final EventDetails event, List<String> imageAssessors) throws Exception{
- PersistentWorkflowI wrk= WorkflowUtils.buildOpenWorkflow(user, assessor.getXSIType(), assessor.getId(),assessor.getProject(),event);
- EventMetaI c=wrk.buildEvent();
- PersistentWorkflowUtils.save(wrk, c);
-
- try {
- assessor.moveToProject(newProject,newLabel,user,c,imageAssessors);
-
- PersistentWorkflowUtils.complete(wrk, c);
- } catch (Exception e) {
- logger.error("",e);
- PersistentWorkflowUtils.fail(wrk,c);
- throw e;
- }
-
- return c;
- }
-
- List<WrkWorkflowdataI> workflows=null;
- public List<WrkWorkflowdataI> getWorkflows() throws Exception{
- if(workflows==null){
- workflows = Lists.newArrayList();
-
- //search for workflow entries with a matching ID
- org.nrg.xft.search.CriteriaCollection cc = new CriteriaCollection("AND");
- cc.addClause("wrk:workflowData.ID",this.getId());
- org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(cc,null,false);
-
- //Sort by Launch Time
- final List<XFTItem> workItems = items.getItems("wrk:workflowData.launch_time","DESC");
- for (final XFTItem wrk : workItems)
- {
- workflows.add(new WrkWorkflowdata(wrk));
- }
- }
-
- return workflows;
- }
-
- public XnatExperimentdata getLightCopy() throws XFTInitException, ElementNotFoundException {
- XFTItem item = XFTItem.NewItem(this.getXSIType(), this.getUser());
- XnatExperimentdata new_expt=(XnatExperimentdata) BaseElement.GetGeneratedItem(item);
- new_expt.setId(this.getId());
- new_expt.setLabel(this.getLabel());
- new_expt.setProject(this.getProject());
- if (this instanceof XnatSubjectassessordata) {
- ((XnatSubjectassessordata) new_expt).setSubjectId(((XnatSubjectassessordata) this).getSubjectId());
- } else if (this instanceof XnatImageassessordata) {
- ((XnatImageassessordata) new_expt).setImagesessionId(((XnatImageassessordata) this).getImagesessionId());
- }
- return new_expt;
- }
-
- @Override
- public SecurityValues getSecurityTags(){
- SecurityValues projects=new SecurityValues();
- projects.getHash().put(this.getXSIType() +"/project", this.getProject());
- for (final XnatExperimentdataShareI pp:this.getSharing_share())
- {
- projects.getHash().put(this.getXSIType() +"/sharing/share/project", pp.getProject());
- }
- return projects;
-
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdataField.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdataField.java
deleted file mode 100644
index 5d535538ae87bc75a755ee37daf14f24d87023a3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdataField.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatExperimentdataField
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatExperimentdataField;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatExperimentdataField extends AutoXnatExperimentdataField {
-
- public BaseXnatExperimentdataField(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatExperimentdataField(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatExperimentdataField(UserI user)
- **/
- public BaseXnatExperimentdataField()
- {}
-
- public BaseXnatExperimentdataField(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdataShare.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdataShare.java
deleted file mode 100644
index 57220e2e39a2d11ffc2a1d071236d5f4ce12f41a..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdataShare.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatExperimentdataShare
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.XnatProjectdataI;
-import org.nrg.xdat.om.XnatProjectdata;
-import org.nrg.xdat.om.base.auto.AutoXnatExperimentdataShare;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTTable;
-import org.nrg.xft.exception.DBPoolException;
-import org.nrg.xft.security.UserI;
-
-import java.sql.SQLException;
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatExperimentdataShare extends AutoXnatExperimentdataShare {
-
- public BaseXnatExperimentdataShare(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatExperimentdataShare(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatExperimentdataShare(UserI user)
- **/
- public BaseXnatExperimentdataShare()
- {}
-
- public BaseXnatExperimentdataShare(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- private String name = null;
- private String description = null;
- private String secondaryID = null;
- private boolean initd = false;
-
- public void loadProjectDetails(){
- if (!initd)
- {
- initd=true;
- try {
- XFTTable table = XFTTable.Execute("SELECT name,description,secondary_ID FROM xnat_projectData WHERE ID ='" + this.getProject() + "';", this.getDBName(), null);
-
- if (table.size()>0)
- {
- Object[] row = (Object[])table.rows().get(0);
- name = (String)row[0];
- description = (String)row[1];
- secondaryID = (String)row[2];
- }
- } catch (SQLException e) {
- logger.error("",e);
- } catch (DBPoolException e) {
- logger.error("",e);
- }
- }
- }
-
- public XnatProjectdataI getProjectData(){
- return XnatProjectdata.getXnatProjectdatasById(this.getProject(), this.getUser(), false);
- }
-
-
- /**
- * @return the description
- */
- public String getDescription() {
- loadProjectDetails();
- return description;
- }
-
- /**
- * @return the name
- */
- public String getProjectName() {
- loadProjectDetails();
- return name;
- }
-
- /**
- * @return the secondaryID
- */
- public String getProjectSecondaryID() {
- loadProjectDetails();
- return secondaryID;
- }
-
-
-
- /**
- * @return the secondaryID
- */
- public String getProjectDisplayID() {
- loadProjectDetails();
- if (secondaryID!=null){
- return secondaryID;
- }else{
- return getProject();
- }
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatFielddefinitiongroup.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatFielddefinitiongroup.java
deleted file mode 100644
index f7b9887d5202a4c574fe5aad30912cf642dd1481..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatFielddefinitiongroup.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatFielddefinitiongroup
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatFielddefinitiongroup;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatFielddefinitiongroup extends AutoXnatFielddefinitiongroup {
-
- public BaseXnatFielddefinitiongroup(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatFielddefinitiongroup(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatFielddefinitiongroup(UserI user)
- **/
- public BaseXnatFielddefinitiongroup()
- {}
-
- public BaseXnatFielddefinitiongroup(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- private ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField> _sorted_Fields_field =null;
-
- /**
- * fields/field
- * @return Returns an ArrayList of org.nrg.xdat.om.XnatFielddefinitiongroupField
- */
- public ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField> getFields_field() {
- try{
- if (_sorted_Fields_field==null){
- _sorted_Fields_field=org.nrg.xdat.base.BaseElement.WrapItems(getChildItemCollection("fields/field").getItems("xnat:fieldDefinitionGroup_field/sequence"));
- return _sorted_Fields_field;
- }else {
- return _sorted_Fields_field;
- }
- } catch (Exception e1) {return new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField>();}
- }
-}
-
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatFielddefinitiongroupField.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatFielddefinitiongroupField.java
deleted file mode 100644
index 93c7399cd21ac20a3fe9ca596df6fae305fd60bc..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatFielddefinitiongroupField.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatFielddefinitiongroupField
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatFielddefinitiongroupField;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatFielddefinitiongroupField extends AutoXnatFielddefinitiongroupField {
-
- public BaseXnatFielddefinitiongroupField(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatFielddefinitiongroupField(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatFielddefinitiongroupField(UserI user)
- **/
- public BaseXnatFielddefinitiongroupField()
- {}
-
- public BaseXnatFielddefinitiongroupField(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getCleanedXMLPath(){
- String xmlPath = this.getXmlpath();
- while(xmlPath.indexOf("[")>-1){
- xmlPath= xmlPath.substring(0,xmlPath.indexOf("[")) + xmlPath.substring(xmlPath.indexOf("]")+1);
- }
- return xmlPath;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatFielddefinitiongroupFieldPossiblevalue.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatFielddefinitiongroupFieldPossiblevalue.java
deleted file mode 100644
index 2bf446675385ea20248a299acb9b74a90f133e86..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatFielddefinitiongroupFieldPossiblevalue.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatFielddefinitiongroupFieldPossiblevalue
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatFielddefinitiongroupFieldPossiblevalue;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatFielddefinitiongroupFieldPossiblevalue extends AutoXnatFielddefinitiongroupFieldPossiblevalue {
-
- public BaseXnatFielddefinitiongroupFieldPossiblevalue(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatFielddefinitiongroupFieldPossiblevalue(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatFielddefinitiongroupFieldPossiblevalue(UserI user)
- **/
- public BaseXnatFielddefinitiongroupFieldPossiblevalue()
- {}
-
- public BaseXnatFielddefinitiongroupFieldPossiblevalue(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatGenericdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatGenericdata.java
deleted file mode 100644
index 6899564669c20f725478add573a2b80d157dbdd7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatGenericdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatGenericdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatGenericdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-
-public class BaseXnatGenericdata extends AutoXnatGenericdata{
- public BaseXnatGenericdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatGenericdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatHdscandata(UserI user)
- **/
- public BaseXnatGenericdata()
- {}
-
- public BaseXnatGenericdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatGmscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatGmscandata.java
deleted file mode 100644
index 762b51c46d3ba0ef8829dc2eecedd4902e9d488a..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatGmscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatGmscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatGmscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatGmscandata extends AutoXnatGmscandata {
-
- public BaseXnatGmscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatGmscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatGmscandata(UserI user)
- **/
- public BaseXnatGmscandata()
- {}
-
- public BaseXnatGmscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatGmsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatGmsessiondata.java
deleted file mode 100644
index be9d80ba5e769128d36da0cd610227b9bba7b03a..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatGmsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatGmsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatGmsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatGmsessiondata extends AutoXnatGmsessiondata {
-
- public BaseXnatGmsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatGmsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatGmsessiondata(UserI user)
- **/
- public BaseXnatGmsessiondata()
- {}
-
- public BaseXnatGmsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatGmvscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatGmvscandata.java
deleted file mode 100644
index 865926837bcae907bd6d28f6881c826c0e11356e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatGmvscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatGmvscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatGmvscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatGmvscandata extends AutoXnatGmvscandata {
-
- public BaseXnatGmvscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatGmvscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatGmvscandata(UserI user)
- **/
- public BaseXnatGmvscandata()
- {}
-
- public BaseXnatGmvscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatGmvsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatGmvsessiondata.java
deleted file mode 100644
index 1cefd8c46ffeb0d701acfec4e90b64428ceeaf6f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatGmvsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatGmvsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatGmvsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatGmvsessiondata extends AutoXnatGmvsessiondata {
-
- public BaseXnatGmvsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatGmvsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatGmvsessiondata(UserI user)
- **/
- public BaseXnatGmvsessiondata()
- {}
-
- public BaseXnatGmvsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatHdscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatHdscandata.java
deleted file mode 100644
index 77e591bbaf21334e5527aacbe14781d8fe9f0fdd..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatHdscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatHdscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatHdscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatHdscandata extends AutoXnatHdscandata {
-
- public BaseXnatHdscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatHdscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatHdscandata(UserI user)
- **/
- public BaseXnatHdscandata()
- {}
-
- public BaseXnatHdscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatHdsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatHdsessiondata.java
deleted file mode 100644
index f8fe3adfc9aafdf360350146bbc3211812e1e949..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatHdsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatHdsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatHdsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatHdsessiondata extends AutoXnatHdsessiondata {
-
- public BaseXnatHdsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatHdsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatHdsessiondata(UserI user)
- **/
- public BaseXnatHdsessiondata()
- {}
-
- public BaseXnatHdsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatImageassessordata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatImageassessordata.java
deleted file mode 100644
index 013e79d78a287f0ada37550916ab9b3dec82ec89..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatImageassessordata.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatImageassessordata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 2/11/14 12:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.xdat.model.XnatAbstractresourceI;
-import org.nrg.xdat.om.*;
-import org.nrg.xdat.om.base.auto.AutoXnatImageassessordata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFT;
-import org.nrg.xft.XFTTable;
-import org.nrg.xft.db.PoolDBUtils;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xnat.exceptions.InvalidArchiveStructure;
-import org.nrg.xnat.turbine.utils.ArcSpecManager;
-
-import java.io.File;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatImageassessordata extends AutoXnatImageassessordata{
-
- public BaseXnatImageassessordata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatImageassessordata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatImageassessordata(UserI user)
- **/
- public BaseXnatImageassessordata()
- {}
-
- public BaseXnatImageassessordata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
-
- private XnatImagesessiondata mr = null;
-
- public XnatImagesessiondata getImageSessionData()
- {
- if (mr==null)
- {
- ArrayList al = XnatImagesessiondata.getXnatImagesessiondatasByField("xnat:imageSessionData/ID",this.getImagesessionId(),this.getUser(),false);
- if (al.size()>0)
- {
- mr = (XnatImagesessiondata)al.get(0);
- }
- }
-
- return mr;
- }
-
- public void setImageSessionData(XnatImagesessiondata ses){
- mr=ses;
- }
-
-
- public boolean validateSessionId(){
- String session_id = this.getImagesessionId();
-
- if (session_id!=null){
- session_id= StringUtils.remove(session_id, '\'');
- String query = "SELECT ID FROM xnat_imageSessiondata WHERE ID='";
- String login =null;
- if (this.getUser()!=null){
- login = this.getUser().getUsername();
- }
-
- try {
- final String idCOUNT= (String)PoolDBUtils.ReturnStatisticQuery(query + session_id + "';", "id", this.getDBName(), login);
- if (idCOUNT!=null){
- return true;
- }
-
- final String project = this.getProject();
- if (project!=null){
- query = "SELECT id FROM xnat_experimentData WHERE label='" +
- session_id +"' AND project='" + project + "';";
- String new_session_id= (String)PoolDBUtils.ReturnStatisticQuery(query, "id", this.getDBName(), login);
- if (new_session_id!=null){
- this.setImagesessionId(new_session_id);
- return true;
- }
-
- query = "SELECT sharing_share_xnat_experimentda_id FROM xnat_experimentData_share WHERE label='" +
- session_id +"' AND project='" + project + "';";
- new_session_id= (String)PoolDBUtils.ReturnStatisticQuery(query, "sharing_share_xnat_experimentda_id", this.getDBName(), login);
- if (new_session_id!=null){
- this.setImagesessionId(new_session_id);
- return true;
- }
- }
- } catch (SQLException e) {
- logger.error("",e);
- } catch (Exception e) {
- logger.error("",e);
- }
- }
-
- return false;
- }
-
- public ArrayList getCatalogSummary() throws Exception{
- String query="SELECT xnat_abstractresource_id,label,element_name ";
- query+=", 'resources'::TEXT AS category, '" + this.getId()+"'::TEXT AS cat_id";
- query+=" FROM xnat_experimentdata_resource map " +
- " LEFT JOIN xnat_abstractresource abst ON map.xnat_abstractresource_xnat_abstractresource_id=abst.xnat_abstractresource_id" +
- " LEFT JOIN xdat_meta_element xme ON abst.extension=xme.xdat_meta_element_id";
- query+= " WHERE xnat_experimentdata_id='"+this.getId() + "'";
-
- XFTTable t = XFTTable.Execute(query, this.getDBName(), "system");
-
- return t.rowHashs();
- }
-
-
- public void deleteFiles(UserI u, EventMetaI ci) throws Exception{
- super.deleteFiles(u,ci);
-
- final String rootPath=ArcSpecManager.GetInstance().getArchivePathForProject(this.getProject());
-
- for(XnatAbstractresourceI abstRes:this.getResources_resource()){
- ((XnatAbstractresource)abstRes).deleteWithBackup(rootPath, u,ci);
- }
-
- for(XnatAbstractresourceI abstRes:this.getOut_file()){
- ((XnatAbstractresource)abstRes).deleteWithBackup(rootPath, u,ci);
- }
-
- // XNAT-1382: Delete the root Assessor Directory if it is empty.
- String assessorDir = this.getArchiveDirectoryName();
- String sessionDir = this.getExpectedSessionDir().getAbsolutePath();
- if(StringUtils.isNotBlank(sessionDir) && StringUtils.isNotBlank(assessorDir)){
- File f = new File(sessionDir + "/ASSESSORS/" + assessorDir);
- if(f.exists() && f.isDirectory() && f.list().length == 0){
- FileUtils.DeleteFile(f);
- }
- }
- }
-
-
- public File getExpectedSessionDir() throws InvalidArchiveStructure,UnknownPrimaryProjectException{
- return this.getImageSessionData().getExpectedSessionDir();
- }
-
- @Override
- public void preSave() throws Exception{
- if(StringUtils.isBlank(this.getId())){
- throw new IllegalArgumentException("Please specify an ID for your experiment.");
- }
-
- if(XFT.getBooleanProperty("security.require_image_assessor_labels", false) && StringUtils.isBlank(this.getLabel())){
- throw new IllegalArgumentException("Please specify a label for your experiment.");
- }
-
- if(!XftStringUtils.IsAlphaNumericUnderscore(getId())){
- throw new IllegalArgumentException("Identifiers cannot use special characters.");
- }
-
- if(StringUtils.isNotBlank(this.getLabel()) && !XftStringUtils.IsAlphaNumericUnderscore(getLabel())){
- throw new IllegalArgumentException("Labels cannot use special characters.");
- }
-
- if(this.getImageSessionData()==null){
- throw new Exception("Unable to identify image session for:" + this.getImagesessionId());
- }
-
- final XnatProjectdata proj = this.getPrimaryProject(false);
- if(proj==null){
- throw new Exception("Unable to identify project for:" + this.getProject());
- }
-
- checkUniqueLabel();
-
- final String expectedPath=this.getExpectedSessionDir().getAbsolutePath().replace('\\', '/');
-
- for(final XnatAbstractresourceI res: this.getResources_resource()){
- final String uri;
- if(res instanceof XnatResource){
- uri=((XnatResource)res).getUri();
- }else if(res instanceof XnatResourceseries){
- uri=((XnatResourceseries)res).getPath();
- }else{
- continue;
- }
-
- FileUtils.ValidateUriAgainstRoot(uri,expectedPath,"URI references data outside of the project:" + uri);
- }
-
- for(final XnatAbstractresourceI res: this.getOut_file()){
- final String uri;
- if(res instanceof XnatResource){
- uri=((XnatResource)res).getUri();
- }else if(res instanceof XnatResourceseries){
- uri=((XnatResourceseries)res).getPath();
- }else{
- continue;
- }
-
- FileUtils.ValidateUriAgainstRoot(uri,expectedPath,"URI references data outside of the project:" + uri);
- }
- }
-
- public String getResourceCatalogRootPathByLabel( String label) {
- String rtn = super.getResourceCatalogRootPathByLabel(label);
- if (rtn == null) {
- //Check if catalog is at the out file level
- Iterator misc = this.getOut_file().iterator();
- while(misc.hasNext()) {
- Object file = misc.next();
- if (file instanceof XnatResourcecatalog) {
- String tag = ((XnatResourcecatalog)file).getLabel();
- if (tag != null && tag.equals(label)) {
- rtn =((XnatResourcecatalog)file).getUri();
- int index = rtn.lastIndexOf("/");
- if (index != -1)
- rtn = rtn.substring(0, index);
- break;
- }
- }
- }
- }
- return rtn;
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatImageresource.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatImageresource.java
deleted file mode 100644
index a1e7b18718014dee2eb2e01adc40b119cfaa70d6..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatImageresource.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatImageresource
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatImageresource;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatImageresource extends AutoXnatImageresource {
-
- public BaseXnatImageresource(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatImageresource(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatImageresource(UserI user)
- **/
- public BaseXnatImageresource()
- {}
-
- public BaseXnatImageresource(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatImageresourceseries.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatImageresourceseries.java
deleted file mode 100644
index 18edb36eacb33fb7bb7c52495e2ed3d9a9781a33..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatImageresourceseries.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatImageresourceseries
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatImageresourceseries;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatImageresourceseries extends AutoXnatImageresourceseries {
-
- public BaseXnatImageresourceseries(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatImageresourceseries(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatImageresourceseries(UserI user)
- **/
- public BaseXnatImageresourceseries()
- {}
-
- public BaseXnatImageresourceseries(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatImagescandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatImagescandata.java
deleted file mode 100644
index 9895454f1bb6d4135bfbf4e21622b52158f32ad7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatImagescandata.java
+++ /dev/null
@@ -1,653 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatImagescandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 12/13/13 1:12 PM
- */
-package org.nrg.xdat.om.base;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.xdat.model.CatCatalogI;
-import org.nrg.xdat.model.CatEntryI;
-import org.nrg.xdat.model.XnatAbstractresourceI;
-import org.nrg.xdat.model.XnatQcscandataI;
-import org.nrg.xdat.model.XnatResourcecatalogI;
-import org.nrg.xdat.om.XnatAbstractresource;
-import org.nrg.xdat.om.XnatDicomseries;
-import org.nrg.xdat.om.XnatImagescandata;
-import org.nrg.xdat.om.XnatImagesessiondata;
-import org.nrg.xdat.om.XnatResource;
-import org.nrg.xdat.om.XnatResourcecatalog;
-import org.nrg.xdat.om.XnatResourceseries;
-import org.nrg.xdat.om.base.BaseXnatExperimentdata.UnknownPrimaryProjectException;
-import org.nrg.xdat.om.base.auto.AutoXnatImagescandata;
-import org.nrg.xdat.security.helpers.Permissions;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.search.CriteriaCollection;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xnat.exceptions.InvalidArchiveStructure;
-import org.nrg.xnat.helpers.scanType.ImageScanTypeMapping;
-import org.nrg.xnat.helpers.scanType.ScanTypeMappingI;
-import org.nrg.xnat.utils.CatalogUtils;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatImagescandata extends AutoXnatImagescandata {
-
- public BaseXnatImagescandata(ItemI item) {
- super(item);
- }
-
- public BaseXnatImagescandata(UserI user) {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatImagescandata(UserI user)
- **/
- public BaseXnatImagescandata()
- {}
-
- public BaseXnatImagescandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getPreCount()
- {
- try {
- String temp = this.getId();
- if (temp != null)
- {
- if (temp.contains("-"))
- {
- return temp.substring(0,temp.indexOf("-"));
- }else{
- return temp;
- }
- }else{
- return "";
- }
- } catch (Exception e) {
- return "";
- }
- }
-
- public String getPostCount()
- {
- try {
- String temp = this.getId();
- if (temp != null)
- {
- if (temp.contains("-"))
- {
- return temp.substring(temp.indexOf("-")+1);
- }else{
- return "";
- }
- }else{
- return "";
- }
- } catch (Exception e) {
- return "";
- }
- }
-
- public Integer getPreCountI()
- {
- String s = getPreCount();
- try{
- if (s.equals(""))
- {
- return 0;
- }else{
- return new Integer(s);
- }
- } catch (NumberFormatException e) {
- return 0;
- }
- }
-
- public Integer getPostCountI()
- {
- String s = getPostCount();
- try {
- if (s.equals(""))
- {
- return 0;
- }else{
- return new Integer(s);
- }
- } catch (NumberFormatException e) {
- return 0;
- }
- }
-
- public boolean isInRAWDirectory(){
- boolean hasRAW=false;
- for (XnatAbstractresourceI xnatAbstractresourceI : getFile()) {
- XnatAbstractresource file = (XnatAbstractresource) xnatAbstractresourceI;
- if (file.isInRAWDirectory()) {
- hasRAW=true;
- break;
- }
- }
- return hasRAW;
- }
-
-
-
-
- public void deleteFilesFromFileSystem(String rootPath,UserI u, EventMetaI ci) throws Exception{
- List<XnatAbstractresourceI> files = this.getFile();
- if (!files.isEmpty())
- for (XnatAbstractresourceI resource:files){
- ((XnatAbstractresource)resource).deleteWithBackup(rootPath, u,ci);
- }
- }
-
- public ArrayList<java.io.File> getJavaFiles(String rootPath){
- ArrayList<File> jFiles = new ArrayList<File>();
- List scanFiles= this.getFile();
- if (scanFiles.size()>0)
- {
- for (Object scanFile : scanFiles) {
- XnatAbstractresource xnatFile = (XnatAbstractresource) scanFile;
- jFiles.addAll(xnatFile.getCorrespondingFiles(rootPath));
- }
- }
- return jFiles;
- }
-
- public static Comparator GetComparator() {
- return (new BaseXnatImagescandata()).getComparator();
- }
-
- public Comparator getComparator()
- {
- return new ImageScanComparator();
- }
-
- public class ImageScanComparator implements Comparator{
- public ImageScanComparator() {}
-
- public int compare(Object o1, Object o2) {
- BaseXnatImagescandata value1 = (BaseXnatImagescandata)(o1);
- BaseXnatImagescandata value2 = (BaseXnatImagescandata)(o2);
-
- if (value1 == null){
- if (value2 == null)
- {
- return 0;
- }else{
- return -1;
- }
- }
- if (value2== null) {
- return 1;
- }
-
- if (value1.getPreCountI().equals(value2.getPreCountI())) {
- return value1.getPostCountI().compareTo(value2.getPostCountI());
- }else{
- Integer i1 = value1.getPreCountI();
- Integer i2 = value2.getPreCountI();
- return i1.compareTo(i2);
- }
- }
- }
- private String scan_dir = null;
- public String deriveScanDir(){
- if (scan_dir == null) {
- String rootPath;
- try {
- rootPath = this.getImageSessionData().getArchiveRootPath();
- } catch (UnknownPrimaryProjectException e) {
- rootPath=null;
- }
- String last_dir = null;
- for (XnatAbstractresourceI xnatFile : this.getFile()) {
- if (xnatFile instanceof org.nrg.xdat.om.XnatResource){
- XnatResource resource = (XnatResource)xnatFile;
- String uri =resource.getFullPath(rootPath);
- if (last_dir==null){
- last_dir= uri;
- int index = last_dir.toUpperCase().indexOf("/RAW/");
- if (index!=-1){
- if(last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)>-1){
- scan_dir = last_dir.substring(0,last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)+this.getId().length()+1);
- } else {
- scan_dir = last_dir.substring(0,index+4);
- }
- return scan_dir;
- }else{
- index = last_dir.toUpperCase().indexOf("/SCANS/");
- if (index!=-1){
- if(last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)>-1){
- scan_dir = last_dir.substring(0,last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)+this.getId().length()+1);
- }else{
- scan_dir = last_dir.substring(0,index+6);
- }
- return scan_dir;
- }
- }
- }
- }else if(xnatFile instanceof org.nrg.xdat.om.XnatDicomseries){
- XnatDicomseries resource = (XnatDicomseries)xnatFile;
- String uri =resource.getFullPath(rootPath);
- if (last_dir==null){
- last_dir= uri;
- int index = last_dir.toUpperCase().indexOf("/RAW/");
- if (index!=-1){
- if(last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)>-1){
- scan_dir = last_dir.substring(0,last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)+this.getId().length()+1);
- }else{
- scan_dir = last_dir.substring(0,index+4);
- }
- return scan_dir;
- }else{
- index = last_dir.toUpperCase().indexOf("/SCANS/");
- if (index!=-1){
- if(last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)>-1){
- scan_dir = last_dir.substring(0,last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)+this.getId().length()+1);
- }else{
- scan_dir = last_dir.substring(0,index+6);
- }
- return scan_dir;
- }
- }
- }
- }else if(xnatFile instanceof org.nrg.xdat.om.XnatResourceseries){
- XnatResourceseries resource = (XnatResourceseries)xnatFile;
- String uri =resource.getFullPath(rootPath);
- if (last_dir==null){
- last_dir= uri;
- int index = last_dir.toUpperCase().indexOf("/RAW/");
- if (index!=-1){
- if(last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)>-1){
- scan_dir = last_dir.substring(0,last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)+this.getId().length()+1);
- }else{
- scan_dir = last_dir.substring(0,index+4);
- }
- return scan_dir;
- }else{
- index = last_dir.toUpperCase().indexOf("/SCANS/");
- if (index!=-1){
- if(last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)>-1){
- scan_dir = last_dir.substring(0,last_dir.toUpperCase().indexOf("/"+this.getId().toUpperCase()+"/",index)+this.getId().length()+1);
- }else{
- scan_dir = last_dir.substring(0,index+6);
- }
- return scan_dir;
- }
- }
- }
- }
- }
-
- if (scan_dir == null) {
- scan_dir = this.getImageSessionData().deriveRawDir();
- }
- }
-
-
- return scan_dir;
- }
-
- private XnatImagesessiondata mr = null;
-
- public XnatImagesessiondata getImageSessionData()
- {
- if (mr==null)
- {
- ArrayList al = XnatImagesessiondata.getXnatImagesessiondatasByField("xnat:imageSessionData/ID",this.getImageSessionId(),this.getUser(),false);
- if (al.size()>0)
- {
- mr = (XnatImagesessiondata)al.get(0);
- }
- }
-
- return mr;
- }
-
- public void setImageSessionData(XnatImagesessiondata ses){
- mr=ses;
- }
-
- Snapshot snapshot=null;
- public Snapshot getSnapshot(){
- if(snapshot!=null){
- return snapshot;
- }
-
- if(this.getFile().size()>0){
- snapshot=new Snapshot();
- XnatImagesessiondata ses=this.getImageSessionData();
- String label=ses.getIdentifier(ses.getProject(),false);
- String labelImg=label + "_"+this.getId() + "_qc";
-
- String path=null;
- for(XnatAbstractresourceI res: this.getFile()){
- if(res.getLabel()!=null && res.getLabel().equalsIgnoreCase("SNAPSHOTS")){
- path="/data/experiments/"+ses.getId() + "/scans/"+this.getId() + "/resources/SNAPSHOTS/files/";
- if(res instanceof XnatResourcecatalog){
- CatCatalogI cat=((XnatResourcecatalog)res).getCleanCatalog(ses.getProjectData().getRootArchivePath(), false,null,null);
- for(CatEntryI entry:cat.getEntries_entry()){
- if(entry.getContent().equalsIgnoreCase("THUMBNAIL")){
- snapshot.setThumbnail(path + entry.getUri());
- }
- if(entry.getContent().equalsIgnoreCase("ORIGINAL")){
- snapshot.setFull(path + entry.getUri());
- }
- }
- }else{
- snapshot.setFull(path + labelImg + ".gif");
- snapshot.setThumbnail(path + labelImg + "_t.gif");
- }
- }
- }
-
- if(path==null){
- path="/app/template/QualityControl.vm?project=" + ses.getProject() + "&session_label=" + label + "&session_id=" + ses.getId() + "&scan="+ this.getId();
- snapshot.setFull(path + "&extension=.gif");
- snapshot.setThumbnail(path + "&extension=_t.gif");
- }
-
- return snapshot;
- }else{
- return null;
- }
- }
-
- public class Snapshot{
- private String thumbnail=null;
- private String full=null;
-
- public String getFull() {
- return full;
- }
- public void setFull(String full) {
- this.full = full;
- }
- public String getThumbnail() {
- return thumbnail;
- }
- public void setThumbnail(String thumbnail) {
- this.thumbnail = thumbnail;
- }
-
-
- }
-
- public void copyValuesFrom(final XnatImagescandata other) throws Exception {
- if (null != other.getType())
- this.setType(other.getType());
- if (null != other.getQuality())
- this.setQuality(other.getQuality());
- if (null != other.getNote())
- this.setNote(other.getNote());
- }
-
- public XnatQcscandataI getManualQC() {
- final XnatImagesessiondata session = getImageSessionData();
- if (session.getManualQC() != null && session.getManualQC().getScans_scan() != null) {
- for (XnatQcscandataI qc : session.getManualQC().getScans_scan()) {
- if (getId().equals(qc.getImagescanId())) {
- return qc;
- }
- }
- }
- return null;
- }
-
- public File getExpectedSessionDir() throws InvalidArchiveStructure, UnknownPrimaryProjectException{
- return this.getImageSessionData().getExpectedSessionDir();
- }
-
- @Override
- public void preSave() throws Exception{
- super.preSave();
-
- if(this.getImageSessionData()==null){
- throw new Exception("Unable to identify image session for:" + this.getImageSessionId());
- }
-
- final String expectedPath=this.getExpectedSessionDir().getAbsolutePath().replace('\\', '/');
-
- validate(expectedPath);
- }
-
- public void validate(String expectedPath) throws Exception{
-
- if(StringUtils.isBlank(this.getId())){
- throw new IllegalArgumentException();
- }
-
- if(!XftStringUtils.IsAlphaNumericUnderscore(getId())){
- throw new IllegalArgumentException("Identifiers cannot use special characters.");
- }
-
- for(final XnatAbstractresourceI res: this.getFile()){
- final String uri;
- if(res instanceof XnatResource){
- uri=((XnatResource)res).getUri();
- }else if(res instanceof XnatResourceseries){
- uri=((XnatResourceseries)res).getPath();
- }else{
- continue;
- }
-
- FileUtils.ValidateUriAgainstRoot(uri,expectedPath,"URI references data outside of the project:" + uri);
- }
- }
-
-
- public static List<XnatImagescandata> getScansByIdORType(final String scanID,
- final XnatImagesessiondata session,UserI user, boolean preLoad) {
- final CriteriaCollection cc = new CriteriaCollection("OR");
- CriteriaCollection subcc = new CriteriaCollection("AND");
- subcc.addClause("xnat:imageScanData/image_session_ID", session.getId());
- if (!(scanID.equals("*") || scanID.equals("ALL")) && !scanID.contains(",")) {
- subcc.addClause("xnat:imageScanData/ID", scanID);
- } else {
- final CriteriaCollection subsubcc = new CriteriaCollection("OR");
- for (final String s : XftStringUtils.CommaDelimitedStringToArrayList(
- scanID, true)) {
- subsubcc.addClause("xnat:imageScanData/ID", s);
- }
- subcc.add(subsubcc);
- }
- cc.add(subcc);
-
- subcc = new CriteriaCollection("AND");
- subcc.addClause("xnat:imageScanData/image_session_ID", session.getId());
- if (!(scanID.equals("*") || scanID.equals("ALL")) && !scanID.contains(",")) {
- if (scanID.equals("NULL")) {
- CriteriaCollection subsubcc = new CriteriaCollection("OR");
- subsubcc.addClause("xnat:imageScanData/type", "", " IS NULL ",
- true);
- subsubcc.addClause("xnat:imageScanData/type", "");
- subcc.add(subsubcc);
- } else {
- subcc.addClause("xnat:imageScanData/type", scanID);
- }
- } else {
- CriteriaCollection subsubcc = new CriteriaCollection("OR");
- for (String s : XftStringUtils.CommaDelimitedStringToArrayList(scanID,
- true)) {
- if (s.equals("NULL")) {
- subsubcc.addClause("xnat:imageScanData/type", "",
- " IS NULL ", true);
- subsubcc.addClause("xnat:imageScanData/type", "");
- } else {
- subsubcc.addClause("xnat:imageScanData/type", s);
- }
- }
- subcc.add(subsubcc);
- }
- cc.add(subcc);
-
- return XnatImagescandata.getXnatImagescandatasByField(cc, user,
- preLoad);
- }
-
- public ScanTypeMappingI getScanTypeMapping(String project, String dbName){
- return new ImageScanTypeMapping(project, dbName);
- }
-
-
- Map<String, Number> stats = null;
-
- public Map<String, Number> getPrearchiveFileStats(){
- if(stats==null){
- stats = new HashMap<String, Number>();
- int totalCount = 0;
- long totalSize = 0;
- for (XnatAbstractresourceI resource : this.getFile()) {
- String prearcPath = null;
- try{
- // Try to retrieve the scan path within the prearchive.
- prearcPath = this.getParent().getStringProperty("prearchivepath");
- if(null == prearcPath || prearcPath.equals("")){
- throw new Exception("Unable to determine the prearchive path for scan");
- }
- }catch(Exception e){
- // If the prearchive path is null or empty, count and size should be 0
- logger.error("Unable to retrieve file counts.", e);
- continue;
- }
-
- if(resource instanceof XnatResourcecatalogI){
- // Get the rootPath and FileStats
- final String rootPath=CatalogUtils.getCatalogFile(prearcPath, ((XnatResourcecatalogI)resource)).getParentFile().getAbsolutePath();
- CatalogUtils.Stats c_stats=CatalogUtils.getFileStats(CatalogUtils.getCleanCatalog(prearcPath, (XnatResourcecatalogI)resource, false), rootPath);
- if(null != c_stats){
- totalSize += c_stats.size;
- totalCount += c_stats.count;
- }else{
- logger.error("Unable to retrieve file counts.", new Exception("Unable to retrieve CatalogUtils.Stats for the given resource."));
- }
- }else{
- logger.error("Unable to retrieve file counts.", new Exception("Prearchive resource is not an instance of XnatResourcecatalogI. Skipping..."));
- }
- }
- stats.put("size", Long.valueOf(totalSize));
- stats.put("count", Integer.valueOf(totalCount));
- }
- return stats;
- }
-
- public List<String> getReadableFileStats() {
- List<String> stats = new ArrayList<String>();
-
- // If the scan is in the prearchive, retrieve the count & file sizes from CatalogUtils.getFileStats()
- if(this.getImageSessionId() == null){
- Map<String,Number> prearcStats = this.getPrearchiveFileStats();
- stats.add(CatalogUtils.formatFileStats("TOTAL", prearcStats.get("count").intValue(), prearcStats.get("size").longValue()));
- }else{ // If this scan is already archived, retrieve the count & file sizes from the resource
- int totalCount = 0;
- long totalSize = 0;
- for (XnatAbstractresourceI resource : getFile()) {
- // Get the label, if it is null or a snapshot skip it.
- String label = resource.getLabel();
- if (label != null && label.equals("SNAPSHOTS")) {
- continue;
- }
-
- int count;
- long size;
- Integer rawCount = resource.getFileCount();
- if (rawCount != null) {
- count = rawCount;
- } else {
- count = 0;
- }
- Object rawFileSize = resource.getFileSize();
-
- if (rawFileSize != null) {
- if (rawFileSize instanceof Integer) {
- size = (Integer) rawFileSize;
- } else if (rawFileSize instanceof Long) {
- size = (Long) rawFileSize;
- } else {
- size = Long.parseLong(rawFileSize.toString());
- }
- } else {
- size = 0;
- }
- totalSize += size;
- totalCount += count;
- stats.add(CatalogUtils.formatFileStats(label, count, size));
- }
- // Add totalCount and totalSize to the stats list
- stats.add(0, CatalogUtils.formatFileStats("TOTAL", totalCount, totalSize));
- }
-
- return stats;
- }
-
- /**
- * It's annoying to do this, but in some cases it's easier to get this formatted display directly from the scan
- * object rather than trying to manage it in the Velocity template.
- * @return A formatted string that will display the scans in a tip text format.
- */
- public String getFormattedReadableFileStats(UserI user) throws Exception {
- if (getFile().size() > 0) {
- List<String> stats = getReadableFileStats();
- if(stats == null || stats.size() == 0 || stats.get(0) == null || stats.get(0).equals("") || stats.get(0).equals("0 B in 0 files")) {
- return getEmptyResourceCount(user);
- } else if (stats.size() == 1) {
- return stats.get(0);
- } else {
- return getListAsTipText(stats);
- }
- } else {
- return getEmptyResourceCount(user);
- }
- }
-
- private String getEmptyResourceCount(UserI user) throws Exception {
- if (Permissions.canEdit(user,this)) {
- return "<a onclick=\"window.viewer.init(true);\">Show Counts</a>";
- }
- return getListAsTipText(EMPTY_RESOURCE_LIST);
- }
-
- static public String getListAsTipText(List<String> list) {
- if (list == null || list.size() == 0 || list.get(0) == null || list.get(0).trim().equals("")) {
- return "<span class=\"tip_text\">No items found.<span style=\"top:20px;white-space:nowrap;left:-10;width:auto;\" class=\"tip shadowed\">No items were found: Check your data to be sure you specified a valid system object.</span></span>";
- }
- StringBuilder buffer = new StringBuilder("<span class=\"tip_text\">").append(list.get(0)).append("<span style=\"top:20px;white-space:nowrap;left:-10;width:auto;\" class=\"tip shadowed\">");
- for (int index = 1; index < list.size(); index++) {
- buffer.append(list.get(index));
- if (index < list.size() - 1) {
- buffer.append("<br/>");
- }
- }
- buffer.append("</span></span>");
- return buffer.toString();
- }
-
- private static final List<String> EMPTY_RESOURCE_LIST = new ArrayList<String>() {{
- add("0 B in 0 files");
- add("No files were found associated with this scan. Contact a member or owner of this project to generate the file count data.");
- }};
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatImagescandataShare.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatImagescandataShare.java
deleted file mode 100644
index 9703338c23a76e0e072bd6d20adfbc1e622e6133..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatImagescandataShare.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatImagescandataShare
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatImagescandataShare;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatImagescandataShare extends AutoXnatImagescandataShare {
-
- public BaseXnatImagescandataShare(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatImagescandataShare(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatImagescandataShare(UserI user)
- **/
- public BaseXnatImagescandataShare()
- {}
-
- public BaseXnatImagescandataShare(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatImagesessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatImagesessiondata.java
deleted file mode 100644
index 92131b4eca31f2c228dfb0015836b15e9fd43da9..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatImagesessiondata.java
+++ /dev/null
@@ -1,3160 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatImagesessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 2/18/14 7:27 PM
- */
-package org.nrg.xdat.om.base;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import edu.sdsc.grid.io.GeneralFile;
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.dcm.CopyOp;
-import org.nrg.transaction.OperationI;
-import org.nrg.transaction.RollbackException;
-import org.nrg.transaction.Run;
-import org.nrg.transaction.TransactionException;
-import org.nrg.xdat.XDAT;
-import org.nrg.xdat.base.BaseElement;
-import org.nrg.xdat.bean.CatCatalogBean;
-import org.nrg.xdat.bean.CatEntryBean;
-import org.nrg.xdat.bean.CatEntryMetafieldBean;
-import org.nrg.xdat.model.*;
-import org.nrg.xdat.om.*;
-import org.nrg.xdat.om.base.auto.AutoScrScreeningassessment;
-import org.nrg.xdat.om.base.auto.AutoValProtocoldata;
-import org.nrg.xdat.om.base.auto.AutoXnatImagesessiondata;
-import org.nrg.xdat.om.base.auto.AutoXnatQcassessmentdata;
-import org.nrg.xdat.schema.SchemaElement;
-import org.nrg.xdat.security.SecurityValues;
-import org.nrg.xdat.security.helpers.Permissions;
-import org.nrg.xdat.security.helpers.Users;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFT;
-import org.nrg.xft.XFTItem;
-import org.nrg.xft.XFTTable;
-import org.nrg.xft.db.MaterializedView;
-import org.nrg.xft.db.PoolDBUtils;
-import org.nrg.xft.event.EventDetails;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.event.EventUtils;
-
-import org.nrg.xft.exception.*;
-import org.nrg.xft.search.CriteriaCollection;
-import org.nrg.xft.search.TableSearch;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileTracker;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xnat.exceptions.InvalidArchiveStructure;
-import org.nrg.xnat.helpers.merge.ProjectAnonymizer;
-import org.nrg.xnat.helpers.scanType.ScanTypeMappingI;
-import org.nrg.xnat.scanAssessors.AssessorComparator;
-import org.nrg.xnat.scanAssessors.ScanAssessorI;
-import org.nrg.xnat.srb.XNATDirectory;
-import org.nrg.xnat.srb.XNATMetaData;
-import org.nrg.xnat.srb.XNATSrbSearch;
-import org.nrg.xnat.turbine.utils.ArcSpecManager;
-import org.nrg.xnat.turbine.utils.CatalogSet;
-import org.nrg.xnat.utils.CatalogUtils;
-
-import java.io.File;
-import java.sql.SQLException;
-import java.text.NumberFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatImagesessiondata extends AutoXnatImagesessiondata {
- public static final String SCAN_ABBR="scan";
- public static final String RECON_ABBR="recon";
- public static final String ASSESSOR_ABBR="assess";
- public static final String RESOURCES_ABBR="uploads";
- public static final String MISC_ABBR="misc";
-
- private static final Map<String,String> CUSTOM_SCAN_FIELDS =
- ImmutableMap.of("Scan Time", "startTime");
-
- private String lowerCaseSessionId = null;
-
- private FileTracker _files = new FileTracker();
- private Hashtable fileGroups=new Hashtable();
- private Map<String,String> arcFiles = null;
-
- private List<XnatImageassessordataI> assessors = null;
-
- private List<XnatImagescandataI> scans = null;
-
- protected List<XnatImageassessordataI> minLoadAssessors = null;
-
- public BaseXnatImagesessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatImagesessiondata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatImagesessiondata()
- {}
-
- public BaseXnatImagesessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- private String _Prearchivepath=null;
- protected XnatQcmanualassessordata manQC;
- protected XnatQcassessmentdata qc;
- protected ScrScreeningassessment scr;
-
- /**
- * @return Returns the prearchivePath.
- */
- public String getPrearchivepath(){
- try{
- if (_Prearchivepath==null){
- _Prearchivepath=getStringProperty("prearchivePath");
- return _Prearchivepath;
- }else {
- return _Prearchivepath;
- }
- } catch (Exception e1) {logger.error(e1);return null;}
- }
-
- /**
- * Sets the value for prearchivePath.
- * @param v Value to Set.
- */
- public void setPrearchivepath(String v){
- try{
- setProperty(SCHEMA_ELEMENT_NAME + "/prearchivePath",v);
- _Prearchivepath=null;
- } catch (Exception e1) {logger.error(e1);}
- }
-
- public int getAssessorCount() {
- return getAssessors().size();
- }
-
- public int getAssessorCount(String elementName) {
- return getAssessors(elementName).size();
- }
-
- public List<XnatImageassessordataI> getAssessors() {
- if (this.assessors == null) {
- try {
- assessors = this.getAssessors_assessor();
-
- } catch (Exception e) {
- logger.error("", e);
- }
- }
- return assessors;
- }
-
- public ArrayList<XnatImageassessordata> getAssessors(String elementName) {
- ArrayList<XnatImageassessordata> temp = new ArrayList<XnatImageassessordata>();
- Iterator iter = getAssessors().iterator();
- while (iter.hasNext()) {
- XnatImageassessordata o = (XnatImageassessordata) iter.next();
- if (o.getXSIType().equalsIgnoreCase(elementName)) {
- temp.add(o);
- }
- }
- return temp;
- }
-
-
- public String getArchivePath() throws UnknownPrimaryProjectException {
- return getArchivePath(getArchiveRootPath());
- }
-
- public String getArchivePath(String rootPath) throws UnknownPrimaryProjectException {
-
- String path = "";
- for(XnatImagescandataI scan : this.getScans_scan()){
- List files = scan.getFile();
- if (files.size() > 0) {
- Iterator fIter = files.iterator();
- while (fIter.hasNext()) {
- XnatAbstractresource file = (XnatAbstractresource) fIter.next();
- String filePath = file.getFullPath(rootPath);
- if (filePath != null && !filePath.equals("")) {
- try {
- String dirName = this.getArchiveDirectoryName();
- int index = filePath.indexOf(dirName);
- if (index == -1) {
- index = filePath.indexOf(dirName
- .toLowerCase());
- }
- if (index == -1) {
- index = filePath.indexOf(dirName
- .toUpperCase());
- }
-
-
- if (index<0){
- path = FileUtils.AppendRootPath("",getArchiveRootPath());
- return path;
- }
- if (index != -1) {
- path = filePath.substring(0, index);
- }
- break;
- } catch (Exception e1) {
- logger.error("", e1);
- }
-
- }
- }
-
- if (!path.equals("")) {
- break;
- }
- }
- }
-
-
- if (!path.equals("")) {
- path = FileUtils.AppendRootPath(getArchiveRootPath(),path);
- }
-
- return path;
- }
- public String getRelativeArchivePath() throws UnknownPrimaryProjectException {
- String path = "";
- for(XnatImagescandataI scan : this.getScans_scan()){
- List files = scan.getFile();
- if (files.size() > 0) {
- Iterator fIter = files.iterator();
- while (fIter.hasNext()) {
- XnatAbstractresource file = (XnatAbstractresource) fIter.next();
- for(String filePath: file.getUnresolvedPaths()){
- if (filePath != null && !filePath.equals("")) {
- try {
- String upperFilePath=filePath.toUpperCase();
-
- String dirName = this.getArchiveDirectoryName();
-
- int index = upperFilePath.indexOf(dirName.toUpperCase());
- if (index==0){
- path = getArchiveRootPath();
- return path;
- }
- if (index != -1) {
- path = filePath.substring(0, index);
- }
- break;
- } catch (Exception e1) {
- logger.error("", e1);
- }
-
- }
- }
- }
-
- if (!path.equals("")) {
- break;
- }
- }
- }
-
- if (path.equals("")){
- try {
- String currentarc = getCurrentArchiveFolder();
- if (currentarc ==null){
- path = getArchiveDirectoryName() + "/";
- }else{
- currentarc = currentarc.replace('\\', '/');
- path = currentarc + getArchiveDirectoryName() + "/";
- }
- } catch (InvalidArchiveStructure e) {
- logger.error("",e);
- }
- }else{
- path +=this.getArchiveDirectoryName() +"/";
- }
-
-
- return path;
- }
-
- /**
- * ArrayList of ArrayLists(String filename,String type, String
- * preArchiveSize, String archiveSize)
- *
- * @return
- */
- public ArrayList<ArrayList<String>> getExtraFiles() throws Exception {
- ArrayList<ArrayList<String>> extraFiles = new ArrayList<ArrayList<String>>();
- ArrayList<String> sub = new ArrayList<String>();
- sub.add("misc");
- sub.add("unknown");
- sub.add("0 Files, 0.00Mb");
- sub.add(this.getArchiveStats("misc"));
-
- extraFiles.add(sub);
- return extraFiles;
- }
-
- public ArrayList<String> getExtraFileNames() throws Exception{
- ArrayList<String> al =new ArrayList<String>();
- if (this.hasSRBData())
- {
- XNATDirectory dir = getSRBDirectory();
- XNATMetaData meta = new XNATMetaData();
- meta.setCategory("MISC"); //match operator is = by default
- XNATDirectory misc= dir.filterLocal(meta);
- al.addAll(misc.getRelativeFileNames());
- }else{
- ArrayList fileIds = (ArrayList)this.getFileGroups().get("misc");
- if (fileIds!=null){
- Iterator iter = fileIds.iterator();
- while (iter.hasNext()){
- String fID = (String)iter.next();
- al.add(this.getFileTracker().getRelativePathByID(fID));
- }
- }
- }
- return al;
- }
-
- /**
- * @return
- * @throws Exception
- */
- public Map<String,String> getArcFiles() throws Exception {
- if (arcFiles == null) {
- logger.debug("BEGIN LOAD ARC FILES");
- arcFiles = new Hashtable<String,String>();
-
- if (this.hasSRBData())
- {
- long startTime = System.currentTimeMillis();
- XNATDirectory dir = getSRBDirectory();
- if(XFT.VERBOSE)System.out.println("Time to load " + (System.currentTimeMillis()-startTime) + "ms");
- startTime = System.currentTimeMillis();
- for(XnatImagescandataI scan : this.getScans_scan()){
- int count = 0;
- long size = 0;
- try {
- XNATMetaData meta = new XNATMetaData();
- meta.setCategory("SCAN"); //match operator is = by default
- meta.setExternalId(scan.getId());
- XNATDirectory scanDIR= dir.filterLocal(meta);
- count = scanDIR.getCount();
- size = scanDIR.getSize();
-
- NumberFormat formatter = NumberFormat.getInstance();
- formatter.setMinimumFractionDigits(2);
- formatter.setMaximumFractionDigits(2);
-
- String stats= count
- + " files, "
- + formatter.format(((float) ((float)size / 1048576))) + "MB";
- arcFiles.put(scan.getId(), stats);
- } catch (RuntimeException e) {
- logger.error("",e);
- arcFiles.put(scan.getId(),"Error");
- }
- }
-
- //POPULATE EXTRA FILES
-// int count = 0;
-// long size = 0;
-// try {
-// XNATMetaData meta = new XNATMetaData();
-// meta.setCategory("MISC"); //match operator is = by default
-// XNATDirectory scanDIR= dir.filterLocal(meta);
-// count = scanDIR.getCount();
-// size = scanDIR.getSize();
-//
-// NumberFormat formatter = NumberFormat.getInstance();
-// formatter.setMinimumFractionDigits(2);
-// formatter.setMaximumFractionDigits(2);
-//
-// String stats= count
-// + " files, "
-// + formatter.format(((float) ((float)size / 1048576))) + "MB";
-// arcFiles.put("misc", stats);
-// } catch (RuntimeException e) {
-// logger.error("",e);
-// arcFiles.put("misc","Error");
-// }
- if(XFT.VERBOSE)System.out.println("Time to sort " + (System.currentTimeMillis()-startTime) + "ms");
- startTime = System.currentTimeMillis();
- }else{
- loadLocalFiles();
-
- for(XnatImagescandataI scan : this.getScans_scan()){
- int count = 0;
- long size = 0;
- try {
- String parsedScanID= StringUtils.replace(StringUtils.replace(scan.getId(), "-", ""), "*", "AST");
-
- ArrayList fileGroup = (ArrayList)getFileGroups().get(SCAN_ABBR + parsedScanID);
- if (fileGroup==null){
-
- }else{
- Iterator iter = fileGroup.iterator();
- while(iter.hasNext())
- {
- String fID = (String)iter.next();
- int idIndex = this.getFileTracker().getIDIndex(fID);
- size += this.getFileTracker().getSize(idIndex);
- }
- count = fileGroup.size();
- }
-
- NumberFormat formatter = NumberFormat.getInstance();
- formatter.setMinimumFractionDigits(2);
- formatter.setMaximumFractionDigits(2);
-
- String stats= count
- + " files, "
- + formatter.format(((float) ((float)size / 1048576))) + "MB";
- arcFiles.put(SCAN_ABBR + scan.getId(), stats);
- } catch (RuntimeException e) {
- logger.error("",e);
- arcFiles.put(SCAN_ABBR + scan.getId(),"Error");
- }
- }
-
- for(XnatReconstructedimagedataI recon : this.getReconstructions_reconstructedimage()){
- int count = 0;
- long size = 0;
- try {
- String parsedScanID= StringUtils.replace(StringUtils.replace(recon.getId(),"-",""),"*","AST");
-
- ArrayList fileGroup = (ArrayList)getFileGroups().get(RECON_ABBR + parsedScanID);
- if (fileGroup==null){
-
- }else{
- Iterator iter = fileGroup.iterator();
- while(iter.hasNext())
- {
- String fID = (String)iter.next();
- int idIndex = this.getFileTracker().getIDIndex(fID);
- size += this.getFileTracker().getSize(idIndex);
- }
- count = fileGroup.size();
- }
-
- NumberFormat formatter = NumberFormat.getInstance();
- formatter.setMinimumFractionDigits(2);
- formatter.setMaximumFractionDigits(2);
-
- String stats= count
- + " files, "
- + formatter.format(((float) ((float)size / 1048576))) + "MB";
- arcFiles.put(RECON_ABBR + recon.getId(), stats);
- } catch (RuntimeException e) {
- logger.error("",e);
- arcFiles.put(RECON_ABBR + recon.getId(),"Error");
- }
- }
-
- for(XnatImageassessordataI assess : this.getAssessors_assessor()){
- int count = 0;
- long size = 0;
- try {
- String parsedScanID= StringUtils.replace(StringUtils.replace(assess.getId(),"-",""),"*","AST");
-
- ArrayList fileGroup = (ArrayList)getFileGroups().get(ASSESSOR_ABBR + parsedScanID);
- if (fileGroup==null){
-
- }else{
- Iterator iter = fileGroup.iterator();
- while(iter.hasNext())
- {
- String fID = (String)iter.next();
- int idIndex = this.getFileTracker().getIDIndex(fID);
- size += this.getFileTracker().getSize(idIndex);
- }
- count = fileGroup.size();
- }
-
- NumberFormat formatter = NumberFormat.getInstance();
- formatter.setMinimumFractionDigits(2);
- formatter.setMaximumFractionDigits(2);
-
- String stats= count
- + " files, "
- + formatter.format(((float) ((float)size / 1048576))) + "MB";
- arcFiles.put(ASSESSOR_ABBR +assess.getId(), stats);
- } catch (RuntimeException e) {
- logger.error("",e);
- arcFiles.put(ASSESSOR_ABBR +assess.getId(),"Error");
- }
- }
-
- for(XnatAbstractresourceI res : this.getResources_resource()){
- int count = 0;
- long size = 0;
- try {
- String parsedScanID= res.getXnatAbstractresourceId().toString();
-
- ArrayList fileGroup = (ArrayList)getFileGroups().get(RESOURCES_ABBR + parsedScanID);
- if (fileGroup==null){
-
- }else{
- Iterator iter = fileGroup.iterator();
- while(iter.hasNext())
- {
- String fID = (String)iter.next();
- int idIndex = this.getFileTracker().getIDIndex(fID);
- size += this.getFileTracker().getSize(idIndex);
- }
- count = fileGroup.size();
- }
-
- NumberFormat formatter = NumberFormat.getInstance();
- formatter.setMinimumFractionDigits(2);
- formatter.setMaximumFractionDigits(2);
-
- String stats= count
- + " files, "
- + formatter.format(((float) ((float)size / 1048576))) + "MB";
- arcFiles.put(RESOURCES_ABBR +res.getXnatAbstractresourceId(), stats);
- } catch (RuntimeException e) {
- logger.error("",e);
- arcFiles.put(RESOURCES_ABBR +res.getXnatAbstractresourceId(),"Error");
- }
- }
-
- int count = 0;
- long size = 0;
- try {
- ArrayList fileGroup = (ArrayList)getFileGroups().get("misc");
- if (fileGroup!=null && !fileGroup.isEmpty()){
- Iterator iter = fileGroup.iterator();
- while(iter.hasNext())
- {
- String fID = (String)iter.next();
- size += this.getFileTracker().getSize(this.getFileTracker().getIDIndex(fID));
- }
- count = fileGroup.size();
-
- NumberFormat formatter = NumberFormat.getInstance();
- formatter.setMinimumFractionDigits(2);
- formatter.setMaximumFractionDigits(2);
-
- String stats= count
- + " files, "
- + formatter.format(((float) ((float)size / 1048576))) + "MB";
- arcFiles.put("misc", stats);
- }
- } catch (RuntimeException e) {
- logger.error("",e);
- arcFiles.put("misc","Error");
- }
-
- logger.debug("END LOAD ARC FILES");
- }
- }
- return arcFiles;
- }
-
- public String getArchiveStats(String scanId) {
- try {
- String s = (String)this.getArcFiles().get(scanId);
- if (s == null) {
- return "0 files, 0.00MB";
- } else {
- return s;
- }
- } catch (Exception e) {
- return "0 files, 0.00MB";
- }
- }
-
- public long getDateDiff(Date d) {
- try {
- Date expt = (Date) this.getDate();
-
- Calendar dobC = new GregorianCalendar();
- dobC.setTime(expt);
- Calendar acqC = new GregorianCalendar();
- acqC.setTime(d);
- long days = getDateDiff(dobC, acqC);
- return Math.round(Math.floor(days));
- } catch (Exception e) {
- return 0;
- }
- }
-
- /**
- * @param type
- * @return ArrayList of org.nrg.xdat.om.XnatMrscandata
- */
- public ArrayList<XnatImagescandata> getScansByXSIType(String type) {
- ArrayList<XnatImagescandata> _return = new ArrayList<XnatImagescandata>();
-
- for(XnatImagescandataI scan : this.getScans_scan()){
- try {
- if(((XnatImagescandata)scan).getItem().instanceOf(type)){
- _return.add((XnatImagescandata)scan);
- }
- } catch (ElementNotFoundException e) {
- e.printStackTrace();
- }
- }
- _return.trimToSize();
- return _return;
- }
-
- /**
- * @param type Scan type literal or regex of the scans to retrieve
- * @return ArrayList of org.nrg.xdat.om.XnatImagescandata
- */
- public ArrayList<XnatImagescandata> getScansByType(String type) {
- ArrayList<XnatImagescandata> _return = Lists.newArrayList();
-
- if (type == null) {
- for(XnatImagescandataI scan : this.getScans_scan()){
- if (scan.getType() == null ) {
- _return.add((XnatImagescandata)scan);
- }
- }
-
- _return.trimToSize();
- return _return;
- }
-
- Pattern p = Pattern.compile("(?i)"+type);
- Matcher m = p.matcher("");
-
- for(XnatImagescandataI scan : this.getScans_scan()){
- String scan_type = scan.getType();
-
- if (scan_type == null) {
- continue;
- }
-
- if (scan_type.equalsIgnoreCase(type)) {
- _return.add((XnatImagescandata)scan);
- }else{
- m.reset(scan_type);
- if (m.find()) {
- _return.add((XnatImagescandata)scan);
- }
- }
- }
-
- _return.trimToSize();
- return _return;
- }
-
- /**
- * @param typeList List of scan type strings (literal or regex) to retrieve from the session
- * @return ArrayList of org.nrg.xdat.om.XnatImagescandata
- */
- public ArrayList<XnatImagescandata> getScansByTypeList(List<String> typeList) {
- ArrayList<XnatImagescandata> _return = Lists.newArrayList();
- HashSet<XnatImagescandata> tempSet = Sets.newHashSet();
-
- if (typeList.size() == 0) {
- return _return;
- }
-
- for (String type : typeList) {
- tempSet.addAll(getScansByType(type));
- }
-
- _return.addAll(tempSet);
-
- Collections.sort(_return, new Comparator<XnatImagescandata>() {
- @Override
- public int compare(XnatImagescandata s1, XnatImagescandata s2) {
- String id1 = s1.getId();
- String id2 = s2.getId();
- int comp;
- try {
- comp = (new Integer(id1)).compareTo(new Integer(id2));
- } catch (NumberFormatException e) {
- comp = id1.compareTo(id2);
- }
- return comp;
- }
- });
-
- return _return;
- }
-
- /**
- * @param id The ID of the scan to retrieve.
- * @return The requested image scan data object.
- */
- public XnatImagescandata getScanById(String id) {
- for(XnatImagescandataI scan : getScans_scan()){
- if (scan.getId().equalsIgnoreCase(id)) {
- return (XnatImagescandata)scan;
- }
-
- }
- return null;
- }
-
- /**
- * @param id The ID of the assessor to retrieve.
- * @return The requested image assessor data object.
- */
- public XnatImageassessordata getAssessorById(String id) {
- for(XnatImageassessordataI scan : getAssessors()){
- if (scan.getId().equalsIgnoreCase(id)) {
- return (XnatImageassessordata) scan;
- }
-
- }
- return null;
- }
-
- /**
- * @param type
- * @return ArrayList of org.nrg.xdat.om.XnatReconstructedimagedata
- */
- public List<XnatReconstructedimagedata> getReconstructionsByType(String type) {
- ArrayList _return = new ArrayList();
- List al = this.getReconstructions_reconstructedimage();
- if (al != null) {
- for (int i = 0; i < al.size(); i++) {
- XnatReconstructedimagedata scan = (XnatReconstructedimagedata) al.get(i);
- try {
- if (scan.getBasescantype().equalsIgnoreCase(type)) {
- _return.add(scan);
- }
- }catch(NullPointerException npe) {
- if (scan.getType().equalsIgnoreCase(type)) {
- _return.add(scan);
- }
- }
- }
- }
- _return.trimToSize();
- return _return;
- }
-
- /**
- * @param type
- * @return org.nrg.xdat.om.XnatReconstructedimagedata
- */
- public XnatReconstructedimagedataI getReconstructionByID(String type) {
- List al = this.getReconstructions_reconstructedimage();
- if (al != null) {
- for (int i = 0; i < al.size(); i++) {
- XnatReconstructedimagedata scan = (XnatReconstructedimagedata) al.get(i);
- if (scan.getId().equalsIgnoreCase(type)) {
- return scan;
- }
- }
- }
- return null;
- }
-
- /**
- * @return Returns the prearchivePath.
- */
- public String getPrearchivepath(UserI user) {
- String s = super.getPrearchivepath();
- // Migration: This code was in the previous XDATUser code.
- // if (s == null || s.equalsIgnoreCase("")) {
- // s = user.getQuarantinePath();
- // }
- return s;
- }
-
- public Collection<XnatImagescandataI> getSortedScans() {
- if (null == scans) {
- try {
- scans =getScans_scan();
- Collections.sort(scans,BaseXnatImagescandata.GetComparator());
- } catch (Exception e) {
- logger.error("", e);
- return getScans_scan();
- }
- }
-
- return scans;
- }
-
-
- public int getMinimalLoadAssessorsCount(String elementName)
- {
- return getMinimalLoadAssessors(elementName).size();
- }
-
- public ArrayList getMinimalLoadAssessors(String elementName)
- {
- ArrayList al = new ArrayList();
- try {
- SchemaElement e = SchemaElement.GetElement(elementName);
- Iterator min = this.getMinimalLoadAssessors().iterator();
- while (min.hasNext())
- {
- ItemI assessor = (ItemI)min.next();
- if (assessor.getXSIType().equalsIgnoreCase(e.getFullXMLName()))
- {
- al.add(assessor);
- }
- }
-
-
-
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- }
-
- al.trimToSize();
- return al;
- }
-
- public List<XnatImageassessordataI> getMinimalLoadAssessors()
- {
- if (minLoadAssessors==null)
- {
- minLoadAssessors = new ArrayList<XnatImageassessordataI>();
- if(getItem().isPreLoaded())
- {
- minLoadAssessors=this.getAssessors();
- }else{
-
- try {
- XFTTable table = TableSearch.Execute("SELECT ex.id,ex.date,ex.project,me.element_name AS type,me.element_name,ex.note AS note,i.lastname, investigator_xnat_investigatorData_id AS invest_id,projects FROM xnat_imageAssessorData assessor LEFT JOIN xnat_experimentData ex ON assessor.ID=ex.ID LEFT JOIN xnat_experimentdata_meta_data meta ON ex.experimentdata_info=meta.meta_data_id LEFT JOIN xnat_investigatorData i ON i.xnat_investigatorData_id=ex.investigator_xnat_investigatorData_id LEFT JOIN xdat_meta_element me ON ex.extension=me.xdat_meta_element_id LEFT JOIN (SELECT xs_a_concat(project || ',') AS PROJECTS, sharing_share_xnat_experimentda_id FROM xnat_experimentData_share GROUP BY sharing_share_xnat_experimentda_id) PROJECT_SEARCH ON ex.id=PROJECT_SEARCH.sharing_share_xnat_experimentda_id WHERE assessor.imagesession_id='" + this.getId() +"' AND meta.status!='obsolete' ORDER BY ex.date ASC",getDBName(),null);
- table.resetRowCursor();
-
- while (table.hasMoreRows())
- {
- Hashtable row = table.nextRowHash();
- String element = (String)row.get("element_name");
- try {
- XFTItem child = XFTItem.NewItem(element,this.getUser());
-
- Object date = row.get("date");
- Object id = row.get("id");
- Object note = row.get("note");
- Object invest_id = row.get("invest_id");
- Object lastname = row.get("lastname");
- Object project = row.get("project");
-
- if (date!=null)
- {
- try {
- child.setProperty("date",date);
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (FieldNotFoundException e) {
- logger.error("",e);
- } catch (InvalidValueException e) {
- logger.error("",e);
- }
- }
- if (id!=null)
- {
- try {
- child.setProperty("ID",id);
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (FieldNotFoundException e) {
- logger.error("",e);
- } catch (InvalidValueException e) {
- logger.error("",e);
- }
- }
-
- if (project!=null)
- {
- try {
- child.setProperty("project",project);
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (FieldNotFoundException e) {
- logger.error("",e);
- } catch (InvalidValueException e) {
- logger.error("",e);
- }
- }
-
- if (note!=null)
- {
- try {
- child.setProperty("note",note);
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (FieldNotFoundException e) {
- logger.error("",e);
- } catch (InvalidValueException e) {
- logger.error("",e);
- }
- }
- if (lastname!=null)
- {
- try {
- child.setProperty("investigator.lastname",lastname);
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (FieldNotFoundException e) {
- logger.error("",e);
- } catch (InvalidValueException e) {
- logger.error("",e);
- }
- }
- if (invest_id!=null)
- {
- try {
- child.setProperty("investigator_xnat_investigatorData_id",invest_id);
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- } catch (FieldNotFoundException e) {
- logger.error("",e);
- } catch (InvalidValueException e) {
- logger.error("",e);
- }
- }
-
- String projects = (String)row.get("projects");
- if (projects!=null)
- {
- Iterator iter= XftStringUtils.CommaDelimitedStringToArrayList(projects, true).iterator();
- while(iter.hasNext())
- {
- String projectName = (String)iter.next();
- child.setProperty("sharing.share.project", projectName);
- }
- }
-
- addMinLoadAssessor(element,child,minLoadAssessors);
-
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- }
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- }
-
- return minLoadAssessors;
- }
-
- /**
- * Method to place minimally loaded assessors into their list.
- *
- * Some servers will want to fully load the data, others won't. Separating this into its own method allows sites to just override this method, instead of the old thing (like they used to have to).
- *
- * @param xsiType
- * @param child
- * @param minLoadAssessors
- * @throws InvalidItemException
- * @throws Exception
- */
- public void addMinLoadAssessor(String xsiType,XFTItem child, List<XnatImageassessordataI> minLoadAssessors) throws InvalidItemException, Exception{
- XnatImageassessordata assessor= (XnatImageassessordata)BaseElement.GetGeneratedItem(child);
-
- if (xsiType.equalsIgnoreCase(XnatQcmanualassessordata.SCHEMA_ELEMENT_NAME))
- {
- if (Permissions.canRead(this.getUser(), child))
- {
- this.manQC = new XnatQcmanualassessordata(child.getCurrentDBVersion(false));
- minLoadAssessors.add(this.manQC);
- }else{
- minLoadAssessors.add(new XnatQcmanualassessordata(child));
- }
- }else if (xsiType.equalsIgnoreCase(XnatQcassessmentdata.SCHEMA_ELEMENT_NAME))
- {
- if (this.qc == null)
- {
- if (Permissions.canRead(this.getUser(), child))
- {
- this.qc = new XnatQcassessmentdata(child.getCurrentDBVersion(false));
- minLoadAssessors.add(this.qc);
- }else{
- minLoadAssessors.add(new XnatQcassessmentdata(child));
- }
- }else{
- this.qc = new XnatQcassessmentdata(child.getCurrentDBVersion(false));
- minLoadAssessors.add(this.qc);
- }
- }else if(assessor instanceof ScanAssessorI){
- minLoadAssessors.add( (XnatImageassessordata)BaseElement.GetGeneratedItem(child.getCurrentDBVersion(false)));
- }else{
- minLoadAssessors.add(assessor);
- }
- }
-
- public void loadSRBFiles()
- {
- if (this.fileGroups.size()==0)
- {
- long startTime = System.currentTimeMillis();
- XNATDirectory dir = getSRBDirectory();
- System.out.println("Time to load " + (System.currentTimeMillis()-startTime) + "ms");
- startTime = System.currentTimeMillis();
-
- for(XnatImagescandataI scan : this.getSortedScans()){
- XNATMetaData meta = new XNATMetaData();
- meta.setCategory("SCAN"); //match operator is = by default
- meta.setExternalId(scan.getId());
- String parsedScanID= StringUtils.replace(StringUtils.replace(scan.getId(),"-",""),"*","AST");
- fileGroups.put(SCAN_ABBR +parsedScanID,dir.filterLocal(meta));
- }
-
- Iterator reconIter= this.getReconstructions_reconstructedimage().iterator();
- while (reconIter.hasNext())
- {
- XnatReconstructedimagedata recon = (XnatReconstructedimagedata)reconIter.next();
-
- XNATMetaData meta = new XNATMetaData();
- meta.setCategory("RECON"); //match operator is = by default
- meta.setExternalId(recon.getId());
- String parsedScanID= StringUtils.replace(StringUtils.replace(recon.getId(),"-",""),"*","AST");
- fileGroups.put(RECON_ABBR +parsedScanID,dir.filterLocal(meta));
-
- }
-
- for(XnatImageassessordataI assess : this.getAssessors_assessor()){
-
- XNATMetaData meta = new XNATMetaData();
- meta.setCategory("ASSESSOR"); //match operator is = by default
- meta.setExternalId(assess.getId());
- String parsedScanID= StringUtils.replace(StringUtils.replace(assess.getId(),"-",""),"*","AST");
- fileGroups.put("assess" +parsedScanID,dir.filterLocal(meta));
-
- }
-
- XNATMetaData meta = new XNATMetaData();
- meta.setCategory("MISC"); //match operator is = by default
- fileGroups.put("misc0",dir.filterLocal(meta));
- startTime = System.currentTimeMillis();
- System.out.println("Time to sort " + (System.currentTimeMillis()-startTime) + "ms");
- }
- }
-
- private void loadDefinedFiles(String rootPath)
- {
- if (!rootPath.startsWith("srb:"))
- {
- rootPath =FileUtils.AppendSlash(rootPath);
- }
- for(XnatImagescandataI scan : this.getSortedScans()){
- final ArrayList fileGrouping = new ArrayList();
- if (!scan.getFile().isEmpty())
- {
- for (XnatAbstractresourceI xnatFile:scan.getFile())
- {
- for (File f:((XnatAbstractresource)xnatFile).getCorrespondingFiles(rootPath))
- {
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getPath(),f,FileTracker.KNOWN);
- fileGrouping.add(fileID);
- }
- }
-
- if (xnatFile instanceof XnatResourcecatalog){
- File f = ((XnatResourcecatalog)xnatFile).getCatalogFile(rootPath);
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getPath(),f,FileTracker.KNOWN);
- fileGrouping.add(fileID);
- }
- }
- }
- if (fileGrouping.size()>0){
- String parsedScanID= StringUtils.replace(StringUtils.replace(scan.getId(),"-",""),"*","AST");
- fileGroups.put(SCAN_ABBR + parsedScanID,fileGrouping);
- }
- }
- }
-
- Iterator reconIter= this.getReconstructions_reconstructedimage().iterator();
- while (reconIter.hasNext())
- {
- XnatReconstructedimagedata recon = (XnatReconstructedimagedata)reconIter.next();
- ArrayList fileGrouping = new ArrayList();
- List outFiles = recon.getOut_file();
- if (outFiles.size()>0)
- {
- Iterator files =outFiles.iterator();
- while (files.hasNext())
- {
- XnatAbstractresource xnatFile = (XnatAbstractresource) files.next();
- ArrayList jFiles = xnatFile.getCorrespondingFiles(rootPath);
-
- Iterator iter = jFiles.iterator();
- while (iter.hasNext())
- {
- File f = (File)iter.next();
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getPath(),f,FileTracker.KNOWN);
- fileGrouping.add(fileID);
- }
-
- }
-
- if (xnatFile instanceof XnatResourcecatalog){
- File f = ((XnatResourcecatalog)xnatFile).getCatalogFile(rootPath);
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getPath(),f,FileTracker.KNOWN);
- fileGrouping.add(fileID);
- }
- }
- }
-
- if (fileGrouping.size()>0){
- if (recon.getId()!=null)
- {
- String parsedScanID= StringUtils.replace(StringUtils.replace(recon.getId(),"-",""),"*","AST");
- fileGroups.put(RECON_ABBR + parsedScanID,fileGrouping);
- }
- }
-
- }
- }
-
- for(XnatImageassessordataI assess : this.getAssessors_assessor()){
- ArrayList fileGrouping = new ArrayList();
- List outFiles = assess.getOut_file();
- if (outFiles.size()>0)
- {
- Iterator files =outFiles.iterator();
- while (files.hasNext())
- {
- XnatAbstractresource xnatFile = (XnatAbstractresource) files.next();
- ArrayList jFiles = xnatFile.getCorrespondingFiles(rootPath);
-
- Iterator iter = jFiles.iterator();
- while (iter.hasNext())
- {
- File f = (File)iter.next();
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getPath(),f,FileTracker.KNOWN);
- fileGrouping.add(fileID);
- }
- }
-
- if (xnatFile instanceof XnatResourcecatalog){
- File f = ((XnatResourcecatalog)xnatFile).getCatalogFile(rootPath);
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getPath(),f,FileTracker.KNOWN);
- fileGrouping.add(fileID);
- }
- }
- }
- if (fileGrouping.size()>0){
- String parsedScanID= StringUtils.replace(StringUtils.replace(assess.getId(),"-",""),"*","AST");
- fileGroups.put(ASSESSOR_ABBR + parsedScanID,fileGrouping);
- }
- }
- }
-
- Iterator resourceIter= this.getResources_resource().iterator();
- while (resourceIter.hasNext())
- {
- XnatAbstractresource xnatFile = (XnatAbstractresource)resourceIter.next();
- ArrayList fileGrouping = new ArrayList();
- ArrayList jFiles = xnatFile.getCorrespondingFiles(rootPath);
-
- Iterator iter = jFiles.iterator();
- while (iter.hasNext())
- {
- File f = (File)iter.next();
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getPath(),f,FileTracker.KNOWN);
- fileGrouping.add(fileID);
- }
- }
-
- if (xnatFile instanceof XnatResourcecatalog){
- File f = ((XnatResourcecatalog)xnatFile).getCatalogFile(rootPath);
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getPath(),f,FileTracker.KNOWN);
- fileGrouping.add(fileID);
- }
- }
-
- if (fileGrouping.size()>0){
- String parsedScanID= xnatFile.getXnatAbstractresourceId().toString();
- fileGroups.put(RESOURCES_ABBR + parsedScanID,fileGrouping);
- }
- }
- }
-
- /**
- */
- public void loadLocalFiles()
- {
- loadLocalFiles(true);
- }
-
- /**
- */
- public void loadLocalFiles(boolean loadMISCFiles)
- {
- if (_files.getSize()==0)
- {
- String s;
- try {
- s = this.getArchiveRootPath();
- } catch (UnknownPrimaryProjectException e) {
- s=null;
- }
-
- loadDefinedFiles(s);
-
- if (loadMISCFiles)
- {
- String rawdir = this.deriveSessionDir();
- if (rawdir!=null){
- File misc = new File(rawdir);
- if (misc.exists())
- loadDirectoryFiles(misc,"",false,new ArrayList());
- }
- }
-
-
- _files.syncToFS() ;
- }
- }
-
- /**
- */
- public void loadLocalRAWFiles()
- {
- if (_files.getSize()==0)
- {
- String s;
- try {
- s = this.getArchiveRootPath();
- } catch (UnknownPrimaryProjectException e) {
- s=null;
- }
- loadDefinedFiles(s);
-
- String rawdir = this.deriveRawDir();
- if (rawdir!=null){
- File misc = new File(rawdir);
- if (misc.exists())
- loadDirectoryFiles(misc,"",false,new ArrayList());
- }
-
-
- _files.syncToFS() ;
- }
- }
-
- public void loadDirectoryFiles(File dir,String parents,boolean raw,ArrayList miscRaw)
- {
- if (dir.exists())
- {
- parents += dir.getName() + "/";
-
- if (!raw){
- if (dir.getName().equalsIgnoreCase("RAW") || dir.getName().equalsIgnoreCase("SCANS")){
- raw = true;
- }
- }
- File[] children = dir.listFiles();
- for (int i=0;i<children.length;i++)
- {
- File child = children[i];
- if (child.isDirectory())
- {
- loadDirectoryFiles(child,parents,raw,miscRaw);
- }else{
- if (_files.indexOf(child)==-1)
- {
- if (!child.getName().equalsIgnoreCase("dcmtoxnat.log") && !child.getName().equalsIgnoreCase("dcmtoxnat.log.gz"))
- {
- String fileID = this._files.addFile(parents + child.getName(),child,FileTracker.MISC);
- if (raw){
- miscRaw.add(fileID);
- }
- }
- }
- }
- }
-
- if (dir.getName().equalsIgnoreCase("RAW") || dir.getName().equalsIgnoreCase("SCANS")){
- fileGroups.put("misc", miscRaw);
- }
-
- }
- }
-
-
-
- public String listArchiveToHTML(String server)
- {
- String rootPath;
- try {
- rootPath = this.getArchiveRootPath();
- } catch (UnknownPrimaryProjectException e2) {
- rootPath=null;
- }
- String miscDir = null;
- File achive = new File(rootPath);
- StringBuffer sb = new StringBuffer();
- StringBuffer allFiles = new StringBuffer();
- int fileCount=0;
-
- allFiles.append("<script type=\"text/javascript\" language=\"JavaScript1.3\">\n");
- allFiles.append(" function allFilesCheckAll(checkAll)\n");
- allFiles.append(" {\n");
- allFiles.append(" var change=null;\n");
- allFiles.append(" var node=null;\n");
-
- sb.append(" <TR>");
- sb.append(" <TD VALIGN=\"top\" ALIGN=\"left\"><b>SCANS</b></TD><TD>");
- for(XnatImagescandataI scan : this.getSortedScans()){
- ArrayList fileGrouping = new ArrayList();
- List scanFiles= scan.getFile();
- if (scanFiles.size()>0)
- {
- Iterator files = scanFiles.iterator();
- boolean hasContent= false;
- boolean hasFunctionText=false;
- StringBuffer scanLinkBuffer = new StringBuffer();
- while (files.hasNext())
- {
- XnatAbstractresource xnatFile = (XnatAbstractresource) files.next();
- ArrayList jFiles = xnatFile.getCorrespondingFiles(rootPath);
- if (miscDir==null){
- miscDir=xnatFile.getFullPath(rootPath);
- int mrIndex = miscDir.toLowerCase().indexOf("/" + getArchiveDirectoryName().toLowerCase() +"/");
- if (mrIndex==-1){
- String sPath = rootPath.replace('\\', '/');
- sPath = sPath.replace("//", "/");
- if (miscDir.startsWith(sPath)){
- int index =miscDir.indexOf(File.separator,sPath.length()+1);
- if (index==-1){
- index =miscDir.indexOf("/",sPath.length()+1);
- if (index==-1){
- index =miscDir.indexOf("\\",sPath.length()+1);
- }
- if (index==-1){
- index =miscDir.indexOf("\\",sPath.length()+1);
- }else{
- miscDir = null;
- }
- }else{
- miscDir = miscDir.substring(0,index);
- }
- }else{
- int index = miscDir.indexOf(achive.getName());
- if (index==-1){
- miscDir=null;
- }else{
- index += achive.getName().length()+1;
- miscDir = miscDir.substring(0,index);
- }
- }
- }else{
- mrIndex += getArchiveDirectoryName().length()+2;
- miscDir = miscDir.substring(0,mrIndex);
- }
- }
-
- Iterator iter = jFiles.iterator();
- while (iter.hasNext())
- {
- File f = (File)iter.next();
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getAbsolutePath(),f,FileTracker.KNOWN);
- scanLinkBuffer.append("<b>").append(f.getName()).append("</b><BR>");
- fileGrouping.add(fileID);
- hasContent=true;
- hasFunctionText=true;
- fileCount++;
- }else{
- scanLinkBuffer.append("\n").append(f.getName()).append(" (File off-line)<BR>");
- hasContent=true;
- }
- }
-
- if (xnatFile instanceof XnatResourcecatalog){
- File f = ((XnatResourcecatalog)xnatFile).getCatalogFile(rootPath);
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getAbsolutePath(),f,FileTracker.KNOWN);
- scanLinkBuffer.append("<b>").append(f.getName()).append("</b><BR>");
- fileGrouping.add(fileID);
- hasContent=true;
- hasFunctionText=true;
- fileCount++;
- }else{
- scanLinkBuffer.append("\n").append(f.getName()).append(" (File off-line)<BR>");
- hasContent=true;
- }
- }
- }
- String parsedScanID= StringUtils.replace(StringUtils.replace(scan.getId(),"-",""),"*","AST");
- if (hasContent){
- sb.append("\n");
- if (hasFunctionText)
- {
- sb.append("<INPUT type=\"checkbox\" id=\"scan").append(parsedScanID).append("\" name=\"scan").append(parsedScanID).append("\" CHECKED/> ");
- this.fileGroups.put("scan" +parsedScanID,fileGrouping);
- }
- sb.append("<span class=\"trigger\" onClick=\"blocking('scan").append(parsedScanID).append("');\">");
- sb.append("<img ID=\"IMGscan").append(parsedScanID).append("\" src=\"").append(server).append("/images/plus.jpg\" border=0/> ");
- sb.append("<b>").append(scan.getId()).append("</b> ");
- if (scan.getType()!=null)
- {
- sb.append("(" + scan.getType() + ")");
- }
- sb.append("</span>");
- sb.append("<BR><span class=\"branch\" ID=\"spanscan").append(parsedScanID).append("\">");
- sb.append(scanLinkBuffer);
- sb.append("</span><BR>");
-
- if (hasFunctionText){
- allFiles.append(" \n");
- allFiles.append(" change = \"scan").append(parsedScanID).append("\";\n");
- allFiles.append(" node = document.getElementById(change);\n");
- allFiles.append(" node.checked=checkAll.checked;\n");
- }
- }else{
- sb.append("<span class=\"trigger\"><b>"+ scan.getId() + "</b> (" + scan.getType() + ")</span><br><span class=\"branch\" style=\"display: block;\">No files found for this scan.</span><BR>");
- }
- }else{
- sb.append("<span class=\"trigger\"><b>"+ scan.getId() + "</b> (" + scan.getType() + ")</span><br><span class=\"branch\" style=\"display: block;\">No files defined for this scan.</span><br>");
- }
- }
- sb.append("</TD></TR>");
-
- sb.append("<TR><TD> </TD></TR>");
-
- sb.append(" <TR>");
- int c=0;
- sb.append(" <TD VALIGN=\"top\" ALIGN=\"left\">");
- Iterator reconIter= this.getReconstructions_reconstructedimage().iterator();
- while (reconIter.hasNext())
- {
- XnatReconstructedimagedata recon = (XnatReconstructedimagedata)reconIter.next();
- ArrayList fileGrouping = new ArrayList();
- List outFiles = recon.getOut_file();
- if (outFiles.size()>0)
- {
- Iterator files =outFiles.iterator();
- boolean hasContent= false;
- boolean hasFunctionText=false;
- StringBuffer scanLinkBuffer = new StringBuffer();
- while (files.hasNext())
- {
- XnatAbstractresource xnatFile = (XnatAbstractresource) files.next();
- ArrayList jFiles = xnatFile.getCorrespondingFiles(rootPath);
-
- Iterator iter = jFiles.iterator();
- while (iter.hasNext())
- {
- File f = (File)iter.next();
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getAbsolutePath(),f,FileTracker.KNOWN);
- scanLinkBuffer.append("<b>").append(f.getName()).append("</b><BR>");
- fileGrouping.add(fileID);
- hasContent=true;
- hasFunctionText=true;
- fileCount++;
- }else{
- scanLinkBuffer.append("\n").append(f.getName()).append(" (File off-line)<BR>");
- hasContent=true;
- }
- }
-
- if (xnatFile instanceof XnatResourcecatalog){
- File f = ((XnatResourcecatalog)xnatFile).getCatalogFile(rootPath);
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getAbsolutePath(),f,FileTracker.KNOWN);
- scanLinkBuffer.append("<b>").append(f.getName()).append("</b><BR>");
- fileGrouping.add(fileID);
- hasContent=true;
- hasFunctionText=true;
- fileCount++;
- }else{
- scanLinkBuffer.append("\n").append(f.getName()).append(" (File off-line)<BR>");
- hasContent=true;
- }
- }
- }
- String parsedScanID= StringUtils.replace(StringUtils.replace(recon.getId(),"-",""),"*","AST");
- if (hasContent){
- if(c++==0)
- sb.append("<b>RECONSTRUCTIONS</b></TD><TD>");
- sb.append("\n");
- if (hasFunctionText){
- sb.append("<INPUT type=\"checkbox\" id=\"recon").append(parsedScanID).append("\" name=\"recon").append(parsedScanID).append("\" CHECKED/> ");
- this.fileGroups.put("recon" +parsedScanID,fileGrouping);
- }
- sb.append("<span class=\"trigger\" onClick=\"blocking('recon").append(parsedScanID).append("');\">");
- sb.append("<img ID=\"IMGrecon").append(parsedScanID).append("\" src=\"").append(server).append("/images/plus.jpg\" border=0/> <b>").append(recon.getId()).append("</b> ");
- if (recon.getType()!=null)
- sb.append("(" + recon.getType() + ")");
- sb.append("</span>");
- sb.append("<BR><span class=\"branch\" ID=\"spanrecon").append(parsedScanID).append("\">");
- sb.append(scanLinkBuffer);
-
- sb.append("</span><BR>");
-
- if (hasFunctionText){
- allFiles.append(" \n");
- allFiles.append(" change = \"recon").append(parsedScanID).append("\";\n");
- allFiles.append(" node = document.getElementById(change);\n");
- allFiles.append(" node.checked=checkAll.checked;\n");
- }
- }else{
- if(c++==0)
- sb.append("<b>RECONSTRUCTIONS</b></TD><TD>");
- sb.append("<span class=\"trigger\"><b>"+ recon.getId() + "</b> (" + recon.getType() + ")</span><br><span class=\"branch\" style=\"display: block;\">No files found for this reconstruction.</span><BR>");
- }
- }else{
- if(c++==0)
- sb.append("<b>RECONSTRUCTIONS</b></TD><TD>");
- sb.append("<span class=\"trigger\"><b>"+ recon.getId() + "</b> (" + recon.getType() + ")</span><br><span class=\"branch\" style=\"display: block;\">No files defined for this reconstruction.</span><BR>");
- }
- }
- sb.append("</TD></TR>");
-
- try {
- sb.append("<TR><TD> </TD></TR>");
-
- sb.append(" <TR>");
- sb.append(" <TD VALIGN=\"top\" ALIGN=\"left\">");
- c=0;
- for(XnatImageassessordataI assess : this.getAssessors_assessor()){
- ArrayList fileGrouping = new ArrayList();
- List outFiles = assess.getOut_file();
- if (outFiles.size()>0)
- {
- Iterator files =outFiles.iterator();
-
- boolean hasContent= false;
- boolean hasFunctionText=false;
- StringBuffer scanLinkBuffer = new StringBuffer();
- while (files.hasNext())
- {
- XnatAbstractresource xnatFile = (XnatAbstractresource) files.next();
- ArrayList jFiles = xnatFile.getCorrespondingFiles(rootPath);
-
- Iterator iter = jFiles.iterator();
- while (iter.hasNext())
- {
- File f = (File)iter.next();
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getAbsolutePath(),f,FileTracker.KNOWN);
- scanLinkBuffer.append("<b>").append(f.getName()).append("</b><BR>");
- fileGrouping.add(fileID);
- hasContent=true;
- hasFunctionText=true;
- fileCount++;
- }else{
- scanLinkBuffer.append("\n").append(f.getName()).append(" (File off-line)<BR>");
- hasContent=true;
- }
- }
-
- if (xnatFile instanceof XnatResourcecatalog){
- File f = ((XnatResourcecatalog)xnatFile).getCatalogFile(rootPath);
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getAbsolutePath(),f,FileTracker.KNOWN);
- scanLinkBuffer.append("<b>").append(f.getName()).append("</b><BR>");
- fileGrouping.add(fileID);
- hasContent=true;
- hasFunctionText=true;
- fileCount++;
- }else{
- scanLinkBuffer.append("\n").append(f.getName()).append(" (File off-line)<BR>");
- hasContent=true;
- }
- }
- }
- String parsedScanID= StringUtils.replace(StringUtils.replace(assess.getId(),"-",""),"*","AST");
- if (hasContent){
- if(c++==0)
- sb.append("<b>ASSESSMENTS</b></TD><TD>");
-
- sb.append("\n");
- if (hasFunctionText){
- sb.append("<INPUT type=\"checkbox\" id=\"assess").append(parsedScanID).append("\" name=\"assess").append(parsedScanID).append("\" checked/> ");
- this.fileGroups.put("assess" +parsedScanID,fileGrouping);
- }
- sb.append("<span class=\"trigger\" onClick=\"blocking('assess").append(parsedScanID).append("');\">");
- sb.append("<img ID=\"IMGassess").append(parsedScanID).append("\" src=\"").append(server).append("/images/plus.jpg\" border=0/> <b>").append(assess.getId()).append("</b> ");
- sb.append("(" + ((XnatImageassessordata)assess).getItem().getProperName() + ")");
- sb.append("</span>");
- sb.append("<BR>\n<span class=\"branch\" ID=\"spanassess").append(parsedScanID).append("\">");
- sb.append(scanLinkBuffer);
- sb.append("</span><BR>");
-
- if (hasFunctionText)
- {
- allFiles.append(" \n");
- allFiles.append(" change = \"assess").append(parsedScanID).append("\";\n");
- allFiles.append(" node = document.getElementById(change);\n");
- allFiles.append(" node.checked=checkAll.checked;\n");
- }
- }else{
- if(c++==0)
- sb.append("<b>ASSESSMENTS</b></TD><TD>");
- sb.append("<span class=\"trigger\"><b>"+ assess.getId() + "</b> (" + ((XnatImageassessordata)assess).getItem().getProperName() + ")</span><br><span class=\"branch\" style=\"display: block;\">No files found for this assessment.</span><BR>");
- }
- }else{
- if(c++==0)
- sb.append("<b>ASSESSMENTS</b></TD><TD>");
- sb.append("<span class=\"trigger\"><b>"+ assess.getId() + "</b> (" + ((XnatImageassessordata)assess).getItem().getProperName() + ")</span><br><span class=\"branch\" style=\"display: block;\">No files defined for this assessment.</span><BR>");
- }
- }
- sb.append("</TD></TR>");
- } catch (ElementNotFoundException e1) {
- logger.error("",e1);
- }
-
- sb.append("<TR><TD> </TD></TR>");
-
- sb.append(" <TR>");
- sb.append(" <TD VALIGN=\"top\" ALIGN=\"left\">");
- c=0;
- Iterator uploadsIter= this.getResources_resource().iterator();
- while (uploadsIter.hasNext())
- {
- XnatAbstractresource xnatFile = (XnatAbstractresource)uploadsIter.next();
- ArrayList fileGrouping = new ArrayList();
- ArrayList jFiles = xnatFile.getCorrespondingFiles(rootPath);
-
- boolean hasContent= false;
- boolean hasFunctionText=false;
- StringBuffer scanLinkBuffer = new StringBuffer();
-
- Iterator iter = jFiles.iterator();
- while (iter.hasNext())
- {
- File f = (File)iter.next();
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getAbsolutePath(),f,FileTracker.KNOWN);
- scanLinkBuffer.append("<b>").append(f.getName()).append("</b><BR>");
- fileGrouping.add(fileID);
- hasContent=true;
- hasFunctionText=true;
- fileCount++;
- }else{
- scanLinkBuffer.append("\n").append(f.getName()).append(" (File off-line)<BR>");
- hasContent=true;
- }
- }
-
- if (xnatFile instanceof XnatResourcecatalog){
- File f = ((XnatResourcecatalog)xnatFile).getCatalogFile(rootPath);
- if (f.exists())
- {
- String fileID = this._files.addFile(f.getAbsolutePath(),f,FileTracker.KNOWN);
- scanLinkBuffer.append("<b>").append(f.getName()).append("</b><BR>");
- fileGrouping.add(fileID);
- hasContent=true;
- hasFunctionText=true;
- fileCount++;
- }else{
- scanLinkBuffer.append("\n").append(f.getName()).append(" (File off-line)<BR>");
- hasContent=true;
- }
- }
-
- String label = xnatFile.getLabel();
- if (label==null){
- label = xnatFile.getXnatAbstractresourceId().toString();
- }
- if(xnatFile instanceof XnatResourcecatalog){
- if (((XnatResourcecatalog)xnatFile).getTags_tag().size()>0){
- int counter =0;
- label +=" Tags: ";
- for(XnatAbstractresourceTagI tag : xnatFile.getTags_tag()){
- if (counter++>0)label+=", ";
- label+=tag.getTag();
- }
- }
- }
-
- String parsedScanID= xnatFile.getXnatAbstractresourceId().toString();
- if (hasContent){
- if(c++==0)
- sb.append("<b>ADDITIONAL RESOURCES</b></TD><TD>");
-
- sb.append("\n");
- if (hasFunctionText){
- sb.append("<INPUT type=\"checkbox\" id=\"uploads").append(parsedScanID).append("\" name=\"uploads").append(parsedScanID).append("\" CHECKED/> ");
- this.fileGroups.put("uploads" +parsedScanID,fileGrouping);
- }
- sb.append("<span class=\"trigger\" onClick=\"blocking('uploads").append(parsedScanID).append("');\">");
- sb.append("<img ID=\"IMGuploads").append(parsedScanID).append("\" src=\"").append(server).append("/images/plus.jpg\" border=0/> <b>").append(label).append("</b> ");
- sb.append("");
- sb.append("</span>");
- sb.append("<BR>\n<span class=\"branch\" ID=\"spanuploads").append(parsedScanID).append("\">");
- sb.append(scanLinkBuffer);
- sb.append("</span><BR>");
-
- if (hasFunctionText)
- {
- allFiles.append(" \n");
- allFiles.append(" change = \"uploads").append(parsedScanID).append("\";\n");
- allFiles.append(" node = document.getElementById(change);\n");
- allFiles.append(" node.checked=checkAll.checked;\n");
- }
- }else{
- if(c++==0)
- sb.append("<b>ADDITIONAL RESOURCES</b></TD><TD>");
- sb.append("<span class=\"trigger\"><b>"+ label + "</b> </span><br><span class=\"branch\" style=\"display: block;\">No files found for this upload.</span><BR>");
- }
- }
- sb.append("</TD></TR>");
-
- if (miscDir!=null){
- File misc = new File(miscDir);
- if(misc.exists()){
- sb.append("<TR><TD> </TD></TR>");
-
- sb.append(" <TR>");
- sb.append(" <TD VALIGN=\"top\" ALIGN=\"left\"><b>MISC FILES</b></TD><TD>");
- String dirListing = listDirectoryToHTML(misc,server,"",0).toString();
- sb.append(dirListing);
- sb.append("</TD></TR>");
- sb.append("</TABLE>");
-
- if (dirListing.length()>0){
- fileCount++;
- allFiles.append(" \n");
- allFiles.append(" f").append(misc.getName() + "0").append("CheckAll(checkAll);\n");
- allFiles.append(" change = \"dir_").append(misc.getName() + "/").append("\";\n");
- allFiles.append(" node = document.getElementById(change);\n");
- allFiles.append(" node.checked=checkAll.checked;\n");
- }
- }
- }
-
-
- allFiles.append(" }");
- allFiles.append(" </script>");
-
- sb.insert(0," </TH></TR>");
- sb.insert(0," <TD></TD><TH VALIGN=\"top\" ALIGN=\"left\">");
-
- if (fileCount>0)
- {
- sb.insert(0,"<input type=\"checkbox\" id=\"all_files\" name=\"all_files\" checked onclick=\"allFilesCheckAll(this);\"/><label for=\"all_files\"> Select All</label>");
- }
- sb.insert(0," <TR>");
- sb.insert(0,"<TABLE>");
- return allFiles.toString() + "<BR>" + sb.toString();
- }
-
- /**
- * @return Returns the fileGroups.
- */
- public Hashtable getFileGroups() {
- return fileGroups;
- }
-
- public StringBuffer listDirectoryToHTML(File dir,String server,String parents,int count)
- {
- StringBuffer sb = new StringBuffer();
- StringBuffer function = new StringBuffer();
-
- int fileCount=0;
-
- if (dir.exists())
- {
- int local_count=count;
- parents += dir.getName() + "/";
- function.append("<script type=\"text/javascript\" language=\"JavaScript1.3\">\n");
- function.append(" function f").append(dir.getName() + local_count).append("CheckAll(checkAll)\n");
- function.append(" {\n");
- function.append(" var change=null;\n");
- function.append(" var node=null;\n");
-
- sb.append("<INPUT type=\"checkbox\" id=\"dir_").append(parents).append("\" name=\"dir_").append(parents).append("\" ONCLICK=\"f").append(dir.getName()).append(local_count + "CheckAll(this)\" CHECKED/>");
- sb.append(" <span class=\"trigger\" onClick=\"blocking('").append(dir.getName() + local_count).append("');\">");
- sb.append("<img ID=\"IMG").append(dir.getName() + local_count).append("\" src=\"").append(server).append("/images/plus.jpg\" border=0/> <b>").append(dir.getName()).append("</b></span>");
- sb.append("<span class=\"branch\" ID=\"span").append(dir.getName() + local_count).append("\">");
- File[] children = dir.listFiles();
- for (int i=0;i<children.length;i++)
- {
- File child = children[i];
- if (child.isDirectory())
- {
- count++;
- StringBuffer functionTemp = new StringBuffer();
- functionTemp.append(" \n");
- functionTemp.append(" f").append(child.getName() + count).append("CheckAll(checkAll);\n");
- functionTemp.append(" change = \"dir_").append(parents + child.getName()+ "/").append("\";\n");
- functionTemp.append(" node = document.getElementById(change);\n");
- functionTemp.append(" node.checked=checkAll.checked;\n");
- StringBuffer temp =listDirectoryToHTML(child,server,parents,count);
- if (temp.length()>0){
- sb.append("\n").append(temp).append("<BR>");
- function.append(functionTemp);
- fileCount++;
- }
- }else{
- if (_files.indexOf(child)==-1)
- {
- if (!child.getName().equalsIgnoreCase("dcmtoxnat.log") && !child.getName().equalsIgnoreCase("dcmtoxnat.log.gz"))
- {
- String fileID = this._files.addFile(parents + child.getName(),child,FileTracker.MISC);
- function.append(" \n");
- function.append(" change = \"dir_file_").append(fileID).append("\";\n");
- function.append(" node = document.getElementById(change);\n");
- function.append(" node.checked=checkAll.checked;\n");
- sb.append("<INPUT type=\"checkbox\" id=\"dir_file_").append(fileID).append("\" name=\"dir_file_").append(fileID).append("\" CHECKED/> ").append(child.getName()).append("<BR>");
- fileCount++;
- }
- }
- }
- }
- function.append(" }");
- function.append(" </script>");
- sb.append("</span>");
-
- }
-
- if (fileCount>0){
- function.append(sb);
- return function;
- }else{
- return new StringBuffer();
- }
- }
-
- public ArrayList getAllFilePaths()
- {
- return this._files.getAbsolutePaths();
- }
-
- /**
- * @return Returns the _files.
- */
- public FileTracker getFileTracker() {
- return _files;
- }
-
-
- /**
- * @return Returns the lowerCaseSessionId.
- */
- public String getLowerCaseSessionId() {
- if (lowerCaseSessionId==null)
- lowerCaseSessionId = getId().toLowerCase();
- return lowerCaseSessionId;
- }
-
- XNATDirectory srbDIR = null;
- public XNATDirectory getSRBDirectory()
- {
- if (srbDIR==null)
- {
- String sessionDIR = deriveSessionDir();
-
- int index = sessionDIR.indexOf("/home/");
- sessionDIR= sessionDIR.substring(index);
-
- //LOAD ALL RAW IMAGES
- srbDIR = XNATSrbSearch.getFilteredFiles(sessionDIR,null);
- }
-
- return srbDIR;
- }
-
- public boolean hasSRBData(){
- String rootPath;
- try {
- rootPath = getArchiveRootPath();
- } catch (UnknownPrimaryProjectException e) {
- rootPath=null;
- }
- for(XnatImagescandataI scan : this.getSortedScans()){
- List scanFiles= scan.getFile();
- Iterator files = scanFiles.iterator();
- while (files.hasNext())
- {
- XnatAbstractresource xnatFile = (XnatAbstractresource) files.next();
- if (xnatFile instanceof org.nrg.xdat.om.XnatResource){
- XnatResource resource = (XnatResource)xnatFile;
- String uri =resource.getFullPath(rootPath);
- if (uri.startsWith("srb:"))
- return true;
- }else if(xnatFile instanceof org.nrg.xdat.om.XnatDicomseries){
- XnatDicomseries resource = (XnatDicomseries)xnatFile;
- String uri =resource.getFullPath(rootPath);
- if (uri.startsWith("srb:"))
- return true;
- }else if(xnatFile instanceof org.nrg.xdat.om.XnatResourceseries){
- XnatResourceseries resource = (XnatResourceseries)xnatFile;
- String uri =resource.getFullPath(rootPath);
- if (uri.startsWith("srb:"))
- return true;
- }
- }
- }
-
- return false;
- }
-
- private String raw_dir = null;
- public String deriveRawDir(){
- if (raw_dir==null)
- {
- String rootPath;
- try {
- rootPath = getArchiveRootPath();
- } catch (UnknownPrimaryProjectException e) {
- rootPath=null;
- }
- String last_dir = null;
- for(XnatImagescandataI scan : this.getSortedScans()){
- for (XnatAbstractresourceI xnatFile:scan.getFile())
- {
- if (xnatFile instanceof org.nrg.xdat.om.XnatResource){
- XnatResource resource = (XnatResource)xnatFile;
- String uri =resource.getFullPath(rootPath);
- if (last_dir==null){
- last_dir= uri;
- int index = last_dir.toUpperCase().indexOf("/RAW/");
- if (index!=-1){
- raw_dir = last_dir.substring(0,index+4);
- return raw_dir;
- }else{
- index = last_dir.toUpperCase().indexOf("/SCANS/");
- if (index!=-1){
- raw_dir = last_dir.substring(0,index+6);
- return raw_dir;
- }
- }
- }else{
-
- }
- }else if(xnatFile instanceof org.nrg.xdat.om.XnatDicomseries){
- XnatDicomseries resource = (XnatDicomseries)xnatFile;
- String uri =resource.getFullPath(rootPath);
- if (last_dir==null){
- last_dir= uri;
- int index = last_dir.toUpperCase().indexOf("/RAW/");
- if (index!=-1){
- raw_dir = last_dir.substring(0,index+4);
- return raw_dir;
- }else{
- index = last_dir.toUpperCase().indexOf("/SCANS/");
- if (index!=-1){
- raw_dir = last_dir.substring(0,index+6);
- return raw_dir;
- }
- }
- }else{
-
- }
- }else if(xnatFile instanceof org.nrg.xdat.om.XnatResourceseries){
- XnatResourceseries resource = (XnatResourceseries)xnatFile;
- String uri =resource.getFullPath(rootPath);
- if (last_dir==null){
- last_dir= uri;
- int index = last_dir.toUpperCase().indexOf("/RAW/");
- if (index!=-1){
- raw_dir = last_dir.substring(0,index+4);
- return raw_dir;
- }else{
- index = last_dir.toUpperCase().indexOf("/SCANS/");
- if (index!=-1){
- raw_dir = last_dir.substring(0,index+6);
- return raw_dir;
- }
- }
- }else{
-
- }
- }
- }
- }
-
- if (raw_dir ==null)
- {
- raw_dir = deriveSessionDir();
- }
- }
-
-
- return raw_dir;
- }
-
- private String session_dir=null;
- public String deriveSessionDir(){
- if (session_dir==null)
- {
- String rootPath;
- try {
- rootPath = getArchiveRootPath();
- } catch (UnknownPrimaryProjectException e) {
- rootPath=null;
- }
- for(XnatImagescandataI scan : this.getSortedScans()){
- logger.debug("CHECKING SCAN: "+scan.getId());
- List scanFiles= scan.getFile();
- Iterator files = scanFiles.iterator();
- while (files.hasNext())
- {
- XnatAbstractresource xnatFile = (XnatAbstractresource) files.next();
- if (xnatFile instanceof org.nrg.xdat.om.XnatResource){
- XnatResource resource = (XnatResource)xnatFile;
- String uri =resource.getFullPath(rootPath);
- logger.debug("CHECKING RESOURCE: " + uri);
- String last_dir = null;
- if (last_dir==null){
- last_dir= uri;
- String UPPER_dir=last_dir.toUpperCase();
- int index = UPPER_dir.indexOf("/" + getArchiveDirectoryName().toUpperCase() + "/");
- if (index!=-1){
- session_dir = last_dir.substring(0,index+(2+getArchiveDirectoryName().length()));
-
- logger.debug("MATCHED BY getArchiveDirectoryName():" + session_dir);
- return session_dir;
- }else{
- index = UPPER_dir.indexOf(getArchiveDirectoryName().toUpperCase());
- if (index!=-1){
- int unixSepIndex = last_dir.indexOf("/", index);
- int winSepIndex = last_dir.indexOf("\\", index);
- if (unixSepIndex ==-1 && winSepIndex==-1)
- {
- session_dir= last_dir + File.separator;
- }else if(unixSepIndex ==-1){
- session_dir = last_dir.substring(0,winSepIndex+1);
- }else if(winSepIndex ==-1){
- session_dir = last_dir.substring(0,unixSepIndex+1);
- }else if(winSepIndex < unixSepIndex){
- session_dir = last_dir.substring(0,winSepIndex+1);
- }else if(winSepIndex > unixSepIndex){
- session_dir = last_dir.substring(0,unixSepIndex+1);
- }
- }else{
- logger.debug("MOT MATCHED");
- }
- }
- }
- }else if(xnatFile instanceof org.nrg.xdat.om.XnatDicomseries){
- XnatDicomseries resource = (XnatDicomseries)xnatFile;
- String uri =resource.getFullPath(rootPath);
- String last_dir = null;
- if (last_dir==null){
- last_dir= uri;
- String UPPER_dir=last_dir.toUpperCase();
- int index = UPPER_dir.indexOf("/" + getArchiveDirectoryName().toUpperCase() + "/");
- if (index!=-1){
- session_dir = last_dir.substring(0,index+(2+getArchiveDirectoryName().length()));
- return session_dir;
- }else{
- index = UPPER_dir.indexOf(getArchiveDirectoryName().toUpperCase());
- if (index!=-1){
- int unixSepIndex = last_dir.indexOf("/", index);
- int winSepIndex = last_dir.indexOf("\\", index);
- if (unixSepIndex ==-1 && winSepIndex==-1)
- {
- session_dir= last_dir + File.separator;
- }else if(unixSepIndex ==-1){
- session_dir = last_dir.substring(0,winSepIndex+1);
- }else if(winSepIndex ==-1){
- session_dir = last_dir.substring(0,unixSepIndex+1);
- }else if(winSepIndex < unixSepIndex){
- session_dir = last_dir.substring(0,winSepIndex+1);
- }else if(winSepIndex > unixSepIndex){
- session_dir = last_dir.substring(0,unixSepIndex+1);
- }
- }
- }
- }
- }else if(xnatFile instanceof org.nrg.xdat.om.XnatResourceseries){
- XnatResourceseries resource = (XnatResourceseries)xnatFile;
- String uri =resource.getFullPath(rootPath);
- String last_dir = null;
- if (last_dir==null){
- last_dir= uri;
- String UPPER_dir=last_dir.toUpperCase();
- int index = UPPER_dir.indexOf("/" + getArchiveDirectoryName().toUpperCase() + "/");
- if (index!=-1){
- session_dir = last_dir.substring(0,index+(2+getArchiveDirectoryName().length()));
- return session_dir;
- }else{
- index = UPPER_dir.indexOf(getArchiveDirectoryName().toUpperCase());
- if (index!=-1){
- int unixSepIndex = last_dir.indexOf("/", index);
- int winSepIndex = last_dir.indexOf("\\", index);
- if (unixSepIndex ==-1 && winSepIndex==-1)
- {
- session_dir= last_dir + File.separator;
- }else if(unixSepIndex ==-1){
- session_dir = last_dir.substring(0,winSepIndex+1);
- }else if(winSepIndex ==-1){
- session_dir = last_dir.substring(0,unixSepIndex+1);
- }else if(winSepIndex < unixSepIndex){
- session_dir = last_dir.substring(0,winSepIndex+1);
- }else if(winSepIndex > unixSepIndex){
- session_dir = last_dir.substring(0,unixSepIndex+1);
- }
- }
- }
- }
- }
- }
- }
- }
-
- return session_dir;
- }
-
-
-
- /**
- * @param c The condition.
- * @return ArrayList of org.nrg.xdat.om.XnatImagescandataI
- */
- public List<XnatImagescandataI> getScansByCondition(String c) {
- List _return = new ArrayList();
- for(XnatImagescandataI scan : this.getSortedScans()){
- String condition = scan.getCondition();
- if (condition ==null)
- {
- if (c==null)
- {
- _return.add(scan);
- }
- }else{
- if (condition.equalsIgnoreCase(c)) {
- _return.add(scan);
- }
- }
- }
- return _return;
- }
-
-
- public List<XnatAbstractresourceI> getAllResources(){
- List<XnatAbstractresourceI> resources = new ArrayList<XnatAbstractresourceI>();
- for(XnatImagescandataI scan : this.getSortedScans()){
- Iterator files = scan.getFile().iterator();
- while (files.hasNext()){
- XnatAbstractresource file = (XnatAbstractresource)files.next();
- resources.add(file);
- }
- }
-
- Iterator recons = getReconstructions_reconstructedimage().iterator();
- while(recons.hasNext())
- {
- XnatReconstructedimagedata scan = (XnatReconstructedimagedata)recons.next();
- Iterator outfiles = scan.getOut_file().iterator();
- while (outfiles.hasNext()){
- XnatAbstractresource file = (XnatAbstractresource)outfiles.next();
- resources.add(file);
- }
-
- Iterator infiles = scan.getIn_file().iterator();
- while (infiles.hasNext()){
- XnatAbstractresource file = (XnatAbstractresource)infiles.next();
- resources.add(file);
- }
- }
-
- for(XnatImageassessordataI assess : this.getAssessors_assessor()){
- Iterator outfiles = assess.getOut_file().iterator();
- while (outfiles.hasNext()){
- XnatAbstractresource file = (XnatAbstractresource)outfiles.next();
- resources.add(file);
- }
-
- Iterator infiles = assess.getIn_file().iterator();
- while (infiles.hasNext()){
- XnatAbstractresource file = (XnatAbstractresource)infiles.next();
- resources.add(file);
- }
- }
-
- Iterator misc = getResources_resource().iterator();
- while(misc.hasNext())
- {
- XnatAbstractresource file = (XnatAbstractresource)misc.next();
- resources.add(file);
- }
- return resources;
- }
-
- /**
- * Appends this path to the enclosed URI or path variables.
- * @param session_path The path to the session.
- */
- public void prependPathsWith(String session_path){
- Iterator files= getAllResources().iterator();
- while(files.hasNext())
- {
- XnatAbstractresource file = (XnatAbstractresource)files.next();
- file.prependPathsWith(session_path);
- }
- }
-
-
-
-
- /**
- * Relatives this path from the first occurrence of the indexOf string.
- * @param indexOf
- */
- public void relativePaths(String indexOf){
- Iterator files= getAllResources().iterator();
- while(files.hasNext())
- {
- XnatAbstractresource file = (XnatAbstractresource)files.next();
- file.relativizePaths(indexOf,false);
- }
- }
-
- public void preLoadFiles(){
- if(this.hasSRBData()){
- this.loadSRBFiles();
- }else{
- this.loadLocalFiles();
- }
- }
-
- public CatalogSet getCatalogBean(String url){
- XnatProjectdata project = this.getPrimaryProject(false);
-
- this.preLoadFiles();
-
- Hashtable<String,Object> fileMap = new Hashtable<String,Object>();
- CatCatalogBean catalog = new CatCatalogBean();
-
- catalog.setId(this.getId());
-
- if (hasSRBData()){
-
- Hashtable fileGroups = getFileGroups();
- for (Enumeration e = fileGroups.keys(); e.hasMoreElements();) {
- String key = (String)e.nextElement();
-
- ArrayList groupFiles = (ArrayList)fileGroups.get(key);
- int counter=0;
- for(Iterator iter=groupFiles.iterator();iter.hasNext();){
- Object o = iter.next();
- if (o instanceof String){
-
- String id = (String)o;
-
- int index = getFileTracker().getIDIndex(id);
- File f = getFileTracker().getFile(index);
- String identifier = "/file/" + id;
- CatEntryBean entry = new CatEntryBean();
- entry.setUri(url + identifier);
-
- fileMap.put(identifier, f);
-
- String path = f.getAbsolutePath();
- if (path.indexOf(File.separator + project.getId())!=-1){
- path = path.substring(path.indexOf(File.separator + project.getId()) + 1);
- }else{
- if (path.indexOf(File.separator + getArchiveDirectoryName())!=-1){
- path = path.substring(path.indexOf(File.separator + getArchiveDirectoryName()) + 1);
- }
- }
-
- entry.setCachepath(path);
- entry.setName(f.getName());
-
- CatEntryMetafieldBean meta = new CatEntryMetafieldBean();
- meta.setMetafield(path);
- meta.setName("RELATIVE_PATH");
- entry.addMetafields_metafield(meta);
-
-
- meta = new CatEntryMetafieldBean();
- meta.setMetafield(key);
- meta.setName("GROUP");
- entry.addMetafields_metafield(meta);
-
- meta = new CatEntryMetafieldBean();
- meta.setMetafield(new Long(f.length()).toString());
- meta.setName("SIZE");
- entry.addMetafields_metafield(meta);
-
- catalog.addEntries_entry(entry);
- }else{
- XNATDirectory dir = (XNATDirectory)o;
-
-
- for (Map.Entry<String,GeneralFile> entryF: dir.getRelativeFiles().entrySet()) {
-
- String relative = entryF.getKey();
-
- if(relative.indexOf(getArchiveDirectoryName())!=-1)
- {
- relative = relative.substring(relative.indexOf(getArchiveDirectoryName()));
- }
-
- String identifier = "/file/" + counter++;
- CatEntryBean entry = new CatEntryBean();
- entry.setUri(url + identifier);
-
- fileMap.put(identifier, entryF.getValue());
-
- entry.setCachepath(relative);
- entry.setName(entryF.getValue().getName());
-
- CatEntryMetafieldBean meta = new CatEntryMetafieldBean();
- meta.setMetafield(relative);
- meta.setName("RELATIVE_PATH");
- entry.addMetafields_metafield(meta);
-
- meta = new CatEntryMetafieldBean();
- meta.setMetafield(key);
- meta.setName("GROUP");
- entry.addMetafields_metafield(meta);
-
- meta = new CatEntryMetafieldBean();
- meta.setMetafield(new Long(entryF.getValue().length()).toString());
- meta.setName("SIZE");
- entry.addMetafields_metafield(meta);
-
- catalog.addEntries_entry(entry);
- }
- }
- }
- }
- }else{
- FileTracker ft =getFileTracker();
- for(String id: ft.getIds()){
- int index = getFileTracker().getIDIndex(id);
- File f = getFileTracker().getFile(index);
- String identifier = "/file/" + id;
- CatEntryBean entry = new CatEntryBean();
- entry.setUri(url + identifier);
-
- fileMap.put(identifier, f);
-
- String path = f.getAbsolutePath();
- if (path.indexOf(File.separator + project.getId())!=-1){
- path = path.substring(path.indexOf(File.separator + project.getId()) + 1);
- }else{
- if (path.indexOf(File.separator + getArchiveDirectoryName())!=-1){
- path = path.substring(path.indexOf(File.separator + getArchiveDirectoryName()) + 1);
- }
- }
-
- entry.setCachepath(path);
- entry.setName(f.getName());
-
- CatEntryMetafieldBean meta = new CatEntryMetafieldBean();
- meta.setMetafield(path);
- meta.setName("RELATIVE_PATH");
- entry.addMetafields_metafield(meta);
-
- meta = new CatEntryMetafieldBean();
- meta.setMetafield(new Long(f.length()).toString());
- meta.setName("SIZE");
- entry.addMetafields_metafield(meta);
-
- catalog.addEntries_entry(entry);
- }
- }
-
- return new CatalogSet(catalog,fileMap);
- }
-
-
-
- public void fixScanTypes(){
- Map<String,ScanTypeMappingI> mappers = new Hashtable<String,ScanTypeMappingI>();
-
- String project=this.getProject();
-
- List al = this.getScans_scan();
- if (al != null) {
- for (int i = 0; i < al.size(); i++) {
- XnatImagescandata scan = (XnatImagescandata) al.get(i);
-
- if(!mappers.containsKey(scan.getXSIType())){
- mappers.put(scan.getXSIType(), scan.getScanTypeMapping(project, this.getDBName()));
- }
-
-
- mappers.get(scan.getXSIType()).setType(scan);
-
- if(scan.getFile().size()>0){
- XnatAbstractresourceI abstRes=scan.getFile().get(0);
- if(abstRes instanceof XnatResource){
- if(((XnatResource)abstRes).getContent()==null || ((XnatResource)abstRes).getContent().equals("")){
- ((XnatResource)abstRes).setContent("RAW");
- }
- if(abstRes.getLabel()!=null && ((XnatResource)abstRes).getFormat()==null){
- ((XnatResource)abstRes).setFormat(abstRes.getLabel());
- }
- }
- }
- }
- }
- }
-
- public void defaultQuality(String s){
- for(XnatImagescandataI scan:this.getScans_scan()){
- if(scan.getQuality()==null)
- ((XnatImagescandata)scan).setQuality(s);
- }
- }
-
- public String getDefaultIdentifier(){
- return null;
- }
-
- /**
- * Copies assigned field values from the indicated image session object to
- * this one, potentially overwriting existing values.
- * @param other object from which assigned values will be copied
- * @throws Exception from XnatExperimentdata.setProjects_project()
- */
- public void copyValuesFrom(final XnatImagesessiondata other) throws Exception {
-
- if (null != other.getSessionType()){
- this.setSessionType(other.getSessionType());
- }
-
- if (null != other.getScanner()){
- this.setScanner(other.getScanner());
- }
-
- if (null != other.getOperator()){
- this.setOperator(other.getOperator());
- }
-
- if (null != other.getDate()){
- this.setDate(other.getDate());
- }
-
- if (null != other.getAcquisitionSite()){
- this.setAcquisitionSite(other.getAcquisitionSite());
- }
-
- if (null != other.getNote()){
- this.setNote(other.getNote());
- }
-
- if (null != other.getInvestigatorFK()){
- this.setInvestigatorFK(other.getInvestigatorFK());
- }
-
- if (null != other.getSubjectId()){
- this.setSubjectId(other.getSubjectId());
- }
-
- while (this.getSharing_share().size()>0){
- this.removeSharing_share(0);
- }
-
- for (final XnatExperimentdataShareI project : other.getSharing_share()) {
- this.setSharing_share((XnatExperimentdataShare)project);
- }
-
- if (null != other.getProject()){
- this.setProject(other.getProject());
- }
-
- if (null != other.getLabel()){
- this.setLabel(other.getLabel());
- }else{
- if(this.getLabel()!=null){
- this.setLabel("NULL");
- }
- }
-
- for(final XnatExperimentdataFieldI otherField : other.getFields_field()){
- final XnatExperimentdataField field=new XnatExperimentdataField(this.getUser());
- if (otherField.getName() != null){
- field.setName(otherField.getName());
- field.setField(otherField.getField());
- this.setFields_field(field);
- }
- }
-
- int scancounter = 0;
- for (final XnatImagescandataI scan : this.getScans_scan()){
- final XnatImagescandata otherScan = other.getScanById(scan.getId());
- if (null != otherScan){
- if (null != otherScan.getType())
- ((XnatImagescandata)scan).setType(otherScan.getType());
- if (null != otherScan.getQuality())
- ((XnatImagescandata)scan).setQuality(otherScan.getQuality());
- if (null != otherScan.getNote())
- ((XnatImagescandata)scan).setNote(otherScan.getNote());
- }
- scancounter++;
- }
- }
-//
-// /**
-// * Generates assessor id to be used for xnat_imageAssessorData.
-// * @return
-// * @throws SQLException
-// */
-// public String createNewAssessorId(String type) throws SQLException{
-// String newID= "";
-// String prefix= "";
-// int i = this.getAssessors(type).size()+1;
-// prefix +=this.getId();
-//
-// String code =ElementSecurity.GetCode(type);
-// if(code!=null && !code.equals(""))
-// prefix+="_" + code;
-//
-// newID=prefix + "_"+ i;
-// String query = "SELECT count(ID) AS id_count FROM xnat_experimentdata WHERE ID='";
-//
-// String login = null;
-// if (this.getUser()!=null){
-// login=this.getUser().getUsername();
-// }
-// try {
-// Long idCOUNT= (Long)PoolDBUtils.ReturnStatisticQuery(query + newID + "';", "id_count", this.getDBName(), login);
-// while (idCOUNT > 0){
-// i++;
-// newID=prefix + "_"+ i;
-// idCOUNT= (Long)PoolDBUtils.ReturnStatisticQuery(query + newID + "';", "id_count", this.getDBName(), login);
-// }
-// } catch (Exception e) {
-// logger.error("",e);
-// }
-//
-// return newID;
-// }
-
-
-// /**
-// * Generates assessor id to be used for xnat_imageAssessorData.
-// * @return
-// * @throws SQLException
-// */
-// public String createNewAssessorId(String visitNum) throws SQLException{
-// String newID= "";
-// int i = this.getAssessorCount()+1;
-// newID=this.getId() + "_"+ visitNum + "_"+ i;
-// String query = "SELECT count(ID) AS id_count FROM xnat_experimentdata WHERE ID='";
-//
-// String login = null;
-// if (this.getUser()!=null){
-// login=this.getUser().getUsername();
-// }
-// try {
-// Long idCOUNT= (Long)PoolDBUtils.ReturnStatisticQuery(query + newID + "';", "id_count", this.getDBName(), this.getUser().getUsername());
-// while (idCOUNT > 0){
-// i++;
-// newID=this.getId() + "_"+ visitNum + "_"+ i;
-// idCOUNT= (Long)PoolDBUtils.ReturnStatisticQuery(query + newID + "';", "id_count", this.getDBName(), this.getUser().getUsername());
-// }
-// } catch (Exception e) {
-// logger.error("",e);
-// }
-//
-// return newID;
-// }
-
- public boolean validateSubjectId(){
- String subjectid = this.getSubjectId();
- if (subjectid!=null){
- subjectid=StringUtils.remove(subjectid, '\'');
- String query = "SELECT ID FROM xnat_subjectdata WHERE ID='";
- String login =null;
- if (this.getUser()!=null){
- login = this.getUser().getUsername();
- }
-
- try {
- final String idCOUNT= (String)PoolDBUtils.ReturnStatisticQuery(query + subjectid + "';", "id", this.getDBName(), login);
- if (idCOUNT!=null){
- return true;
- }
-
- final String project = this.getProject();
- if (project!=null){
- //CHECK by primary label
- query = "SELECT id FROM xnat_subjectdata WHERE label='" +
- subjectid +"' AND project='" + project + "';";
- String new_subjectid= (String)PoolDBUtils.ReturnStatisticQuery(query, "id", this.getDBName(), login);
- if (new_subjectid!=null){
- this.setSubjectId(new_subjectid);
- return true;
- }
-
- //CHECK by secondary labels
- query = "SELECT subject_id FROM xnat_projectParticipant WHERE label='" +
- subjectid +"' AND project='" + project + "';";
- new_subjectid= (String)PoolDBUtils.ReturnStatisticQuery(query, "subject_id", this.getDBName(), login);
- if (new_subjectid!=null){
- this.setSubjectId(new_subjectid);
- return true;
- }
- }
- } catch (SQLException e) {
- logger.error("",e);
- } catch (Exception e) {
- logger.error("",e);
- }
- }
-
- return false;
- }
-
- public List<String> getSessionReadableScanStats() {
- return getSessionReadableScanStats(false);
- }
-
- public String getFormattedSessionReadableScanStats(){
- List<String> stats = this.getSessionReadableScanStats();
- if (stats.size() == 1) {
- return stats.get(0);
- } else {
- return BaseXnatImagescandata.getListAsTipText(stats);
- }
- }
-
- public static List<String> getPrearchiveSessionReadableScanStats(Collection <XnatImagescandataI> scans){
- List<String> stats = new ArrayList<String>();
- int count = 0;
- long size = 0;
- for (XnatImagescandataI scan : scans){
- if(scan instanceof BaseXnatImagescandata){
- Map<String,Number> prearcStats = ((BaseXnatImagescandata)scan).getPrearchiveFileStats();
- count += prearcStats.get("count").intValue();
- size += prearcStats.get("size").longValue();
- }else{
- logger.error("Unable to retrieve file counts.", new Exception("Prearchive scan is not an instance of BaseXnatImagescandata. Skipping..."));
- }
- }
- stats.add(CatalogUtils.formatFileStats("TOTAL", count, size));
- return stats;
- }
-
-
- public List<String> getSessionReadableScanStats(boolean useLabel) {
- List<String> stats = new ArrayList<String>();
- // Use the TreeMap so that the keys are sorted
- Map<String, List<Long>> accumulator = new TreeMap<String, List<Long>>();
-
- if(this.getId() == null){
- // If the session is in the prearchive
- stats = this.getPrearchiveSessionReadableScanStats(this.getSortedScans());
- }else{
- // The session is in the archive
- int count = 0;
- long size = 0;
- for (XnatImagescandataI scan : this.getSortedScans()){
- for (XnatAbstractresourceI resource : scan.getFile()) {
- String fileLabel = resource.getLabel();
- if (fileLabel != null && fileLabel.equals("SNAPSHOTS")) {
- continue;
- }
- if (fileLabel == null || fileLabel.trim().equals("")) {
- fileLabel = "Unknown";
- }
-
- Integer fileCount = resource.getFileCount();
- Object rawFileSize = resource.getFileSize();
-
- List<Long> data;
- if (accumulator.containsKey(fileLabel)) {
- data = accumulator.get(fileLabel);
- } else {
- data = new ArrayList<Long>() {{ add(0L); add(0L); }};
- accumulator.put(fileLabel, data);
- }
-
- if (fileCount != null) {
- count += fileCount;
- Long aggregate = data.get(0);
- data.set(0, aggregate + fileCount);
- }
- if (rawFileSize != null) {
- long fileSize;
- if (rawFileSize instanceof Integer) {
- fileSize = (Integer) rawFileSize;
- } else if (rawFileSize instanceof Long) {
- fileSize = (Long) rawFileSize;
- } else {
- fileSize = Long.parseLong(rawFileSize.toString());
- }
- size += fileSize;
- data.set(1, data.get(1) + fileSize);
- }
- }
- }
- stats.add(CatalogUtils.formatFileStats(useLabel ? getLabel() : "TOTAL", count, size));
- }
- if (accumulator.containsKey("DICOM")) {
- List<Long> values = accumulator.get("DICOM");
- stats.add(CatalogUtils.formatFileStats("DICOM", values.get(0), values.get(1)));
- accumulator.remove("DICOM");
- }
- for (String modality : accumulator.keySet()) {
- List<Long> values = accumulator.get(modality);
- stats.add(CatalogUtils.formatFileStats(modality, values.get(0), values.get(1)));
- }
- return stats;
- }
-
- public void correctArchivePaths() throws InvalidArchiveStructure, UnknownPrimaryProjectException{
- this.correctArchivePaths(true);
- }
-
-
- public void correctArchivePaths(boolean relativePaths)
- throws InvalidArchiveStructure, UnknownPrimaryProjectException {
- final String session_path = getCurrentSessionFolder(false);
- for (final XnatImagescandataI scan : scans) {
- final List<XnatAbstractresource> files=scan.getFile();
- for (final XnatAbstractresource file : files) {
- file.prependPathsWith(session_path);
-
- try {
- if (files.size()==1 || (file.getContent()!=null && file.getContent().endsWith("_RAW")))
- file.setProperty("content", "RAW");
- } catch (Throwable e) {
- logger.error("",e);
-
- }
- }
- }
- }
-
- public Map<String,String> getCustomScanFields(String project){
- return Maps.newLinkedHashMap(CUSTOM_SCAN_FIELDS);
- }
-
- public void moveToProject(final XnatProjectdata newProject, final String label , final UserI user,final EventMetaI c, final List<String> assessorsToMove) throws Exception{
- if(!this.getProject().equals(newProject.getId()))
- {
- if (!MoverMaker.check(this, user)) {
- throw new InvalidPermissionException(this.getXSIType());
- }
-
- final File rootBackup=MoverMaker.createPrimaryBackupDirectory("move",this.getProject(),getId());
- final String existingRootPath=this.getProjectData().getRootArchivePath();
- //FIXME: Is this correct?
- final String newLabel = label == null? (this.getLabel() == null ? this.getId() : this.getLabel()) : label;
- final File newSessionDir = new File(new File(newProject.getRootArchivePath(),newProject.getCurrentArc()),newLabel);
- final String current_label=this.getLabel() == null ? this.getId() : this.getLabel();
- final BaseXnatImagesessiondata base = this;
-
- Map<String,File> fs = new HashMap<String,File>();
- fs.put("src", this.getSessionDir());
- CopyOp scanOp = new CopyOp(new OperationI<Map<String,File>>(){
- public void run(Map<String,File> fs) throws Exception {
- new ProjectAnonymizer(base,newProject.getId(), base.getArchivePath(existingRootPath)).call();
- for(XnatImagescandataI scan: getScans_scan()){
- for(XnatAbstractresourceI abstRes: scan.getFile()){
- MoverMaker.Mover m = MoverMaker.moveResource(abstRes, current_label, base, newSessionDir, existingRootPath, user,c);
- m.setResource((XnatAbstractresource)abstRes);
- m.call();
- }
- }
-
- for(XnatReconstructedimagedataI recon:base.getReconstructions_reconstructedimage()){
- for(XnatAbstractresourceI abstRes: recon.getOut_file()){
- MoverMaker.Mover m = MoverMaker.moveResource(abstRes, current_label, base, newSessionDir, existingRootPath, user,c);
- m.setResource((XnatAbstractresource)abstRes);
- m.call();
- }
- }
-
- for(XnatImageassessordataI assessor:base.getAssessors_assessor()){
- // assessors need to be updated
- if (assessorsToMove != null && assessorsToMove.contains(assessor.getId())) {
- EventDetails event = EventUtils.newEventInstance(EventUtils.CATEGORY.DATA, EventUtils.TYPE.WEB_SERVICE, "Moved assessor to new project.");
- XnatImageassessordata.ChangePrimaryProject(user, (XnatImageassessordata)assessor, newProject, null, event, null);
- }
-
- for(XnatAbstractresourceI abstRes: assessor.getOut_file()){
- MoverMaker.Mover m = MoverMaker.moveResource(abstRes, current_label, base, newSessionDir, existingRootPath, user,c);
- m.setResource((XnatAbstractresource)abstRes);
- m.call();
- }
- for(XnatAbstractresourceI abstRes: assessor.getResources_resource()){
- MoverMaker.Mover m = MoverMaker.moveResource(abstRes, current_label, base, newSessionDir, existingRootPath, user,c);
- m.setResource((XnatAbstractresource)abstRes);
- m.call();
- }
- }
- BaseXnatImagesessiondata.super.moveToProject(newProject, newLabel, user,c,assessorsToMove);
- }
- }, new File(rootBackup, "src_backup"), fs);
-
- try {
- Run.runTransaction(scanOp);
- }
- catch (TransactionException e) {
- throw new Exception(e);
- }
- catch (RollbackException e) {
- throw new Exception(e);
- }
- }
- }
-
- public ArrayList getCatalogSummary() throws Exception{
- String query="SELECT * FROM (SELECT xnat_abstractresource_id,label,element_name, 'resources'::TEXT AS category, NULL::TEXT AS cat_id"+
- " FROM xnat_experimentdata_resource res_map"+
- " JOIN xnat_abstractresource abst ON res_map.xnat_abstractresource_xnat_abstractresource_id=abst.xnat_abstractresource_id" +
- " JOIN xdat_meta_element xme ON abst.extension=xme.xdat_meta_element_id"+
- " WHERE res_map.xnat_experimentdata_id='"+this.getId() + "'"+
- " UNION"+
- " SELECT xnat_abstractresource_id,label,element_name, 'scans'::TEXT,isd.id"+
- " FROM xnat_imagescanData isd "+
- " JOIN xnat_abstractresource abst ON isd.xnat_imagescandata_id=abst.xnat_imagescandata_xnat_imagescandata_id"+
- " JOIN xdat_meta_element xme ON abst.extension=xme.xdat_meta_element_id"+
- " WHERE isd.image_session_id='"+this.getId() + "'"+
- " UNION"+
- " SELECT xnat_abstractresource_id,label,element_name, 'reconstructions'::TEXT,recon.id"+
- " FROM xnat_reconstructedimagedata recon"+
- " JOIN recon_out_resource map ON recon.xnat_reconstructedimagedata_id=map.xnat_reconstructedimagedata_xnat_reconstructedimagedata_id"+
- " JOIN xnat_abstractresource abst ON map.xnat_abstractresource_xnat_abstractresource_id=abst.xnat_abstractresource_id"+
- " JOIN xdat_meta_element xme ON abst.extension=xme.xdat_meta_element_id"+
- " WHERE image_session_id='"+this.getId() + "'"+
- " UNION"+
- " SELECT xnat_abstractresource_id,label,element_name, 'assessments'::TEXT,iad.id"+
- " FROM xnat_imageAssessorData iad"+
- " JOIN img_assessor_out_resource map ON iad.id=map.xnat_imageassessordata_id"+
- " JOIN xnat_abstractresource abst ON map.xnat_abstractresource_xnat_abstractresource_id=abst.xnat_abstractresource_id"+
- " JOIN xdat_meta_element xme ON abst.extension=xme.xdat_meta_element_id"+
- " WHERE imagesession_id='"+this.getId() + "'"+
- " UNION"+
- " SELECT xnat_abstractresource_id,label,element_name, 'assessments'::TEXT,iad.id"+
- " FROM xnat_imageAssessorData iad"+
- " JOIN xnat_experimentdata_resource map ON iad.id=map.xnat_experimentdata_id"+
- " JOIN xnat_abstractresource abst ON map.xnat_abstractresource_xnat_abstractresource_id=abst.xnat_abstractresource_id" +
- " JOIN xdat_meta_element xme ON abst.extension=xme.xdat_meta_element_id"+
- " WHERE imagesession_id='"+this.getId() + "') all_resources";
-
- XFTTable t = XFTTable.Execute(query, this.getDBName(), "system");
-
- return t.rowHashs();
- }
-
-
-
- public String canDelete(XnatProjectdata proj, UserI user){
-
- BaseXnatImagesessiondata expt=this;
- if(this.getItem().getUser()!=null){
- expt=new XnatImagesessiondata(this.getCurrentDBVersion(true));
- }
- if(!expt.hasProject(proj.getId())){
- return null;
- }else {
-
- try {
- SecurityValues values = new SecurityValues();
- values.put(this.getXSIType() + "/project", proj.getId());
- SchemaElement se= SchemaElement.GetElement(this.getXSIType());
-
- if (!Permissions.canDelete(user,se,values))
- {
- return "User cannot delete experiments for project " + proj.getId();
- }
- } catch (Exception e1) {
- return "Unable to delete subject.";
- }
-
- for(XnatImageassessordataI sad: expt.getAssessors_assessor()){
- String msg=((XnatImageassessordata)sad).canDelete(proj,user);
- if(msg!=null){
- return msg;
- }
- }
- }
- return null;
- }
-
-
-
- public String delete(XnatProjectdata proj, UserI user, boolean removeFiles,EventMetaI c){
- BaseXnatImagesessiondata expt=this;
- if(this.getItem().getUser()!=null){
- expt=new XnatImagesessiondata(this.getCurrentDBVersion(true));
- }
-
- String msg=expt.canDelete(proj,user);
-
- if(msg!=null){
- logger.error(msg);
- return msg;
- }
-
- if(!expt.getProject().equals(proj.getId())){
- try {
- SecurityValues values = new SecurityValues();
- values.put(this.getXSIType() + "/project", proj.getId());
-
- if (!Permissions.canDelete(user, expt) && !Permissions.canDelete(user,this.getSchemaElement(),values))
- {
- return "User cannot delete experiments for project " + proj.getId();
- }
-
-
- //unshare children before unsharing parent
- final List<XnatImageassessordata> expts = (expt).getAssessors_assessor();
- for (XnatImageassessordataI exptI : expts){
- final XnatImageassessordata assess = (XnatImageassessordata)exptI;
- if(assess.getProject().equals(proj.getId())){
- return "This operation would delete an experiment (rather than un-share). Please move experiment ("+expt.getId()+") to another project or manually delete.";
-
- }
- msg= assess.delete(proj,user,false,c);
- if(msg!=null){
- return msg;
- }
- }
-
- int index = 0;
- int match = -1;
- for(XnatExperimentdataShareI pp : expt.getSharing_share()){
- if(pp.getProject().equals(proj.getId())){
- SaveItemHelper.authorizedRemoveChild(expt.getItem(), "xnat:experimentData/sharing/share", ((XnatExperimentdataShare)pp).getItem(), user,c);
- match=index;
- break;
- }
- index++;
- }
-
- if(match==-1)return null;
-
- this.removeSharing_share(match);
-
- return null;
- } catch (SQLException e) {
- logger.error("",e);
- return e.getMessage();
- } catch (Exception e) {
- logger.error("",e);
- return e.getMessage();
- }
- }else{
-
- if(XDAT.getBoolSiteConfigurationProperty("security.prevent-data-deletion", false)){
- return "User account cannot delete experiments";
- }
-
- try {
-
- if(!Permissions.canDelete(user,this)){
- return "User account doesn't have permission to delete this experiment.";
- }
-
- if(removeFiles){
- this.deleteFiles(user,c);
- }
-
- final List<XnatImageassessordata> expts = expt.getAssessors_assessor();
- for (XnatImageassessordata iad : expts){
- msg=iad.delete(proj,user,removeFiles,c);
- if(msg!=null)return msg;
- }
-
- SaveItemHelper.authorizedDelete(expt.getItem().getCurrentDBVersion(), user,c);
-
- Users.clearCache(user);
- MaterializedView.deleteByUser(user);
- } catch (SQLException e) {
- logger.error("",e);
- return e.getMessage();
- } catch (Exception e) {
- logger.error("",e);
- return e.getMessage();
- }
- }
- return null;
- }
-
- public void deleteFiles(UserI user, EventMetaI ci) throws Exception{
- for(XnatAbstractresourceI abstRes:this.getResources_resource()){
- ((XnatAbstractresource)abstRes).deleteWithBackup(ArcSpecManager.GetInstance().getArchivePathForProject(this.getProject()), user,ci);
- }
-
- String rootPath=ArcSpecManager.GetInstance().getArchivePathForProject(this.getProject());
-
- for(final XnatImagescandataI scan: this.getScans_scan()){
- for(XnatAbstractresourceI abstRes:scan.getFile()){
- ((XnatAbstractresource)abstRes).deleteWithBackup(rootPath, user, ci);
- }
- }
-
- for(XnatReconstructedimagedataI scan: this.getReconstructions_reconstructedimage()){
- for(XnatAbstractresourceI abstRes:scan.getOut_file()){
- ((XnatAbstractresource)abstRes).deleteWithBackup(rootPath, user, ci);
- }
- }
-
- for(XnatImageassessordataI scan: this.getAssessors_assessor()){
- for(XnatAbstractresourceI abstRes:scan.getResources_resource()){
- ((XnatAbstractresource)abstRes).deleteWithBackup(rootPath, user, ci);
- }
-
- for(XnatAbstractresourceI abstRes:scan.getOut_file()){
- ((XnatAbstractresource)abstRes).deleteWithBackup(rootPath, user, ci);
- }
- }
-
- File dir=this.getSessionDir();
- if(dir!=null){
- FileUtils.MoveToCache(dir);
- }
- }
-
- public int getAssessmentCount(String project){
- int count=0;
- for(int i=0;i<this.getMinimalLoadAssessors().size();i++){
- XnatExperimentdata expt=(XnatExperimentdata)this.getMinimalLoadAssessors().get(i);
- if(expt.getProject().equals(project)){
- count++;
- }
- }
- return count;
- }
-
-
- public XnatQcmanualassessordataI getManualQC() {
- final List<XnatImageassessordata> assessors = getMinimalLoadAssessors(XnatQcmanualassessordata.SCHEMA_ELEMENT_NAME);
- if (assessors != null && assessors.size() > 0) {
- return (XnatQcmanualassessordata) assessors.get(assessors.size()-1);
- }
- return null;
- }
-
- public XnatQcassessmentdataI getQCByType(String type) {
- final List<XnatImageassessordata> assessors = getMinimalLoadAssessors(XnatQcassessmentdata.SCHEMA_ELEMENT_NAME);
- final List<XnatImageassessordata> qcassessorOfType = new ArrayList<XnatImageassessordata>();
- for (int i = 0; i < assessors.size(); i++) {
- if (((AutoXnatQcassessmentdata)assessors.get(i)).getType().equals(type)) {
- qcassessorOfType.add(assessors.get(i));
- }
- }
- if (qcassessorOfType != null && qcassessorOfType.size() > 0) {
- return (XnatQcassessmentdata) qcassessorOfType.get(qcassessorOfType.size()-1);
- }
- return null;
- }
-
- public ValProtocoldataI getProtocolValidation() {
- final List<XnatImageassessordata> protocolData = getMinimalLoadAssessors(AutoValProtocoldata.SCHEMA_ELEMENT_NAME);
- if (protocolData != null && protocolData.size() > 0) {
- return (ValProtocoldataI) protocolData.get(protocolData.size()-1);
- }
- return null;
- }
-
- public ScrScreeningassessmentI getScreeningAssessment() {
- final List<XnatImageassessordata> screeningAssessment = getMinimalLoadAssessors(AutoScrScreeningassessment.SCHEMA_ELEMENT_NAME);
- if (screeningAssessment != null && screeningAssessment.size() > 0) {
- return (ScrScreeningassessmentI) screeningAssessment.get(screeningAssessment.size()-1);
- }
- return null;
- }
-
- public List<ScanAssessorI> getScanAssessors(){
- List al = new ArrayList();
- Iterator min = this.getMinimalLoadAssessors().iterator();
- while (min.hasNext())
- {
- ItemI assessor = (ItemI)min.next();
- if (assessor instanceof ScanAssessorI)
- {
- al.add(assessor);
- }
- }
- Collections.sort(al, new AssessorComparator());
- return al;
- }
-
- @Override
- public void preSave() throws Exception{
- super.preSave();
-
- final String expectedPath=this.getExpectedSessionDir().getAbsolutePath().replace('\\', '/');
-
- for(final XnatImagescandataI scan:this.getScans_scan()){
- ((XnatImagescandata)scan).setImageSessionData((XnatImagesessiondata)this);
- ((XnatImagescandata)scan).validate(expectedPath);
-
- }
-
- for(final XnatReconstructedimagedataI recon:this.getReconstructions_reconstructedimage()){
- ((XnatReconstructedimagedata)recon).setImageSessionData((XnatImagesessiondata)this);
- ((XnatReconstructedimagedata)recon).validate(expectedPath);
- }
-
- for(final XnatImageassessordataI assess:this.getAssessors_assessor()){
- ((XnatImageassessordata)assess).setImageSessionData((XnatImagesessiondata)this);
- ((XnatImageassessordata)assess).preSave();
- }
- }
-
- List<WrkWorkflowdataI> workflows=null;
- public List<WrkWorkflowdataI> getWorkflows() throws Exception{
- if(workflows==null){
- workflows = Lists.newArrayList();
-
- //search for workflow entries with a matching ID
- org.nrg.xft.search.CriteriaCollection cc = new CriteriaCollection("AND");
- cc.addClause("wrk:workflowData.ID",this.getId());
- org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(cc,null,false);
-
- //Sort by Launch Time
- List<XFTItem> workitems = items.getItems("wrk:workflowData.launch_time","DESC");
- for (XFTItem wrk:workitems)
- {
- workflows.add(new WrkWorkflowdata(wrk));
- }
- }
-
- return workflows;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatInvestigatordata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatInvestigatordata.java
deleted file mode 100644
index 4e10ba6a9fbef3b4df8bf42828956446a797555d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatInvestigatordata.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatInvestigatordata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatInvestigatordata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatInvestigatordata extends AutoXnatInvestigatordata {
-
- public BaseXnatInvestigatordata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatInvestigatordata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatInvestigatordata()
- {}
-
- public BaseXnatInvestigatordata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatIoscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatIoscandata.java
deleted file mode 100644
index f38758c0a64e2dfefb8ccdbf82828d29c5092711..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatIoscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatIoscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatIoscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatIoscandata extends AutoXnatIoscandata {
-
- public BaseXnatIoscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatIoscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatIoscandata(UserI user)
- **/
- public BaseXnatIoscandata()
- {}
-
- public BaseXnatIoscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatIosessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatIosessiondata.java
deleted file mode 100644
index 973171a595bd111a14936746f2bff389355dc920..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatIosessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatIosessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatIosessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatIosessiondata extends AutoXnatIosessiondata {
-
- public BaseXnatIosessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatIosessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatIosessiondata(UserI user)
- **/
- public BaseXnatIosessiondata()
- {}
-
- public BaseXnatIosessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatMegscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatMegscandata.java
deleted file mode 100644
index 6c8522b3f9b8dfd3b1b874f9542810bda3723508..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatMegscandata.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatMegscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatMegscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatMegscandata extends AutoXnatMegscandata {
-
- public BaseXnatMegscandata(ItemI item) {
- super(item);
- }
-
- public BaseXnatMegscandata(UserI user) {
- super(user);
- }
-
- public BaseXnatMegscandata() {
- }
-
- public BaseXnatMegscandata(Hashtable properties, UserI user) {
- super(properties, user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatMegsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatMegsessiondata.java
deleted file mode 100644
index e8c5d530b7b585b438139d3f229d6d507cf38bb5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatMegsessiondata.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatMegsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatMegsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatMegsessiondata extends AutoXnatMegsessiondata {
-
- public BaseXnatMegsessiondata(ItemI item) {
- super(item);
- }
-
- public BaseXnatMegsessiondata(UserI user) {
- super(user);
- }
-
- public BaseXnatMegsessiondata() {
- }
-
- public BaseXnatMegsessiondata(Hashtable properties, UserI user) {
- super(properties, user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatMgscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatMgscandata.java
deleted file mode 100644
index 0f86deb176e3cfb8ea52972820164a61f81e1e08..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatMgscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatMgscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatMgscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatMgscandata extends AutoXnatMgscandata {
-
- public BaseXnatMgscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatMgscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatMgscandata(UserI user)
- **/
- public BaseXnatMgscandata()
- {}
-
- public BaseXnatMgscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatMgsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatMgsessiondata.java
deleted file mode 100644
index dc20a52df8f6db771d4f4cea508c042293171b29..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatMgsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatMgsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatMgsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatMgsessiondata extends AutoXnatMgsessiondata {
-
- public BaseXnatMgsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatMgsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatMgsessiondata(UserI user)
- **/
- public BaseXnatMgsessiondata()
- {}
-
- public BaseXnatMgsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrassessordata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatMrassessordata.java
deleted file mode 100644
index 1df63a40c2eb380665d27e1d9323d25d54d2c921..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrassessordata.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatMrassessordata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.XnatAddfieldI;
-import org.nrg.xdat.om.XnatMrsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatMrassessordata extends org.nrg.xdat.om.base.auto.AutoXnatMrassessordata {
-
- public BaseXnatMrassessordata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatMrassessordata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatMrassessordata()
- {}
-
- public BaseXnatMrassessordata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- public XnatMrsessiondata getMrSessionData()
- {
- return (XnatMrsessiondata)this.getImageSessionData();
- }
-
- Hashtable parametersByName = null;
- public Hashtable getAddParametersByName(){
- if (parametersByName == null){
- parametersByName=new Hashtable();
- Iterator iter = this.getParameters_addparam().iterator();
- while (iter.hasNext()){
- XnatAddfieldI field = (XnatAddfieldI)iter.next();
- parametersByName.put(field.getName(), field);
- }
- }
-
- return parametersByName;
- }
-
- public Object getAddParameterByName(String s){
- XnatAddfieldI field = (XnatAddfieldI)getAddParametersByName().get(s);
- if (field!=null){
- return field.getAddfield();
- }else{
- return null;
- }
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrqcscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatMrqcscandata.java
deleted file mode 100644
index e2e33e092105c80eb86d2a76058afaf14ab31cb5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrqcscandata.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatMrqcscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatMrqcscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatMrqcscandata extends AutoXnatMrqcscandata {
- public BaseXnatMrqcscandata(ItemI item) {
- super(item);
- }
-
- public BaseXnatMrqcscandata(UserI user) {
- super(user);
- }
-
- public BaseXnatMrqcscandata() {
- }
-
- public BaseXnatMrqcscandata(Hashtable properties, UserI user) {
- super(properties, user);
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatMrscandata.java
deleted file mode 100644
index 534707a732ab6a7121caeb42592923ca5a391e5a..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrscandata.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatMrscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import org.nrg.xdat.model.XnatImagescandataI;
-import org.nrg.xdat.model.XnatMrqcscandataI;
-import org.nrg.xdat.model.XnatMrscandataI;
-import org.nrg.xdat.om.base.auto.AutoXnatMrscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.helpers.scanType.AbstractScanTypeMapping;
-import org.nrg.xnat.helpers.scanType.ScanTypeMappingI;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatMrscandata extends AutoXnatMrscandata {
-
- public BaseXnatMrscandata(ItemI item) {
- super(item);
- }
-
- public BaseXnatMrscandata(UserI user) {
- super(user);
- }
-
- public BaseXnatMrscandata() {
- }
-
- public BaseXnatMrscandata(Hashtable properties, UserI user) {
- super(properties, user);
- }
-
- public XnatMrqcscandataI getManualQC() {
- return (XnatMrqcscandataI) super.getManualQC();
- }
-
- public ScanTypeMappingI getScanTypeMapping(final String project, final String dbName){
- return new MRScanTypeMapping(project,dbName);
- }
-
- private static class ScanTypeHistory{
- private final List<ScanType> types = Lists.newArrayList();
-
- public void add(String t, String it, Integer f){
- types.add(new ScanType(t,it,f));
- }
-
- public String match(String desc,String imgtype,Integer frames){
- if(types.size()==1){
- return types.get(0).getType();
- }
- //match by imgtype
- if(imgtype!=null && !imgtype.equals("")){
- for(ScanType st: types){
- if(imgtype.equalsIgnoreCase(st.getImgtype())){
- return st.getType();
- }
- }
- }
-
- //match by frames
- if(frames!=null){
- for(ScanType st: types){
- if(frames.equals(st.getFrames())){
- return st.getType();
- }
- }
- }
-
- if(imgtype==null){
- ScanType candidate = null;
- for (ScanType scanType : types) {
- if (scanType.getImgtype() == null) {
- if (candidate == null || (candidate.getType() == null && scanType.getType() != null)) {
- candidate = scanType;
- }
- }
- }
- if (candidate != null) {
- return candidate.getType();
- }
- }
-
- if(frames==null){
- for(ScanType st: types){
- if(st.getFrames()==null){
- return st.getType();
- }
- }
- }
-
- return types.get(0).getType();
- }
- }
-
- private static class ScanType{
- private final String _type;
- private final String _imgtype;
- private final Integer _frames;
-
- public ScanType(final String t, final String it, final Integer f) {
- _type=t;
- _imgtype=it;
- _frames=f;
- }
-
- public Integer getFrames() {
- return _frames;
- }
-
- public String getImgtype() {
- return _imgtype;
- }
-
- public String getType() {
- return _type;
- }
- }
-
- /**
- * For MR, we also use the DICOM image type parameters for matching scan types.
- *
- */
- public static class MRScanTypeMapping extends AbstractScanTypeMapping<ScanTypeHistory> implements ScanTypeMappingI {
- public MRScanTypeMapping(String project,String dbName){
- super(project, dbName, buildSelectSql(project));
- }
-
- private static final String buildSelectSql(final String project) {
- if (Strings.isNullOrEmpty(project)) {
- return null;
- } else {
- return "SELECT DISTINCT REPLACE(REPLACE(REPLACE(REPLACE(UPPER(scan.series_description),' ',''),'_',''),'-',''),'*','') AS series_description,scan.type,UPPER(parameters_imagetype) AS parameters_imagetype,frames FROM xnat_imagescandata scan LEFT JOIN xnat_mrscandata mr ON scan.xnat_imagescandata_id=mr.xnat_imagescandata_id LEFT JOIN xnat_experimentData isd ON scan.image_session_id=isd.id WHERE scan.series_description IS NOT NULL AND isd.project='" + project + "';";
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.nrg.xnat.helpers.scanType.AbstractScanTypeMapping#getMappedType(org.nrg.xdat.model.XnatImagescandataI, java.util.Map)
- */
- protected String getMappedType(XnatImagescandataI scan, Map<String,ScanTypeHistory> histories) {
- final String seriesDescription = scan.getSeriesDescription();
- final String formatted = AbstractScanTypeMapping.standardizeFormat(seriesDescription);
- final String imgType = ((XnatMrscandataI)scan).getParameters_imagetype();
-
- final ScanTypeHistory history = histories.get(formatted);
- return null == history ? null : history.match(seriesDescription, imgType, scan.getFrames());
- }
-
- /*
- * (non-Javadoc)
- * @see org.nrg.xnat.helpers.scanType.AbstractScanTypeMapping#newScanHistory()
- */
- protected ScanTypeHistory newScanHistory() { return new ScanTypeHistory(); }
-
- /*
- * (non-Javadoc)
- * @see org.nrg.xnat.helpers.scanType.AbstractScanTypeMapping#update(java.lang.Object, java.util.Hashtable)
- */
- protected void update(final ScanTypeHistory h, final Hashtable<?,?> row) {
- h.add((String)row.get("type"),(String)row.get("parameters_imagetype"),(Integer)row.get("frames"));
- }
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatMrsessiondata.java
deleted file mode 100644
index a09f1b670b29fa44f624d418db2e06e80e8e764d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrsessiondata.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatMrsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.XnatImagescandataI;
-import org.nrg.xdat.om.WrkWorkflowdata;
-import org.nrg.xdat.om.XnatImagesessiondata;
-import org.nrg.xdat.om.XnatMrsessiondata;
-import org.nrg.xdat.om.base.auto.AutoXnatMrsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.search.CriteriaCollection;
-import org.nrg.xft.security.UserI;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Hashtable;
-import java.util.Map;
-
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatMrsessiondata extends AutoXnatMrsessiondata {
-
- public BaseXnatMrsessiondata(ItemI item) {
- super(item);
- }
-
- public BaseXnatMrsessiondata(UserI user) {
- super(user);
- }
-
- public BaseXnatMrsessiondata() {
- }
-
- public BaseXnatMrsessiondata(Hashtable properties, UserI user) {
- super(properties, user);
- }
-
- public static Comparator GetScannerDelayComparator()
- {
- return (new BaseXnatMrsessiondata()).getScannerDelayComparator();
- }
-
- public Comparator getScannerDelayComparator()
- {
- return new ScannerDelayComparator();
- }
-
- public class ScannerDelayComparator implements Comparator{
- public ScannerDelayComparator()
- {
- }
- public int compare(Object o1, Object o2) {
- BaseXnatMrsessiondata value1 = (BaseXnatMrsessiondata)(o1);
- BaseXnatMrsessiondata value2 = (BaseXnatMrsessiondata)(o2);
-
- if (value1 == null){
- if (value2 == null)
- {
- return 0;
- }else{
- return -1;
- }
- }
- if (value2== null)
- {
- return 1;
- }
-
- int i = Compare(value1.getScanner(),value2.getScanner());
-
- if (i == 0)
- {
- return Compare(value1.getDelay(),value2.getDelay());
- }else{
- return i;
- }
- }
- }
-
- private static int Compare(final Comparable o1, final Comparable o2) {
- if (o1 == null) {
- return null == o2 ? 0 : -1;
- } else {
- return null == o2 ? 1 : o1.compareTo(o2);
- }
- }
-
- public String getWorkflowStatus()
- {
- WrkWorkflowdata wkdata = null;
-
- CriteriaCollection cc= new CriteriaCollection("AND");
- cc.addClause("wrk:workFlowData.ID",getId());
- ArrayList al =WrkWorkflowdata.getWrkWorkflowdatasByField(cc, getUser(), false);
- if (al.size()>0){
- wkdata= (WrkWorkflowdata)al.get(al.size()-1);
- if (wkdata.getPipelineName().toLowerCase().indexOf("transfer")!=-1){
- if(wkdata.getStatus().equalsIgnoreCase("In Progress"))
- {
- if (wkdata.getCurrentStepId().equalsIgnoreCase("Store"))
- return "storing";
- else
- return "archiving";
- }if(wkdata.getStatus().equalsIgnoreCase("Running"))
- {
- if (wkdata.getCurrentStepId().equalsIgnoreCase("Store"))
- return "storing";
- else
- return "archiving";
- }else if (wkdata.getStatus().equalsIgnoreCase("Complete")){
- return "uploaded";
- }else if (wkdata.getStatus().equalsIgnoreCase("Queued")){
- return "queued";
- }else{
- return wkdata.getPipelineName() + " " + wkdata.getStatus();
- }
- }else{
- if(wkdata.getStatus().equalsIgnoreCase("Running"))
- {
- return "processing";
- }else if (wkdata.getStatus().equalsIgnoreCase("Complete")){
- return "processed";
- }else if (wkdata.getStatus().equalsIgnoreCase("Awaiting Action")){
- return "waiting";
- }else if (wkdata.getStatus().equalsIgnoreCase("Queued")){
- return "queued";
- }else{
- return wkdata.getPipelineName() + " " + wkdata.getStatus();
- }
- }
- }
-
- if (this.getScanner()!=null)
- {
- return "uploading";
- }else{
- return "";
- }
-
-
- }
-
- /**
- *
- * @param otherImageSession
- * @throws Exception
- */
- public void copyValuesFrom(final XnatImagesessiondata otherImageSession) throws Exception {
- super.copyValuesFrom(otherImageSession);
-
- if(otherImageSession instanceof XnatMrsessiondata){
- final XnatMrsessiondata otherMR = (XnatMrsessiondata)otherImageSession;
-
- if (null != otherMR.getStabilization()){
- this.setStabilization(otherMR.getStabilization());
- }
-
- if (null != otherMR.getMarker()){
- this.setMarker(otherMR.getMarker());
- }
-
- if (null != otherMR.getCoil()){
- this.setCoil(otherMR.getCoil());
- }
- }
- }
-
- public String getDefaultIdentifier(){
- return this.getDcmpatientname();
- }
-
- public ArrayList getUnionOfScansByType(String csvType) {
- ArrayList _return = new ArrayList();
- String[] types = csvType.split(",");
- if (types != null && types.length > 0) {
- for(int i = 0; i < types.length; i++) {
- ArrayList rtn = getScansByType(types[i].trim());
- if (rtn.size() > 0 )_return.addAll(rtn);
- }
- }
- _return.trimToSize();
- return _return;
- }
-
- public ArrayList getUnionOfScansByType(String csvType, boolean chronological) {
- ArrayList _return = new ArrayList();
- if (chronological) {
- String[] types = csvType.split(",");
- Hashtable scanTypes = new Hashtable();
- if (types != null && types.length > 0) {
- for(int i = 0; i < types.length; i++) {
- scanTypes.put(types[i].trim(), "");
- }
- }
- for(XnatImagescandataI scan : this.getScans_scan()){
- if (scan.getType() != null && scanTypes.containsKey(scan.getType())) {
- _return.add(scan);
- }
- }
- _return.trimToSize();
- return _return;
- }else
- return getUnionOfScansByType(csvType);
- }
-
- public ArrayList getUnionOfScansByType(String csvType, String chronological) {
- return getUnionOfScansByType(csvType, new Boolean(chronological).booleanValue());
- }
-
- public Map<String,String> getCustomScanFields(String project){
- Map<String,String> customheaders= super.getCustomScanFields(project);
-
- customheaders.put("parameters/tr","");
- customheaders.put("parameters/te","");
- customheaders.put("parameters/ti","");
- customheaders.put("parameters/flip","");
- customheaders.put("parameters/sequence","");
- customheaders.put("parameters/imageType","");
- customheaders.put("parameters/scanSequence","");
- customheaders.put("parameters/seqVariant","");
- customheaders.put("parameters/scanOptions","");
- customheaders.put("parameters/acqType","");
-
- return customheaders;
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrsscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatMrsscandata.java
deleted file mode 100644
index 642ea115818ed6b65777349c0b35ba3f37609883..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatMrsscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatMrsscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatMrsscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatMrsscandata extends AutoXnatMrsscandata {
-
- public BaseXnatMrsscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatMrsscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatMrsscandata(UserI user)
- **/
- public BaseXnatMrsscandata()
- {}
-
- public BaseXnatMrsscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatNmscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatNmscandata.java
deleted file mode 100644
index 09fa2892db0f1e10b1a78788525793ddbfc89ec9..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatNmscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatNmscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatNmscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatNmscandata extends AutoXnatNmscandata {
-
- public BaseXnatNmscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatNmscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatNmscandata(UserI user)
- **/
- public BaseXnatNmscandata()
- {}
-
- public BaseXnatNmscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatNmsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatNmsessiondata.java
deleted file mode 100644
index d86d0ac399b2032988c23abdfabcc79c95ab8209..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatNmsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatNmsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatNmsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatNmsessiondata extends AutoXnatNmsessiondata {
-
- public BaseXnatNmsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatNmsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatNmsessiondata(UserI user)
- **/
- public BaseXnatNmsessiondata()
- {}
-
- public BaseXnatNmsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatOpscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatOpscandata.java
deleted file mode 100644
index 96e4a2b1f905daebe05a1f6777744b0befc7cee7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatOpscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatOpscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatOpscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatOpscandata extends AutoXnatOpscandata {
-
- public BaseXnatOpscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatOpscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatOpscandata(UserI user)
- **/
- public BaseXnatOpscandata()
- {}
-
- public BaseXnatOpscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatOpsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatOpsessiondata.java
deleted file mode 100644
index e968c31293916c41dd3a307d86465ed84ae5f3d4..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatOpsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatOpsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatOpsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatOpsessiondata extends AutoXnatOpsessiondata {
-
- public BaseXnatOpsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatOpsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatOpsessiondata(UserI user)
- **/
- public BaseXnatOpsessiondata()
- {}
-
- public BaseXnatOpsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatOptscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatOptscandata.java
deleted file mode 100644
index bd15941a07d0904dda12651f84508bd08711da6f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatOptscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatOptscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatOptscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatOptscandata extends AutoXnatOptscandata {
-
- public BaseXnatOptscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatOptscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatOptscandata(UserI user)
- **/
- public BaseXnatOptscandata()
- {}
-
- public BaseXnatOptscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatOptsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatOptsessiondata.java
deleted file mode 100644
index 97b9373e24dd742fdc03607043b8745c72909dc3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatOptsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatOptsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatOptsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatOptsessiondata extends AutoXnatOptsessiondata {
-
- public BaseXnatOptsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatOptsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatOptsessiondata(UserI user)
- **/
- public BaseXnatOptsessiondata()
- {}
-
- public BaseXnatOptsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatOtherdicomscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatOtherdicomscandata.java
deleted file mode 100644
index 7e6ea76778b5d3454d107fb1d76fa7e8e7e47b34..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatOtherdicomscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatOtherdicomscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatOtherdicomscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatOtherdicomscandata extends AutoXnatOtherdicomscandata {
-
- public BaseXnatOtherdicomscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatOtherdicomscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatOtherdicomscandata(UserI user)
- **/
- public BaseXnatOtherdicomscandata()
- {}
-
- public BaseXnatOtherdicomscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatOtherdicomsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatOtherdicomsessiondata.java
deleted file mode 100644
index 30a76791cb993fbd0f2f985076ed338755d6bbaa..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatOtherdicomsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatOtherdicomsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatOtherdicomsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatOtherdicomsessiondata extends AutoXnatOtherdicomsessiondata {
-
- public BaseXnatOtherdicomsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatOtherdicomsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatOtherdicomsessiondata(UserI user)
- **/
- public BaseXnatOtherdicomsessiondata()
- {}
-
- public BaseXnatOtherdicomsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatOtherqcscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatOtherqcscandata.java
deleted file mode 100644
index 66663b4efd75346053489278495685bb55f0dd81..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatOtherqcscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatOtherqcscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatOtherqcscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatOtherqcscandata extends AutoXnatOtherqcscandata {
-
- public BaseXnatOtherqcscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatOtherqcscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatOtherqcscandata(UserI user)
- **/
- public BaseXnatOtherqcscandata()
- {}
-
- public BaseXnatOtherqcscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetassessordata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatPetassessordata.java
deleted file mode 100644
index 0e4e364aa034b72ad572a0fd65508b87a6961745..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetassessordata.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatPetassessordata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.XnatPetsessiondata;
-import org.nrg.xdat.om.base.auto.AutoXnatPetassessordata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatPetassessordata extends AutoXnatPetassessordata {
-
- public BaseXnatPetassessordata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatPetassessordata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatPetassessordata(UserI user)
- **/
- public BaseXnatPetassessordata()
- {}
-
- public BaseXnatPetassessordata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
-
- public XnatPetsessiondata getPetSessionData()
- {
- return (XnatPetsessiondata)this.getImageSessionData();
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetmrsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatPetmrsessiondata.java
deleted file mode 100644
index dfcaaa0ec4cdba0344c7cde4351b195f5da0ee94..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetmrsessiondata.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatPetmrsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.XnatImagescandataI;
-import org.nrg.xdat.om.base.auto.AutoXnatPetmrsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatPetmrsessiondata extends AutoXnatPetmrsessiondata {
-
- public BaseXnatPetmrsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatPetmrsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatPetmrsessiondata(UserI user)
- **/
- public BaseXnatPetmrsessiondata()
- {}
-
- public BaseXnatPetmrsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public ArrayList getUnionOfScansByType(String csvType) {
- ArrayList _return = new ArrayList();
- String[] types = csvType.split(",");
- if (types != null && types.length > 0) {
- for(int i = 0; i < types.length; i++) {
- ArrayList rtn = getScansByType(types[i].trim());
- if (rtn.size() > 0 )_return.addAll(rtn);
- }
- }
- _return.trimToSize();
- return _return;
- }
-
- public ArrayList getUnionOfScansByType(String csvType, boolean chronological) {
- ArrayList _return = new ArrayList();
- if (chronological) {
- String[] types = csvType.split(",");
- Hashtable scanTypes = new Hashtable();
- if (types != null && types.length > 0) {
- for(int i = 0; i < types.length; i++) {
- scanTypes.put(types[i].trim(), "");
- }
- }
- for(XnatImagescandataI scan : this.getScans_scan()){
- if (scan.getType() != null && scanTypes.containsKey(scan.getType())) {
- _return.add(scan);
- }
- }
- _return.trimToSize();
- return _return;
- }else
- return getUnionOfScansByType(csvType);
- }
-
- public ArrayList getUnionOfScansByType(String csvType, String chronological) {
- return getUnionOfScansByType(csvType, new Boolean(chronological).booleanValue());
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetqcscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatPetqcscandata.java
deleted file mode 100644
index b67679709ad6d6bf541fb6432974ec52e936f074..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetqcscandata.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatPetqcscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatPetqcscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatPetqcscandata extends AutoXnatPetqcscandata {
- public BaseXnatPetqcscandata(ItemI item) {
- super(item);
- }
-
- public BaseXnatPetqcscandata(UserI user) {
- super(user);
- }
-
- public BaseXnatPetqcscandata() {
- }
-
- public BaseXnatPetqcscandata(Hashtable properties, UserI user) {
- super(properties, user);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetqcscandataProcessingerror.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatPetqcscandataProcessingerror.java
deleted file mode 100644
index 5cd1d6a9c2f985a202ab19e8a0e6d12345ed3d27..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetqcscandataProcessingerror.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatPetqcscandataProcessingerror
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatPetqcscandataProcessingerror;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatPetqcscandataProcessingerror extends AutoXnatPetqcscandataProcessingerror {
- public BaseXnatPetqcscandataProcessingerror(ItemI item) {
- super(item);
- }
-
- public BaseXnatPetqcscandataProcessingerror(UserI user) {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatPetqcscandataProcessingerror(UserI user)
- */
- public BaseXnatPetqcscandataProcessingerror() {
- }
-
- public BaseXnatPetqcscandataProcessingerror(Hashtable properties, UserI user) {
- super(properties, user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatPetscandata.java
deleted file mode 100644
index f854cc98b5a0fe1a1266aed2b05eb86ca0c461cd..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetscandata.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatPetscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.XnatAbstractresource;
-import org.nrg.xdat.om.base.auto.AutoXnatPetscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatPetscandata extends AutoXnatPetscandata {
- public BaseXnatPetscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatPetscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatPetscandata(UserI user)
- **/
- public BaseXnatPetscandata()
- {}
-
- public BaseXnatPetscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- public boolean isInRAWDirectory(){
- boolean hasRAW=false;
- Iterator files = getFile().iterator();
- while (files.hasNext()){
- XnatAbstractresource file = (XnatAbstractresource)files.next();
- if (file.isInRAWDirectory())
- {
- hasRAW=true;
- break;
- }
- }
- return hasRAW;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetscandataFrame.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatPetscandataFrame.java
deleted file mode 100644
index 9f6d82d06eb24abb70220d6c7d429940aa02e4f3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetscandataFrame.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatPetscandataFrame
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatPetscandataFrame;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatPetscandataFrame extends AutoXnatPetscandataFrame {
-
- public BaseXnatPetscandataFrame(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatPetscandataFrame(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatPetscandataFrame(UserI user)
- **/
- public BaseXnatPetscandataFrame()
- {}
-
- public BaseXnatPetscandataFrame(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatPetsessiondata.java
deleted file mode 100644
index a4621dbb161798d03a561944bf5d7aab8d15a244..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatPetsessiondata.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatPetsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.XnatImagescandataI;
-import org.nrg.xdat.model.XnatPetscandataI;
-import org.nrg.xdat.om.XnatImagesessiondata;
-import org.nrg.xdat.om.XnatPetsessiondata;
-import org.nrg.xdat.om.base.auto.AutoXnatPetsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * @author XDAT
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatPetsessiondata extends AutoXnatPetsessiondata {
- public BaseXnatPetsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatPetsessiondata(UserI user)
- {
- super(user);
- }
-
- /**
- * @deprecated Use BaseXnatPetsessiondata(UserI user)
- **/
- public BaseXnatPetsessiondata()
- {}
-
- public BaseXnatPetsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- public XnatPetscandataI getDynamicEmissionScan()
- {
- ArrayList scans = this.getScansByType("Dynamic emission");
-
- if (scans.size()>0)
- {
- return (XnatPetscandataI)scans.get(0);
- }else{
- return null;
- }
- }
-
-
- public XnatPetscandataI getTransmissionScan()
- {
- ArrayList scans = this.getScansByType("Transmission");
-
- if (scans.size()>0)
- {
- return (XnatPetscandataI)scans.get(0);
- }else{
- return null;
- }
- }
-
-
-
- public String getDefaultIdentifier(){
- return this.getPatientname();
- }
-
-
- public void copyValuesFrom(XnatImagesessiondata otherImage) throws Exception {
- super.copyValuesFrom(otherImage);
- if(otherImage instanceof XnatPetsessiondata){
- final XnatPetsessiondata tempPET = (XnatPetsessiondata)otherImage;
- if (null != tempPET.getTracer_dose())
- this.setTracer_dose(tempPET.getTracer_dose());
- if (null != tempPET.getTracer_dose_units())
- this.setTracer_dose_units(tempPET.getTracer_dose_units());
- if (null != tempPET.getTracer_intermediate_units())
- this.setTracer_intermediate_units(tempPET.getTracer_intermediate_units());
- if (null != tempPET.getTracer_intermediate())
- this.setTracer_intermediate(tempPET.getTracer_intermediate());
- if (null != tempPET.getTracer_isotope_halfLife())
- this.setTracer_isotope_halfLife(tempPET.getTracer_isotope_halfLife());
- if (null != tempPET.getTracer_isotope())
- this.setTracer_isotope(tempPET.getTracer_isotope());
- if (null != tempPET.getTracer_name())
- this.setTracer_name(tempPET.getTracer_name());
- if (null != tempPET.getTracer_specificactivity())
- this.setTracer_specificactivity(tempPET.getTracer_specificactivity());
- if (null != tempPET.getTracer_transmissions())
- this.setTracer_transmissions(tempPET.getTracer_transmissions());
- if (null != tempPET.getTracer_totalmass())
- this.setTracer_totalmass(tempPET.getTracer_totalmass());
- if (null != tempPET.getTracer_totalmass_units())
- this.setTracer_totalmass_units(tempPET.getTracer_totalmass_units());
- if (null != tempPET.getStartTimeInjection())
- this.setStartTimeInjection(tempPET.getStartTimeInjection());
- if (null != tempPET.getStartTimeScan())
- this.setStartTimeScan(tempPET.getStartTimeScan());
- }
-
- }
-
- public Map<String,String> getCustomScanFields(String project){
- Map<String,String> customheaders= super.getCustomScanFields(project);
-
- customheaders.put("Original File Name","parameters/originalFileName");
- customheaders.put("System Type","parameters/systemType");
- customheaders.put("File Type","parameters/fileType");
- customheaders.put("Transaxial FOV","parameters/transaxialFOV");
- customheaders.put("Acq Type","parameters/acqType");
- customheaders.put("Facility","parameters/facility");
- customheaders.put("Num Planes","parameters/numPlanes");
- customheaders.put("Num Gates","parameters/numGates");
- customheaders.put("Plane Separation","parameters/planeSeparation");
- customheaders.put("Bin Size","parameters/binSize");
- customheaders.put("Data Type","parameters/dataType");
- customheaders.put("Dimensions x","parameters/dimensions/x");
- customheaders.put("Dimensions y","parameters/dimensions/y");
- customheaders.put("Dimensions z","parameters/dimensions/z");
- customheaders.put("Dimensions num","parameters/dimensions/num");
- customheaders.put("Offset x","parameters/offset/x");
- customheaders.put("Offset y","parameters/offset/y");
- customheaders.put("Offset z","parameters/offset/z");
- customheaders.put("Recon Zoom","parameters/reconZoom");
- customheaders.put("Pixel Size x","parameters/pixelSize/x");
- customheaders.put("Pixel Size y","parameters/pixelSize/y");
- customheaders.put("Pixel Size z","parameters/pixelSize/z");
- customheaders.put("Filter Code","parameters/filterCode");
- customheaders.put("Resolution x","parameters/resolution/x");
- customheaders.put("Resolution y","parameters/resolution/y");
- customheaders.put("Resolution z","parameters/resolution/z");
- customheaders.put("Num RElements","parameters/numRElements");
- customheaders.put("Num Angles","parameters/numAngles");
- customheaders.put("ZRotation Angle","parameters/ZRotationAngle");
- customheaders.put("Processing Code","parameters/processingCode");
- customheaders.put("Gate Duration","parameters/gateDuration");
- customheaders.put("rWave Offset","parameters/rWaveOffset");
- customheaders.put("Num Accepted Beats","parameters/numAcceptedBeats");
- customheaders.put("Filter cutoff","parameters/filter/cutoff");
- customheaders.put("Annotation","parameters/annotation");
- customheaders.put("MT_1_1","parameters/MT_1_1");
- customheaders.put("MT_1_2","parameters/MT_1_2");
- customheaders.put("MT_1_3","parameters/MT_1_3");
- customheaders.put("MT_1_4","parameters/MT_1_4");
- customheaders.put("MT_2_1","parameters/MT_2_1");
- customheaders.put("MT_2_2","parameters/MT_2_2");
- customheaders.put("MT_2_3","parameters/MT_2_3");
- customheaders.put("MT_2_4","parameters/MT_2_4");
- customheaders.put("MT_3_1","parameters/MT_3_1");
- customheaders.put("MT_3_2","parameters/MT_3_2");
- customheaders.put("MT_3_3","parameters/MT_3_3");
- customheaders.put("MT_3_4","parameters/MT_3_4");
- customheaders.put("RFilter cutoff","parameters/RFilter/cutoff");
- customheaders.put("RFilter resolution","parameters/RFilter/resolution");
- customheaders.put("RFilter code","parameters/RFilter/code");
- customheaders.put("RFilter order","parameters/RFilter/order");
- customheaders.put("ZFilter cutoff","parameters/ZFilter/cutoff");
- customheaders.put("ZFilter resolution","parameters/ZFilter/resolution");
- customheaders.put("ZFilter code","parameters/ZFilter/code");
- customheaders.put("ZFilter order","parameters/ZFilter/order");
- customheaders.put("scatter Type","parameters/scatterType");
- customheaders.put("recon Type","parameters/reconType");
- customheaders.put("recon Views","parameters/reconViews");
- customheaders.put("bed Position","parameters/bedPosition");
- customheaders.put("ecat Calibration Factor","parameters/ecatCalibrationFactor");
- customheaders.put("ecat Validation","ecatValidation");
- customheaders.put("ecat Validation status","ecatValidation/status");
-
-
- return customheaders;
- }
-
- public ArrayList getUnionOfScansByType(String csvType) {
- ArrayList _return = new ArrayList();
- String[] types = csvType.split(",");
- if (types != null && types.length > 0) {
- for(int i = 0; i < types.length; i++) {
- ArrayList rtn = getScansByType(types[i].trim());
- if (rtn.size() > 0 )_return.addAll(rtn);
- }
- }
- _return.trimToSize();
- return _return;
- }
-
- public ArrayList getUnionOfScansByType(String csvType, boolean chronological) {
- ArrayList _return = new ArrayList();
- if (chronological) {
- String[] types = csvType.split(",");
- Hashtable scanTypes = new Hashtable();
- if (types != null && types.length > 0) {
- for(int i = 0; i < types.length; i++) {
- scanTypes.put(types[i].trim(), "");
- }
- }
- for(XnatImagescandataI scan : this.getScans_scan()){
- if (scan.getType() != null && scanTypes.containsKey(scan.getType())) {
- _return.add(scan);
- }
- }
- _return.trimToSize();
- return _return;
- }else
- return getUnionOfScansByType(csvType);
- }
-
- public ArrayList getUnionOfScansByType(String csvType, String chronological) {
- return getUnionOfScansByType(csvType, new Boolean(chronological).booleanValue());
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdata.java
deleted file mode 100755
index 4d0551812f11b5a47116b79229bb1869f3671176..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdata.java
+++ /dev/null
@@ -1,1732 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatProjectdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 2/18/14 1:28 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.action.ActionException;
-import org.nrg.action.ClientException;
-import org.nrg.action.ServerException;
-import org.nrg.automation.entities.ScriptTrigger;
-import org.nrg.automation.entities.ScriptTriggerTemplate;
-import org.nrg.automation.services.ScriptTriggerService;
-import org.nrg.automation.services.ScriptTriggerTemplateService;
-import org.nrg.config.entities.Configuration;
-import org.nrg.config.exceptions.ConfigServiceException;
-import org.nrg.config.services.ConfigService;
-import org.nrg.framework.constants.Scope;
-import org.nrg.framework.utilities.Reflection;
-import org.nrg.xdat.XDAT;
-import org.nrg.xdat.base.BaseElement;
-import org.nrg.xdat.display.DisplayField;
-import org.nrg.xdat.display.DisplayManager;
-import org.nrg.xdat.model.*;
-import org.nrg.xdat.om.*;
-import org.nrg.xdat.om.base.auto.AutoXnatProjectdata;
-import org.nrg.xdat.schema.SchemaElement;
-import org.nrg.xdat.search.CriteriaCollection;
-import org.nrg.xdat.search.DisplaySearch;
-import org.nrg.xdat.security.ElementSecurity;
-import org.nrg.xdat.security.SecurityValues;
-import org.nrg.xdat.security.UserGroupI;
-import org.nrg.xdat.security.XdatStoredSearch;
-import org.nrg.xdat.security.helpers.Groups;
-import org.nrg.xdat.security.helpers.Permissions;
-import org.nrg.xdat.security.helpers.Users;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFT;
-import org.nrg.xft.XFTItem;
-import org.nrg.xft.XFTTable;
-import org.nrg.xft.db.MaterializedView;
-import org.nrg.xft.db.PoolDBUtils;
-import org.nrg.xft.event.*;
-import org.nrg.xft.event.persist.PersistentWorkflowI;
-import org.nrg.xft.event.persist.PersistentWorkflowUtils;
-import org.nrg.xft.event.persist.PersistentWorkflowUtils.EventRequirementAbsent;
-import org.nrg.xft.exception.*;
-import org.nrg.xft.schema.Wrappers.GenericWrapper.GenericWrapperElement;
-import org.nrg.xft.search.ItemSearch;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xft.utils.ValidationUtils.ValidationResults;
-import org.nrg.xnat.exceptions.InvalidArchiveStructure;
-import org.nrg.xnat.helpers.prearchive.PrearcUtils;
-import org.nrg.xnat.restlet.resources.SecureResource;
-import org.nrg.xnat.turbine.utils.ArcSpecManager;
-import org.nrg.xnat.turbine.utils.ArchivableItem;
-import org.nrg.xnat.utils.WorkflowUtils;
-import org.restlet.data.Status;
-
-import java.io.File;
-import java.sql.SQLException;
-import java.text.NumberFormat;
-import java.util.*;
-
-/**
- * @author XDAT
- */
-@SuppressWarnings({"unchecked", "rawtypes"})
-public class BaseXnatProjectdata extends AutoXnatProjectdata implements ArchivableItem {
- public final static String MEMBER_GROUP = "member";
- public final static String COLLABORATOR_GROUP = "collaborator";
- public final static String OWNER_GROUP = "owner";
-
- public BaseXnatProjectdata(ItemI item) {
- super(item);
- }
-
- public BaseXnatProjectdata(UserI user) {
- super(user);
- }
-
- public BaseXnatProjectdata() {
- }
-
- public BaseXnatProjectdata(Hashtable properties, UserI user) {
- super(properties, user);
- }
-
- public int getSubjectCount() {
- try {
- XFTTable table = XFTTable.Execute("SELECT COUNT(*) FROM (SELECT DISTINCT subject_id,project FROM (SELECT pp.subject_id,pp.project FROM xnat_projectparticipant pp LEFT JOIN xnat_subjectData sub ON pp.subject_id=sub.id WHERE sub.id IS NOT NULL UNION SELECT ID,project FROM xnat_subjectdata )SEARCH )SEARCH WHERE project='" + getId() + "';", getDBName(), null);
-
- Long i = (Long) table.getFirstObject();
- if (i != null) {
- return i.intValue();
- }
- } catch (SQLException e) {
- logger.error("", e);
- } catch (DBPoolException e) {
- logger.error("", e);
- }
- return -1;
- }
-
- public Hashtable<String, Long> getExperimentCountByName() {
- Hashtable<String, Long> hash = new Hashtable<String, Long>();
- try {
- XFTTable table = XFTTable.Execute("SELECT COUNT(*) AS expt_count,element_name FROM (SELECT DISTINCT project,sharing_share_xnat_experimentda_id,extension FROM (SELECT exs.project, sharing_share_xnat_experimentda_id,extension FROM xnat_experimentdata_share exs LEFT JOIN xnat_experimentData ex ON exs.sharing_share_xnat_experimentda_id=ex.id WHERE ex.id IS NOT NULL UNION SELECT project,ID,extension FROM xnat_experimentdata) SEARCH )SEARCH LEFT JOIN xdat_meta_element ON SEARCH.extension=xdat_meta_element.xdat_meta_element_id WHERE project='" + getId() + "' GROUP BY element_name;", getDBName(), null);
-
- table.resetRowCursor();
- while (table.hasMoreRows()) {
- Object[] row = table.nextRow();
- Long count = (Long) row[0];
- String elementN = (String) row[1];
- try {
- SchemaElement se = SchemaElement.GetElement(elementN);
- elementN = se.getProperName();
- } catch (XFTInitException e) {
- logger.error("", e);
- } catch (ElementNotFoundException e) {
- logger.error("", e);
- }
- hash.put(elementN, count);
- }
- } catch (SQLException e) {
- logger.error("", e);
- } catch (DBPoolException e) {
- logger.error("", e);
- }
-
- return hash;
- }
-
- Hashtable<String, Long> exptCountsByType = null;
-
- public Hashtable<String, Long> getExperimentCountByXSIType() {
- if (exptCountsByType == null) {
- exptCountsByType = new Hashtable<String, Long>();
- try {
- XFTTable table = XFTTable.Execute("SELECT COUNT(*) AS expt_count,element_name FROM (SELECT DISTINCT project,sharing_share_xnat_experimentda_id,extension FROM (SELECT exs.project, sharing_share_xnat_experimentda_id,extension FROM xnat_experimentdata_share exs LEFT JOIN xnat_experimentData ex ON exs.sharing_share_xnat_experimentda_id=ex.id WHERE ex.id IS NOT NULL UNION SELECT project,ID,extension FROM xnat_experimentdata) SEARCH )SEARCH LEFT JOIN xdat_meta_element ON SEARCH.extension=xdat_meta_element.xdat_meta_element_id WHERE project='" + getId() + "' GROUP BY element_name;", getDBName(), null);
-
- table.resetRowCursor();
- while (table.hasMoreRows()) {
- Object[] row = table.nextRow();
- Long count = (Long) row[0];
- String elementN = (String) row[1];
- exptCountsByType.put(elementN, count);
- }
- } catch (SQLException e) {
- logger.error("", e);
- } catch (DBPoolException e) {
- logger.error("", e);
- }
- }
-
- return exptCountsByType;
- }
-
- public ArrayList<org.nrg.xdat.om.XnatPublicationresource> getPublicationsByType(String t) {
- ArrayList<org.nrg.xdat.om.XnatPublicationresource> pubs = new ArrayList<org.nrg.xdat.om.XnatPublicationresource>();
-
- List<XnatPublicationresourceI> allPubs = getPublications_publication();
- for (int i = 0; i < allPubs.size(); i++) {
- org.nrg.xdat.om.XnatPublicationresource res = (org.nrg.xdat.om.XnatPublicationresource) allPubs.get(i);
- if (res.getType().equals(t)) {
- pubs.add(res);
- }
- }
-
- return pubs;
-
- }
-
- public String getShortenedDescription() {
- if (getDescription() == null) {
- return "";
- }
- if (getDescription().length() > 500) {
- return getDescription().substring(0, 499) + "...";
- } else {
- return getDescription();
- }
- }
-
- public String createID(String base, int digits) throws Exception {
- String identifier = "";
-
- if (base != null) {
- identifier = base;
- identifier = StringUtils.replace(identifier, " ", "");
- identifier = StringUtils.replace(identifier, "-", "_");
- identifier = StringUtils.replace(identifier, "\"", "");
- identifier = StringUtils.replace(identifier, "'", "");
-
- identifier = incrementID(identifier, digits);
- }
-
- return identifier;
- }
-
- public String createID(String base) throws Exception {
- return createID(base, -1);
- }
-
- private String incrementID(String s, int digits) throws Exception {
- String temp_id = null;
-
- if (s == null) {
- throw new NullPointerException();
- }
-
- XFTTable table = org.nrg.xft.search.TableSearch.Execute("SELECT id FROM xnat_projectdata WHERE id LIKE '" + s + "%';", this.getSchemaElement().getDbName(), null);
- ArrayList al = table.convertColumnToArrayList("id");
-
- NumberFormat nf = NumberFormat.getIntegerInstance();
- nf.setMinimumIntegerDigits(digits);
- if (al.size() > 0) {
- int count = al.size() + 1;
- String full = StringUtils.replace(nf.format(count), ",", "");
- temp_id = s + full;
-
- while (al.contains(temp_id)) {
- count++;
- full = StringUtils.replace(nf.format(count), ",", "");
- temp_id = s + full;
- }
-
- return temp_id;
- } else {
- int count = 1;
- String full = nf.format(count);
- temp_id = s + full;
- return temp_id;
- }
- }
-
- public String setId(XnatInvestigatordataI i) throws Exception {
-
- if (i == null) {
- throw new NullPointerException();
- }
- String temp_id = createID(i.getLastname());
-
- this.setId(temp_id);
-
- return temp_id;
- }
-
- private ArrayList<XnatSubjectdata> _participants = null;
-
- public ArrayList<XnatSubjectdata> getParticipants_participant() {
- if (_participants == null) {
- final UserI user = this.getUser();
- final CriteriaCollection cc = new CriteriaCollection("OR");
- cc.addClause("xnat:subjectData/project", this.getId());
- cc.addClause("xnat:subjectData/sharing/share/project", this.getId());
- _participants = XnatSubjectdata.getXnatSubjectdatasByField(cc, user, false);
- }
-
- return _participants;
- }
-
- private ArrayList<XnatExperimentdata> _experiments = null;
-
- public ArrayList<XnatExperimentdata> getExperiments() {
- if (_experiments == null) {
- final UserI user = this.getUser();
- final CriteriaCollection cc = new CriteriaCollection("OR");
- cc.addClause("xnat:experimentData/project", this.getId());
- cc.addClause("xnat:experimentData/sharing/share/project", this.getId());
- _experiments = XnatExperimentdata.getXnatExperimentdatasByField(cc, user, false);
- }
-
- return _experiments;
- }
-
- public ArrayList getExperimentsByXSIType(String type) {
- ArrayList<XnatExperimentdata> typed = new ArrayList<XnatExperimentdata>();
- for (final XnatExperimentdata expt : this.getExperiments()) {
- if (expt.getXSIType().equals(type)) {
- typed.add(expt);
- }
- }
- return typed;
- }
-
-
- Hashtable<String, XnatProjectdataField> fieldsByName = null;
-
- public Hashtable getFieldsByName() {
- if (fieldsByName == null) {
- fieldsByName = new Hashtable<String, XnatProjectdataField>();
- for (final XnatProjectdataFieldI field : this.getFields_field()) {
- fieldsByName.put(field.getName(), (XnatProjectdataField) field);
- }
- }
-
- return fieldsByName;
- }
-
- public Object getFieldByName(String s) {
- final XnatProjectdataFieldI field = (XnatProjectdataFieldI) getFieldsByName().get(s);
- if (field != null) {
- return field.getField();
- } else {
- return null;
- }
- }
-
- public ArrayList<String> getOwnerEmails() throws Exception {
- return this.getOwners();
- }
-
-
- public ArrayList<String> getOwners() throws Exception {
- final XFTTable table2 = XFTTable.Execute("SELECT DISTINCT email FROM xdat_element_access ea LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id LEFT JOIN xdat_userGroup ug ON ea.xdat_usergroup_xdat_usergroup_id=ug.xdat_usergroup_id LEFT JOIN xdat_user_groupid map ON ug.id=map.groupid LEFT JOIN xdat_user u ON map.groups_groupid_xdat_user_xdat_user_id=u.xdat_user_id WHERE read_element=1 AND delete_element=1 AND login !='guest' AND element_name='xnat:subjectData' AND field_value='" + getId() + "' ORDER BY email;", getDBName(), null);
- return table2.convertColumnToArrayList("email");
- }
-//
-// public ArrayList<XnatProjectparticipant> getParticipants(String field, Object value){
-// final ArrayList<XnatProjectparticipant> matches = new ArrayList<XnatProjectparticipant>();
-//
-// ArrayList<XnatProjectparticipant> participants = this.getSharing_sh();
-// if (participants.size()>0)
-// {
-// for (XnatProjectparticipant pp: participants){
-// try {
-// if (pp.hasProperty(field, value)){
-// matches.add(pp);
-// }
-// } catch (XFTInitException e) {
-// logger.error("",e);
-// } catch (ElementNotFoundException e) {
-// logger.error("",e);
-// } catch (FieldNotFoundException e) {
-// logger.error("",e);
-// }
-// }
-// }
-//
-// return matches;
-// }
-
- public String getSubjectSummary() {
- final StringBuffer sb = new StringBuffer();
- sb.append(this.getSubjectCount());
- sb.append(" Subjects ");
-
- return sb.toString();
- }
-
- public String getRootArchivePath() {
- String path = null;
-
- final ArcProject arcProj = this.getArcSpecification();
- if (arcProj != null) {
- ArcPathinfo pathInfo = arcProj.getPaths();
- if (pathInfo != null) {
- path = pathInfo.getArchivepath();
- }
- }
-
- if (path == null) {
- path = ArcSpecManager.GetInstance().getGlobalArchivePath() + "/" + this.getId();
- }
-
- path = path.replace('\\', '/');
- if (!path.endsWith("/")) {
- path = path + "/";
- }
-
- return path;
- }
-
- public String getCachePath() {
- String path = null;
-
- final ArcProject arcProj = this.getArcSpecification();
- if (arcProj != null) {
- ArcPathinfoI pathInfo = arcProj.getPaths();
- if (pathInfo != null) {
- path = pathInfo.getCachepath();
- }
- }
-
- if (path == null) {
- path = ArcSpecManager.GetInstance().getGlobalCachePath() + "/" + this.getId();
- }
-
- path = path.replace('\\', '/');
- if (!path.endsWith("/")) {
- path = path + "/";
- }
-
- return path;
- }
-
- public String getPrearchivePath() {
- String path = null;
-
- final ArcProject arcProj = this.getArcSpecification();
- if (arcProj != null) {
- ArcPathinfoI pathInfo = arcProj.getPaths();
- if (pathInfo != null) {
- path = pathInfo.getPrearchivepath();
- }
- }
-
- if (path == null) {
- path = ArcSpecManager.GetInstance().getGlobalPrearchivePath() + "/" + this.getId();
- }
-
- path = path.replace('\\', '/');
- if (!path.endsWith("/")) {
- path = path + "/";
- }
-
- return path;
- }
-
- public String getBuildPath() {
- String path = null;
-
- final ArcProject arcProj = this.getArcSpecification();
- if (arcProj != null) {
- ArcPathinfoI pathInfo = arcProj.getPaths();
- if (pathInfo != null) {
- path = pathInfo.getBuildpath();
- }
- }
-
- if (path == null) {
- path = ArcSpecManager.GetInstance().getGlobalBuildPath() + "/" + this.getId();
- }
-
- path = path.replace('\\', '/');
- if (!path.endsWith("/")) {
- path = path + "/";
- }
-
- return path;
- }
-
- public String getCurrentArc() {
- String path = null;
-
- final ArcProject arcProj = this.getArcSpecification();
-
- if (arcProj == null) return "arc001";
-
- path = arcProj.getCurrentArc();
- if (path == null || path.equals("")) {
- path = "arc001";
- }
-
- return path;
- }
-
- public ArrayList<String> getGroupMembers(String level) {
- try {
- final XFTTable table = XFTTable.Execute("SELECT DISTINCT email FROM xdat_user RIGHT JOIN xdat_user_groupid xug ON xdat_user.xdat_user_id=xug.groups_groupid_xdat_user_xdat_user_id WHERE groupid='" + this.getId() + "_" + level + "';", this.getDBName(), null);
- return table.convertColumnToArrayList("email");
- } catch (SQLException e) {
- logger.error("", e);
- } catch (DBPoolException e) {
- logger.error("", e);
-
- }
-
- return null;
- }
-
- public ArrayList<String> getGroupMembersByGroupID(String groupid) {
- try {
- final XFTTable table = XFTTable.Execute("SELECT DISTINCT email FROM xdat_user RIGHT JOIN xdat_user_groupid xug ON xdat_user.xdat_user_id=xug.groups_groupid_xdat_user_xdat_user_id WHERE groupid='" + groupid + "';", this.getDBName(), null);
- return table.convertColumnToArrayList("email");
- } catch (SQLException e) {
- logger.error("", e);
- } catch (DBPoolException e) {
- logger.error("", e);
-
- }
-
- return null;
- }
-
- public List<UserGroupI> getGroups() throws Exception {
- return Groups.getGroupsByTag(this.getId());
- }
-
- public ArrayList<List> getGroupIDs() {
- try {
- final XFTTable groups = XFTTable.Execute("SELECT id,displayname FROM xdat_usergroup WHERE tag='" + this.getId() + "' ORDER BY displayname DESC", this.getDBName(), null);
- return groups.toArrayListOfLists();
- } catch (Exception e) {
- logger.error("", e);
- return new ArrayList();
- }
- }
-
- public UserGroupI addGroupMember(String group_id, UserI newUser, UserI currentUser, EventMetaI ci) throws Exception {
- if (!Permissions.canDelete(currentUser, this) && !currentUser.getLogin().equals(newUser.getLogin())) {//equal user skips security here.
- throw new InvalidPermissionException("User cannot modify project " + this.getId());
- }
- return Groups.addUserToGroup(group_id, newUser, currentUser, ci);
- }
-
- public void removeGroupMember(String group_id, UserI newUser, UserI currentUser, EventDetails ci) throws Exception {
- if (!Permissions.canDelete(currentUser, this)) {
- throw new InvalidPermissionException("User cannot modify project " + this.getId());
- }
-
- if (Groups.isMember(newUser, group_id)) {
- PersistentWorkflowI wrk = PersistentWorkflowUtils.buildOpenWorkflow(currentUser, Users.getUserDataType(), newUser.getID().toString(), this.getId(), ci);
- try {
- Groups.removeUserFromGroup(newUser, group_id, wrk.buildEvent());
-
- PersistentWorkflowUtils.complete(wrk, wrk.buildEvent());
- } catch (Exception e) {
- PersistentWorkflowUtils.fail(wrk, wrk.buildEvent());
- throw e;
- }
- }
- }
-
-
- private List<ElementSecurity> getSecuredElements() {
-
- final ArrayList<ElementSecurity> ess = new ArrayList<ElementSecurity>();
- try {
- ess.addAll(ElementSecurity.GetElementSecurities().values());
- } catch (Exception e2) {
- logger.error("", e2);
- }
-
- for (final ElementSecurity es : (ArrayList<ElementSecurity>) ess.clone()) {
- try {
- if (es.isSecure() && (es.getSchemaElement().getGenericXFTElement().instanceOf("xnat:subjectData") || es.getSchemaElement().getGenericXFTElement().instanceOf("xnat:experimentData"))) {
-
- es.initPSF(es.getElementName() + "/project", EventUtils.DEFAULT_EVENT(getUser(), null));
- es.initPSF(es.getElementName() + "/sharing/share/project", EventUtils.DEFAULT_EVENT(getUser(), null));
- } else {
- ess.remove(es);
- }
- } catch (Exception e) {
- logger.error("", e);
- }
- }
- return ess;
- }
-
- public boolean initGroups() throws Exception {
- boolean modified = false;
- final long startTime = Calendar.getInstance().getTimeInMillis();
-
- if (XFT.VERBOSE)
- System.out.println("Group init() BEGIN: " + (Calendar.getInstance().getTimeInMillis() - startTime) + "ms");
- List<ElementSecurity> ess = getSecuredElements();
-
- Groups.createOrUpdateGroup(getId() + "_" + OWNER_GROUP, "Owners", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, ess, this.getId(), this.getUser());
-
-
- Groups.createOrUpdateGroup(getId() + "_" + MEMBER_GROUP, "Members", Boolean.TRUE, Boolean.TRUE, Boolean.FALSE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, ess, this.getId(), this.getUser());
-
-
- Groups.createOrUpdateGroup(getId() + "_" + COLLABORATOR_GROUP, "Collaborators", Boolean.FALSE, Boolean.TRUE, Boolean.FALSE, Boolean.FALSE, Boolean.TRUE, Boolean.TRUE, ess, this.getId(), this.getUser());
- return modified;
- }
-
- public static void quickSave(XnatProjectdata project, UserI user, boolean allowDataDeletion, boolean overrideSecurity, EventMetaI ci) throws Exception {
- project.initNewProject(user, allowDataDeletion, true, ci);
-
- SaveItemHelper.authorizedSave(project, user, overrideSecurity, false, ci);
- XFTItem item = project.getItem().getCurrentDBVersion(false);
-
- XnatProjectdata postSave = new XnatProjectdata(item);
- postSave.getItem().setUser(user);
-
- postSave.initGroups();
-
- Groups.reloadGroupForUser(user, postSave.getId() + "_" + BaseXnatProjectdata.OWNER_GROUP);
-
- postSave.initArcProject(null, user, ci);
-
- Users.clearCache(user);
- MaterializedView.deleteByUser(user);
- ElementSecurity.refresh();
- }
-
- public XnatAbstractprotocol getProtocolByDataType(String elementName) {
- Iterator iter = this.getStudyprotocol().iterator();
- while (iter.hasNext()) {
- XnatAbstractprotocol protocol = (XnatAbstractprotocol) iter.next();
- if (protocol.getDataType().equals(elementName)) {
- return protocol;
- }
- }
-
- return null;
- }
-
-
- public ArrayList<XdatStoredSearch> getBundles() {
- ArrayList<XdatStoredSearch> searches = XdatStoredSearch.GetSearches("xdat:stored_search/tag", this.getId(), true);
-
- Hashtable<String, Long> counts = this.getExperimentCountByXSIType();
-
- boolean matched = false;
- for (XdatStoredSearch xss : searches) {
- if (xss.getRootElementName().equalsIgnoreCase("xnat:subjectData") &&
- xss.getBriefDescription().equalsIgnoreCase(DisplayManager.GetInstance().getPluralDisplayNameForSubject())) {
- matched = true;
- break;
- }
- }
-
- if (!matched) {
- XnatAbstractprotocol protocol = this.getProtocolByDataType("xnat:subjectData");
- XdatStoredSearch xss = null;
- if (protocol != null) {
- xss = protocol.getDefaultSearch((XnatProjectdata) this);
- } else {
- xss = this.getDefaultSearch("xnat:subjectData");
- }
- xss.setId("@xnat:subjectData");
- searches.add(xss);
- }
-
- for (String key : counts.keySet()) {
- matched = false;
- for (XdatStoredSearch xss : searches) {
- if (xss.getRootElementName().equalsIgnoreCase(key) &&
- xss.getBriefDescription().equalsIgnoreCase(DisplayManager.GetInstance().getPluralDisplayNameForElement(key))) {
- matched = true;
- break;
- }
- }
-
- if (!matched) {
- XnatAbstractprotocol protocol = this.getProtocolByDataType(key);
- try {
- if (ElementSecurity.IsBrowseableElement(key)) {
- XdatStoredSearch xss = null;
- if (protocol != null) {
- xss = protocol.getDefaultSearch((XnatProjectdata) this);
- } else {
- xss = this.getDefaultSearch(key);
- }
- xss.setId("@" + key);
- searches.add(xss);
- } else {
- logger.error("Erroneous data (rows=" + counts.get(key) + ") of type '" + key + "' in project '" + this.getId() + "'.");
- }
- } catch (Exception e) {
- logger.error("Error while accessing data (rows=" + counts.get(key) + ") of type '" + key + "' in project '" + this.getId() + "'.", e);
- }
- }
- }
- try {
- dynamicSearchAdd(this.getUser(), searches, this);
- } catch (Exception e) {
- e.printStackTrace(); //TODO fix this
- }
-
- return searches;
- }
-
- public interface AddBundlesI {
- public void execute(UserI user, List<XdatStoredSearch> storedSearches, BaseXnatProjectdata proj) throws Exception;
- }
-
- private void dynamicSearchAdd(UserI user, List<XdatStoredSearch> storedSearches, BaseXnatProjectdata proj) throws Exception {
- List<Class<?>> classes = Reflection.getClassesForPackage("org.nrg.xnat.project.getBundles.extensions");
-
- if (classes != null && classes.size() > 0) {
- for (Class<?> clazz : classes) {
- if (AddBundlesI.class.isAssignableFrom(clazz)) {
- AddBundlesI action = (AddBundlesI) clazz.newInstance();
- action.execute(user, storedSearches, proj);
- }
- }
- }
- }
-
- public XdatStoredSearch getDefaultSearch(String elementName) {
- XdatStoredSearch xss = null;
- try {
- xss = this.getDefaultSearch(elementName, this.getId() + "_" + elementName);
-
- xss.setId(this.getId() + "_" + elementName);
-
- ElementSecurity es = ElementSecurity.GetElementSecurity(elementName);
-
- if (es != null)
- xss.setBriefDescription(es.getPluralDescription());
- else {
- xss.setBriefDescription(elementName);
- }
- xss.setSecure(false);
- xss.setAllowDiffColumns(false);
- xss.setTag(this.getId());
-
- UserI user = this.getUser();
-
- XnatAbstractprotocol protocol = this.getProtocolByDataType(elementName);
- if (protocol != null) {
- if (protocol instanceof XnatDatatypeprotocol)
- for (XnatFielddefinitiongroupI group : ((XnatDatatypeprotocol) protocol).getDefinitions_definition()) {
- for (XnatFielddefinitiongroupFieldI field : group.getFields_field()) {
-
- XdatSearchField xsf = new XdatSearchField(this.getUser());
- xsf.setElementName(((XnatDatatypeprotocol) protocol).getDataType());
- String fieldID = null;
- if (field.getType().equals("custom")) {
- fieldID = ((XnatDatatypeprotocol) protocol).getDatatypeSchemaElement().getSQLName().toUpperCase() + "_FIELD_MAP=" + field.getName().toLowerCase();
-
- } else {
- try {
- SchemaElement se = SchemaElement.GetElement(((XnatDatatypeprotocol) protocol).getDataType());
-
- try {
- DisplayField df = se.getDisplayFieldForXMLPath(field.getXmlpath());
- if (df != null) {
- fieldID = df.getId();
- }
- } catch (Exception e) {
- logger.error("", e);
- }
- } catch (XFTInitException e) {
- logger.error("", e);
- } catch (ElementNotFoundException e) {
- logger.error("", e);
- }
- }
-
- if (fieldID != null) {
- xsf.setFieldId(fieldID);
-
- xsf.setHeader(field.getName());
- xsf.setType(field.getDatatype());
- xsf.setSequence(xss.getSearchField().size());
- if (field.getType().equals("custom")) xsf.setValue(field.getName().toLowerCase());
- try {
- xss.setSearchField(xsf);
- System.out.println("LOADED " + field.getXmlpath());
- } catch (Exception e) {
- logger.error("", e);
- System.out.println("FAILED to load " + field.getXmlpath());
- }
- } else {
- System.out.println("FAILED to load " + field.getXmlpath());
- }
- }
- }
- }
-
- SchemaElement root = SchemaElement.GetElement(elementName);
-
- if (elementName.equals("xnat:subjectData")) {
- for (String xsiType : this.getExperimentCountByXSIType().keySet()) {
- try {
- final GenericWrapperElement e = GenericWrapperElement.GetElement(xsiType);
- if (e.instanceOf("xnat:subjectAssessorData")) {
- SchemaElement se = SchemaElement.GetElement(xsiType);
- if (se != null) {
- //generate a project specific count column
- DisplayField df = root.getSQLQueryField("CNT_" + se.getSQLName().toUpperCase(), ElementSecurity.GetPluralDescription(xsiType), true, false, "integer", "sub_project_count", "SELECT COUNT(*) as sub_project_count, subject_id FROM xnat_subjectAssessorData sad LEFT JOIN xnat_experimentData ex ON sad.ID=ex.ID LEFT JOIN xnat_experimentData_meta_data inf ON ex.experimentData_info=inf.meta_data_id JOIN xdat_meta_element xme ON ex.extension=xme.xdat_meta_element_id LEFT JOIN xnat_experimentdata_share sp ON ex.id=sp.sharing_share_xnat_experimentda_id AND sp.project='@WHERE' WHERE xme.element_name='" + xsiType + "' AND (ex.project='@WHERE' OR sp.project='@WHERE') AND (inf.status = 'active' OR inf.status = 'locked' OR inf.status = 'quarantine') GROUP BY subject_id", "xnat:subjectData.ID", "subject_id");
-
- XdatSearchField xsf = new XdatSearchField(user);
- xsf.setElementName("xnat:subjectData");
-
- xsf.setFieldId(df.getId() + "=" + this.getId());
- xsf.setHeader(ElementSecurity.GetPluralDescription(xsiType));
- xsf.setValue(this.getId());
-
- xsf.setType("integer");
- xsf.setSequence(xss.getSearchField().size());
- xss.setSearchField(xsf);
- }
- }
- } catch (XFTInitException e) {
- logger.error("", e);
- } catch (ElementNotFoundException e) {
- logger.error("", e);
- } catch (Exception e) {
- logger.error("", e);
- }
- }
- }
-
- if (root.getGenericXFTElement().instanceOf("xnat:imageSessionData")) {
- for (String xsiType : this.getExperimentCountByXSIType().keySet()) {
- try {
- final GenericWrapperElement e = GenericWrapperElement.GetElement(xsiType);
- if (e.instanceOf("xnat:imageAssessorData")) {
- SchemaElement se = SchemaElement.GetElement(xsiType);
- if (se != null) {
- //generate a project specific count column
- DisplayField df = root.getSQLQueryField("CNT_" + se.getSQLName().toUpperCase(), ElementSecurity.GetPluralDescription(xsiType), true, false, "integer", "mr_project_count", "SELECT COUNT(*) as mr_project_count, imagesession_id FROM xnat_imageAssessorData iad LEFT JOIN xnat_experimentData ex ON iad.ID=ex.ID LEFT JOIN xnat_experimentData_meta_data inf ON ex.experimentData_info=inf.meta_data_id JOIN xdat_meta_element xme ON ex.extension=xme.xdat_meta_element_id LEFT JOIN xnat_experimentdata_share sp ON ex.id=sp.sharing_share_xnat_experimentda_id AND sp.project='@WHERE' WHERE xme.element_name='" + xsiType + "' AND (ex.project='@WHERE' OR sp.project='@WHERE') AND (inf.status = 'active' OR inf.status = 'locked' OR inf.status = 'quarantine') GROUP BY imagesession_id", elementName + ".ID", "imagesession_id");
-
- XdatSearchField xsf = new XdatSearchField(user);
- xsf.setElementName(elementName);
-
- xsf.setFieldId(df.getId() + "=" + this.getId());
- xsf.setHeader(ElementSecurity.GetPluralDescription(xsiType));
- xsf.setValue(this.getId());
-
- xsf.setType("integer");
- xsf.setSequence(xss.getSearchField().size());
- xss.setSearchField(xsf);
- }
- }
- } catch (XFTInitException e) {
- logger.error("", e);
- } catch (ElementNotFoundException e) {
- logger.error("", e);
- } catch (Exception e) {
- logger.error("", e);
- }
- }
- }
-
- } catch (Exception e) {
- logger.error("", e);
- }
-
- return xss;
- }
-
- public String getPublicAccessibility() throws Exception {
- UserI guest = Users.getGuest();
- if (Permissions.canRead(guest, "xnat:subjectData/project", this.getId())) {
- return "public";
- } else if (Permissions.canRead(guest, "xnat:projectData/ID", this.getId())) {
- return "protected";
- } else {
- return "private";
- }
- }
-
- /* (non-Javadoc)
- * @see org.nrg.xft.ItemWrapper#save(org.nrg.xft.security.UserI, boolean, boolean)
- */
- @Override
- public boolean save(UserI user, boolean overrideSecurity, boolean allowItemRemoval, EventMetaI c) throws Exception {
-
- UserGroupI ownerG = Groups.getGroup(getId() + "_" + OWNER_GROUP);
- if (ownerG == null) {
- //if there is no owner group, then this must be a new project.
- //projects are secured. Thus, you can't just create a project. In order to create a project, you have to be an owner of the project.
- //So, before we actually save the project, we create the owner group and add the user to it.
- UserGroupI group = Groups.createOrUpdateGroup(getId() + "_" + OWNER_GROUP, "Owners", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, getSecuredElements(), this.getId(), this.getUser());
-
- if (!Groups.getGroupsForUser(user).containsKey(group.getId())) {
- Groups.updateUserForGroup(user, group.getId(), group);
-
- this.addGroupMember(this.getId() + "_" + OWNER_GROUP, user, user, c);
- }
- }
-
- return super.save(user, overrideSecurity, allowItemRemoval, c);
- }
-
- public String getDisplayName() {
- if (this.getSecondaryId() == null)
- return this.getId();
- else
- return this.getSecondaryId();
- }
-
- public String getDisplayID() {
- if (this.getSecondaryId() == null)
- return this.getId();
- else
- return this.getSecondaryId();
- }
-
- public ArcProject getArcSpecification() {
- return ArcSpecManager.GetInstance().getProjectArc(getId());
- }
-
-
- public static Comparator GetComparator() {
- return (new BaseXnatProjectdata()).getComparator();
- }
-
- public Comparator getComparator() {
- return new ProjectIDComparator();
- }
-
- public class ProjectIDComparator implements Comparator {
- public ProjectIDComparator() {
- }
-
- public int compare(Object o1, Object o2) {
- BaseXnatProjectdata value1 = (BaseXnatProjectdata) (o1);
- BaseXnatProjectdata value2 = (BaseXnatProjectdata) (o2);
-
- if (value1 == null) {
- if (value2 == null) {
- return 0;
- } else {
- return -1;
- }
- }
- if (value2 == null) {
- return 1;
- }
-
- return value1.getId().compareTo(value2.getId());
-
- }
- }
-
- public void initNewProject(UserI user, boolean allowDataDeletion, boolean allowMatchingID, EventMetaI c) throws Exception {
- if (this.getId() == null) {
- String secondaryID = this.getSecondaryId();
- if (secondaryID == null) {
- throw new ClientException(Status.CLIENT_ERROR_BAD_REQUEST, new Exception("Please define a project abbreviation."));
- } else {
- setId(secondaryID);
-
- XFTItem db = getCurrentDBVersion();
- if (db != null) {
- String msg = "Project '" + getId() + "' already exists.";
- this.setId("");
- throw new ClientException(Status.CLIENT_ERROR_CONFLICT, new Exception(msg));
- }
- }
- } else {
- XFTItem db = getCurrentDBVersion();
- if (!allowMatchingID) {
- if (db != null) {
- String msg = "Project '" + getId() + "' already exists.";
- this.setId("");
- throw new ClientException(Status.CLIENT_ERROR_CONFLICT, new Exception(msg));
- }
- } else if (db != null) {
- if (!Permissions.canEdit(user, db)) {
- String msg = "Project '" + getId() + "' already exists.";
- this.setId("");
- throw new ClientException(Status.CLIENT_ERROR_CONFLICT, new Exception(msg));
- }
- }
- }
-
- if (this.getSecondaryId() == null) {
- this.setSecondaryId(this.getId());
- }
-
- if (this.getName() == null) {
- this.setName(this.getId());
- }
-
- if (this.getStudyprotocol().size() > 0) {
- Hashtable<String, ElementSecurity> ess = ElementSecurity.GetElementSecurities();
-
- int index = 0;
- for (XnatAbstractprotocolI protocolT : this.getStudyprotocol()) {
- XnatAbstractprotocol protocol = (XnatAbstractprotocol) protocolT;
- if (protocol.getProperty("data-type") == null) {
- if (allowDataDeletion) {
- //NOT REQUESTED
- if (protocol.getProperty("xnat_abstractProtocol_id") != null) {
- try {
- getItem().getCurrentDBVersion().removeChildFromDB("xnat:projectData/studyProtocol", protocol.getCurrentDBVersion(), user, c);
- //This may need to use a authorized call instead of the unauthorized call that's inside removeChildFromDB
- } catch (SQLException e) {
- logger.error("", e);
- } catch (Exception e) {
- logger.error("", e);
- }
- }
-
- getItem().removeChild("xnat:projectData/studyProtocol", getItem().getChildItems("xnat:projectData/studyProtocol").indexOf(protocol));
- }
- } else {
- //REQUESTED
- GenericWrapperElement e = GenericWrapperElement.GetElement((String) protocol.getProperty("data-type"));
- if (protocol.getProperty("ID") == null) {
- try {
- protocol.setProperty("ID", getItem().getProperty("ID") + "_" + e.getSQLName());
- } catch (InvalidValueException e1) {
- logger.error("", e1);
- }
- }
- if (protocol.getProperty("name") == null) {
- protocol.setProperty("name", ess.get(e.getFullXMLName()).getPluralDescription());
- }
-
- if (protocol.getXSIType().equals("xnat:datatypeProtocol")) {
- protocol.setProperty("xnat:datatypeProtocol/definitions/definition[ID=default]/data-type", protocol.getProperty("data-type"));
- protocol.setProperty("xnat:datatypeProtocol/definitions/definition[ID=default]/project-specific", "false");
- }
- }
- index++;
- }
- }
-
- for (XnatInvestigatordataI inv : this.getInvestigators_investigator()) {
- if (inv.getFirstname() == null) {
- XFTItem temp = ((XnatInvestigatordata) inv).getCurrentDBVersion();
- ((XnatInvestigatordata) inv).setFirstname(temp.getStringProperty("firstname"));
- ((XnatInvestigatordata) inv).setLastname(temp.getStringProperty("lastname"));
- }
- }
-
- for (XnatInvestigatordataI inv : this.getInvestigators_investigator()) {
- if (inv.getFirstname() == null) {
- XFTItem temp = ((XnatInvestigatordata) inv).getCurrentDBVersion();
- ((XnatInvestigatordata) inv).setFirstname(temp.getStringProperty("firstname"));
- ((XnatInvestigatordata) inv).setLastname(temp.getStringProperty("lastname"));
- }
- }
- }
-
- public void initArcProject(ArcProject arcP, UserI user, EventMetaI c) throws Exception {
- if (!Permissions.canDelete(user, this)) {
- throw new InvalidPermissionException("User cannot modify project " + this.getId());
- }
-
- if (arcP == null) {
- XFTItem item = XFTItem.NewItem("arc:project", user);
- arcP = new ArcProject(item);
- arcP.setCurrentArc("arc001");
- }
- arcP.setProperty("projects_project_arc_archivespe_arc_archivespecification_id", ArcSpecManager.GetInstance().getArcArchivespecificationId());
- arcP.setId(getId());
-
- arcP.setProperty("arc:project/paths/archivePath", ArcSpecManager.GetInstance().getGlobalArchivePath() + getId() + "/");
- arcP.setProperty("arc:project/paths/prearchivePath", ArcSpecManager.GetInstance().getGlobalPrearchivePath() + getId() + "/");
- arcP.setProperty("arc:project/paths/cachePath", ArcSpecManager.GetInstance().getGlobalCachePath() + getId() + "/");
- arcP.setProperty("arc:project/paths/buildPath", ArcSpecManager.GetInstance().getGlobalBuildPath() + getId() + "/");
- arcP.setPrearchiveCode(4);
-
- SaveItemHelper.authorizedSave(arcP, user, true, false, c);
- ArcSpecManager.Reset();
- }
-
- public XdatStoredSearch getDefaultSearch(String dataType, String id) {
- XdatStoredSearch xss = null;
- try {
- DisplaySearch search = new DisplaySearch();
- search.setDisplay("project_bundle");
- search.setRootElement(dataType);
- CriteriaCollection cc = new CriteriaCollection("OR");
- cc.addClause(dataType + "/sharing/share/project", "=", getId());
- cc.addClause(dataType + ".PROJECT", "=", getId());
-
- search.addCriteria(cc);
-
- xss = search.convertToStoredSearch(id);
-
- Iterator fields = xss.getSearchFields().iterator();
- while (fields.hasNext()) {
- XdatSearchField f = (XdatSearchField) fields.next();
- if (f.getFieldId().endsWith("_PROJECT_IDENTIFIER")) {
- f.setValue(getId());
- f.setFieldId(f.getFieldId() + "=" + getId());
- }
- }
- } catch (XFTInitException e) {
- logger.error("", e);
- } catch (ElementNotFoundException e) {
- logger.error("", e);
- } catch (FieldNotFoundException e) {
- logger.error("", e);
- } catch (Exception e) {
- logger.error("", e);
- }
- return xss;
- }
-
- public static String CleanID(String s) {
- s = s.replace('`', '_');
- s = s.replace('~', '_');
- s = s.replace('!', '_');
- s = s.replace('@', '_');
- s = s.replace('#', '_');
- s = s.replace('$', '_');
- s = s.replace('%', '_');
- s = s.replace('^', '_');
- s = s.replace('&', '_');
- s = s.replace('*', '_');
- s = s.replace('(', '_');
- s = s.replace(')', '_');
- s = s.replace('+', '_');
- s = s.replace('=', '_');
- s = s.replace('|', '_');
- s = s.replace('\\', '_');
- s = s.replace('{', '_');
- s = s.replace('[', '_');
- s = s.replace('}', '_');
- s = s.replace(']', '_');
- s = s.replace(':', '_');
- s = s.replace(';', '_');
- s = s.replace('"', '_');
- s = s.replace('\'', '_');
- s = s.replace('<', '_');
- s = s.replace('>', '_');
- s = s.replace('?', '_');
- s = s.replace(',', '_');
- s = s.replace('.', '_');
- s = s.replace('/', '_');
- return s;
- }
-
-
- public String checkDelete(UserI user) {
- try {
- if (!Permissions.canDelete(user, this.getItem())) {
- return "Invalid delete permissions for this project.";
- }
- } catch (Exception e) {
- e.printStackTrace();
- return "Invalid delete permissions for this project.";
- }
-
- for (XnatSubjectdata sub : this.getParticipants_participant()) {
- String msg = sub.canDelete(this, user);
- if (msg != null) {
- return msg;
- }
- }
-
- return null;
- }
-
- public void deleteFiles(UserI user, EventMetaI ci) throws Exception {
- String archive = this.getRootArchivePath();
- File dir = new File(archive);
- if (dir.exists()) {
- FileUtils.MoveToCache(dir);
- }
-
- for (XnatAbstractresourceI abstRes : this.getResources_resource()) {
- ((XnatAbstractresource) abstRes).deleteWithBackup(archive, user, ci);
- }
- }
-
- public void delete(boolean removeFiles, UserI user, EventMetaI ci) throws SQLException, Exception {
- boolean preventProjectDelete = false;
- boolean preventProjectDeleteByP = false;
-
- if (!Permissions.canDelete(user, this)) {
- throw new InvalidPermissionException("User cannot delete project:" + getId());
- }
-
- if (XDAT.getBoolSiteConfigurationProperty("security.prevent-data-deletion", false)) {
- throw new InvalidPermissionException("User cannot delete project:" + getId());
- }
-
- for (XnatSubjectdata subject : getParticipants_participant()) {
- if (subject != null) {
- boolean preventSubjectDelete = false;
- boolean preventSubjectDeleteByP = false;
- final List<XnatSubjectassessordataI> expts = subject.getExperiments_experiment();
-
- if (!(preventSubjectDelete || preventSubjectDeleteByP) && expts.size() != subject.getSubjectAssessorCount()) {
- preventSubjectDelete = true;
- }
-
- for (XnatSubjectassessordataI exptI : expts) {
- final XnatSubjectassessordata expt = (XnatSubjectassessordata) exptI;
-
- if (expt.getProject().equals(getId())) {
- if (Permissions.canDelete(user, expt)) {
- if (removeFiles) {
- final List<XFTItem> hash = expt.getItem().getChildrenOfType("xnat:abstractResource");
-
- for (XFTItem resource : hash) {
- ItemI om = BaseElement.GetGeneratedItem((XFTItem) resource);
- if (om instanceof XnatAbstractresource) {
- XnatAbstractresource resourceA = (XnatAbstractresource) om;
- resourceA.deleteWithBackup(getRootArchivePath(), user, ci);
- }
- }
- }
-
- SaveItemHelper.authorizedDelete(expt.getItem().getCurrentDBVersion(), user, ci);
- } else {
- preventSubjectDeleteByP = true;
- }
- } else {
- preventSubjectDelete = true;
- for (XnatExperimentdataShareI pp : expt.getSharing_share()) {
- if (pp.getProject().equals(getId())) {
- SaveItemHelper.authorizedDelete(((XnatExperimentdataShare) pp).getItem(), user, ci);
- }
- }
- }
-
- }
-
-
- if (!subject.getProject().equals(getId())) {
- for (XnatProjectparticipantI pp : subject.getSharing_share()) {
- if (pp.getProject().equals(getId())) {
- SaveItemHelper.authorizedDelete(((XnatProjectparticipant) pp).getItem(), user, ci);
- }
- }
- } else {
- if (preventSubjectDelete) {
- preventProjectDelete = true;
- } else if (preventSubjectDeleteByP) {
- preventProjectDeleteByP = true;
- } else {
- if (Permissions.canDelete(user, subject)) {
- if (removeFiles) {
- final List<XFTItem> hash = subject.getItem().getChildrenOfType("xnat:abstractResource");
-
- for (XFTItem resource : hash) {
- ItemI om = BaseElement.GetGeneratedItem((XFTItem) resource);
- if (om instanceof XnatAbstractresource) {
- XnatAbstractresource resourceA = (XnatAbstractresource) om;
- resourceA.deleteFromFileSystem(getRootArchivePath());
- }
- }
- }
- SaveItemHelper.authorizedDelete(subject.getItem().getCurrentDBVersion(), user, ci);
- } else {
- preventProjectDeleteByP = true;
- }
- }
- }
- }
- }
-
- Users.clearCache(user);
- MaterializedView.deleteByUser(user);
-
- if (!preventProjectDelete && !preventProjectDeleteByP) {
- final File arc = new File(this.getRootArchivePath());
-
- PrearcUtils.deleteProject(this.getId());
- SaveItemHelper.authorizedDelete(getItem().getCurrentDBVersion(), user, ci);
-
- Groups.deleteGroupsByTag(getId(), user, ci);
-
- //DELETE any other field mappings (i.e. guest settings)
- ItemSearch is = ItemSearch.GetItemSearch("xdat:field_mapping", user);
- is.addCriteria("xdat:field_mapping.field_value", getId());
- Iterator items = is.exec(false).iterator();
- while (items.hasNext()) {
- XFTItem item = (XFTItem) items.next();
- SaveItemHelper.authorizedDelete(item, user, ci);
- }
-
- //DELETE storedSearches
- for (final ItemI bundle : getBundles()) {
- try {
- SaveItemHelper.authorizedDelete(bundle.getItem(), user, ci);
- } catch (Throwable e) {
- logger.error("", e);
- }
- }
-
- ArcProject p = getArcSpecification();
- try {
- if (p != null) SaveItemHelper.authorizedDelete(p.getItem(), user, ci);
- } catch (Throwable e) {
- logger.error("", e);
- }
-
- try {
- if (arc.exists() && removeFiles) FileUtils.MoveToCache(arc);
- } catch (Exception e) {
- logger.error("", e);
- }
-
- final ScriptTriggerTemplateService templateService = XDAT.getContextService().getBean(ScriptTriggerTemplateService.class);
- final List<ScriptTriggerTemplate> templates = templateService.getTemplatesForEntity(getId());
- if (templates != null) {
- for (ScriptTriggerTemplate template : templates) {
- if (logger.isDebugEnabled()) {
- logger.debug("Deleting script trigger template association between template " + template.getTemplateId() + " and project " + getId());
- }
- template.getAssociatedEntities().remove(getId());
- templateService.update(template);
- }
- }
- final ScriptTriggerService triggerService = XDAT.getContextService().getBean(ScriptTriggerService.class);
- final List<ScriptTrigger> triggers = triggerService.getByScope(Scope.Project, getId());
- if (triggers != null) {
- for (ScriptTrigger trigger : triggers) {
- if (logger.isDebugEnabled()) {
- logger.debug("Deleting script trigger " + trigger.getTriggerId() + " with script ID " + trigger.getScriptId() + " and event " + trigger.getEvent() + " while deleting project " + getId());
- }
- triggerService.delete(trigger);
- }
- }
-
- try {
- XftEventService.getService().triggerEvent(new XftItemEvent(Groups.getGroupDatatype(), XftItemEvent.UPDATE));
- } catch (Exception e1) {
- logger.error("", e1);
- }
- }
- }
-
-
- @Override
- public void preSave() throws Exception {
- super.preSave();
-
- if (StringUtils.isBlank(this.getId())) {
- throw new IllegalArgumentException();
- }
-
- if (!XftStringUtils.IsAlphaNumericUnderscore(getId())) {
- throw new IllegalArgumentException("Identifiers cannot use special characters.");
- }
-
- // Validate project fields. If there are conflicts, throw a new exception
- this.trimProjectFields();
- Collection<String> conflicts = this.validateProjectFields();
- if (!conflicts.isEmpty()) {
- StringBuilder conflictStr = new StringBuilder();
- for (String conflict : conflicts) {
- conflictStr.append(conflict).append("\n");
- }
- throw new IllegalArgumentException(conflictStr.toString());
- }
-
- final String expectedPath = getExpectedCurrentDirectory().getAbsolutePath().replace('\\', '/');
-
- for (final XnatAbstractresourceI res : this.getResources_resource()) {
- final String uri;
- if (res instanceof XnatResource) {
- uri = ((XnatResource) res).getUri();
- } else if (res instanceof XnatResourceseries) {
- uri = ((XnatResourceseries) res).getPath();
- } else {
- continue;
- }
-
- FileUtils.ValidateUriAgainstRoot(uri, expectedPath, "URI references data outside of the project:" + uri);
- }
-
- XFTItem existing = this.getCurrentDBVersion();
- if (existing == null) {
- Long count = (Long) PoolDBUtils.ReturnStatisticQuery("SELECT COUNT(ID) FROM xnat_projectdata_history WHERE ID='" + this.getId() + "';", "COUNT", null, null);
- if (count > 0) {
- throw new Exception("Project '" + this.getId() + "' was used in a previously deleted project and cannot be reused.");
- }
- }
-
- UserGroupI ownerG = Groups.getGroup(getId() + "_" + OWNER_GROUP);
- if (ownerG == null) {
- PersistentWorkflowI wrk = PersistentWorkflowUtils.getOrCreateWorkflowData(null, this.getUser(), this.getXSIType(), this.getId(), PersistentWorkflowUtils.ADMIN_EXTERNAL_ID, EventUtils.newEventInstance(EventUtils.CATEGORY.PROJECT_ADMIN, EventUtils.TYPE.WEB_SERVICE, "Initialized permissions"));
-
- EventMetaI ci = wrk.buildEvent();
- try {
- UserI u = this.getUser();
-
- UserGroupI group = Groups.createOrUpdateGroup(getId() + "_" + OWNER_GROUP, "Owners", Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE, getSecuredElements(), this.getId(), this.getUser());
-
- wrk.setDataType(Groups.getGroupDatatype());
- wrk.setId(group.getPK().toString());
- wrk.setExternalid(this.getId());
-
- if (!Groups.isMember(u, group.getId())) {
- this.addGroupMember(this.getId() + "_" + OWNER_GROUP, u, u, ci);
-
- Groups.updateUserForGroup(u, group.getId(), group);
-
- //add a workflow entry for the user audit trail
- PersistentWorkflowI wrk2 = PersistentWorkflowUtils.getOrCreateWorkflowData(null, u, "xdat:user", u.getID().toString(), PersistentWorkflowUtils.ADMIN_EXTERNAL_ID, EventUtils.newEventInstance(EventUtils.CATEGORY.PROJECT_ADMIN, EventUtils.TYPE.WEB_SERVICE, "Initialized permissions"));
- PersistentWorkflowUtils.complete(wrk2, wrk2.buildEvent());
- }
-
- PersistentWorkflowUtils.complete(wrk, ci);
- } catch (Exception e) {
- PersistentWorkflowUtils.fail(wrk, ci);
- throw e;
- }
- }
- }
-
-
- public String getArchiveDirectoryName() {
- return this.getId();
- }
-
- public File getExpectedCurrentDirectory() throws InvalidArchiveStructure {
- return new File(getRootArchivePath(), "resources");
- }
-
- @SuppressWarnings("unused")
- public boolean isAutoArchive() {
- Integer i = ArcSpecManager.GetInstance().getAutoQuarantineCodeForProject(this.getId());
- return !(i == null || i < 4);
- }
-
- public static XnatProjectdata getProjectByIDorAlias(String pID, UserI user, boolean preLoad) {
- XnatProjectdata proj = null;
- if (pID != null) {
- proj = XnatProjectdata.getXnatProjectdatasById(pID, user, preLoad);
- }
-
- if (proj == null && pID != null) {
- final ArrayList<XnatProjectdata> matches = XnatProjectdata
- .getXnatProjectdatasByField(
- "xnat:projectData/aliases/alias/alias", pID,
- user, preLoad);
- if (matches.size() == 1) {
- proj = matches.get(0);
- }
- }
-
- return proj;
- }
-
- @Override
- public String getProject() {
- return getId();
- }
-
- @Override
- public String getArchiveRootPath() {
- return this.getRootArchivePath();
- }
-
- public static String createProject(XnatProjectdata project, UserI user, boolean allowDataDeletion, boolean allowMatchingID, EventDetails event, String accessibility) throws ActionException {
- PersistentWorkflowI wrk;
- try {
- wrk = PersistentWorkflowUtils.getOrCreateWorkflowData(null, user, XnatProjectdata.SCHEMA_ELEMENT_NAME, project.getId(), project.getId(), event);
- } catch (EventRequirementAbsent e1) {
- throw new ClientException(Status.CLIENT_ERROR_FORBIDDEN, e1);
- }
- EventMetaI c = wrk.buildEvent();
-
- try {
- String id = createProject(project, user, allowDataDeletion, allowMatchingID, c, accessibility);
-
- Users.clearCache(user);
- ElementSecurity.refresh();
- try {
- WorkflowUtils.complete(wrk, c);
- } catch (Exception e) {
- throw new ServerException(e);
- }
- return id;
- } catch (ActionException e) {
- try {
- WorkflowUtils.fail(wrk, c);
- } catch (Exception e1) {
- logger.error("", e1);
- }
- throw e;
- }
- }
-
- public static String createProject(XnatProjectdata project, UserI user, boolean allowDataDeletion, boolean allowMatchingID, EventMetaI event, String accessibility) throws ActionException {
- try {
- project.initNewProject(user, allowDataDeletion, allowMatchingID, event);
-
- final ValidationResults vr = project.validate();
-
- if (vr != null && !vr.isValid()) {
- throw new ClientException(Status.CLIENT_ERROR_BAD_REQUEST, vr.toFullString(), null);
- }
-
- project.save(user, true, false, event);
- } catch (ClientException e) {
- throw e;
- } catch (Exception e) {
- SecureResource.logger.error("", e);
- throw new ServerException(Status.SERVER_ERROR_INTERNAL, e);
- }
- try {
- XFTItem item = project.getItem().getCurrentDBVersion(false);
-
- XnatProjectdata postSave = new XnatProjectdata(item);
- postSave.getItem().setUser(user);
-
- postSave.initGroups();
-
- if (accessibility == null) {
- accessibility = "protected";
- }
-
- if (!accessibility.equals("private"))
- Permissions.setDefaultAccessibility(project.getId(), accessibility, true, user, event);
-
- Groups.reloadGroupForUser(user, postSave.getId() + "_" + OWNER_GROUP);
-
- postSave.initArcProject(null, user, event);
-
- return postSave.getId();
- } catch (Exception e) {
- throw new ServerException(e);
- }
- }
-
-
- public Integer getMetaId() {
- return ((XFTItem) this.getItem()).getMetaDataId();
- }
-
- /**
- * Return the project info ID (meta data id) for this project ID.
- *
- * @param project
- * @return
- */
- public static Long getProjectInfoIdFromStringId(String project) {
- if (project != null) {
- XnatProjectdata p = XnatProjectdata.getXnatProjectdatasById(project, null, false);
- if (p != null) {
- return Long.parseLong(p.getItem().getProps().get("projectdata_info").toString());
- }
- }
- return null;
- }
-
- /**
- * Function removes excess whitespace from the project id, secondary id, name and alias fields.
- */
- public void trimProjectFields() throws Exception {
- String trim; //Temporary variable to store trimmed variables.
-
- //Trim excess white space from the project id
- String id = this.getId();
- if (StringUtils.isNotBlank(id)) {
- trim = id.trim();
- if (!trim.equals(id)) {
- this.setId(trim);
- }
- }
-
- // Trim excess white space from the secondary id
- String secondaryId = this.getSecondaryId();
- if (StringUtils.isNotBlank(secondaryId)) {
- trim = secondaryId.trim();
- if (!trim.equals(secondaryId)) {
- this.setSecondaryId(trim);
- }
- }
-
- // Trim excess white space from the project name
- String name = this.getName();
- if (StringUtils.isNotBlank(name)) {
- trim = name.trim();
- if (!trim.equals(name)) {
- this.setName(trim);
- }
- }
-
- // Trim excess white space from each alias
- for (XnatProjectdataAliasI a : this.getAliases_alias()) {
- String newA = a.getAlias().trim();
- if (!newA.equals(a)) {
- a.setAlias(newA);
- }
- }
- }
-
- /**
- * Function validates a project's id, secondary id, name and aliases
- * to make sure they will not conflict with any existing projects within the database.
- * See: XNAT-2801, XNAT-2934, XNAT-2813, XNAT-2551, XNAT-2628, XNAT-2780
- *
- * @return - A list of conflict errors. If the list is empty, all elements passed validation.
- */
- public Collection<String> validateProjectFields() throws Exception {
-
- // Make sure the Id isn't null or empty
- if (StringUtils.isBlank(this.getId())) {
- return Arrays.asList("Missing required field: Project Id.");
- }
-
- // Add all the elements that require validation to a Map.
- Map<String, String> elements = new HashMap<String, String>();
- elements.put("Project Id", TurbineUtils.escapeParam(this.getId().toLowerCase())); // Add the Project Id.
-
- if (StringUtils.isNotBlank(this.getName())) { // Add the Project Title.
- elements.put("Project Title", TurbineUtils.escapeParam(this.getName().toLowerCase()));
- }
-
- if (StringUtils.isNotBlank(this.getSecondaryId())) { // Add the Running Title.
- elements.put("Running Title", TurbineUtils.escapeParam(this.getSecondaryId().toLowerCase()));
- }
-
- return validateElements(elements, getNewProjectAliasStrings());
- }
-
- /**
- * Validates a collection of elements and aliases that we wish to insert into the database.
- * Elements are validated against all
- *
- * @param elements - The Collection elements we wish to validate.
- * @param aliases - The Collection of aliases we wish to validate.
- * @return - A list of conflict errors. If the list is empty, all elements passed validation.
- * @throws Exception
- */
- private Collection<String> validateElements(Map<String, String> elements, Collection<String> aliases) throws Exception {
-
- // Get a list of the aliases the user wishes to add and validate them.
- Collection<String> conflicts = validateAliases(aliases);
-
- // Create a query and find all possible matches in the database
- String inClause = collectionToCommaDelimitedString(elements.values());
- Collection<String> matches = getMatchingElements("SELECT LOWER(a.id) as id, LOWER(a.secondary_id) as secondary_id, LOWER(a.name) as name, LOWER(b.alias) as alias FROM (SELECT id,secondary_id,name FROM xnat_projectdata WHERE LOWER(id) != '" + this.getId().toLowerCase() + "') a FULL OUTER JOIN ( SELECT aliases_alias_xnat_projectdata_id as id, alias FROM xnat_projectdata_alias) b ON a.id = b.id WHERE (LOWER(a.secondary_id) IN (" + inClause + ") OR LOWER(a.name) IN (" + inClause + ") OR LOWER(b.alias) IN (" + inClause + ") OR LOWER(a.id) IN (" + inClause + "));");
-
- // For each element, check to see if it is contained within the collection of possible matches. If so, add a conflict.
- for (Map.Entry<String, String> entry : elements.entrySet()) {
- if (matches.contains(entry.getValue())) {
- conflicts.add("Invalid " + entry.getKey() + ": '" + entry.getValue() + "' is already being used.");
- }
- if (aliases.contains(entry.getValue())) { // element cannot be an alias as well as a project id, secondary id or title.
- conflicts.add("Invalid " + entry.getKey() + ": '" + entry.getValue() + "' cannot be used as the " + entry.getKey() + " and an alias.");
- }
- }
- return conflicts;
- }
-
- /**
- * Validates any Aliases the user is trying to add to this project.
- *
- * @return - A list of conflict errors. If the list is empty, all elements passed validation.
- * @throws Exception
- */
- private Collection<String> validateAliases(Collection<String> aliases) throws Exception {
- Collection<String> conflicts = new ArrayList<String>();
- if (null == aliases || aliases.isEmpty()) {
- return conflicts;
- }
-
- // Create a query and find all possible matches in the database
- String inClause = collectionToCommaDelimitedString(aliases);
- Collection<String> matches = getMatchingElements("SELECT LOWER(a.id) as id, LOWER(a.secondary_id) as secondary_id, LOWER(a.name) as name, LOWER(b.alias) as alias FROM (SELECT id,secondary_id,name FROM xnat_projectdata) a FULL OUTER JOIN ( SELECT aliases_alias_xnat_projectdata_id as id, alias FROM xnat_projectdata_alias WHERE LOWER(aliases_alias_xnat_projectdata_id) != '" + this.getId().toLowerCase() + "') b ON a.id = b.id WHERE (LOWER(a.secondary_id) IN (" + inClause + ") OR LOWER(a.name) IN (" + inClause + ") OR LOWER(b.alias) IN (" + inClause + ") OR LOWER(a.id) IN (" + inClause + "));");
-
- // For each alias, check to see if it is contained within the collection of possible matches. If so, add a conflict.
- for (String entry : aliases) {
- if (matches.contains(entry)) {
- conflicts.add("Invalid Alias: '" + entry + "' is already being used.");
- }
- }
- return conflicts;
- }
-
- /**
- * Function executes a query and returns all results in one Set of strings.
- *
- * @param query - the query to execute
- * @return A set of any strings that are returned from the database
- * @throws Exception
- */
- private Collection<String> getMatchingElements(String query) throws Exception {
- XFTTable t = new PoolDBUtils().executeSelectQuery(query, null, this.getUser().getUsername());
- ArrayList<ArrayList<String>> l = t.convertColumnsToArrayList(new ArrayList(Arrays.asList(t.getColumns())));
-
- // Convert the ArrayList<ArrayList<String>> into a one Set<String> so it's easy to manage.
- // We don't care about duplicate values or the column names anymore.
- Collection<String> retSet = new HashSet<String>();
- for (Collection<String> e : l) {
- retSet.addAll(e);
- }
- return retSet;
- }
-
- /**
- * Function gets the string form of each alias the user is trying to add to this project.
- *
- * @return - List of Alias Strings
- */
- public Collection<String> getNewProjectAliasStrings() {
- Collection<String> retList = new ArrayList<String>();
- for (org.nrg.xdat.model.XnatProjectdataAliasI a : this.getAliases_alias()) {
- retList.add(TurbineUtils.escapeParam(a.getAlias().toLowerCase()));
- }
- return retList;
- }
-
- /**
- * Converts a collection of strings into a single comma delimited string.
- *
- * @param elements - A collection of strings
- * @return a comma delimited string. e.g. "'element_1', 'element_2', 'element_3' ... 'element_n'"
- */
- private String collectionToCommaDelimitedString(Collection<String> elements) {
- StringBuilder q = new StringBuilder().append("'");
- Iterator<String> it = elements.iterator();
- while (it.hasNext()) {
- q.append(it.next());
- if (it.hasNext()) {
- q.append("','");
- }
- }
- return q.append("'").toString();
- }
-
- @Override
- public SecurityValues getSecurityTags() {
- SecurityValues projects = new SecurityValues();
- projects.getHash().put("xnat:projectData/ID", this.getId());
- return projects;
- }
-
- public boolean getUseScanTypeMapping() {
- ConfigService configService = XDAT.getConfigService();
-
- // check project config
- Configuration config = configService.getConfig("project", "scanTypeMapping", new Long((Integer) this.getProps().get("projectdata_info")));
- if (config != null && config.getStatus().equals("enabled")) {
- return Boolean.valueOf(config.getContents());
- }
-
- // if nothing there, check site config
- return XDAT.getBoolSiteConfigurationProperty("scanTypeMapping", true);
- }
-
- public void setUseScanTypeMapping(boolean newValue) {
- ConfigService configService = XDAT.getConfigService();
- try {
- configService.replaceConfig(getUser().getUsername(), "", "project", "scanTypeMapping", String.valueOf(newValue), new Long((Integer) this.getProps().get("projectdata_info")));
- } catch (ConfigServiceException exception) {
- logger.error("Configuration service error replacing config for user " + getUser().getUsername() + " and project " + getId());
- }
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdataAlias.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdataAlias.java
deleted file mode 100644
index cb7b392cc866dff33d579d950a60c5eaea5a3549..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdataAlias.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatProjectdataAlias
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatProjectdataAlias;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatProjectdataAlias extends AutoXnatProjectdataAlias {
-
- public BaseXnatProjectdataAlias(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatProjectdataAlias(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatProjectdataAlias(UserI user)
- **/
- public BaseXnatProjectdataAlias()
- {}
-
- public BaseXnatProjectdataAlias(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdataField.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdataField.java
deleted file mode 100644
index b7bbfee1b7d3bb02019262d7a6c80bb3227f063c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdataField.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatProjectdataField
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatProjectdataField;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatProjectdataField extends AutoXnatProjectdataField {
-
- public BaseXnatProjectdataField(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatProjectdataField(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatProjectdataField(UserI user)
- **/
- public BaseXnatProjectdataField()
- {}
-
- public BaseXnatProjectdataField(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectparticipant.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectparticipant.java
deleted file mode 100644
index 8e5f6f78d6dad2f545a3522d669028fcf2880318..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatProjectparticipant.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatProjectparticipant
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.XnatProjectdataI;
-import org.nrg.xdat.om.XnatProjectdata;
-import org.nrg.xdat.om.base.auto.AutoXnatProjectparticipant;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTTable;
-import org.nrg.xft.exception.DBPoolException;
-import org.nrg.xft.security.UserI;
-
-import java.sql.SQLException;
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatProjectparticipant extends AutoXnatProjectparticipant {
-
- public BaseXnatProjectparticipant(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatProjectparticipant(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatProjectparticipant(UserI user)
- **/
- public BaseXnatProjectparticipant()
- {}
-
- public BaseXnatProjectparticipant(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- private String name = null;
- private String description = null;
- private String secondaryID = null;
- private boolean initd = false;
-
- public void loadProjectDetails(){
- if (!initd)
- {
- initd=true;
- try {
- XFTTable table = XFTTable.Execute("SELECT name,description,secondary_ID FROM xnat_projectData WHERE ID ='" + this.getProject() + "';", this.getDBName(), null);
-
- if (table.size()>0)
- {
- Object[] row = (Object[])table.rows().get(0);
- name = (String)row[0];
- description = (String)row[1];
- secondaryID = (String)row[2];
- }
- } catch (SQLException e) {
- logger.error("",e);
- } catch (DBPoolException e) {
- logger.error("",e);
- }
- }
- }
-
- public XnatProjectdataI getProjectData(){
- return XnatProjectdata.getXnatProjectdatasById(this.getProject(), this.getUser(), false);
- }
-
- /**
- * @return the description
- */
- public String getProjectDescription() {
- loadProjectDetails();
- return description;
- }
-
- /**
- * @return the name
- */
- public String getProjectName() {
- loadProjectDetails();
- return name;
- }
-
- /**
- * @return the secondaryID
- */
- public String getProjectSecondaryID() {
- loadProjectDetails();
- return secondaryID;
- }
-
-
-
- /**
- * @return the secondaryID
- */
- public String getProjectDisplayID() {
- loadProjectDetails();
- if (secondaryID!=null){
- return secondaryID;
- }else{
- return getProject();
- }
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatPublicationresource.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatPublicationresource.java
deleted file mode 100644
index 56c373ac1cef5eb0382c11d9e6a1185d3adcc66e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatPublicationresource.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatPublicationresource
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 11/18/13 9:35 AM
- */
-package org.nrg.xdat.om.base;
-
-import edu.sdsc.grid.io.GeneralFile;
-import edu.sdsc.grid.io.srb.SRBFile;
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.xdat.om.base.auto.AutoXnatPublicationresource;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xnat.srb.XNATDirectory;
-import org.nrg.xnat.srb.XNATSrbSearch;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatPublicationresource extends AutoXnatPublicationresource {
-
- public BaseXnatPublicationresource(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatPublicationresource(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatPublicationresource(UserI user)
- **/
- public BaseXnatPublicationresource()
- {}
-
- public BaseXnatPublicationresource(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- protected ArrayList files=null;
- protected ArrayList fileNames=null;
- /**
- * Returns ArrayList of java.io.File objects
- * @return
- */
- public ArrayList<File> getCorrespondingFiles(String rootPath)
- {
- if (files==null)
- {
- String fullPath = getFullPath(rootPath);
- if (fullPath.endsWith("\\")) {
- fullPath = fullPath.substring(0,fullPath.length() -1);
- }
- if (fullPath.endsWith("/")) {
- fullPath = fullPath.substring(0,fullPath.length() -1);
- }
- /* files = new ArrayList();
- File f = new File(org.nrg.xft.utils.FileUtils.AppendRootPath(rootPath,this.getUri()));
- if (!f.getPath().startsWith("srb:") && !f.getPath().startsWith("http:")){
- if (!f.exists() && !getUri().endsWith(".gz"))
- {
- f = new java.io.File(org.nrg.xft.utils.FileUtils.AppendRootPath(rootPath,this.getUri()) + ".gz");
- }
- }
- files.add(f); */
- files = getAssociatedFilesOnLocalFileSystem(fullPath);
- }
- return files;
- }
-
- /**
- * Returns ArrayList of java.lang.String objects
- * @return
- */
- public ArrayList getCorrespondingFileNames(String rootPath)
- {
- if (fileNames==null)
- {
- fileNames = new ArrayList();
- File f = new File(org.nrg.xft.utils.FileUtils.AppendRootPath(rootPath,this.getUri()));
- if (!f.exists() && !getUri().endsWith(".gz"))
- {
- f = new java.io.File(org.nrg.xft.utils.FileUtils.AppendRootPath(rootPath,this.getUri()) + ".gz");
- }
- fileNames.add(f.getName());
- }
- return fileNames;
- }
- /**
- * Appends this path to the enclosed URI or path variables.
- * @param root
- */
- public void prependPathsWith(String root){
- if (!FileUtils.IsAbsolutePath(this.getUri())){
- try {
- this.setUri(root + this.getUri());
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- }
-
- /**
- * Relatives this path from the first occurrence of the indexOf string.
- * @param indexOf
- */
- public void relativizePaths(String indexOf, boolean caseSensitive){
- String uri = this.getUri();
- if (uri.indexOf(indexOf)==-1){
- if (!caseSensitive){
- int index = uri.toLowerCase().indexOf(indexOf.toLowerCase());
- if (index!=-1){
- this.setUri(uri.substring(index));
- }
- }
- }else{
- this.setUri(uri.substring(uri.indexOf(indexOf)));
- }
- }
-
-
- /**
- * Appends this path to the enclosed URI or path variables.
- * @param root
- */
- public ArrayList<String> getUnresolvedPaths(){
- ArrayList<String> al = new ArrayList<String>();
- String p = getUri();
- p.replace('\\', '/');
- al.add(p);
- return al;
- }
-
- public String getFullPath(String rootPath){
-
- String fullPath = StringUtils.replace(FileUtils.AppendRootPath(rootPath, this.getUri()), "\\", "/");
- while (fullPath.indexOf("//")!=-1)
- {
- fullPath =StringUtils.replace(fullPath,"//","/");
- }
-
- if(!fullPath.endsWith("/"))
- {
- fullPath+="/";
- }
-
- return fullPath;
- }
-
-
- /**
- * Gets the files associated with an image.
- * For an uri which is say like: /data/a.img
- * This method will return all files which match the pattern /data/a.*
- *
- * @return
- */
-
-
- public ArrayList<File> getAssociatedFiles(String rootPath, File tempDir) {
- String fullPath = getFullPath(rootPath);
- if (fullPath.endsWith(File.separator)) {
- fullPath = fullPath.substring(0,fullPath.length() -1);
- }
- if (fullPath.startsWith("srb:"))
- return getAssociatedFilesFromRemoteFileSystem(fullPath,tempDir);
- else
- return getAssociatedFilesOnLocalFileSystem(fullPath);
- }
-
- protected ArrayList<File> getAssociatedFilesFromRemoteFileSystem(String fullPath,File tempDir) {
- ArrayList<File> associatedFiles = new ArrayList();
- int lastIndexOfSlash = fullPath.lastIndexOf(SRBFile.PATH_SEPARATOR);
- if (lastIndexOfSlash != -1) {
- String path = fullPath.substring(0,lastIndexOfSlash);
- try {
- URI uri = new URI(path);
- XNATDirectory srbDir = XNATSrbSearch.getFilesAssociatedWith(uri.getPath(),fullPath.substring(lastIndexOfSlash+1));
- srbDir.importFiles(tempDir);
- ArrayList srbAssociatedFiles = srbDir.getFiles();
- for (int i = 0; i < srbAssociatedFiles.size(); i++) {
- associatedFiles.add(new File(tempDir.getAbsolutePath() + File.separator + ((GeneralFile)srbAssociatedFiles.get(i)).getName()));
- }
- }catch(Exception e) {
- logger.error("Couldnt get Files for " + fullPath,e);
- }
-
- }
- return associatedFiles;
- }
-
- protected ArrayList<File> getAssociatedFilesOnLocalFileSystem(String fullPath) {
- ArrayList<File> associatedFiles = new ArrayList();
- if (!new File(fullPath).exists()) return associatedFiles;
- int lastSlash = fullPath.lastIndexOf("/");
- if (lastSlash==-1){
- lastSlash = fullPath.lastIndexOf("\\");
- }
- String path = "";
- String fileroot = fullPath;
- if (lastSlash != -1) {
- path = fullPath.substring(0, lastSlash);
- fileroot = fullPath.substring(lastSlash+1);
- }
- int indexOfDot = fileroot.lastIndexOf(".");
- if (indexOfDot != -1) {
- fileroot = fileroot.substring(0,indexOfDot);
- }
- final String fileRoot = fileroot;
- File dir = new File(path);
- if (dir.exists() && dir.isDirectory()) {
- FilenameFilter filter = new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return (name.startsWith(fileRoot));
- }
- };
- String[] associatedFileNames = dir.list(filter);
- if (associatedFileNames == null) {
- return associatedFiles;
- }
- for (int i = 0; i < associatedFileNames.length; i++) {
- associatedFiles.add(new File(dir.getAbsolutePath() + File.separator + associatedFileNames[i]));
- }
- }
- return associatedFiles;
- }
-
-
-
- public String getLabel(){
- if (this.getTitle().length()>15)
- {
- return this.getTitle().substring(0,14);
- }else
- return this.getTitle();
- }
-
- public void moveTo(File newSessionDir,String existingSessionDir,String rootPath,UserI user,EventMetaI c) throws IOException,Exception{
- String uri = this.getUri();
-
- String relativePath=null;
- if(existingSessionDir!=null && uri.startsWith(existingSessionDir)){
- relativePath=uri.substring(existingSessionDir.length());
- }else{
- if(FileUtils.IsAbsolutePath(uri)){
- if(uri.indexOf("/")>0){
- relativePath=uri.substring(uri.indexOf("/")+1);
- }else if(uri.indexOf("\\")>0){
- relativePath=uri.substring(uri.indexOf("\\")+1);
- }else{
- relativePath=uri;
- }
- }else{
- relativePath=uri;
- }
- }
-
- File newFile = new File(newSessionDir,relativePath);
- File parentDir=newFile.getParentFile();
- if(!parentDir.exists())
- {
- parentDir.mkdirs();
- }
-
- for(File f: this.getCorrespondingFiles(rootPath)){
- FileUtils.MoveFile(f, new File(parentDir,f.getName()), true, true);
- }
-
- this.setUri(newFile.getAbsolutePath());
- SaveItemHelper.authorizedSave(this,user, true, false,c);
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatPvisitdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatPvisitdata.java
deleted file mode 100644
index b74f340b47e8e8b3b9ff95acdb9c816f7b904799..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatPvisitdata.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatPvisitdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.apache.commons.lang.builder.CompareToBuilder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.xdat.base.BaseElement;
-import org.nrg.xdat.model.XnatExperimentdataShareI;
-import org.nrg.xdat.om.*;
-import org.nrg.xdat.om.base.auto.AutoXnatPvisitdata;
-import org.nrg.xdat.security.SecurityValues;
-import org.nrg.xdat.security.helpers.Permissions;
-import org.nrg.xdat.security.helpers.Users;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-import org.nrg.xft.XFTTable;
-import org.nrg.xft.db.MaterializedView;
-import org.nrg.xft.db.ViewManager;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.exception.DBPoolException;
-import org.nrg.xft.exception.ElementNotFoundException;
-import org.nrg.xft.exception.XFTInitException;
-import org.nrg.xft.identifier.IDGeneratorFactory;
-import org.nrg.xft.identifier.IDGeneratorI;
-import org.nrg.xft.search.CriteriaCollection;
-import org.nrg.xft.search.QueryOrganizer;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xft.utils.XftStringUtils;
-
-public class BaseXnatPvisitdata extends AutoXnatPvisitdata implements Comparable {
-
- public ArrayList<ItemI> getVisits()
- {
- return null;
-
- }
-
- public BaseXnatPvisitdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatPvisitdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatHdscandata(UserI user)
- **/
- public BaseXnatPvisitdata()
- {}
-
- public BaseXnatPvisitdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- public static XnatPvisitdata GetVisitByProjectIdentifier(String project, String identifier,UserI user,boolean preLoad){
- if(StringUtils.isBlank(identifier)){
- return null;
- }
-
- CriteriaCollection cc=new CriteriaCollection("OR");
-
- CriteriaCollection subcc1 = new CriteriaCollection("AND");
- subcc1.addClause("xnat:pvisitData/project", project);
- subcc1.addClause("xnat:pvisitData/label", identifier);
-
- cc.add(subcc1);
-
- CriteriaCollection subcc2 = new CriteriaCollection("AND");
- subcc2.addClause("xnat:pvisitData/sharing/share/project", project);
- subcc2.addClause("xnat:pvisitData/sharing/share/label", identifier);
-
- cc.add(subcc2);
-
- ArrayList al = XnatPvisitdata.getXnatPvisitdatasByField(cc, user, preLoad);
- al = BaseElement.WrapItems(al);
- if (al.size()>0){
- return (XnatPvisitdata)al.get(0);
- }else{
- return null;
- }
-
- }
-
- public XnatSubjectdata getSubjectData()
- {
- XnatSubjectdata subject = null;
-
- if (getSubjectId()!=null)
- {
- ArrayList al = XnatSubjectdata.getXnatSubjectdatasByField("xnat:subjectData/ID",this.getSubjectId(),this.getUser(),false);
- if (al.size()>0)
- {
- subject = (XnatSubjectdata)al.get(0);
- }
- }
-
- return subject;
- }
-
- public static synchronized String CreateNewID() throws Exception{
- IDGeneratorI generator = IDGeneratorFactory.GetIDGenerator("org.nrg.xnat.turbine.utils.IDGenerator");
- generator.setTable("xnat_pvisitData");
- generator.setDigits(5);
- generator.setColumn("id");
- return generator.generateIdentifier();
- }
-
- public String delete(BaseXnatProjectdata proj, UserI user, boolean removeFiles,EventMetaI c){
- BaseXnatPvisitdata visit=this;
- if(this.getItem().getUser()!=null){
- visit=new BaseXnatPvisitdata(this.getCurrentDBVersion(true));
- }
-
- String msg=visit.canDelete(proj,user);
-
- if(msg!=null){
- logger.error(msg);
- return msg;
- }
-
- if(visit.getProject() != null && !visit.getProject().equals(proj.getId())){
- try {
- SecurityValues values = new SecurityValues();
- values.put(this.getXSIType() + "/project", proj.getId());
-
- if (!Permissions.canDelete(user,visit) && !Permissions.canDelete(user,this.getSchemaElement(),values))
- {
- return "User cannot delete experiments for project " + proj.getId();
- }
-
- int index = 0;
- int match = -1;
- for(XnatExperimentdataShareI pp : visit.getSharing_share()){
- if(pp.getProject().equals(proj.getId())){
- SaveItemHelper.authorizedRemoveChild(visit.getItem(), "xnat:experimentData/sharing/share", ((XnatExperimentdataShare)pp).getItem(), user,c);
- match=index;
- break;
- }
- index++;
- }
-
- if(match==-1)return null;
-
- //TODO:at this point, retrieve all experiments associated with this visit and disassociate them.
-
- this.removeSharing_share(match);
- return null;
- } catch (SQLException e) {
- logger.error("",e);
- return e.getMessage();
- } catch (Exception e) {
- logger.error("",e);
- return e.getMessage();
- }
- }else{
- try {
-
- if(!Permissions.canDelete(user,this)){
- return "User account doesn't have permission to delete this experiment.";
- }
-
- if(removeFiles){
- this.deleteFiles(user,c);
- }
-
- String visitId=visit.getId();
-
- //find any experiments that reference this visit and delete the reference.
- try {
-
- final QueryOrganizer qo = new QueryOrganizer("xnat:experimentdata",user,ViewManager.ALL);
- qo.addField("xnat:experimentdata/ID");
-
- CriteriaCollection where=new CriteriaCollection("AND");
-
- CriteriaCollection cc= new CriteriaCollection("OR");
-
- CriteriaCollection cc2=new CriteriaCollection("AND");
- cc2.addClause("xnat:experimentdata/sharing/share/project", proj.getId());
- cc2.addClause("xnat:experimentdata/sharing/share/visit", visit.getId());
-
- CriteriaCollection cc3=new CriteriaCollection("AND");
- cc3.addClause("xnat:experimentdata/project", proj.getId());
- cc3.addClause("xnat:experimentdata/visit", visit.getId());
-
- cc.addClause(cc2);
- cc.addClause(cc3);
-
- where.addClause(cc);
- qo.setWhere(where);
-
- String query=qo.buildQuery();
-
- String exptIdColumn= qo.getFieldAlias("xnat:experimentdata/ID");
-
- XFTTable table=XFTTable.Execute(query, user.getDBName(), user.getUsername());
- //TODO: these are the visits we're going to have to disassociate.
- table.resetRowCursor();
- while (table.hasMoreRows())
- {
- final Hashtable row = table.nextRowHash();
-
- try {
- final Object exptID = row.get(exptIdColumn.toLowerCase()); //fun, we have to do a toLowerCase because getFieldAlias returns a different case than Execute creates. Hopefully, it will always lowercase it. I am guessing.
- //grab the experiment, clear out visit and save...
- XnatExperimentdata frank = XnatExperimentdata.getXnatExperimentdatasById(exptID.toString(), user, true);
- if(org.apache.commons.lang.StringUtils.equalsIgnoreCase(frank.getVisit(), visitId)){
- XnatExperimentdata new_expt = frank.getLightCopy();
- new_expt.setProperty("xnat:experimentdata/visit", "NULL");
- SaveItemHelper.authorizedSave(new_expt, user, false, false, c);
- } else {
- //the visit must be in the shared project, then. So, we need to clear that out...
- //TODO: implement this.
- throw new Exception("Unable to delete a shared project's visit from an experiment because the feature is not implemented.");
- }
- } catch (XFTInitException e) {
- logger.error("",e);
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- }
- }
-
- } catch (SQLException e) {
- e.printStackTrace();
- } catch (DBPoolException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
-
- SaveItemHelper.authorizedDelete(visit.getItem().getCurrentDBVersion(), user,c);
-
- Users.clearCache(user);
- MaterializedView.deleteByUser(user);
-
- } catch (SQLException e) {
- logger.error("",e);
- return e.getMessage();
- } catch (Exception e) {
- logger.error("",e);
- return e.getMessage();
- }
- }
- return null;
- }
-
- public int hashCode() {
- return new HashCodeBuilder(11, 37). // two randomly chosen prime numbers
- // if deriving: appendSuper(super.hashCode()).
- append(this.getVisitName()).
- append(this.getSubjectId()).
- append(this.getVisitType()).
-
- toHashCode();
- }
-
- public boolean equals(Object obj) {
- if (obj == null)
- return false;
- if (obj == this)
- return true;
- if (obj.getClass() != getClass())
- return false;
-
- BaseXnatPvisitdata rhs = (BaseXnatPvisitdata) obj;
- return new EqualsBuilder().
- // if deriving: appendSuper(super.equals(obj)).
- append(this.getVisitName(), rhs.getVisitName()).
- append(this.getSubjectId(), rhs.getSubjectId()).
- append(this.getVisitType(), rhs.getVisitType()).
-
- isEquals();
- }
-
- @Override
- public int compareTo(Object obj) {
- BaseXnatPvisitdata rhs = (BaseXnatPvisitdata) obj;
-
- return new CompareToBuilder().
- //if deriving: .appendSuper(super.compareTo(o)).
- append(this.getVisitName(), rhs.getVisitName()).
- append(this.getSubjectId(), rhs.getSubjectId()).
- append(this.getVisitType(), rhs.getVisitType()).
- toComparison();
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcassessmentdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatQcassessmentdata.java
deleted file mode 100644
index b270a1e387519cbc24168df538e7fce276a90ccf..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcassessmentdata.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatQcassessmentdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.XnatQcassessmentdataScan;
-import org.nrg.xdat.om.base.auto.AutoXnatQcassessmentdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.scanAssessors.ScanAssessorI;
-import org.nrg.xnat.scanAssessors.ScanAssessorScanI;
-
-import java.util.Hashtable;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatQcassessmentdata extends AutoXnatQcassessmentdata implements ScanAssessorI{
-
- public BaseXnatQcassessmentdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatQcassessmentdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatQcassessmentdata(UserI user)
- **/
- public BaseXnatQcassessmentdata()
- {}
-
- public BaseXnatQcassessmentdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public ScanAssessorScanI getScanById(String scanId){
- XnatQcassessmentdataScan rtn = null;
- if (scanId == null) throw new NullPointerException("Expected a non-null value for the scan id input parameter");
- List<XnatQcassessmentdataScan> scans = super.getScans_scan();
- if (scans != null && scans.size() > 0) {
- for (int i=0; i< scans.size(); i++) {
- XnatQcassessmentdataScan aScan = (XnatQcassessmentdataScan)scans.get(i);
- if (aScan.getId().equals(scanId)) {
- rtn = aScan;
- break;
- }
- }
- }
- if (rtn == null) throw new NullPointerException("Couldnt find QC assessment for scan id " + scanId);
- return rtn;
- }
-
- public String getHeader(){
- return this.getType();
- }
-
- public int getPrecedence(){
- return 3;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcassessmentdataScan.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatQcassessmentdataScan.java
deleted file mode 100644
index d5a3f76a3469087fab87282d2d99ea853b289665..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcassessmentdataScan.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatQcassessmentdataScan
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatQcassessmentdataScan;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.scanAssessors.ScanAssessorScanI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatQcassessmentdataScan extends AutoXnatQcassessmentdataScan implements ScanAssessorScanI{
-
- public BaseXnatQcassessmentdataScan(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatQcassessmentdataScan(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatQcassessmentdataScan(UserI user)
- **/
- public BaseXnatQcassessmentdataScan()
- {}
-
- public BaseXnatQcassessmentdataScan(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getSummary(){
- return "Present";
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcassessmentdataScanSlice.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatQcassessmentdataScanSlice.java
deleted file mode 100644
index cb31dcd6f2db5f875baf95e72cef5519862c37cb..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcassessmentdataScanSlice.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatQcassessmentdataScanSlice
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatQcassessmentdataScanSlice;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatQcassessmentdataScanSlice extends AutoXnatQcassessmentdataScanSlice {
-
- public BaseXnatQcassessmentdataScanSlice(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatQcassessmentdataScanSlice(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatQcassessmentdataScanSlice(UserI user)
- **/
- public BaseXnatQcassessmentdataScanSlice()
- {}
-
- public BaseXnatQcassessmentdataScanSlice(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcmanualassessordata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatQcmanualassessordata.java
deleted file mode 100644
index f193d814c9cbee7ceea0adcb30a9317fb5f9e741..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcmanualassessordata.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatQcmanualassessordata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.XnatQcscandata;
-import org.nrg.xdat.om.base.auto.AutoXnatQcmanualassessordata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.scanAssessors.ScanAssessorI;
-import org.nrg.xnat.scanAssessors.ScanAssessorScanI;
-
-import java.util.Hashtable;
-import java.util.List;
-
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatQcmanualassessordata extends AutoXnatQcmanualassessordata implements ScanAssessorI{
- public BaseXnatQcmanualassessordata(ItemI item) {
- super(item);
- }
-
- public BaseXnatQcmanualassessordata(UserI user) {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatQcmanualassessordata(UserI user)
- */
- public BaseXnatQcmanualassessordata() {
- }
-
- public BaseXnatQcmanualassessordata(Hashtable properties, UserI user) {
- super(properties, user);
- }
-
- public ScanAssessorScanI getScanById(String scanId){
- XnatQcscandata rtn = null;
- if (scanId == null) throw new NullPointerException("Expected a non-null value for the scan id input parameter");
- List<XnatQcscandata> scans = super.getScans_scan();
- if (scans != null && scans.size() > 0) {
- for (int i=0; i< scans.size(); i++) {
- XnatQcscandata aScan = (XnatQcscandata)scans.get(i);
- if (aScan.getImagescanId().equals(scanId)) {
- rtn = aScan;
- break;
- }
- }
- }
- if (rtn == null) throw new NullPointerException("Couldnt find manual QC assessment for scan id " + scanId);
- return rtn;
- }
-
- public String getHeader(){
- return "Manual QC";
- }
-
- public int getPrecedence(){
- return 2;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatQcscandata.java
deleted file mode 100644
index e3470e660d9cbca5c02d4c19a96f08ca0a7ce630..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcscandata.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatQcscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatQcscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xnat.scanAssessors.ScanAssessorScanI;
-
-import java.util.Hashtable;
-
-
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatQcscandata extends AutoXnatQcscandata implements ScanAssessorScanI{
- public BaseXnatQcscandata(ItemI item) {
- super(item);
- }
-
- public BaseXnatQcscandata(UserI user) {
- super(user);
- }
-
- public BaseXnatQcscandata() {
- }
-
- public BaseXnatQcscandata(Hashtable properties, UserI user) {
- super(properties, user);
- }
-
- public String getSummary(){
- String status = getPass();
- String summary = "<span>Unknown</span>";
- if(status!=null){
- if(status.equals("1")||status.equalsIgnoreCase("pass")){
- summary = "<span style=\"color:green\">Passed</span>";
- }
- else if(status.equals("0")||status.equalsIgnoreCase("fail")){
- summary = "<span style=\"color:red\">Failed</span>";
- }
- }
- return summary;
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcscandataField.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatQcscandataField.java
deleted file mode 100644
index 61384bc23c5eeb5dd8aaa0938f60c3be3ec84c3b..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatQcscandataField.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatQcscandataField
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatQcscandataField;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatQcscandataField extends AutoXnatQcscandataField {
-
- public BaseXnatQcscandataField(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatQcscandataField(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatQcscandataField(UserI user)
- **/
- public BaseXnatQcscandataField()
- {}
-
- public BaseXnatQcscandataField(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatReconstructedimagedata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatReconstructedimagedata.java
deleted file mode 100644
index 84356ff1f06cd38cfa47f8991f41f7ec2dfe1c02..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatReconstructedimagedata.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatReconstructedimagedata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.xdat.model.XnatAbstractresourceI;
-import org.nrg.xdat.om.*;
-import org.nrg.xdat.om.base.BaseXnatExperimentdata.UnknownPrimaryProjectException;
-import org.nrg.xdat.om.base.auto.AutoXnatReconstructedimagedata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xnat.exceptions.InvalidArchiveStructure;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatReconstructedimagedata extends AutoXnatReconstructedimagedata {
-
- public BaseXnatReconstructedimagedata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatReconstructedimagedata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatReconstructedimagedata()
- {}
-
- public BaseXnatReconstructedimagedata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- private XnatImagesessiondata mr = null;
-
- public XnatImagesessiondata getImageSessionData()
- {
- if (mr==null)
- {
- ArrayList al = XnatImagesessiondata.getXnatImagesessiondatasByField("xnat:imageSessionData/ID",this.getImageSessionId(),this.getUser(),false);
- if (al.size()>0)
- {
- mr = (XnatImagesessiondata)al.get(0);
- }
- }
-
- return mr;
- }
-
- public void setImageSessionData(XnatImagesessiondata ses){
- mr=ses;
- }
-
- public ArrayList getOutFileByContent(String content) {
-
- ArrayList files = new ArrayList();
-
- List outFiles = getOut_file();
-
- if (outFiles == null || outFiles.size() == 0) return files;
-
- for (int i = 0 ; i < outFiles.size(); i++) {
-
- XnatAbstractresource absrsc = (XnatAbstractresource) outFiles.get(i);
-
- String rcontent = null;
-
- if (absrsc instanceof XnatResource) {
-
- XnatResource resource = (XnatResource)outFiles.get(i);
-
- rcontent = resource.getContent();
-
- }
-
- if (rcontent != null && content != null && rcontent.equals(content)) {
-
- files.add(absrsc);
-
- }
-
- }
-
- return files;
-
- }
-
- public ArrayList getComputationByName(String name) {
-
- ArrayList rtn = new ArrayList();
-
- List datums = this.getComputations_datum();
-
- if (datums == null || datums.size() == 0) {
-
- return rtn;
-
- }
-
- for (int i = 0; i < datums.size(); i++) {
-
- XnatComputationdata aDatum = (XnatComputationdata)datums.get(i);
-
- if (aDatum.getName().equals(name)) {
-
- rtn.add(datums.get(i));
-
- }
-
- }
-
- return rtn;
-
- }
-
-
- public File getExpectedSessionDir() throws InvalidArchiveStructure, UnknownPrimaryProjectException{
- return this.getImageSessionData().getExpectedSessionDir();
- }
- @Override
- public void preSave() throws Exception{
- super.preSave();
- if(this.getImageSessionData()==null){
- throw new Exception("Unable to identify image session for:" + this.getImageSessionId());
- }
- final String expectedPath=this.getExpectedSessionDir().getAbsolutePath().replace('\\', '/');
-
- validate(expectedPath);
- }
-
- public void validate(String expectedPath) throws Exception{
-
- if(StringUtils.isBlank(this.getId())){
- throw new IllegalArgumentException();
- }
-
- if(!XftStringUtils.IsAlphaNumericUnderscore(getId())){
- throw new IllegalArgumentException("Identifiers cannot use special characters.");
- }
-
- for(final XnatAbstractresourceI res: this.getOut_file()){
- final String uri;
- if(res instanceof XnatResource){
- uri=((XnatResource)res).getUri();
- }else if(res instanceof XnatResourceseries){
- uri=((XnatResourceseries)res).getPath();
- }else{
- continue;
- }
-
- FileUtils.ValidateUriAgainstRoot(uri,expectedPath,"URI references data outside of the project:" + uri);
- }
-
- for(final XnatAbstractresourceI res: this.getIn_file()){
- final String uri;
- if(res instanceof XnatResource){
- uri=((XnatResource)res).getUri();
- }else if(res instanceof XnatResourceseries){
- uri=((XnatResourceseries)res).getPath();
- }else{
- continue;
- }
-
- FileUtils.ValidateUriAgainstRoot(uri,expectedPath,"URI references data outside of the project:" + uri);
-}
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatReconstructedimagedataScanid.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatReconstructedimagedataScanid.java
deleted file mode 100644
index 698cd72a6be0f6e4cc0222239684b1a3e3563e23..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatReconstructedimagedataScanid.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatReconstructedimagedataScanid
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatReconstructedimagedataScanid;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatReconstructedimagedataScanid extends AutoXnatReconstructedimagedataScanid {
-
- public BaseXnatReconstructedimagedataScanid(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatReconstructedimagedataScanid(UserI user)
- {
- super(user);
- }
-
- public BaseXnatReconstructedimagedataScanid()
- {}
-
- public BaseXnatReconstructedimagedataScanid(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatRegionresource.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatRegionresource.java
deleted file mode 100644
index f067ef410d1451ba11ceda62c4efc6c477f02318..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatRegionresource.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatRegionresource
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatRegionresource;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatRegionresource extends AutoXnatRegionresource {
-
- public BaseXnatRegionresource(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatRegionresource(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatRegionresource(UserI user)
- **/
- public BaseXnatRegionresource()
- {}
-
- public BaseXnatRegionresource(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatRegionresourceLabel.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatRegionresourceLabel.java
deleted file mode 100644
index 4e5da4588bae9357e0800fc5c44066dcc74c2467..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatRegionresourceLabel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatRegionresourceLabel
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatRegionresourceLabel;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatRegionresourceLabel extends AutoXnatRegionresourceLabel {
-
- public BaseXnatRegionresourceLabel(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatRegionresourceLabel(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatRegionresourceLabel(UserI user)
- **/
- public BaseXnatRegionresourceLabel()
- {}
-
- public BaseXnatRegionresourceLabel(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatResource.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatResource.java
deleted file mode 100644
index 52bac47f83293385336a7253209735841a2c1113..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatResource.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatResource
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 11/18/13 9:35 AM
- */
-package org.nrg.xdat.om.base;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.xdat.om.base.auto.AutoXnatResource;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xnat.srb.XNATDirectory;
-import org.nrg.xnat.srb.XNATSrbSearch;
-
-import edu.sdsc.grid.io.GeneralFile;
-import edu.sdsc.grid.io.srb.SRBFile;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatResource extends AutoXnatResource {
-
- public BaseXnatResource(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatResource(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatResource(UserI user)
- **/
- public BaseXnatResource()
- {}
-
- public BaseXnatResource(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-
- protected ArrayList files=null;
- protected ArrayList fileNames=null;
- /**
- * Returns ArrayList of java.io.File objects
- * @return
- */
- public ArrayList<File> getCorrespondingFiles(String rootPath)
- {
- if (files==null)
- {
- String fullPath = getFullPath(rootPath);
- if (fullPath.endsWith("\\")) {
- fullPath = fullPath.substring(0,fullPath.length() -1);
- }
- if (fullPath.endsWith("/")) {
- fullPath = fullPath.substring(0,fullPath.length() -1);
- }
- files = getAssociatedFilesOnLocalFileSystem(fullPath);
- }
- return files;
- }
-
- public ArrayList<File> getCorrespondingFiles()
- {
- if (files==null || files.size()==0)
- {
- if (getUri().startsWith("file:")) {
- try {
- URI uri = new URI(getUri());
- File file = new File(uri);
- files = getAssociatedFilesOnLocalFileSystem(file.getAbsolutePath());
- }catch(Exception e) {
-
- }
- }
- }
- return files;
- }
-
- /**
- * Returns ArrayList of java.lang.String objects
- * @return
- */
- public ArrayList getCorrespondingFileNames(String rootPath)
- {
- if (fileNames==null)
- {
- fileNames = new ArrayList();
- File f = new File(org.nrg.xft.utils.FileUtils.AppendRootPath(rootPath,this.getUri()));
- if (!f.exists() && !getUri().endsWith(".gz"))
- {
- f = new java.io.File(org.nrg.xft.utils.FileUtils.AppendRootPath(rootPath,this.getUri()) + ".gz");
- }
- fileNames.add(f.getName());
- }
- return fileNames;
- }
- /**
- * Prepends this path to the enclosed URI or path variables.
- * @param root
- */
- public void prependPathsWith(String root){
- if (!FileUtils.IsAbsolutePath(this.getUri())){
- try {
- this.setUri(root + this.getUri());
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- }
-
- /**
- * Relatives this path from the first occurrence of the indexOf string.
- * @param indexOf
- */
- public void relativizePaths(String indexOf, boolean caseSensitive){
- String uri = this.getUri();
- uri= uri.replace('\\', '/');
- if (uri.indexOf(indexOf)==-1){
- if (!caseSensitive){
- int index = uri.toLowerCase().indexOf(indexOf.toLowerCase());
- if (index!=-1){
- this.setUri(uri.substring(index + 1));
- }
- }
- }else{
- this.setUri(uri.substring(uri.indexOf(indexOf) + 1));
- }
- }
-
-
- /**
- * Appends this path to the enclosed URI or path variables.
- * @param root
- */
- public ArrayList<String> getUnresolvedPaths(){
- ArrayList<String> al = new ArrayList<String>();
- String p = getUri();
- p.replace('\\', '/');
- al.add(p);
- return al;
- }
-
- public String getFullPath(String rootPath){
-
- String fullPath = StringUtils.replace(FileUtils.AppendRootPath(rootPath, this.getUri()), "\\", "/");
- while (fullPath.indexOf("//")!=-1)
- {
- fullPath =StringUtils.replace(fullPath,"//","/");
- }
-
- if(!fullPath.endsWith("/"))
- {
- fullPath+="/";
- }
-
- return fullPath;
- }
-
- /**
- * Gets the files associated with an image.
- * For an uri which is say like: /data/a.img
- * This method will return all files which match the pattern /data/a.*
- *
- * @return
- */
-
-
- public ArrayList<File> getAssociatedFiles(String rootPath, File tempDir) {
- String fullPath = getFullPath(rootPath);
- if (fullPath.endsWith(File.separator)) {
- fullPath = fullPath.substring(0,fullPath.length() -1);
- }
- if (fullPath.startsWith("srb:"))
- return getAssociatedFilesFromRemoteFileSystem(fullPath,tempDir);
- else
- return getAssociatedFilesOnLocalFileSystem(fullPath);
- }
-
- protected ArrayList<File> getAssociatedFilesFromRemoteFileSystem(String fullPath,File tempDir) {
- ArrayList<File> associatedFiles = new ArrayList();
- int lastIndexOfSlash = fullPath.lastIndexOf(SRBFile.PATH_SEPARATOR);
- if (lastIndexOfSlash != -1) {
- String path = fullPath.substring(0,lastIndexOfSlash);
- try {
- URI uri = new URI(path);
- XNATDirectory srbDir = XNATSrbSearch.getFilesAssociatedWith(uri.getPath(),fullPath.substring(lastIndexOfSlash+1));
- srbDir.importFiles(tempDir);
- ArrayList srbAssociatedFiles = srbDir.getFiles();
- for (int i = 0; i < srbAssociatedFiles.size(); i++) {
- associatedFiles.add(new File(tempDir.getAbsolutePath() + File.separator + ((GeneralFile)srbAssociatedFiles.get(i)).getName()));
- }
- }catch(Exception e) {
- logger.error("Couldnt get Files for " + fullPath,e);
- }
-
- }
- return associatedFiles;
- }
-
- protected File getFileOnLocalFileSystem(String fullPath) {
- File f = new File(fullPath);
- if (!f.exists()){
- if (!fullPath.endsWith(".gz")){
- f= new File(fullPath + ".gz");
- if (!f.exists()){
- logger.debug("Unable to find file:" + fullPath);
- return null;
- }
- }else{
- return null;
- }
- }
-
- return f;
- }
-
- protected ArrayList<File> getAssociatedFilesOnLocalFileSystem(String fullPath) {
- ArrayList<File> associatedFiles = new ArrayList();
- if (!new File(fullPath).exists()){
- if (!fullPath.endsWith(".gz")){
- if (!new File(fullPath +".gz").exists())return associatedFiles;
- }else{
- return associatedFiles;
- }
- }
- int lastSlash = fullPath.lastIndexOf("/");
- if (lastSlash==-1){
- lastSlash = fullPath.lastIndexOf("\\");
- }
- String path = "";
- String fileroot = fullPath;
- if (lastSlash != -1) {
- path = fullPath.substring(0, lastSlash);
- fileroot = fullPath.substring(lastSlash+1);
- }
- int indexOfDot = (fileroot.toLowerCase().lastIndexOf(".ima")!=-1 ?fileroot.toLowerCase().lastIndexOf(".ima") : fileroot.toLowerCase().lastIndexOf(".img"));
- if (indexOfDot != -1) {
- fileroot = fileroot.substring(0,indexOfDot);
- final String fileRoot = fileroot;
- File dir = new File(path);
- if (dir.exists() && dir.isDirectory()) {
- FilenameFilter filter = new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return (name.startsWith(fileRoot));
- }
- };
- String[] associatedFileNames = dir.list(filter);
- if (associatedFileNames == null) {
- return associatedFiles;
- }
- for (int i = 0; i < associatedFileNames.length; i++) {
- associatedFiles.add(new File(dir.getAbsolutePath() + File.separator + associatedFileNames[i]));
- }
- }
- }else{
- if (!new File(fullPath).exists()){
- if (!fullPath.endsWith(".gz")){
- if (new File(fullPath +".gz").exists()){
- associatedFiles.add(new File(fullPath +".gz"));
- }
- }
- }else{
- associatedFiles.add(new File(fullPath));
- }
- }
- return associatedFiles;
- }
-
- public void moveTo(File newSessionDir,String existingSessionDir,String rootPath,UserI user,EventMetaI ci) throws IOException,Exception{
- String uri = this.getUri();
-
- String relativePath=null;
- if(existingSessionDir!=null && uri.startsWith(existingSessionDir)){
- relativePath=uri.substring(existingSessionDir.length());
- }else{
- if(FileUtils.IsAbsolutePath(uri)){
- if(uri.indexOf("/")>0){
- relativePath=uri.substring(uri.indexOf("/")+1);
- }else if(uri.indexOf("\\")>0){
- relativePath=uri.substring(uri.indexOf("\\")+1);
- }else{
- relativePath=uri;
- }
- }else{
- relativePath=uri;
- }
- }
-
- File newFile = new File(newSessionDir,relativePath);
- File parentDir=newFile.getParentFile();
- if(!parentDir.exists())
- {
- parentDir.mkdirs();
- }
-
- for(File f: this.getCorrespondingFiles(rootPath)){
- FileUtils.MoveFile(f, new File(parentDir,f.getName()), true, true);
- }
-
- this.setUri(newFile.getAbsolutePath());
- SaveItemHelper.authorizedSave(this,user, true, false,ci);
- }
-
- @Override
- public String getUri() {
- if( super.getUri()!=null){
- return super.getUri().replace('\\', '/');
- }else{
- return null;
- }
- }
-
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatResourcecatalog.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatResourcecatalog.java
deleted file mode 100644
index 27780a928e2bdd8e75f9e54f347ed4a3bb232020..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatResourcecatalog.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatResourcecatalog
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 10/14/13 5:42 PM
- */
-package org.nrg.xdat.om.base;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.zip.GZIPInputStream;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.xdat.bean.CatCatalogBean;
-import org.nrg.xdat.bean.CatEntryBean;
-import org.nrg.xdat.bean.base.BaseElement;
-import org.nrg.xdat.bean.reader.XDATXMLReader;
-import org.nrg.xdat.model.CatCatalogI;
-import org.nrg.xdat.model.CatEntryI;
-import org.nrg.xdat.om.base.auto.AutoXnatResourcecatalog;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.event.EventUtils;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xnat.utils.CatalogUtils;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatResourcecatalog extends AutoXnatResourcecatalog {
-
- public BaseXnatResourcecatalog(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatResourcecatalog(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatResourcecatalog(UserI user)
- **/
- public BaseXnatResourcecatalog()
- {}
-
- public BaseXnatResourcecatalog(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- /**
- * Returns ArrayList of java.io.File objects
- * @return
- */
- public ArrayList getCorrespondingFiles(String rootPath)
- {
- if (files==null)
- {
- files = new ArrayList<File>();
-
- final File catFile = this.getCatalogFile(rootPath);
- final String parentPath=catFile.getParent();
- final CatCatalogBean cat=CatalogUtils.getCatalog(rootPath, this);
-
- if (cat!=null){
- for(CatEntryI entry: cat.getEntries_entry()){
- String entryPath = StringUtils.replace(FileUtils.AppendRootPath(parentPath, entry.getUri()), "\\", "/");
- File temp=getFileOnLocalFileSystem(entryPath);
- if(temp!=null)
- files.add(temp);
- }
- }
-
- }
- return files;
- }
-
- public void clearFiles() {
- files = null;
- }
-
-
- /**
- * Returns ArrayList of java.lang.String objects
- * @return
- */
- public ArrayList getCorrespondingFileNames(String rootPath)
- {
- if (fileNames==null)
- {
- fileNames = new ArrayList();
- ArrayList files = getCorrespondingFiles(rootPath);
- for (int i=0;i<files.size();i++){
- File f = (File)files.get(i);
- fileNames.add(f.getName());
- }
- }
- return fileNames;
- }
-
- /**
- * Appends this path to the enclosed URI or path variables.
- * @param root
- */
- public void prependPathsWith(String root){
- if (!FileUtils.IsAbsolutePath(this.getUri())){
- try {
- this.setUri(root + this.getUri());
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- }
-
- public File getCatalogFile(String rootPath){
- return CatalogUtils.getCatalogFile(rootPath, this);
- }
-
- public CatCatalogBean getCatalog(String rootPath){
- return CatalogUtils.getCatalog(rootPath, this);
- }
-
- public static void backupEntry(String parentPath,CatCatalogBean cat,UserI user, EventMetaI c, String timestamp) throws FileNotFoundException, IOException{
- if (cat!=null){
- for(CatEntryI entry: cat.getEntries_entry()){
- final File f = new File(parentPath,entry.getUri());
- final File newFile=FileUtils.CopyToHistory(f,timestamp);
- entry.setUri(newFile.getAbsolutePath());
- ((CatEntryBean)entry).setModifiedtime(EventUtils.getEventDate(c, false));
- if(user!=null){
- entry.setModifiedby(user.getUsername());
- }
-
- if(c!=null && c.getEventId()!=null){
- entry.setModifiedeventid(Integer.valueOf(c.getEventId().intValue()));
- }
- }
- }
- }
-
- public void backupToHistory(String rootPath,UserI user, EventMetaI c) throws Exception{
- final File f = this.getCatalogFile(rootPath);
- final String parentPath=f.getParentFile().getAbsolutePath();
- final CatCatalogBean cat=CatalogUtils.getCatalog(rootPath,this);
-
- if(cat!=null){
- String timestamp=EventUtils.getTimestamp(c);
- backupEntry(parentPath, cat, user, c,timestamp);
- CatalogUtils.writeCatalogToFile(cat, FileUtils.BuildHistoryFile(f,timestamp));
- }
- }
-
-
-
- public void deleteWithBackup(String rootPath, UserI user, EventMetaI c) throws Exception{
- if(CatalogUtils.maintainFileHistory()){
- backupToHistory(rootPath, user, c);
- }
-
- deleteFromFileSystem(rootPath);
- }
-
- public void deleteFromFileSystem(String rootPath){
- super.deleteFromFileSystem(rootPath);
-
- final File f = this.getCatalogFile(rootPath);
-
- if (f.exists()){
- try {
- FileUtils.MoveToCache(f);
- if(FileUtils.CountFiles(f.getParentFile(),true)==0){
- FileUtils.DeleteFile(f.getParentFile());
- }
- } catch (FileNotFoundException e) {
- logger.error("",e);
- } catch (IOException e) {
- logger.error("",e);
- }
- }
- }
-
- public int entryCount =0;
- public boolean formalizeCatalog(CatCatalogI cat, String catPath,UserI user, EventMetaI now){
- return CatalogUtils.formalizeCatalog(cat,catPath,user,now);
- }
-
- public CatCatalogBean getCleanCatalog(String rootPath,boolean includeFullPaths,UserI user, EventMetaI c){
- return CatalogUtils.getCleanCatalog(rootPath, this, includeFullPaths,user,c);
- }
-
- public void clearCountAndSize() {
- count = null;
- size = null;
- }
-
- Integer count = null;
- public Integer getCount(String rootPath){
- if (count ==null){
- long sizeI = 0;
- int countI = 0;
- Iterator files = this.getCorrespondingFiles(rootPath).iterator();
- while (files.hasNext()){
- File f = (File)files.next();
-
- if (f!=null && f.exists() && !f.getName().endsWith("catalog.xml")){
- countI++;
- sizeI+=f.length();
- }
- }
-
- size = new Long(sizeI);
- count = new Integer(countI);
- }
- return count;
- }
-
- Long size = null;
- public long getSize(String rootPath){
- if (size ==null){
- long sizeI = 0;
- int countI = 0;
- Iterator files = this.getCorrespondingFiles(rootPath).iterator();
- while (files.hasNext()){
- File f = (File)files.next();
- if (!f.getName().endsWith("catalog.xml")){
- countI++;
- sizeI+=f.length();
- }
- }
-
- size = new Long(sizeI);
- count = new Integer(countI);
- }
- return size.longValue();
- }
-
- public void moveTo(File newSessionDir,String existingSessionDir,String rootPath,UserI user,EventMetaI ci) throws IOException,Exception{
- String uri = this.getUri();
-
- String relativePath=null;
- if(existingSessionDir!=null && uri.startsWith(existingSessionDir)){
- relativePath=uri.substring(existingSessionDir.length());
- }else{
- if(FileUtils.IsAbsolutePath(uri)){
- if(uri.indexOf("/")>0){
- relativePath=uri.substring(uri.indexOf("/")+1);
- }else if(uri.indexOf("\\")>0){
- relativePath=uri.substring(uri.indexOf("\\")+1);
- }else{
- relativePath=uri;
- }
- }else{
- relativePath=uri;
- }
- }
-
- File newFile = new File(newSessionDir,relativePath);
- File parentDir=newFile.getParentFile();
- if(!parentDir.exists())
- {
- parentDir.mkdirs();
- }
-
- File catalog =this.getCatalogFile(rootPath);
-
- InputStream fis = new FileInputStream(catalog);
- if (catalog.getName().endsWith(".gz"))
- {
- fis = new GZIPInputStream(fis);
- }
- XDATXMLReader reader = new XDATXMLReader();
- BaseElement base = reader.parse(fis);
-
- if (base instanceof CatCatalogBean){
- moveCatalogEntries((CatCatalogBean)base,catalog.getParent(),newFile.getParent());
- }
-
- try {
- FileWriter fw = new FileWriter(catalog);
- base.toXML(fw, true);
- fw.close();
- } catch (IOException e) {
- logger.error("",e);
- }
-
- FileUtils.MoveFile(catalog, newFile, true, true);
-
- this.setUri(newFile.getAbsolutePath());
- SaveItemHelper.authorizedSave(this,user, true, false,ci);
- }
-
- public void moveCatalogEntries(CatCatalogI cat,String existingRootPath,String newRootPath) throws IOException{
- for(CatEntryI entry: cat.getEntries_entry()){
- File existingLocation=null;
- String relativePath=null;
-
- String uri= entry.getUri();
- if(FileUtils.IsAbsolutePath(entry.getUri())){
- existingLocation=new File(entry.getUri());
- if(entry.getUri().startsWith(existingRootPath)){
- relativePath=uri.substring(existingRootPath.length());
- }else{
- if(FileUtils.IsAbsolutePath(entry.getUri())){
- if(entry.getUri().indexOf("/")>0){
- relativePath=uri.substring(entry.getUri().indexOf("/")+1);
- }else if(uri.indexOf("\\")>0){
- relativePath=uri.substring(entry.getUri().indexOf("\\")+1);
- }else{
- relativePath=uri;
- }
- }else{
- relativePath=uri;
- }
- }
- ((CatEntryBean)entry).setUri(relativePath);
- }else{
- existingLocation=new File(existingRootPath,uri);
- relativePath=uri;
- }
-
-
-
- File newFile = new File(newRootPath,relativePath);
- File parentDir=newFile.getParentFile();
- if(!parentDir.exists())
- {
- parentDir.mkdirs();
- }
-
- if(!existingLocation.exists())
- existingLocation=getFileOnLocalFileSystem(existingLocation.getAbsolutePath());
-
- if(existingLocation!=null && existingLocation.exists()){
- FileUtils.MoveFile(existingLocation, newFile, true, true);
- }
- }
-
- for(CatCatalogI subset: cat.getSets_entryset()){
- moveCatalogEntries(subset, existingRootPath, newRootPath);
- }
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatResourceseries.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatResourceseries.java
deleted file mode 100644
index 6c4327aafc79b6d301d52212f8f4b39021822d90..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatResourceseries.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatResourceseries
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 11/18/13 9:35 AM
- */
-package org.nrg.xdat.om.base;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.xdat.om.base.auto.AutoXnatResourceseries;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.event.EventUtils;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.FileUtils.OldFileHandlerI;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xft.utils.XftStringUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.regex.Pattern;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatResourceseries extends AutoXnatResourceseries {
-
- public BaseXnatResourceseries(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatResourceseries(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatResourceseries(UserI user)
- **/
- public BaseXnatResourceseries()
- {}
-
- public BaseXnatResourceseries(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- protected ArrayList files=null;
- protected ArrayList fileNames=null;
-
- private String fullPath = null;
-
-
- public String getFullPath(String rootpath){
- if (fullPath==null)
- {
- fullPath = StringUtils.replace(FileUtils.AppendRootPath(rootpath,this.getPath()),"\\","/");
- while (fullPath.indexOf("//")!=-1)
- {
- fullPath = StringUtils.replace(fullPath, "//", "/");
- }
-
- if(!fullPath.endsWith("/"))
- {
- fullPath+="/";
- }
- }
- return fullPath;
- }
-
- /**
- * Returns ArrayList of java.io.File objects
- * @return
- */
- public ArrayList<File> getCorrespondingFiles(String rootPath)
- {
- if (files==null)
- {
- files = new ArrayList();
- String fullPath = getFullPath(rootPath);
- if (!fullPath.endsWith(File.separator))
- {
- fullPath += File.separator;
- }
- File dir = new File(fullPath);
- if (dir.exists())
- {
- String pattern = this.getPattern();
- if (pattern==null)
- {
- files = new ArrayList(Arrays.asList(dir.listFiles()));
- }else{
- XNATFileFilter filter= new XNATFileFilter();
- filter.setPattern(pattern);
- files = new ArrayList(Arrays.asList(dir.listFiles(filter)));
- }
- }
- }
- return files;
- }
-
- /**
- * Returns ArrayList of java.lang.String objects
- * @return
- */
- public ArrayList getCorrespondingFileNames(String rootPath)
- {
- if (fileNames==null)
- {
- fileNames = new ArrayList();
- String fullPath = getFullPath(rootPath);
- if (!fullPath.endsWith(File.separator))
- {
- fullPath += File.separator;
- }
- File dir = new File(fullPath);
- if (dir.exists())
- {
- String pattern = this.getPattern();
- if (pattern==null)
- {
- fileNames = new ArrayList(Arrays.asList(dir.list()));
- }else{
- XNATFileNameFilter filter= new XNATFileNameFilter();
- filter.setPattern(pattern);
- fileNames = new ArrayList(Arrays.asList(dir.list(filter)));
- }
- }
- }
- return fileNames;
- }
-
- public class XNATFileFilter implements java.io.FileFilter {
- private Pattern _pattern=null;
- public XNATFileFilter()
- {
- }
-
- public void setPattern(String pattern){
- _pattern=java.util.regex.Pattern.compile(pattern);
- }
-
- public boolean accept(File f)
- {
- if (_pattern.matcher(f.getName()).find())
- {
- return true;
- }else{
- return false;
- }
-
- }
- }
-
- public class XNATFileNameFilter implements FilenameFilter {
- private Pattern _pattern=null;
- public XNATFileNameFilter()
- {
- }
-
- public void setPattern(String pattern){
- _pattern=java.util.regex.Pattern.compile(pattern);
- }
-
- public boolean accept(File dir,String name)
- {
- if (_pattern.matcher(name).find())
- {
- return true;
- }else{
- return false;
- }
- }
- }
-
- /**
- * Prepends this path to the enclosed URI or path variables.
- * @param root
- */
- public void prependPathsWith(String root){
- if (!FileUtils.IsAbsolutePath(this.getPath())){
- try {
- this.setPath(root + this.getPath());
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- }
-
- /**
- * Relatives this path from the first occurrence of the indexOf string.
- * @param indexOf
- */
- public void relativizePaths(String indexOf, boolean caseSensitive){
- String uri = this.getPath();
- uri= uri.replace('\\', '/');
- if (uri.indexOf(indexOf)==-1){
- if (!caseSensitive){
- int index = uri.toLowerCase().indexOf(indexOf.toLowerCase());
- if (index!=-1){
- this.setPath(uri.substring(index + 1));
- }
- }
- }else{
- this.setPath(uri.substring(uri.indexOf(indexOf)+ 1));
- }
- }
-
- /**
- * Appends this path to the enclosed URI or path variables.
- */
- public ArrayList<String> getUnresolvedPaths(){
- ArrayList<String> al = new ArrayList<String>();
- String p = getPath();
- p.replace('\\', '/');
- if (!p.endsWith("/"))
- {
- p +="/";
- }
- al.add(p + getPattern());
- return al;
- }
-
-
- public void moveTo(File newSessionDir,String existingSessionDir,String rootPath,UserI user,final EventMetaI ci) throws IOException,Exception{
- String uri = this.getPath();
-
- String relativePath=null;
- if(existingSessionDir!=null && uri.startsWith(existingSessionDir)){
- relativePath=uri.substring(existingSessionDir.length());
- }else{
- if(FileUtils.IsAbsolutePath(uri)){
- if(uri.indexOf("/")>0){
- relativePath=uri.substring(uri.indexOf("/")+1);
- }else if(uri.indexOf("\\")>0){
- relativePath=uri.substring(uri.indexOf("\\")+1);
- }else{
- relativePath=uri;
- }
- }
- }
-
- File newFile = new File(newSessionDir,relativePath);
- if(!newFile.exists())
- {
- newFile.mkdirs();
- }
-
- for(File f: this.getCorrespondingFiles(rootPath)){
- FileUtils.MoveFile(f, new File(newFile,f.getName()), true, true,new OldFileHandlerI(){
- @Override
- public boolean handle(File f) {
- try {
- FileUtils.MoveToHistory(f, EventUtils.getTimestamp(ci));
- } catch (FileNotFoundException e) {
- logger.error("",e);
- return false;
- } catch (IOException e) {
- logger.error("",e);
- return false;
- }
- return true;
- }});
- }
-
- this.setPath(newFile.getAbsolutePath());
- SaveItemHelper.authorizedSave(this,user, true, false,ci);
- }
-
-
- @Override
- public String getPath() {
- if( super.getPath()!=null){
- return super.getPath().replace('\\', '/');
- }else{
- return null;
- }
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatRfscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatRfscandata.java
deleted file mode 100644
index 5c44d5ff2db84f887de6dd49f555149c32419140..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatRfscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatRfscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatRfscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatRfscandata extends AutoXnatRfscandata {
-
- public BaseXnatRfscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatRfscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatRfscandata(UserI user)
- **/
- public BaseXnatRfscandata()
- {}
-
- public BaseXnatRfscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatRfsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatRfsessiondata.java
deleted file mode 100644
index d5de3c4379eb97be0965aa571bf311cca84e4d49..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatRfsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatRfsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatRfsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatRfsessiondata extends AutoXnatRfsessiondata {
-
- public BaseXnatRfsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatRfsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatRfsessiondata(UserI user)
- **/
- public BaseXnatRfsessiondata()
- {}
-
- public BaseXnatRfsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatRtimagescandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatRtimagescandata.java
deleted file mode 100644
index c6de9feda522aeb57f67d107a5983b22993bd929..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatRtimagescandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatRtimagescandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatRtimagescandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatRtimagescandata extends AutoXnatRtimagescandata {
-
- public BaseXnatRtimagescandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatRtimagescandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatRtimagescandata(UserI user)
- **/
- public BaseXnatRtimagescandata()
- {}
-
- public BaseXnatRtimagescandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatRtsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatRtsessiondata.java
deleted file mode 100644
index 9828e20320e292cf135bd3dcdc04774774f25f79..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatRtsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatRtsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatRtsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatRtsessiondata extends AutoXnatRtsessiondata {
-
- public BaseXnatRtsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatRtsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatRtsessiondata(UserI user)
- **/
- public BaseXnatRtsessiondata()
- {}
-
- public BaseXnatRtsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatScscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatScscandata.java
deleted file mode 100644
index 2a85bdd922e5112b7e87def8446b63a9a13f54ab..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatScscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatScscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatScscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatScscandata extends AutoXnatScscandata {
-
- public BaseXnatScscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatScscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatScscandata(UserI user)
- **/
- public BaseXnatScscandata()
- {}
-
- public BaseXnatScscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSegscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSegscandata.java
deleted file mode 100644
index 07f043bc95bf75833f726b14869454b376120e6c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSegscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSegscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSegscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatSegscandata extends AutoXnatSegscandata {
-
- public BaseXnatSegscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSegscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatSegscandata(UserI user)
- **/
- public BaseXnatSegscandata()
- {}
-
- public BaseXnatSegscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSmscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSmscandata.java
deleted file mode 100644
index 68cfd004a566c76059496164d1fc75cdf878072c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSmscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSmscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSmscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatSmscandata extends AutoXnatSmscandata {
-
- public BaseXnatSmscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSmscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatSmscandata(UserI user)
- **/
- public BaseXnatSmscandata()
- {}
-
- public BaseXnatSmscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSmsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSmsessiondata.java
deleted file mode 100644
index 37ecea83eeb857a51d0deabfd0e43cdf47717f74..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSmsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSmsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSmsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatSmsessiondata extends AutoXnatSmsessiondata {
-
- public BaseXnatSmsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSmsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatSmsessiondata(UserI user)
- **/
- public BaseXnatSmsessiondata()
- {}
-
- public BaseXnatSmsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSrscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSrscandata.java
deleted file mode 100644
index 4bdeebd9b5381dc74122345c91f919edb4f6cb48..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSrscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSrscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSrscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatSrscandata extends AutoXnatSrscandata {
-
- public BaseXnatSrscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSrscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatSrscandata(UserI user)
- **/
- public BaseXnatSrscandata()
- {}
-
- public BaseXnatSrscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSrsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSrsessiondata.java
deleted file mode 100644
index eee1d7a4a42e2e8982cf8f034626a2341fdde964..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSrsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSrsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSrsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatSrsessiondata extends AutoXnatSrsessiondata {
-
- public BaseXnatSrsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSrsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatSrsessiondata(UserI user)
- **/
- public BaseXnatSrsessiondata()
- {}
-
- public BaseXnatSrsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatStatisticsdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatStatisticsdata.java
deleted file mode 100644
index 6674c465f03e3b90b3cae10183624f91a1c07695..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatStatisticsdata.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatStatisticsdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.model.XnatStatisticsdataAddfieldI;
-import org.nrg.xdat.model.XnatStatisticsdataAdditionalstatisticsI;
-import org.nrg.xdat.om.XnatStatisticsdataAddfield;
-import org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics;
-import org.nrg.xdat.om.base.auto.AutoXnatStatisticsdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatStatisticsdata extends AutoXnatStatisticsdata {
-
- public BaseXnatStatisticsdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatStatisticsdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatStatisticsdata(UserI user)
- **/
- public BaseXnatStatisticsdata()
- {}
-
- public BaseXnatStatisticsdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public XnatStatisticsdataAdditionalstatistics getAdditionalstatistics(String name) {
- XnatStatisticsdataAdditionalstatistics rtn = null;
- List<XnatStatisticsdataAdditionalstatisticsI> additionalStats = getAdditionalstatistics() ;
- for (int i = 0; i < additionalStats.size(); i++) {
- if (additionalStats.get(i).getName().equals(name)) {
- rtn = (XnatStatisticsdataAdditionalstatistics)additionalStats.get(i);
- break;
- }
- }
- return rtn;
- }
-
- public XnatStatisticsdataAddfield getAddfield(String name) {
- XnatStatisticsdataAddfield rtn = null;
- List<XnatStatisticsdataAddfieldI> additionalFields = getAddfield() ;
- for (int i = 0; i < additionalFields.size(); i++) {
- if (additionalFields.get(i).getName().equals(name)) {
- rtn = (XnatStatisticsdataAddfield)additionalFields.get(i);
- break;
- }
- }
- return rtn;
- }
-
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatStatisticsdataAddfield.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatStatisticsdataAddfield.java
deleted file mode 100644
index 63f6e628d096a2ef1e7930e2c41546fd45739d6f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatStatisticsdataAddfield.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatStatisticsdataAddfield
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatStatisticsdataAddfield;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatStatisticsdataAddfield extends AutoXnatStatisticsdataAddfield {
-
- public BaseXnatStatisticsdataAddfield(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatStatisticsdataAddfield(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatStatisticsdataAddfield(UserI user)
- **/
- public BaseXnatStatisticsdataAddfield()
- {}
-
- public BaseXnatStatisticsdataAddfield(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatStatisticsdataAdditionalstatistics.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatStatisticsdataAdditionalstatistics.java
deleted file mode 100644
index ae6c846f93d7c8f42f139f6dc25e46fa2687e2e2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatStatisticsdataAdditionalstatistics.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatStatisticsdataAdditionalstatistics
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatStatisticsdataAdditionalstatistics;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatStatisticsdataAdditionalstatistics extends AutoXnatStatisticsdataAdditionalstatistics {
-
- public BaseXnatStatisticsdataAdditionalstatistics(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatStatisticsdataAdditionalstatistics(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatStatisticsdataAdditionalstatistics(UserI user)
- **/
- public BaseXnatStatisticsdataAdditionalstatistics()
- {}
-
- public BaseXnatStatisticsdataAdditionalstatistics(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocol.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocol.java
deleted file mode 100644
index 4bc9e3d5f3b68bb717863b8138def0c0c15b6a06..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocol.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatStudyprotocol
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatStudyprotocol;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatStudyprotocol extends AutoXnatStudyprotocol {
-
- public BaseXnatStudyprotocol(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatStudyprotocol(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatStudyprotocol(UserI user)
- **/
- public BaseXnatStudyprotocol()
- {}
-
- public BaseXnatStudyprotocol(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolCondition.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolCondition.java
deleted file mode 100644
index 79999cb33b6f633d9aa112686a6fe0fcb686b502..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolCondition.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatStudyprotocolCondition
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatStudyprotocolCondition;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatStudyprotocolCondition extends AutoXnatStudyprotocolCondition {
-
- public BaseXnatStudyprotocolCondition(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatStudyprotocolCondition(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatStudyprotocolCondition(UserI user)
- **/
- public BaseXnatStudyprotocolCondition()
- {}
-
- public BaseXnatStudyprotocolCondition(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolGroup.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolGroup.java
deleted file mode 100644
index b3d68bc26dea4e59640912353678b6c2f5068528..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolGroup.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatStudyprotocolGroup
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatStudyprotocolGroup;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatStudyprotocolGroup extends AutoXnatStudyprotocolGroup {
-
- public BaseXnatStudyprotocolGroup(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatStudyprotocolGroup(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatStudyprotocolGroup(UserI user)
- **/
- public BaseXnatStudyprotocolGroup()
- {}
-
- public BaseXnatStudyprotocolGroup(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolSession.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolSession.java
deleted file mode 100644
index 2471ae689fa629bb6cfdcc192af41720c2469890..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolSession.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatStudyprotocolSession
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatStudyprotocolSession;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatStudyprotocolSession extends AutoXnatStudyprotocolSession {
-
- public BaseXnatStudyprotocolSession(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatStudyprotocolSession(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatStudyprotocolSession(UserI user)
- **/
- public BaseXnatStudyprotocolSession()
- {}
-
- public BaseXnatStudyprotocolSession(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolVariable.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolVariable.java
deleted file mode 100644
index 3f980f70bf6f7c7175cdf4fed0d7a6d52e3121e4..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatStudyprotocolVariable.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatStudyprotocolVariable
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatStudyprotocolVariable;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatStudyprotocolVariable extends AutoXnatStudyprotocolVariable {
-
- public BaseXnatStudyprotocolVariable(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatStudyprotocolVariable(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatStudyprotocolVariable(UserI user)
- **/
- public BaseXnatStudyprotocolVariable()
- {}
-
- public BaseXnatStudyprotocolVariable(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectassessordata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectassessordata.java
deleted file mode 100644
index 8956238d51985cbaf0a8addda2282ce3dad56999..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectassessordata.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSubjectassessordata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 1/30/14 11:48 AM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.dcm.CopyOp;
-import org.nrg.transaction.OperationI;
-import org.nrg.transaction.TransactionException;
-import org.nrg.xdat.om.XnatImagesessiondata;
-import org.nrg.xdat.om.XnatSubjectdata;
-import org.nrg.xdat.om.base.auto.AutoXnatSubjectassessordata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.DateUtils;
-import org.nrg.xnat.helpers.merge.ProjectAnonymizer;
-
-import java.io.File;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatSubjectassessordata extends AutoXnatSubjectassessordata {
-
- public BaseXnatSubjectassessordata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSubjectassessordata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatSubjectassessordata()
- {}
-
- public BaseXnatSubjectassessordata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- private XnatSubjectdata subject = null;
- public XnatSubjectdata getSubjectData()
- {
- if (subject==null)
- {
- if (getSubjectId()!=null)
- {
- ArrayList al = XnatSubjectdata.getXnatSubjectdatasByField("xnat:subjectData/ID",this.getSubjectId(),this.getUser(),false);
- if (al.size()>0)
- {
- subject = (XnatSubjectdata)al.get(0);
- }
- }
- }
- return subject;
- }
-
-
- public String getSubjectAge() {
- if (this.getAge()!=null){
- Double d = getAge();
- NumberFormat formatter = NumberFormat.getInstance();
- formatter.setGroupingUsed(false);
- formatter.setMaximumFractionDigits(2);
- formatter.setMinimumFractionDigits(2);
- return formatter.format(d);
- }
-
- XnatSubjectdata s = this.getSubjectData();
- if (s == null) {
- return "--";
- } else {
- try {
- Object o = this.getDate();
- if (o instanceof String)
- {
- Date expt_date = DateUtils.parseDateTime((String)o);
- return s.getAge(expt_date);
- }else{
- Date expt_date = (Date) this.getDate();
- return s.getAge(expt_date);
- }
- } catch (Exception e) {
- logger.error("", e);
- if (s.getAge()!=null)
- {
- return s.getAge().toString();
- }else
- return "--";
-
- }
- }
- }
-
- @Override
- public void preSave() throws Exception{
- super.preSave();
-
- if(this.getSubjectData()==null){
- throw new Exception("Unable to identify subject for:" + this.getSubjectId());
- }
- }
-
- public void applyAnonymizationScript(final ProjectAnonymizer anonymizer) throws TransactionException{
- if(this instanceof XnatImagesessiondata){
- final BaseXnatSubjectassessordata expt = this;
- File tmpDir = new File(System.getProperty("java.io.tmpdir"), "anon_backup");
- new CopyOp(new OperationI<Map<String,File>>() {
- @Override
- public void run(Map<String, File> a) throws Throwable {
- anonymizer.call();
- }
- }, tmpDir,expt.getSessionDir()).run();
- }
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdata.java
deleted file mode 100644
index 7598774682a7a0bd35149bf63fecf5cb2cc7bd7f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdata.java
+++ /dev/null
@@ -1,1508 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSubjectdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 2/18/14 5:54 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nrg.action.ClientException;
-import org.nrg.xdat.XDAT;
-import org.nrg.xdat.base.BaseElement;
-import org.nrg.xdat.model.*;
-import org.nrg.xdat.om.*;
-import org.nrg.xdat.om.base.auto.AutoXnatSubjectdata;
-import org.nrg.xdat.schema.SchemaElement;
-import org.nrg.xdat.security.SecurityValues;
-import org.nrg.xdat.security.helpers.Permissions;
-import org.nrg.xdat.security.helpers.Users;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-import org.nrg.xft.XFTTable;
-import org.nrg.xft.db.MaterializedView;
-import org.nrg.xft.db.PoolDBUtils;
-import org.nrg.xft.event.EventDetails;
-import org.nrg.xft.event.EventMetaI;
-import org.nrg.xft.event.persist.PersistentWorkflowI;
-import org.nrg.xft.event.persist.PersistentWorkflowUtils;
-import org.nrg.xft.exception.*;
-import org.nrg.xft.identifier.IDGeneratorFactory;
-import org.nrg.xft.identifier.IDGeneratorI;
-import org.nrg.xft.search.CriteriaCollection;
-import org.nrg.xft.search.TableSearch;
-import org.nrg.xft.security.UserI;
-import org.nrg.xft.utils.FileUtils;
-import org.nrg.xft.utils.SaveItemHelper;
-import org.nrg.xft.utils.XftStringUtils;
-import org.nrg.xnat.exceptions.InvalidArchiveStructure;
-import org.nrg.xnat.turbine.utils.ArchivableItem;
-import org.nrg.xnat.turbine.utils.XNATUtils;
-import org.nrg.xnat.utils.WorkflowUtils;
-import org.restlet.data.Status;
-
-import java.io.File;
-import java.sql.SQLException;
-import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatSubjectdata extends AutoXnatSubjectdata implements ArchivableItem, MoveableI{
- protected ArrayList<ItemI> minLoadAssessors = null;
-
- public BaseXnatSubjectdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSubjectdata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatSubjectdata()
- {}
-
- public BaseXnatSubjectdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public String getArchiveDirectoryName(){
- if(this.getLabel()!=null)
- return this.getLabel();
- else
- return this.getId();
- }
-
- @SuppressWarnings("unused")
- public String getAddIdString(){
- StringBuilder sb = new StringBuilder();
- for(int j=0;j<getAddid().size();j++)
- {
- XnatSubjectdataAddid addid =(XnatSubjectdataAddid) getAddid().get(j);
- if (j==0)
- {
- sb.append(addid.getAddid()).append(" (").append(addid.getName()).append(")");
- }else{
- sb.append(", ").append(addid.getAddid()).append(" (").append(addid.getName()).append(")");
- }
- }
- return sb.toString();
- }
-
- public String getGenderText()
- {
- String s = null;
- try {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- s= ((XnatDemographicdata)ame).getGender();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- if (s==null)
- {
- return "";
- }else{
- if (s.equalsIgnoreCase("m"))
- {
- return "Male";
- }else if (s.equalsIgnoreCase("f"))
- {
- return "Female";
- }else if (s.equalsIgnoreCase("o"))
- {
- return "Other";
- }else if (s.equalsIgnoreCase("u"))
- {
- return "Unknown";
- }else{
- return StringUtils.capitalize(s.toLowerCase());
- }
- }
- }
-
- public Date getDOB()
- {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return (Date)((XnatDemographicdata)ame).getDob();
- }
- return null;
- }
-
- public String getGender()
- {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return ((XnatDemographicdata)ame).getGender();
- }
- return null;
- }
-
- public String getHandedness()
- {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return ((XnatDemographicdata)ame).getHandedness();
- }
- return null;
- }
-
- public Integer getYOB()
- {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return ((XnatDemographicdata)ame).getYob();
- }
- return null;
- }
-
- public String getHandedText()
- {
- String s = null;
- try {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- s= ((XnatDemographicdata)ame).getHandedness();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- if (s==null)
- {
- return "";
- }else{
- if (s.equalsIgnoreCase("l"))
- {
- return "Left";
- }else if (s.equalsIgnoreCase("r"))
- {
- return "Right";
- }else if (s.equalsIgnoreCase("a"))
- {
- return "Ambidextrous";
- }else if (s.equalsIgnoreCase("u"))
- {
- return "Unknown";
- }else{
- return StringUtils.capitalize(s.toLowerCase());
- }
- }
- }
-
- @SuppressWarnings({"deprecation", "unused"})
- public String getDOBDisplay()
- {
- try {
- if (this.getYOB()!=null)
- {
- return (getYOB()) + "";
- }else if(this.getDOB()!=null){
- return (this.getDOB().getYear() + 1900) + "";
- }else{
- return "--";
- }
- } catch (Exception e) {
- logger.error("",e);
- return "--";
- }
- }
-
- public String getLongCreateTime()
- {
- if (this.getItem().getInsertDate() == null)
- {
- return "--";
- }else
- {
- Date date = this.getItem().getInsertDate();
- return DateFormat.getDateInstance(DateFormat.LONG).format(date);
- }
- }
-
- public String getAge(Date experimentDate) {
- if (experimentDate == null) {
- return failSafeAge();
- }
- try {
- Date dob = getDOB();
- if (dob != null) {
- return formatAge(calculateAge(experimentDate, dob));
- } else {
- Integer year = getYOB();
- if (year == null) {
- return failSafeAge();
- } else {
- Calendar cal = Calendar.getInstance();
- cal.set(year, Calendar.JANUARY, 1);
- dob = cal.getTime();
- return formatAge(calculateAge(experimentDate, dob));
- }
- }
- } catch (Exception e) {
- logger.error("",e);
- return failSafeAge();
- }
- }
-
- private Calendar makeCalendar(Date date) {
- Calendar calendar = new GregorianCalendar();
- calendar.setTime(date);
- return calendar;
- }
-
- private int calculateAge(Date current, Date dob) {
- Calendar currentCalendar = makeCalendar(current);
- Calendar dobCalendar = makeCalendar(dob);
- int age = currentCalendar.get(Calendar.YEAR) - dobCalendar.get(Calendar.YEAR);
- if (currentCalendar.get(Calendar.DAY_OF_YEAR) < dobCalendar.get(Calendar.DAY_OF_YEAR)) {
- age--;
- }
- return age;
- }
-
- private String formatAge(double age) {
- NumberFormat formatter = NumberFormat.getInstance();
- formatter.setGroupingUsed(false);
- formatter.setMaximumFractionDigits(2);
- formatter.setMinimumFractionDigits(2);
- return formatter.format(age);
- }
-
- private String failSafeAge() {
- if (getAge() != null) {
- return getAge().toString();
- } else {
- return "--";
- }
- }
-
- public String getRace(){
- try {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return ((XnatDemographicdata)ame).getRace();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- return null;
- }
-
- public String getEthnicity(){
- try {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return ((XnatDemographicdata)ame).getEthnicity();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- return null;
- }
-
- public Integer getAge(){
- try {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return ((XnatDemographicdata)ame).getAge();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- return null;
- }
-
- public Integer getEducation(){
- try {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return ((XnatDemographicdata)ame).getEducation();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- return null;
- }
-
- public String getEducationDesc(){
- try {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return ((XnatDemographicdata)ame).getEducationdesc();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- return null;
- }
-
- public Integer getSes(){
- try {
- XnatAbstractdemographicdataI ame = this.getDemographics();
- if (ame instanceof XnatDemographicdata)
- {
- return ((XnatDemographicdata)ame).getSes();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- return null;
- }
-
- public String getCohort(){
- try {
- XnatAbstractsubjectmetadataI ame = this.getMetadata();
- if (ame instanceof XnatSubjectmetadata)
- {
- return ((XnatSubjectmetadata)ame).getCohort();
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- return null;
- }
-
-
- public ArrayList<ItemI> getMinimalLoadAssessors()
- {
- if (minLoadAssessors==null)
- {
- minLoadAssessors = new ArrayList<>();
-
- try {
- XFTTable table = TableSearch.Execute("SELECT ex.id,ex.date,me.element_name AS type,ex.project,me.element_name,ex.note AS note,projects,label,visit as visit, protocol as protocol FROM xnat_subjectAssessorData assessor LEFT JOIN xnat_experimentData ex ON assessor.ID=ex.ID LEFT JOIN xnat_experimentdata_meta_data meta ON ex.experimentdata_info=meta.meta_data_id LEFT JOIN xdat_meta_element me ON ex.extension=me.xdat_meta_element_id LEFT JOIN (SELECT xs_a_concat(project || ':' || label || ',') AS PROJECTS, sharing_share_xnat_experimentda_id FROM xnat_experimentData_share GROUP BY sharing_share_xnat_experimentda_id) PROJECT_SEARCH ON ex.id=PROJECT_SEARCH.sharing_share_xnat_experimentda_id WHERE assessor.subject_id='" + this.getId() +"' AND meta.status!='obsolete' ORDER BY ex.date ASC",getDBName(),null);
- table.resetRowCursor();
- while (table.hasMoreRows())
- {
- final Hashtable row = table.nextRowHash();
- final String element = (String)row.get("element_name");
- try {
- final XFTItem child = XFTItem.NewItem(element,this.getUser());
-
- final Object date = row.get("date");
- final Object id = row.get("id");
- final Object note = row.get("note");
- final Object project = row.get("project");
- final Object label = row.get("label");
- final Object visit = row.get("visit");
- final Object protocol = row.get("protocol");
-
- if (date!=null)
- {
- try {
- child.setProperty("date",date);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (id!=null)
- {
- try {
- child.setProperty("ID",id);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (label!=null)
- {
- try {
- child.setProperty("label",label);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (visit!=null)
- {
- try {
- child.setProperty("visit",visit);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (protocol!=null)
- {
- try {
- child.setProperty("protocol",protocol);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (note!=null)
- {
- try {
- child.setProperty("note",note);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (project!=null)
- {
- try {
- child.setProperty("project",project);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
-
- final String projects = (String)row.get("projects");
- if (projects!=null)
- {
- for(final String projectName:XftStringUtils.CommaDelimitedStringToArrayList(projects, true))
- {
- if(projectName.contains(":")){
- XnatExperimentdataShare es = new XnatExperimentdataShare(this.getUser());
- es.setProject(projectName.substring(0,projectName.indexOf(":")));
- if(!projectName.endsWith(":")){
- es.setLabel(projectName.substring(projectName.indexOf(":")+1));
- }
- child.setChild("xnat:experimentData/sharing/share",es.getItem(),false);
- }else{
- child.setProperty("sharing.share.project", projectName);
- }
- }
- }
-
-
- if (child.instanceOf("xnat:imageSessionData"))
- {
- minLoadAssessors.add(BaseElement.GetGeneratedItem(child));
- try {
- XFTTable table2 = TableSearch.Execute("SELECT ex.id,ex.date,me.element_name AS type,ex.project,me.element_name,ex.note AS note,projects,label,assessor.imagesession_id,visit as visit, protocol as protocol FROM xnat_imageAssessorData assessor LEFT JOIN xnat_experimentData ex ON assessor.ID=ex.ID LEFT JOIN xnat_experimentdata_meta_data meta ON ex.experimentdata_info=meta.meta_data_id LEFT JOIN xdat_meta_element me ON ex.extension=me.xdat_meta_element_id LEFT JOIN (SELECT xs_a_concat(project || ':' || label || ',') AS PROJECTS, sharing_share_xnat_experimentda_id FROM xnat_experimentData_share GROUP BY sharing_share_xnat_experimentda_id) PROJECT_SEARCH ON ex.id=PROJECT_SEARCH.sharing_share_xnat_experimentda_id WHERE assessor.imagesession_id='" + id +"' AND meta.status!='obsolete' ORDER BY ex.date ASC",getDBName(),null);
- table2.resetRowCursor();
- while (table2.hasMoreRows())
- {
- final Hashtable row2 = table2.nextRowHash();
- final String element2 = (String)row2.get("element_name");
- try {
- final XFTItem child2 = XFTItem.NewItem(element2,this.getUser());
-
- final Object date2 = row2.get("date");
- final Object id2 = row2.get("id");
- final Object project2 = row2.get("project");
- final Object note2 = row2.get("note");
- final Object label2 = row2.get("label");
- final Object visit2 = row2.get("visit");
- final Object protocol2 = row2.get("protocol");
- final Object imgsession2 = row2.get("imagesession_id");
-
-
- if (imgsession2!=null)
- {
- try {
- child2.setProperty("imageSession_ID",imgsession2);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (date2!=null)
- {
- try {
- child2.setProperty("date",date2);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (id2!=null)
- {
- try {
- child2.setProperty("ID",id2);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (label2!=null)
- {
- try {
- child2.setProperty("label",label2);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (visit2!=null)
- {
- try {
- child2.setProperty("visit_id",visit2);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (protocol2!=null)
- {
- try {
- child2.setProperty("protocol",protocol2);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (note2!=null)
- {
- try {
- child2.setProperty("note",note2);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
- if (project2!=null)
- {
- try {
- child2.setProperty("project",project2);
- } catch (XFTInitException | ElementNotFoundException | InvalidValueException | FieldNotFoundException e) {
- logger.error("",e);
- }
- }
-
- final String projects2 = (String)row2.get("projects");
- if (projects2!=null)
- {
- for(final String projectName:XftStringUtils.CommaDelimitedStringToArrayList(projects2, true))
- {
- if(projectName.contains(":")){
- final XnatExperimentdataShare es = new XnatExperimentdataShare(this.getUser());
- es.setProject(projectName.substring(0,projectName.indexOf(":")));
- if(!projectName.endsWith(":")){
- es.setLabel(projectName.substring(projectName.indexOf(":")+1));
- }
- child2.setChild("xnat:experimentData/sharing/share",es.getItem(),false);
- }else{
- child2.setProperty("sharing.share.project", projectName);
- }
- }
- }
-
- minLoadAssessors.add(BaseElement.GetGeneratedItem(child2));
- } catch (XFTInitException | ElementNotFoundException e) {
- logger.error("",e);
- }
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- }else{
- minLoadAssessors.add(BaseElement.GetGeneratedItem(child));
- }
- } catch (XFTInitException | ElementNotFoundException e) {
- logger.error("",e);
- }
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- }
-
- return minLoadAssessors;
- }
-
- @SuppressWarnings("unused")
- public int getMinimalLoadAssessorsCount(String elementName)
- {
- return getMinimalLoadAssessors(elementName).size();
- }
-
- @SuppressWarnings("unused")
- public Map<String,List<MinLoadExptByP>> getMinimalLoadAssessorsByProject()
- {
- final Map<String,List<MinLoadExptByP>> al = new TreeMap<>();
- final Map<String,String> projects= new Hashtable<>();
- for (final ItemI assessor:this.getMinimalLoadAssessors())
- {
- try{
- final XnatExperimentdata expt=(XnatExperimentdata)assessor;
- if(projects.get(expt.getProject())==null){
- final String pAlias=expt.getProjectDisplayID();
- projects.put(expt.getProject(), pAlias);
- al.put(pAlias, new ArrayList<MinLoadExptByP>());
- }
-
- al.get(projects.get(expt.getProject())).add(new MinLoadExptByP(expt.getProject(), expt.getIdentifier(expt.getProject()),expt));
-
- for(final XnatExperimentdataShareI share:expt.getSharing_share()){
- if(projects.get(share.getProject())==null){
- final String pAlias=((XnatExperimentdataShare)share).getProjectDisplayID();
- projects.put(share.getProject(), pAlias);
- al.put(pAlias, new ArrayList<MinLoadExptByP>());
- }
-
- al.get(projects.get(share.getProject())).add(new MinLoadExptByP(share.getProject(), expt.getIdentifier(share.getProject()),expt));
- }
- }catch (Throwable e){
- logger.error("", e);
- }
- }
-
- return al;
- }
-
- public class MinLoadExptByP{
- String project=null;
- String label=null;
- ItemI item =null;
-
- public MinLoadExptByP(String p, String l, ItemI i){
- project=p;
- label=l;
- item=i;
- }
-
- public ItemI getItem() {
- return item;
- }
-
- public void setItem(ItemI item) {
- this.item = item;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
-
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
-
- }
-
- public ArrayList getMinimalLoadAssessors(String elementName)
- {
- ArrayList al = new ArrayList();
- try {
- SchemaElement e = SchemaElement.GetElement(elementName);
- for (final ItemI assessor : this.getMinimalLoadAssessors()) {
- if (assessor.getXSIType().equalsIgnoreCase(e.getFullXMLName())) {
- al.add(assessor);
- }
- }
- } catch (XFTInitException | ElementNotFoundException e) {
- logger.error("",e);
- }
-
- al.trimToSize();
- return al;
- }
-
-
- public ArrayList<XnatSubjectassessordata> getExperiments_experiment(String type)
- {
- ArrayList<XnatSubjectassessordata> al = new ArrayList<>();
- for (final XnatSubjectassessordataI o : getExperiments_experiment()) {
- XnatSubjectassessordata expt = (XnatSubjectassessordata) o;
- try {
- if (expt.getItem().instanceOf(type)) {
- al.add(expt);
- }
- } catch (ElementNotFoundException e) {
- logger.error("",e);
- }
- }
-
- return al;
- }
-
- @SuppressWarnings("unused")
- public ArrayList getSessionsByType(String type) {
- ArrayList al = new ArrayList();
- for (final XnatSubjectassessordata assessor : getExperiments_experiment("xnat:mrSessionData")) {
- XnatMrsessiondata expt = (XnatMrsessiondata) assessor;
- if (expt.getSessionType()!=null){
- if (expt.getSessionType().equalsIgnoreCase(type)) {
- al.add(expt);
- }
- }else{
- if(type==null)
- al.add(expt);
- }
- }
- return al;
- }
-
- @SuppressWarnings("unused")
- public int getExperiments_experiment_Count(String type)
- {
- return getExperiments_experiment(type).size();
- }
-
- @SuppressWarnings("unused")
- public boolean isMrAssessor(ItemI i) {
- return i instanceof BaseXnatMrassessordata;
- }
-
- public boolean isImageAssessor(ItemI i)
- {
- return i instanceof BaseXnatImageassessordata;
- }
-
- public XnatMrsessiondata getLastSession()
- {
- return XNATUtils.getLastSessionForParticipant(getId(), getUser());
- }
-
- @SuppressWarnings("unused")
- public ArrayList getScannerSortedSessions()
- {
- ArrayList al = this.getExperiments_experiment("xnat:mrSessionData");
- Collections.sort(al,BaseXnatMrsessiondata.GetScannerDelayComparator());
- return al;
- }
-
- @SuppressWarnings("unused")
- public String getAddFieldValueByName(String name)
- {
- return (String)this.getFieldByName(name);
- }
-
- // XNAT-2865 - Function performs case insensitive search for subject
- public static XnatSubjectdata GetSubjectByProjectIdentifierCaseInsensitive(String project, String identifier, UserI user, boolean preLoad){
- try{
- String id = (String)PoolDBUtils.ReturnStatisticQuery("SELECT id, label, project FROM xnat_subjectdata WHERE LOWER(project) = '" + project.toLowerCase() + "' AND LOWER(label) = '" + identifier.toLowerCase() + "';", "id", null, null);
- return XnatSubjectdata.getXnatSubjectdatasById(id, user, preLoad);
- }catch(Exception e){
- logger.debug("Unable to find subject.",e);
- return null;
- }
- }
-
- public static XnatSubjectdata GetSubjectByProjectIdentifier(String project, String identifier,UserI user,boolean preLoad){
- CriteriaCollection cc=new CriteriaCollection("OR");
-
- CriteriaCollection subcc1 = new CriteriaCollection("AND");
- subcc1.addClause("xnat:subjectData/project", project);
- subcc1.addClause("xnat:subjectData/label", identifier);
-
- cc.add(subcc1);
-
- CriteriaCollection subcc2 = new CriteriaCollection("AND");
- subcc2.addClause("xnat:subjectData/sharing/share/project", project);
- subcc2.addClause("xnat:subjectData/sharing/share/label", identifier);
-
- cc.add(subcc2);
-
- ArrayList al = XnatSubjectdata.getXnatSubjectdatasByField(cc, user, preLoad);
- if (al.size()>0){
- return new XnatSubjectdata((ItemI)al.get(0));
- }else{
- return null;
- }
-
- }
-
- public String getIdentifier(String project){
- return this.getIdentifier(project, true);
- }
-
- public String getIdentifiers(){
- final Hashtable<String,String> ids = new Hashtable<>();
-
- if (this.getProject()!=null){
- if (this.getLabel()!=null){
- ids.put(this.getLabel(), this.getProject());
- }else{
- ids.put(this.getId(), this.getProject());
- }
- }
- for (final XnatProjectparticipantI pp:this.getSharing_share())
- {
- if (pp.getLabel()!=null){
- if (ids.containsKey(pp.getLabel()))
- {
- ids.put(pp.getLabel(), ids.get(pp.getLabel()) + "," + pp.getProject());
- }else{
- ids.put(pp.getLabel(), pp.getProject());
- }
- }else{
- if (ids.containsKey(this.getId()))
- {
- ids.put(this.getId(), ids.get(this.getId()) + "," + pp.getProject());
- }else{
- ids.put(this.getId(), pp.getProject());
- }
- }
- }
-
- StringBuilder identifiers = new StringBuilder();
-
- int counter=0;
- for (String key: ids.keySet()){
- if (counter++>0) {
- identifiers.append(", ");
- }
- identifiers.append(key).append(" (").append(ids.get(key)).append(")");
- }
-
- return identifiers.toString();
- }
-
- public Hashtable<XnatProjectdataI,String> getProjectDatas(){
- final Hashtable<XnatProjectdataI,String> hash = new Hashtable<>();
- for (final XnatProjectparticipantI pp:this.getSharing_share())
- {
- if (pp.getLabel()==null)
- hash.put(((XnatProjectparticipant)pp).getProjectData(), this.getId());
- else
- hash.put(((XnatProjectparticipant)pp).getProjectData(), pp.getLabel());
- }
- return hash;
- }
-
- Hashtable fieldsByName = null;
- public Hashtable getFieldsByName(){
- if (fieldsByName == null){
- fieldsByName=new Hashtable();
- for (final XnatSubjectdataFieldI field : this.getFields_field()){
- fieldsByName.put(field.getName(), field);
- }
- }
-
- return fieldsByName;
- }
-
- public Object getFieldByName(String s){
- final XnatSubjectdataFieldI field = (XnatSubjectdataFieldI)getFieldsByName().get(s);
- if (field!=null){
- return field.getField();
- }else{
- return null;
- }
- }
-
-
- public XnatProjectdataI getProject(String projectID, boolean preLoad)
- {
- XnatProjectparticipant ep = null;
- for (final XnatProjectparticipantI tempep: this.getSharing_share())
- {
- if (tempep.getProject().equals(projectID))
- {
- ep=(XnatProjectparticipant)tempep;
- break;
- }
- }
-
- try {
- if (ep!=null){
- return XnatProjectdata.getXnatProjectdatasById(ep.getProject(), this.getUser(), preLoad);
- }else if (this.getProject().equals(projectID)){
- return XnatProjectdata.getXnatProjectdatasById(this.getProject(), this.getUser(), preLoad);
- }
- } catch (RuntimeException e) {
- logger.error("",e);
- }
-
- return null;
- }
-
-
-
- public XnatProjectdata getPrimaryProject(boolean preLoad){
- if (this.getProject()!=null){
- return XnatProjectdata.getXnatProjectdatasById(getProject(), this.getUser(), preLoad);
- }else{
- return (XnatProjectdata)getFirstProject();
- }
- }
-
-
- public XnatProjectdataI getFirstProject()
- {
- XnatProjectparticipant ep = null;
- if (!this.getSharing_share().isEmpty()){
- ep = (XnatProjectparticipant)this.getSharing_share().get(0);
- }
-
- try {
- if (ep!=null){
- return XnatProjectdata.getXnatProjectdatasById(ep.getProject(), this.getUser(), false);
- }
- } catch (RuntimeException e) {
- logger.error("",e);
- }
-
- return null;
- }
-
- public String getIdentifier(String project,boolean returnNULL){
- if (project!=null){
- if (this.getProject().equals(project)){
- if (this.getLabel()!=null){
- return this.getLabel();
- }
- }
-
- for (final XnatProjectparticipantI pp: this.getSharing_share())
- {
- if (pp.getProject().equals(project))
- {
- if (pp.getLabel()!=null){
- return pp.getLabel();
- }
- }
- }
- }
-
- if (returnNULL){
- return null;
- }else{
- return getId();
- }
- }
-
- public int getSubjectAssessorCount(){
- try {
- final XFTTable table = XFTTable.Execute("SELECT COUNT(*) FROM xnat_subjectassessordata WHERE subject_id='" + getId() + "';", getDBName(), null);
-
- Long i = (Long)table.getFirstObject();
- if (i!=null){
- return i.intValue();
- }
- } catch (SQLException | DBPoolException e) {
- logger.error("",e);
- }
- return -1;
- }
-
-
-// public String createNewAssessorId(String xsiType) throws SQLException{
-// String newID= "";
-// String prefix= "";
-// long i = this.getExperiments_experiment_Count(xsiType)+1;
-// prefix+=this.getId();
-//
-// NumberFormat nf = NumberFormat.getInstance();
-// nf.setMinimumIntegerDigits(3);
-//
-// String code =ElementSecurity.GetCode(xsiType);
-// if(code!=null && !code.equals(""))
-// prefix+="_" + code;
-//
-// newID+=prefix +"_"+ StringUtils.replace(nf.format(i), ",", "");
-//
-// String query = "SELECT count(ID) AS id_count FROM xnat_experimentdata WHERE ID='";
-//
-// String login = null;
-// if (this.getUser()!=null){
-// login=this.getUser().getUsername();
-// }
-// try {
-// Long idCOUNT= (Long)PoolDBUtils.ReturnStatisticQuery(query + newID + "';", "id_count", this.getDBName(), login);
-// while (idCOUNT > 0){
-// i++;
-// newID=prefix + "_"+ StringUtils.replace(nf.format(i), ",", "");
-// idCOUNT= (Long)PoolDBUtils.ReturnStatisticQuery(query + newID + "';", "id_count", this.getDBName(), login);
-// }
-// } catch (Exception e) {
-// logger.error("",e);
-// }
-//
-// return newID;
-// }
-
- private String name = null;
- private String description = null;
- private String secondaryID = null;
- private boolean initd = false;
-
- public void loadProjectDetails(){
- if (!initd)
- {
- initd=true;
- try {
- XFTTable table = XFTTable.Execute("SELECT name,description,secondary_ID FROM xnat_projectData WHERE ID ='" + this.getProject() + "';", this.getDBName(), null);
-
- if (table.size()>0)
- {
- final Object[] row = table.rows().get(0);
- name = (String)row[0];
- description = (String)row[1];
- secondaryID = (String)row[2];
- }
- } catch (SQLException | DBPoolException e) {
- logger.error("",e);
- }
- }
- }
-
- public XnatProjectdata getProjectData(){
- return XnatProjectdata.getXnatProjectdatasById(this.getProject(), this.getUser(), false);
- }
-
-
- /**
- * @return the description
- */
- public String getDescription() {
- loadProjectDetails();
- return description;
- }
-
- /**
- * @return the name
- */
- public String getProjectName() {
- loadProjectDetails();
- return name;
- }
-
- /**
- * @return the secondaryID
- */
- public String getProjectSecondaryID() {
- loadProjectDetails();
- return secondaryID;
- }
-
-
-
- /**
- * @return the secondaryID
- */
- public String getProjectDisplayID() {
- loadProjectDetails();
- if (secondaryID!=null){
- return secondaryID;
- }else{
- return getProject();
- }
- }
-
- @SuppressWarnings("unused")
- public Collection<XnatFielddefinitiongroup> getFieldDefinitionGroups(final String dataType, final String projectID) {
- final Hashtable<String, XnatFielddefinitiongroup> groups = new Hashtable<>();
- final Hashtable<XnatProjectdataI, String> projects = getProjectDatas();
- final XnatProjectdata primaryProject = getPrimaryProject(false);
- if (primaryProject != null) {
- projects.put(primaryProject, "");
-
- for (final Map.Entry<XnatProjectdataI, String> entry : projects.entrySet()) {
- final XnatAbstractprotocol prot = ((XnatProjectdata) entry.getKey()).getProtocolByDataType(dataType);
- if((projectID != null && !projectID.isEmpty()) && !projectID.equals(entry.getKey().getId())){
- continue;
- }
- if (prot!=null && prot instanceof XnatDatatypeprotocol){
- final XnatDatatypeprotocol dataProt = (XnatDatatypeprotocol) prot;
- for (final XnatFielddefinitiongroupI group : dataProt.getDefinitions_definition()) {
- groups.put(group.getId(), (XnatFielddefinitiongroup)group);
- }
- }
- }
- }
- return groups.values();
- }
-
- public static String CreateNewID() throws Exception{
- IDGeneratorI generator = IDGeneratorFactory.GetIDGenerator("org.nrg.xnat.turbine.utils.IDGenerator");
- assert generator != null;
- generator.setTable("xnat_subjectData");
- generator.setDigits(5);
- generator.setColumn("id");
- return generator.generateIdentifier();
- }
-
- public void moveToProject(XnatProjectdata newProject,String newLabel,UserI user,EventMetaI ci) throws Exception{
- if(!this.getProject().equals(newProject.getId()))
- {
- if (!MoverMaker.check(this, user)) {
- throw new InvalidPermissionException(this.getXSIType());
- }
-
- String existingRootPath=this.getProjectData().getRootArchivePath();
-
- if(newLabel==null)newLabel = this.getLabel();
- if(newLabel==null)newLabel = this.getId();
-
- File newSessionDir = new File(new File(newProject.getRootArchivePath(),newProject.getCurrentArc()),newLabel);
-
- String current_label=this.getLabel();
-
- if(current_label==null)current_label=this.getId();
- for(XnatAbstractresourceI abstRes:this.getResources_resource()){
- MoverMaker.Mover m = MoverMaker.moveResource(abstRes, current_label, this, newSessionDir, existingRootPath, user,ci);
- m.setResource((XnatAbstractresource) abstRes);
- m.call();
- }
-
- MoverMaker.writeDB(this, newProject, newLabel, user,ci);
- MoverMaker.setLocal(this, newProject, newLabel);
- }
- }
-
- public boolean hasProject(String proj_id){
- if(this.getProject().equals(proj_id)){
- return true;
- }else{
- for(XnatProjectparticipantI pp: this.getSharing_share()){
- if(pp.getProject().equals(proj_id)){
- return true;
- }
- }
- }
-
- return false;
- }
-
- public String canDelete(BaseXnatProjectdata proj, UserI user) {
- BaseXnatSubjectdata subj=this;
- if(this.getItem().getUser()!=null){
- subj=new XnatSubjectdata(this.getCurrentDBVersion(true));
- }
- if(!subj.hasProject(proj.getId())){
- return "Subject is not assigned to specified project " + proj.getId();
- }else {
-
- try {
- SecurityValues values = new SecurityValues();
- values.put(this.getXSIType() + "/project", proj.getId());
-
- if (!Permissions.canDelete(user, this.getSchemaElement(), values))
- {
- return "User cannot delete subjects for project " + proj.getId();
- }
- } catch (Exception e1) {
- return "Unable to delete subject.";
- }
-
- for(XnatSubjectassessordataI sad: subj.getExperiments_experiment()){
- String msg=((XnatSubjectassessordata)sad).canDelete(proj,user);
- if(msg!=null){
- return msg;
- }
- }
-
- return null;
- }
- }
-
- public String delete(BaseXnatProjectdata proj, UserI user, boolean removeFiles,final EventMetaI c){
- BaseXnatSubjectdata sub=this;
- if(this.getItem().getUser()!=null){
- sub=new XnatSubjectdata(this.getCurrentDBVersion(true));
- }
-
- String msg=sub.canDelete(proj,user);
- if(msg!=null){
- logger.error(msg);
- return msg;
- }
-
- if(!sub.getProject().equals(proj.getId())){
- try {
- SecurityValues values = new SecurityValues();
- values.put(this.getXSIType() + "/project", proj.getId());
-
- if (!Permissions.canDelete(user, sub) && !Permissions.canDelete(user,this.getSchemaElement(),values))
- {
- return null;
- }
-
- //unshare children before unsharing parent
- final List<XnatSubjectassessordataI> expts = sub.getExperiments_experiment();
- for (XnatSubjectassessordataI exptI : expts){
- final XnatSubjectassessordata expt = (XnatSubjectassessordata)exptI;
- if(expt.getProject().equals(proj.getId())){
- return "This operation would delete an experiment (rather than un-share). Please modify experiment ("+expt.getId()+").";
-
- }
- msg=expt.delete(proj,user,false,c);
- if(msg!=null){
- return msg;
- }
- }
-
- int index = 0;
- int match = -1;
- for(XnatProjectparticipantI pp : sub.getSharing_share()){
- if(pp.getProject().equals(proj.getId())){
- SaveItemHelper.authorizedRemoveChild(sub.getItem(), "xnat:subjectData/sharing/share", ((XnatProjectparticipant)pp).getItem(), user,c);
- match=index;
- break;
- }
- index++;
- }
-
- if(match==-1)return null;
-
- this.removeSharing_share(match);
-
- return null;
- } catch (SQLException e) {
- logger.error("",e);
- return e.getMessage();
- } catch (Exception e) {
- logger.error("",e);
- return e.getMessage();
- }
- }else{
-
- if(XDAT.getBoolSiteConfigurationProperty("security.prevent-data-deletion", false)){
- return "User account cannot delete experiments";
- }
-
- try {
-
- if(!Permissions.canDelete(user, this)){
- return "User account doesn't have permission to delete this subject.";
- }
-
- if(removeFiles){
- this.deleteFiles(user,c);
- }
-
- final List<XnatSubjectassessordataI> expts = sub.getExperiments_experiment();
- for (XnatSubjectassessordataI exptI : expts){
- final XnatSubjectassessordata expt = (XnatSubjectassessordata)exptI;
- msg=expt.delete(proj,user,removeFiles,c);
- if(msg!=null)return msg;
- }
-
- SaveItemHelper.authorizedDelete(sub.getItem().getCurrentDBVersion(), user,c);
-
- Users.clearCache(user);
- MaterializedView.deleteByUser(user);
- } catch (SQLException e) {
- logger.error("",e);
- return e.getMessage();
- } catch (Exception e) {
- logger.error("",e);
- return e.getMessage();
- }
- }
- return null;
- }
-
- public void deleteFiles(UserI user, EventMetaI ci) throws Exception{
- final XnatProjectdata project = this.getPrimaryProject(false);
- if (project != null) {
- String archive=project.getRootArchivePath();
- File dir=new File(archive,"subjects/"+ this.getArchiveDirectoryName());
- if(dir.exists()){
- FileUtils.MoveToCache(dir);
- }
-
- for(XnatAbstractresourceI abstRes:this.getResources_resource()){
- ((XnatAbstractresource)abstRes).deleteWithBackup(archive,user,ci);
- }
- } else {
- logger.warn("User " + user.getUsername() + " tried to delete the files for the primary project for subject " + getLabel() + ", but there was no primary project found.");
- }
- }
-
- public int getAssessmentCount(String project){
- int count=0;
- for(int i=0;i<this.getMinimalLoadAssessors().size();i++){
- XnatExperimentdata expt=(XnatExperimentdata)this.getMinimalLoadAssessors().get(i);
- if(expt.getProject().equals(project)){
- count++;
- }
- }
- return count;
- }
-
- public static String cleanValue(String v){
- v= StringUtils.replace(v, " ", "_");
- v= StringUtils.replace(v, "`", "_");
- v= StringUtils.replace(v, "~", "_");
- v= StringUtils.replace(v, "@", "_");
- v= StringUtils.replace(v, "#", "_");
- v= StringUtils.replace(v, "$", "_");
- v= StringUtils.replace(v, "%", "_");
- v= StringUtils.replace(v, "^", "_");
- v= StringUtils.replace(v, "&", "_");
- v= StringUtils.replace(v, "*", "_");
- v= StringUtils.replace(v, "(", "_");
- v= StringUtils.replace(v, ")", "_");
- v= StringUtils.replace(v, "+", "_");
- v= StringUtils.replace(v, "=", "_");
- v= StringUtils.replace(v, "[", "_");
- v= StringUtils.replace(v, "]", "_");
- v= StringUtils.replace(v, "{", "_");
- v= StringUtils.replace(v, "}", "_");
- v= StringUtils.replace(v, "|", "_");
- v= StringUtils.replace(v, "\\", "_");
- v= StringUtils.replace(v, "/", "_");
- v= StringUtils.replace(v, "?", "_");
- v= StringUtils.replace(v, ":", "_");
- v= StringUtils.replace(v, ";", "_");
- v= StringUtils.replace(v, "\"", "_");
- v= StringUtils.replace(v, "'", "_");
- v= StringUtils.replace(v, ",", "_");
- v= StringUtils.replace(v, ".", "_");
- v= StringUtils.replace(v, "<", "_");
- v= StringUtils.replace(v, ">", "_");
-
- return v;
- }
-
- public void checkUniqueLabel() throws Exception{
- if(StringUtils.isNotBlank(this.getLabel())){
- Long count=(Long)PoolDBUtils.ReturnStatisticQuery(String.format("SELECT COUNT(*) FROM (SELECT label,id FROM xnat_subjectData WHERE label='%1$s' AND ID !='%2$s' AND project='%3$s' UNION SELECT label, subject_id as ID FROM xnat_projectParticipant WHERE label='%1$s' AND subject_id !='%2$s' AND project='%3$s')SRCH",this.getLabel(),this.getId(),this.getProject()), "count", this.getDBName(), "system");
- if(count>0){
- throw new ClientException(Status.CLIENT_ERROR_CONFLICT,"Conflict: Duplicate subject label",new Exception());
- }
- }
- }
-
-
- @Override
- public void preSave() throws Exception{
- super.preSave();
-
- if(StringUtils.isBlank(this.getId())){
- throw new IllegalArgumentException();
- }
-
- if(StringUtils.isBlank(this.getLabel())){
- throw new IllegalArgumentException();
- }
-
- if(!XftStringUtils.IsAlphaNumericUnderscore(getId())){
- throw new IllegalArgumentException("Identifiers cannot use special characters.");
- }
-
- if(!XftStringUtils.IsAlphaNumericUnderscore(getLabel())){
- throw new IllegalArgumentException("Labels cannot use special characters.");
- }
-
-
- final XnatProjectdata proj = this.getPrimaryProject(false);
- if(proj==null){
- throw new Exception("Unable to identify project for:" + this.getProject());
- }
-
- checkUniqueLabel();
-
- final String expectedPath=getExpectedCurrentDirectory().getAbsolutePath().replace('\\', '/');
-
- for(final XnatAbstractresourceI res: this.getResources_resource()){
- final String uri;
- if(res instanceof XnatResource){
- uri=((XnatResource)res).getUri();
- }else if(res instanceof XnatResourceseries){
- uri=((XnatResourceseries)res).getPath();
- }else{
- continue;
- }
-
- File u = new File(uri);
- if (u.isFile()) {
- FileUtils.ValidateUriAgainstRoot(u.getParent(),expectedPath,"URI references data outside of the project: " + uri);
- }
- else {
- FileUtils.ValidateUriAgainstRoot(uri,expectedPath,"URI references data outside of the project: " + uri);
- }
- }
-
- for(final XnatSubjectassessordataI expt:this.getExperiments_experiment()){
- ((XnatSubjectassessordata)expt).preSave();
- }
- }
-
- public File getExpectedCurrentDirectory() throws InvalidArchiveStructure {
- final XnatProjectdata primaryProject = this.getPrimaryProject(false);
- return primaryProject == null ? null : new File(primaryProject.getRootArchivePath(),"subjects/"+ this.getArchiveDirectoryName());
- }
-
- public static void save(XnatSubjectdata subject,boolean overrideSecurity, boolean allowItemRemoval, UserI user,EventDetails event) throws Exception{
- PersistentWorkflowI wrk= WorkflowUtils.buildOpenWorkflow(user, subject.getXSIType(), subject.getId(),subject.getProject(),event);
- EventMetaI c=wrk.buildEvent();
-
- try {
- SaveItemHelper.authorizedSave(subject,user, overrideSecurity, allowItemRemoval,c);
- WorkflowUtils.complete(wrk, c);
- } catch (Exception e) {
- WorkflowUtils.fail(wrk, c);
- throw e;
- }
- }
-
- public static void SaveSharedProject(XnatProjectparticipant pp, XnatSubjectdata expt,UserI user,EventDetails event) throws Exception{
- PersistentWorkflowI wrk= WorkflowUtils.buildOpenWorkflow(user, expt.getItem(), event);
- EventMetaI c=wrk.buildEvent();
- PersistentWorkflowUtils.save(wrk, c);
- try {
- SaveItemHelper.authorizedSave(pp, user, false,false,c);
- PersistentWorkflowUtils.complete(wrk, c);
- } catch (Exception e) {
- logger.error("",e);
- PersistentWorkflowUtils.fail(wrk, c);
- throw e;
- }
- }
-
- public static EventMetaI ChangePrimaryProject(UserI user, XnatSubjectdata assessor, XnatProjectdata newProject, String newLabel,EventDetails event) throws Exception{
- PersistentWorkflowI wrk= WorkflowUtils.buildOpenWorkflow(user, assessor.getXSIType(), assessor.getId(),assessor.getProject(),event);
- wrk.setDetails("Move subject from project " + assessor.getProject() + " to " + newProject.getId());
- EventMetaI c=wrk.buildEvent();
- PersistentWorkflowUtils.save(wrk, c);
-
- try {
- assessor.moveToProject(newProject,newLabel,user,c);
-
- PersistentWorkflowUtils.complete(wrk, c);
- } catch (Exception e) {
- logger.error("",e);
- PersistentWorkflowUtils.fail(wrk,c);
- throw e;
- }
-
- return c;
- }
-
- /**
- * Gets root path to the primary project's archive space.
- * @return The path to the root folder of the subject's primary project's archive space.
- */
- public String getArchiveRootPath(){
- final XnatProjectdata primaryProject = getPrimaryProject(false);
- return primaryProject != null ? primaryProject.getRootArchivePath() : null;
- }
-
- public XnatSubjectdata getLightCopy() throws XFTInitException, ElementNotFoundException {
- XFTItem item = XFTItem.NewItem(this.getXSIType(), this.getUser());
- XnatSubjectdata new_expt=(XnatSubjectdata) BaseElement.GetGeneratedItem(item);
- new_expt.setId(this.getId());
- new_expt.setLabel(this.getLabel());
- new_expt.setProject(this.getProject());
- return new_expt;
- }
-
- @Override
- public SecurityValues getSecurityTags() {
- SecurityValues projects=new SecurityValues();
- projects.getHash().put(this.getXSIType() +"/project", this.getProject());
- for (final XnatProjectparticipantI pp:this.getSharing_share())
- {
- projects.getHash().put(this.getXSIType() +"/sharing/share/project", pp.getProject());
- }
- return projects;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdataAddid.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdataAddid.java
deleted file mode 100644
index cdb08ab084d5e1079a66b85fc3973d22426ea694..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdataAddid.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSubjectdataAddid
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSubjectdataAddid;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatSubjectdataAddid extends AutoXnatSubjectdataAddid {
-
- public BaseXnatSubjectdataAddid(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSubjectdataAddid(UserI user)
- {
- super(user);
- }
-
- public BaseXnatSubjectdataAddid()
- {}
-
- public BaseXnatSubjectdataAddid(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdataField.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdataField.java
deleted file mode 100644
index 46103999cc11a42a293aef1f5ee2f2cfd90489c2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdataField.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSubjectdataField
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSubjectdataField;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatSubjectdataField extends AutoXnatSubjectdataField {
-
- public BaseXnatSubjectdataField(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSubjectdataField(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatSubjectdataField(UserI user)
- **/
- public BaseXnatSubjectdataField()
- {}
-
- public BaseXnatSubjectdataField(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectmetadata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectmetadata.java
deleted file mode 100644
index c0dd9cb642eb25fa9c14c45f290ec288564317fb..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectmetadata.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSubjectmetadata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSubjectmetadata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatSubjectmetadata extends AutoXnatSubjectmetadata {
-
- public BaseXnatSubjectmetadata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSubjectmetadata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatSubjectmetadata()
- {}
-
- public BaseXnatSubjectmetadata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectvariablesdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectvariablesdata.java
deleted file mode 100644
index 2f923d386e32dd6ba81d0746e548cfd97074cf56..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectvariablesdata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSubjectvariablesdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSubjectvariablesdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatSubjectvariablesdata extends AutoXnatSubjectvariablesdata {
-
- public BaseXnatSubjectvariablesdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSubjectvariablesdata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatSubjectvariablesdata(UserI user)
- **/
- public BaseXnatSubjectvariablesdata()
- {}
-
- public BaseXnatSubjectvariablesdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectvariablesdataVariable.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectvariablesdataVariable.java
deleted file mode 100644
index 65ddc9f55a19a3ce2850c103129779015527a3a6..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectvariablesdataVariable.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatSubjectvariablesdataVariable
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatSubjectvariablesdataVariable;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatSubjectvariablesdataVariable extends AutoXnatSubjectvariablesdataVariable {
-
- public BaseXnatSubjectvariablesdataVariable(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatSubjectvariablesdataVariable(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatSubjectvariablesdataVariable(UserI user)
- **/
- public BaseXnatSubjectvariablesdataVariable()
- {}
-
- public BaseXnatSubjectvariablesdataVariable(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatUsscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatUsscandata.java
deleted file mode 100644
index 21f9269387e877bea655f6bb42bd7d68796dafe2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatUsscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatUsscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatUsscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatUsscandata extends AutoXnatUsscandata {
-
- public BaseXnatUsscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatUsscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatUsscandata(UserI user)
- **/
- public BaseXnatUsscandata()
- {}
-
- public BaseXnatUsscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatUssessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatUssessiondata.java
deleted file mode 100644
index e779aaffbec99fce63f18c5f661fe463db52f95a..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatUssessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatUssessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatUssessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatUssessiondata extends AutoXnatUssessiondata {
-
- public BaseXnatUssessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatUssessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatUssessiondata(UserI user)
- **/
- public BaseXnatUssessiondata()
- {}
-
- public BaseXnatUssessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatValidationdata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatValidationdata.java
deleted file mode 100644
index d9db6f160b59072b039a5a224680a817bbe037e6..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatValidationdata.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatValidationdata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatValidationdata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatValidationdata extends AutoXnatValidationdata {
-
- public BaseXnatValidationdata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatValidationdata(UserI user)
- {
- super(user);
- }
-
- public BaseXnatValidationdata()
- {}
-
- public BaseXnatValidationdata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatVoiceaudioscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatVoiceaudioscandata.java
deleted file mode 100644
index 7a94c522ce328fe6bc5d47588ed135f895939044..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatVoiceaudioscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatVoiceaudioscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatVoiceaudioscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatVoiceaudioscandata extends AutoXnatVoiceaudioscandata {
-
- public BaseXnatVoiceaudioscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatVoiceaudioscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatVoiceaudioscandata(UserI user)
- **/
- public BaseXnatVoiceaudioscandata()
- {}
-
- public BaseXnatVoiceaudioscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatVolumetricregion.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatVolumetricregion.java
deleted file mode 100644
index 63ddb93651b8f7427d41c45a031c7032e7085807..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatVolumetricregion.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatVolumetricregion
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.XnatVolumetricregionSubregion;
-import org.nrg.xdat.om.base.auto.AutoXnatVolumetricregion;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatVolumetricregion extends AutoXnatVolumetricregion {
-
- public BaseXnatVolumetricregion(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatVolumetricregion(UserI user)
- {
- super(user);
- }
-
- public BaseXnatVolumetricregion()
- {}
-
- public BaseXnatVolumetricregion(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
- public BaseXnatVolumetricregionSubregion getSubRegionByName(String name)
- {
- List al = this.getSubregions_subregion();
- Iterator iter = al.iterator();
- while (iter.hasNext())
- {
- XnatVolumetricregionSubregion sub = (XnatVolumetricregionSubregion)iter.next();
- if (sub.getName().equalsIgnoreCase(name))
- {
- return sub;
- }
- }
-
- return null;
- }
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatVolumetricregionSubregion.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatVolumetricregionSubregion.java
deleted file mode 100644
index 35338a6eb5a872f777381e589a513df6207dc004..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatVolumetricregionSubregion.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatVolumetricregionSubregion
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatVolumetricregionSubregion;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class BaseXnatVolumetricregionSubregion extends AutoXnatVolumetricregionSubregion {
-
- public BaseXnatVolumetricregionSubregion(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatVolumetricregionSubregion(UserI user)
- {
- super(user);
- }
-
- public BaseXnatVolumetricregionSubregion()
- {}
-
- public BaseXnatVolumetricregionSubregion(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatXa3dscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatXa3dscandata.java
deleted file mode 100644
index b71acce6dd03755dcf45cfe8be1d47f13677adb3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatXa3dscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatXa3dscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatXa3dscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatXa3dscandata extends AutoXnatXa3dscandata {
-
- public BaseXnatXa3dscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatXa3dscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatXa3dscandata(UserI user)
- **/
- public BaseXnatXa3dscandata()
- {}
-
- public BaseXnatXa3dscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatXa3dsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatXa3dsessiondata.java
deleted file mode 100644
index 90ced8f1945a93c1408fd082110cc3103137c7cf..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatXa3dsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatXa3dsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatXa3dsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatXa3dsessiondata extends AutoXnatXa3dsessiondata {
-
- public BaseXnatXa3dsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatXa3dsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatXa3dsessiondata(UserI user)
- **/
- public BaseXnatXa3dsessiondata()
- {}
-
- public BaseXnatXa3dsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatXascandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatXascandata.java
deleted file mode 100644
index bef2c93e1832b151643a01c896afdb1a2e1864d7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatXascandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatXascandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatXascandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatXascandata extends AutoXnatXascandata {
-
- public BaseXnatXascandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatXascandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatXascandata(UserI user)
- **/
- public BaseXnatXascandata()
- {}
-
- public BaseXnatXascandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatXasessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatXasessiondata.java
deleted file mode 100644
index 9da9224955bc29551240cf6c4162f16d13749615..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatXasessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatXasessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatXasessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatXasessiondata extends AutoXnatXasessiondata {
-
- public BaseXnatXasessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatXasessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatXasessiondata(UserI user)
- **/
- public BaseXnatXasessiondata()
- {}
-
- public BaseXnatXasessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatXcscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatXcscandata.java
deleted file mode 100644
index 333c7389336e8c43df16ce9b6e48d047b93fdc4e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatXcscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatXcscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatXcscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatXcscandata extends AutoXnatXcscandata {
-
- public BaseXnatXcscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatXcscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatXcscandata(UserI user)
- **/
- public BaseXnatXcscandata()
- {}
-
- public BaseXnatXcscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatXcsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatXcsessiondata.java
deleted file mode 100644
index 2a3342a0e1cb0417ab607921d30454302577fadb..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatXcsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatXcsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatXcsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatXcsessiondata extends AutoXnatXcsessiondata {
-
- public BaseXnatXcsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatXcsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatXcsessiondata(UserI user)
- **/
- public BaseXnatXcsessiondata()
- {}
-
- public BaseXnatXcsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatXcvscandata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatXcvscandata.java
deleted file mode 100644
index bfa0cc1f028faa16f47acb277f37a88a585367ef..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatXcvscandata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatXcvscandata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatXcvscandata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatXcvscandata extends AutoXnatXcvscandata {
-
- public BaseXnatXcvscandata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatXcvscandata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatXcvscandata(UserI user)
- **/
- public BaseXnatXcvscandata()
- {}
-
- public BaseXnatXcvscandata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseXnatXcvsessiondata.java b/src/main/java/org/nrg/xdat/om/base/BaseXnatXcvsessiondata.java
deleted file mode 100644
index d98168ed024fa18ef135048cc5fb903697ed9a20..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseXnatXcvsessiondata.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * org.nrg.xdat.om.base.BaseXnatXcvsessiondata
- * XNAT http://www.xnat.org
- * Copyright (c) 2014, Washington University School of Medicine
- * All Rights Reserved
- *
- * Released under the Simplified BSD.
- *
- * Last modified 7/10/13 9:04 PM
- */
-package org.nrg.xdat.om.base;
-
-import org.nrg.xdat.om.base.auto.AutoXnatXcvsessiondata;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.security.UserI;
-
-import java.util.Hashtable;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseXnatXcvsessiondata extends AutoXnatXcvsessiondata {
-
- public BaseXnatXcvsessiondata(ItemI item)
- {
- super(item);
- }
-
- public BaseXnatXcvsessiondata(UserI user)
- {
- super(user);
- }
-
- /*
- * @deprecated Use BaseXnatXcvsessiondata(UserI user)
- **/
- public BaseXnatXcvsessiondata()
- {}
-
- public BaseXnatXcvsessiondata(Hashtable properties, UserI user)
- {
- super(properties,user);
- }
-
-}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_cat_catalog.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_cat_catalog.java
deleted file mode 100644
index 95089303ff2df482e6c8402fd6c8cdb256ea1147..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_cat_catalog.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_cat_catalog extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_cat_catalog.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "cat:catalog";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_cat_dcmCatalog.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_cat_dcmCatalog.java
deleted file mode 100644
index ae39c89abf3e1abd0bf0f640538126d0dd377f39..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_cat_dcmCatalog.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_cat_dcmCatalog extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_cat_dcmCatalog.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "cat:dcmCatalog";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_cat_entry.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_cat_entry.java
deleted file mode 100644
index 2c210a655b939e4775c342a6cc709365d5bc71b3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_cat_entry.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_cat_entry extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_cat_entry.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "cat:entry";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_prov_process.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_prov_process.java
deleted file mode 100644
index 986f37bf7e57f8f0ee0126bd926581f23e416422..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_prov_process.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_prov_process extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_prov_process.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "prov:process";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_scr_screeningAssessment.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_scr_screeningAssessment.java
deleted file mode 100644
index b0f01c535ddb8defd1d7bc36b2103485322b4d94..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_scr_screeningAssessment.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_scr_screeningAssessment extends org.nrg.xnat.turbine.modules.screens.EditImageAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_scr_screeningAssessment.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "scr:screeningAssessment";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_val_protocolData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_val_protocolData.java
deleted file mode 100644
index 1e4783940c5d7a4d4146969c2b90bc424f9ed9d2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_val_protocolData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_val_protocolData extends org.nrg.xnat.turbine.modules.screens.EditImageAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_val_protocolData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "val:protocolData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_wrk_workflowData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_wrk_workflowData.java
deleted file mode 100644
index 687914db4a47ed91a7089e1c5f35311cf4f0b1f1..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_wrk_workflowData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_wrk_workflowData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_wrk_workflowData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "wrk:workflowData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_scidResearchData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_scidResearchData.java
deleted file mode 100644
index 85cc61b09edb12f72ad470fb2b485977edae1f93..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_scidResearchData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_a_scidResearchData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_a_scidResearchData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat_a:scidResearchData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_sideEffectsPittsburghData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_sideEffectsPittsburghData.java
deleted file mode 100644
index ff81291443f2097fb5c446e9057d7d3f4e8fed21..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_sideEffectsPittsburghData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_a_sideEffectsPittsburghData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_a_sideEffectsPittsburghData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat_a:sideEffectsPittsburghData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_updrs3Data.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_updrs3Data.java
deleted file mode 100644
index 49f5b0c0218b784b1afff821f3ebe329d375d8a3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_updrs3Data.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_a_updrs3Data extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_a_updrs3Data.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat_a:updrs3Data";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_ybocsData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_ybocsData.java
deleted file mode 100644
index 923dc15c43ff065289630c010d44080bc4a0532f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_ybocsData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_a_ybocsData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_a_ybocsData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat_a:ybocsData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_ygtssData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_ygtssData.java
deleted file mode 100644
index 633ed4ec610ac1753b7e6f7a600280cb17feed31..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_a_ygtssData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_a_ygtssData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_a_ygtssData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat_a:ygtssData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_crScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_crScanData.java
deleted file mode 100644
index 57a7b8ac6a00c1791d8bc036146edeafb8ef8e9a..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_crScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_crScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_crScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:crScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_crSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_crSessionData.java
deleted file mode 100644
index f089047abf74a687929929c131d6bc9b64c2eebe..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_crSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_crSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_crSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:crSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ctScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ctScanData.java
deleted file mode 100644
index 427ff888476e0ca99aef27a9a64cdb54fd2fbecd..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ctScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_ctScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_ctScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:ctScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ctSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ctSessionData.java
deleted file mode 100644
index c2c0e5877d3a40b70c3f4af4d7a511cc061ae394..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ctSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_ctSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_ctSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:ctSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dx3DCraniofacialScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dx3DCraniofacialScanData.java
deleted file mode 100644
index 4ee6bd2dc3b71decd670e9607f11ddb083f8ecbc..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dx3DCraniofacialScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:07 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_dx3DCraniofacialScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_dx3DCraniofacialScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:dx3DCraniofacialScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dx3DCraniofacialSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dx3DCraniofacialSessionData.java
deleted file mode 100644
index 8bfd589f228fc31171277f64efab6a9c7d80a9ef..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dx3DCraniofacialSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_dx3DCraniofacialSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_dx3DCraniofacialSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:dx3DCraniofacialSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dxScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dxScanData.java
deleted file mode 100644
index d35a8f8be78e6801802a9ec4ece7afc9d23a3bdd..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dxScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_dxScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_dxScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:dxScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dxSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dxSessionData.java
deleted file mode 100644
index adc6eb5d39be8bf176e3a1ec4ce9cb9ca86e2196..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_dxSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_dxSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_dxSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:dxSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ecgScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ecgScanData.java
deleted file mode 100644
index 089e1ae3d41040d034dd3b1adfb4060a23adf77d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ecgScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_ecgScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_ecgScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:ecgScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ecgSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ecgSessionData.java
deleted file mode 100644
index 128ec375c7f19dbf7e0691ff71a304bc311fcdc8..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ecgSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_ecgSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_ecgSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:ecgSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_eegScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_eegScanData.java
deleted file mode 100644
index 967c18fc04229becd1b5d26bf82ff5d25d9920cb..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_eegScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_eegScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_eegScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:eegScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_eegSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_eegSessionData.java
deleted file mode 100644
index 592a3264ff465fe26c4e3b61e06b11e74e6c0787..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_eegSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_eegSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_eegSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:eegSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_epsScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_epsScanData.java
deleted file mode 100644
index 71660c1c6b928ebf445686af5cae604144e2563d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_epsScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_epsScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_epsScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:epsScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_epsSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_epsSessionData.java
deleted file mode 100644
index 81405545ac449f9b5d9ef58ede8f3411a01db91f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_epsSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_epsSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_epsSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:epsSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esScanData.java
deleted file mode 100644
index 1c1954042d00082303cb28ac5fba25cced051c90..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_esScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_esScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:esScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esSessionData.java
deleted file mode 100644
index 1a721d58863a144ffe9015e89e99c1603912ba2d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_esSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_esSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:esSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esvScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esvScanData.java
deleted file mode 100644
index ab44b6ff3a0be1e9ee5dc4738b98620ad832db31..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esvScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_esvScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_esvScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:esvScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esvSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esvSessionData.java
deleted file mode 100644
index e888afa7d5319af524704e0be3743539705341be..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_esvSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_esvSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_esvSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:esvSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_fieldDefinitionGroup.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_fieldDefinitionGroup.java
deleted file mode 100644
index fc04385236bec36f9bd9371e39bac94e12f5dc9a..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_fieldDefinitionGroup.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_fieldDefinitionGroup extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_fieldDefinitionGroup.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:fieldDefinitionGroup";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_genericData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_genericData.java
deleted file mode 100644
index d8fafaf71b9e724e79bc39f8909457f1f049b8e3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_genericData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_genericData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_genericData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:genericData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmScanData.java
deleted file mode 100644
index fa957ca50c1d00444a577cdc149387a320941881..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_gmScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_gmScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:gmScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmSessionData.java
deleted file mode 100644
index 9377aab3f0b52633fa38397a95f39e57c749ed5c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_gmSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_gmSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:gmSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmvScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmvScanData.java
deleted file mode 100644
index 8f5dfdce46e25cdd4f48d706c42eb5abe5aa192a..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmvScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_gmvScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_gmvScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:gmvScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmvSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmvSessionData.java
deleted file mode 100644
index b96de23b2a2ab3d4e77e49082ff6d60f466a347f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_gmvSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_gmvSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_gmvSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:gmvSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_hdScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_hdScanData.java
deleted file mode 100644
index b0967b40f51ded5593db2563996c85e0aa599d82..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_hdScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_hdScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_hdScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:hdScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_hdSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_hdSessionData.java
deleted file mode 100644
index b16abe922eaeb8fea1ae8269d8dd1e9d1f70875f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_hdSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_hdSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_hdSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:hdSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_investigatorData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_investigatorData.java
deleted file mode 100644
index 7a7578ebc926e890996d55ac7c14b98a26eacc4e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_investigatorData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_investigatorData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_investigatorData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:investigatorData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ioScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ioScanData.java
deleted file mode 100644
index e8af894db803f45cd8d45f437ee289c5dfea40c4..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ioScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_ioScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_ioScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:ioScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ioSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ioSessionData.java
deleted file mode 100644
index d95ce793dca41515697f78852aeba88608eb00f5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_ioSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_ioSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_ioSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:ioSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_megScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_megScanData.java
deleted file mode 100644
index 49aadae79b7a7a414bc27d6670181d3ba72e3181..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_megScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_megScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_megScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:megScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_megSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_megSessionData.java
deleted file mode 100644
index 4f0d5d3fde62bbc627f014bf95b440552593c419..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_megSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_megSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_megSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:megSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mgScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mgScanData.java
deleted file mode 100644
index 5f56275186429ec7720bef40835b2fcb90d0f3eb..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mgScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_mgScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_mgScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:mgScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mgSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mgSessionData.java
deleted file mode 100644
index 3f128ca103facc9c28112ee2ddb78a2b6f9ccafc..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mgSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_mgSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_mgSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:mgSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mrScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mrScanData.java
deleted file mode 100644
index 2007cdee259b8a934688fa8e74c4c28f1f54d5aa..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mrScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_mrScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_mrScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:mrScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mrSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mrSessionData.java
deleted file mode 100644
index 4d52f6da1263742870f473629d32ace2e155e61c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mrSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_mrSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_mrSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:mrSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mrsScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mrsScanData.java
deleted file mode 100644
index 43bd3de1b546250a2d27693d602664e9369768f9..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_mrsScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_mrsScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_mrsScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:mrsScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_nmScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_nmScanData.java
deleted file mode 100644
index 34fdddb3573ca49dfcb53ee0b891ff4e4200ed14..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_nmScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_nmScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_nmScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:nmScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_nmSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_nmSessionData.java
deleted file mode 100644
index 5ec55be6be223b36dc53f07a3e7026c921c1a6b8..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_nmSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:07 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_nmSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_nmSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:nmSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_opScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_opScanData.java
deleted file mode 100644
index 006c28efba79ebfb98da50dc1cdc6ff886a27f60..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_opScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_opScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_opScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:opScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_opSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_opSessionData.java
deleted file mode 100644
index 912c430c3ff6f265b49dcf61bf2904b62fd22cd4..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_opSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_opSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_opSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:opSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_optScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_optScanData.java
deleted file mode 100644
index b8ed60bc694f71ac425d8aceb9ca81bde3fa9005..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_optScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_optScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_optScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:optScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_optSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_optSessionData.java
deleted file mode 100644
index d5ec871817ba5888bd7ffb964c0de5a60156b9e3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_optSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_optSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_optSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:optSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_otherDicomScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_otherDicomScanData.java
deleted file mode 100644
index 59f112cb5d8cee44953642f8c41eb79e85b2b89e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_otherDicomScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_otherDicomScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_otherDicomScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:otherDicomScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_otherDicomSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_otherDicomSessionData.java
deleted file mode 100644
index 983a363b5262b12f6f9e0192e6b35bb4673a18c5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_otherDicomSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_otherDicomSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_otherDicomSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:otherDicomSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_pVisitData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_pVisitData.java
deleted file mode 100644
index 3c74112724672285fe0093d6893987f39f78c030..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_pVisitData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_pVisitData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_pVisitData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:pVisitData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_petScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_petScanData.java
deleted file mode 100644
index 4e87e343c8f2f3048c06e956f259ba07dc9c8b67..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_petScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_petScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_petScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:petScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_petSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_petSessionData.java
deleted file mode 100644
index aaeeb59f64a76cd42527073c74dc61ff316c8b97..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_petSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_petSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_petSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:petSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_petmrSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_petmrSessionData.java
deleted file mode 100644
index 272f0a87048ca3a9efdbe86786f74fd6da0154b4..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_petmrSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_petmrSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_petmrSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:petmrSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_projectData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_projectData.java
deleted file mode 100644
index d2eac129e7444a7b9454720c69d619fd7daf073d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_projectData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_projectData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_projectData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:projectData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_qcAssessmentData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_qcAssessmentData.java
deleted file mode 100644
index a560e4a0d8c45fb5e06fd1bfddf048d0ea3e67d5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_qcAssessmentData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_qcAssessmentData extends org.nrg.xnat.turbine.modules.screens.EditImageAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_qcAssessmentData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:qcAssessmentData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_qcManualAssessorData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_qcManualAssessorData.java
deleted file mode 100644
index c522781c2cbc21406f8bdfa1059e29c6b3326801..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_qcManualAssessorData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_qcManualAssessorData extends org.nrg.xnat.turbine.modules.screens.EditImageAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_qcManualAssessorData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:qcManualAssessorData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_reconstructedImageData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_reconstructedImageData.java
deleted file mode 100644
index 55a49b204f1ad5c0426c51b6c5c8de7956d48ff5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_reconstructedImageData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_reconstructedImageData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_reconstructedImageData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:reconstructedImageData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_regionResource.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_regionResource.java
deleted file mode 100644
index 67ec38a40a92f790613c037ce762700ee0dc8a14..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_regionResource.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_regionResource extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_regionResource.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:regionResource";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_resourceCatalog.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_resourceCatalog.java
deleted file mode 100644
index 66e00380d6d38d8d19a27ec95b55d26a01cefc7b..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_resourceCatalog.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_resourceCatalog extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_resourceCatalog.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:resourceCatalog";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rfScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rfScanData.java
deleted file mode 100644
index dab9256bf3fbc159028ba619012ea1e94280eb41..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rfScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_rfScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_rfScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:rfScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rfSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rfSessionData.java
deleted file mode 100644
index 7abc642ef698a35517998b3fa54f23f1341b4639..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rfSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_rfSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_rfSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:rfSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rtImageScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rtImageScanData.java
deleted file mode 100644
index 000ee2015430d0bd90fd314cd7e8925be3885f8f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rtImageScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_rtImageScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_rtImageScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:rtImageScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rtSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rtSessionData.java
deleted file mode 100644
index 1236ae7e08e17a597c4c1e6e748fe6e2776415c2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_rtSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_rtSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_rtSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:rtSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_scScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_scScanData.java
deleted file mode 100644
index d209939fca9ca25394d8801ac22dbab4564cbd26..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_scScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_scScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_scScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:scScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_segScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_segScanData.java
deleted file mode 100644
index a449b0663c5727c26ce8fcdbf84e1f04df02d928..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_segScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_segScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_segScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:segScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_smScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_smScanData.java
deleted file mode 100644
index 3a273d7e97b093738fba853458ab57fdbbd3079e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_smScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_smScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_smScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:smScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_smSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_smSessionData.java
deleted file mode 100644
index 4107023a315cb225bd564f84a31a2bf10367ce6d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_smSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_smSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_smSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:smSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_srScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_srScanData.java
deleted file mode 100644
index 81df9ba163638cd3d64d7d62315d501b3d0e81e7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_srScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_srScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_srScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:srScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_srSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_srSessionData.java
deleted file mode 100644
index 970de5ab3899ed9509edd2f04539fd4666fb7fe7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_srSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_srSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_srSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:srSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_subjectData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_subjectData.java
deleted file mode 100644
index 54e468ab287a5ef2ef87584cf8cbf045385771dd..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_subjectData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_subjectData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_subjectData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:subjectData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_subjectVariablesData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_subjectVariablesData.java
deleted file mode 100644
index 6a43553a0f653fc46158aa122b93487b0d6fde28..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_subjectVariablesData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_subjectVariablesData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_subjectVariablesData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:subjectVariablesData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_usScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_usScanData.java
deleted file mode 100644
index 4062f89e1654d2418102efeaee73bf851331a878..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_usScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_usScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_usScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:usScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_usSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_usSessionData.java
deleted file mode 100644
index f18be7a468033fd2110a38e304bbac640b5ad61c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_usSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_usSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_usSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:usSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_voiceAudioScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_voiceAudioScanData.java
deleted file mode 100644
index fb4c3518eb6d71b991277a24398b6b42eb602ba7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_voiceAudioScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_voiceAudioScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_voiceAudioScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:voiceAudioScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xa3DScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xa3DScanData.java
deleted file mode 100644
index f38d892a21b7b08156f12f2298830f9ae1940569..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xa3DScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_xa3DScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_xa3DScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:xa3DScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xa3DSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xa3DSessionData.java
deleted file mode 100644
index 41664b90066f8d61f0b62a59ad961c11c74a6530..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xa3DSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_xa3DSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_xa3DSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:xa3DSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xaScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xaScanData.java
deleted file mode 100644
index 4ad1333adb8747370077fc36ee88368003d3321b..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xaScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_xaScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_xaScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:xaScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xaSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xaSessionData.java
deleted file mode 100644
index e4ad81af5e0b38425c6e030b239e994d563f7890..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xaSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_xaSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_xaSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:xaSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcScanData.java
deleted file mode 100644
index ff425e865ad2f3067057ddb4cd5623cb70f3be1f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_xcScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_xcScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:xcScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcSessionData.java
deleted file mode 100644
index 9add3ddf7385ea3f23dd8cc5c44b94a6cf1ce369..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_xcSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_xcSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:xcSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcvScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcvScanData.java
deleted file mode 100644
index 72d120ebd3348c5330a37f2951bdd307cd54942b..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcvScanData.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_xcvScanData extends org.nrg.xdat.turbine.modules.screens.EditScreenA {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_xcvScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:xcvScanData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcvSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcvSessionData.java
deleted file mode 100644
index 289dd7adb4ef283a94b3b678fca68a987c90a068..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_edit_xnat_xcvSessionData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.ItemI;
-import org.nrg.xft.XFTItem;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_edit_xnat_xcvSessionData extends org.nrg.xnat.turbine.modules.screens.EditSubjectAssessorScreen {
- static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_edit_xnat_xcvSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.EditScreenA#getElementName()
- */
- public String getElementName() {
- return "xnat:xcvSessionData";
- }
-
- public ItemI getEmptyItem(RunData data) throws Exception
- {
- return super.getEmptyItem(data);
- }
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- super.finalProcessing(data,context);
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_cat_catalog.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_cat_catalog.java
deleted file mode 100644
index 1c88c2d183661e7fb4715379ab53b471935dfa7c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_cat_catalog.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_cat_catalog extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_cat_catalog.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_cat_dcmCatalog.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_cat_dcmCatalog.java
deleted file mode 100644
index fbd9af4d4fdab3a0b7bc67ac0b34cf3dace1ea00..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_cat_dcmCatalog.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_cat_dcmCatalog extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_cat_dcmCatalog.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_cat_entry.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_cat_entry.java
deleted file mode 100644
index 5205052ebac7ce5635be0104a60f2dab7d354843..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_cat_entry.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_cat_entry extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_cat_entry.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_prov_process.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_prov_process.java
deleted file mode 100644
index 20f1e2e02b5aca19d5d1d22a2768e8a84c4ea12e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_prov_process.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_prov_process extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_prov_process.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_scr_screeningAssessment.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_scr_screeningAssessment.java
deleted file mode 100644
index 32806698aad6941c1ce0a67ebbc55b780cfb9798..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_scr_screeningAssessment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_scr_screeningAssessment extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_scr_screeningAssessment.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_val_protocolData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_val_protocolData.java
deleted file mode 100644
index a16a907e7a6c6e2dc207c3a16efe056333f0eba5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_val_protocolData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_val_protocolData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_val_protocolData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_wrk_workflowData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_wrk_workflowData.java
deleted file mode 100644
index d2b02bf862cecf2464ea1a4c11d7f963bc9438e5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_wrk_workflowData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_wrk_workflowData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_wrk_workflowData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_scidResearchData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_scidResearchData.java
deleted file mode 100644
index c5de342afa570588fd893452bc4f0f29f1bd9ea3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_scidResearchData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_a_scidResearchData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_a_scidResearchData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatAscidresearchdata om = new org.nrg.xdat.om.XnatAscidresearchdata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatAscidresearchdata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_sideEffectsPittsburghData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_sideEffectsPittsburghData.java
deleted file mode 100644
index 041615e966bc22b3779dd7e40a2b6a441afb54c2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_sideEffectsPittsburghData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_a_sideEffectsPittsburghData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_a_sideEffectsPittsburghData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatAsideeffectspittsburghdata om = new org.nrg.xdat.om.XnatAsideeffectspittsburghdata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatAsideeffectspittsburghdata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_updrs3Data.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_updrs3Data.java
deleted file mode 100644
index db74e497c72420ed3168e36c7407fc65ca37b9fc..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_updrs3Data.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_a_updrs3Data extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_a_updrs3Data.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatAupdrs3data om = new org.nrg.xdat.om.XnatAupdrs3data(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatAupdrs3data) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_ybocsData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_ybocsData.java
deleted file mode 100644
index b940e5ac5618419df3af6cab04cdb3dffd97e425..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_ybocsData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_a_ybocsData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_a_ybocsData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatAybocsdata om = new org.nrg.xdat.om.XnatAybocsdata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatAybocsdata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_ygtssData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_ygtssData.java
deleted file mode 100644
index 1b3347dedfbefb8d815a3096cb4976bec1e89f0f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_a_ygtssData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_a_ygtssData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_a_ygtssData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatAygtssdata om = new org.nrg.xdat.om.XnatAygtssdata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatAygtssdata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_crScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_crScanData.java
deleted file mode 100644
index e29bf7b787250708d13c93f6907f3b66a821c401..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_crScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_crScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_crScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_crSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_crSessionData.java
deleted file mode 100644
index bc013ce6e013e0900416cec2c1bca64dab19396f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_crSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_crSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_crSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatCrsessiondata om = new org.nrg.xdat.om.XnatCrsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatCrsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ctScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ctScanData.java
deleted file mode 100644
index a7f0e9f6ff9ef481c71a2563022feaca83e924f0..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ctScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_ctScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_ctScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ctSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ctSessionData.java
deleted file mode 100644
index 0dc44daa338bf2ad2c6ceb8884769f1662fbd44d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ctSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_ctSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_ctSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatCtsessiondata om = new org.nrg.xdat.om.XnatCtsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatCtsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dx3DCraniofacialScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dx3DCraniofacialScanData.java
deleted file mode 100644
index 66bea736c65fe88e98b9ac93fe3a894b00ebd1b2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dx3DCraniofacialScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:07 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_dx3DCraniofacialScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_dx3DCraniofacialScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dx3DCraniofacialSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dx3DCraniofacialSessionData.java
deleted file mode 100644
index 93576e512f906a583ed3fb6d93aba2c9207ace07..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dx3DCraniofacialSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_dx3DCraniofacialSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_dx3DCraniofacialSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata om = new org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dxScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dxScanData.java
deleted file mode 100644
index 903f4a9747e36c627641772b67067e1dfbb7908d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dxScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_dxScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_dxScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dxSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dxSessionData.java
deleted file mode 100644
index 65f25cb1bb51e4b89e87e34add2c365e99b520ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_dxSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_dxSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_dxSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatDxsessiondata om = new org.nrg.xdat.om.XnatDxsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatDxsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ecgScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ecgScanData.java
deleted file mode 100644
index f5f10ee12c5871b979ce4a531c975efb003b2bae..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ecgScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_ecgScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_ecgScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ecgSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ecgSessionData.java
deleted file mode 100644
index 0b3d22b11b8d02efc922fe996dc828383f4909e7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ecgSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_ecgSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_ecgSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatEcgsessiondata om = new org.nrg.xdat.om.XnatEcgsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatEcgsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_eegScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_eegScanData.java
deleted file mode 100644
index 898bd7809993a64f4879990d32bd5891ba40b91d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_eegScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_eegScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_eegScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_eegSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_eegSessionData.java
deleted file mode 100644
index 06dc353ff712f913994c25822c0d7b4c0a7cfe7c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_eegSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_eegSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_eegSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatEegsessiondata om = new org.nrg.xdat.om.XnatEegsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatEegsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_epsScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_epsScanData.java
deleted file mode 100644
index 253a69bfb6292c6c6ec9cfc301975138dd1b5498..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_epsScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_epsScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_epsScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_epsSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_epsSessionData.java
deleted file mode 100644
index 61e758b794a43911d4b17385396fdcb372c9ff67..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_epsSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_epsSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_epsSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatEpssessiondata om = new org.nrg.xdat.om.XnatEpssessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatEpssessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esScanData.java
deleted file mode 100644
index 18e9d1f11349d57f580b163afa628087c1eb00e1..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_esScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_esScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esSessionData.java
deleted file mode 100644
index 374bf43fcbf0d5c26f7da7b5a810c22ea9bc109e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_esSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_esSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatEssessiondata om = new org.nrg.xdat.om.XnatEssessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatEssessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esvScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esvScanData.java
deleted file mode 100644
index b3f058f25391e263f22763bbe75bdb971a51e66b..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esvScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_esvScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_esvScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esvSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esvSessionData.java
deleted file mode 100644
index 19e14deb4823e385065f8b1fbb175f0e4ff62c00..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_esvSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_esvSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_esvSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatEsvsessiondata om = new org.nrg.xdat.om.XnatEsvsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatEsvsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_fieldDefinitionGroup.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_fieldDefinitionGroup.java
deleted file mode 100644
index fa4a37c11b454b630f1e798a76e6dfefc9d24b35..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_fieldDefinitionGroup.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_fieldDefinitionGroup extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_fieldDefinitionGroup.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_genericData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_genericData.java
deleted file mode 100644
index 5d01bf287d4ed872d2307dc3febd8748be1fa768..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_genericData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_genericData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_genericData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmScanData.java
deleted file mode 100644
index 2c0a318f501cef5f575160bb4926b3cab0787dc7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_gmScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_gmScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmSessionData.java
deleted file mode 100644
index bc72828f303a40ef98783484ddb2a672f016c3ca..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_gmSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_gmSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatGmsessiondata om = new org.nrg.xdat.om.XnatGmsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatGmsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmvScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmvScanData.java
deleted file mode 100644
index 4277c2a8e97405f4b982f6a1b6b9f93d4348dc69..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmvScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_gmvScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_gmvScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmvSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmvSessionData.java
deleted file mode 100644
index e040013ac1f13511795c6d0ef1160cdbda2804ef..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_gmvSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_gmvSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_gmvSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatGmvsessiondata om = new org.nrg.xdat.om.XnatGmvsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatGmvsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_hdScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_hdScanData.java
deleted file mode 100644
index f1f2e03e01be6d7ca1e3b4aaf1b3d43a6450a57c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_hdScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_hdScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_hdScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_hdSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_hdSessionData.java
deleted file mode 100644
index 1fcecdc71b48dec1768ae4985e4b1265acdf0cfc..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_hdSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_hdSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_hdSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatHdsessiondata om = new org.nrg.xdat.om.XnatHdsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatHdsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_investigatorData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_investigatorData.java
deleted file mode 100644
index 5857139cbfeeccd395e146ed82a48c0a210f4c3f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_investigatorData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_investigatorData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_investigatorData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ioScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ioScanData.java
deleted file mode 100644
index 00f49770daa8c70b56c0f474721b875fe2e689b5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ioScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_ioScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_ioScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ioSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ioSessionData.java
deleted file mode 100644
index b2364fe54c0ae3dd22b004c98c49f4f8c59d3482..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_ioSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_ioSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_ioSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatIosessiondata om = new org.nrg.xdat.om.XnatIosessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatIosessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_megScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_megScanData.java
deleted file mode 100644
index c71a2c96607b8569abb18dfa34f36d09dcdab114..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_megScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_megScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_megScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_megSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_megSessionData.java
deleted file mode 100644
index ba5becf28be573a602ca0343ed5c81967e7e40fa..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_megSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_megSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_megSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatMegsessiondata om = new org.nrg.xdat.om.XnatMegsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatMegsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mgScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mgScanData.java
deleted file mode 100644
index 7dd6f8f9f8243f848e1ceccfeafe7465edf18b95..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mgScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_mgScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_mgScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mgSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mgSessionData.java
deleted file mode 100644
index 1a23a6bc78cc1298868df3fd1b07ef40b9e39bd9..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mgSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_mgSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_mgSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatMgsessiondata om = new org.nrg.xdat.om.XnatMgsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatMgsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mrScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mrScanData.java
deleted file mode 100644
index 39940d349ed060d13c002a71acb97560fcc0a0af..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mrScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_mrScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_mrScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mrSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mrSessionData.java
deleted file mode 100644
index 496583596fddc2e1e1a9492631c910840f870f9e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mrSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_mrSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_mrSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatMrsessiondata om = new org.nrg.xdat.om.XnatMrsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatMrsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mrsScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mrsScanData.java
deleted file mode 100644
index e107ca09a0fcccf0ea4d06e81c424112c152fd88..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_mrsScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_mrsScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_mrsScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_nmScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_nmScanData.java
deleted file mode 100644
index bc6a1ee5d7a66182879231e248925d2314f20299..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_nmScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_nmScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_nmScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_nmSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_nmSessionData.java
deleted file mode 100644
index 79fc65b13d2cce9d8975435d7385a9ff603031b5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_nmSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:07 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_nmSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_nmSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatNmsessiondata om = new org.nrg.xdat.om.XnatNmsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatNmsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_opScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_opScanData.java
deleted file mode 100644
index 5314dc410f57fd825ccbeae782666f06ccd973c7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_opScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_opScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_opScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_opSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_opSessionData.java
deleted file mode 100644
index cf7db5d19fa73ce04cabbf812d2b72350043102e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_opSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_opSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_opSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatOpsessiondata om = new org.nrg.xdat.om.XnatOpsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatOpsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_optScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_optScanData.java
deleted file mode 100644
index 9d538777eef08c0f6bb2f0729634e89c7bea2673..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_optScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_optScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_optScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_optSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_optSessionData.java
deleted file mode 100644
index 6575e2d024df0700f4654c4c3709e728e905c1f1..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_optSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_optSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_optSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatOptsessiondata om = new org.nrg.xdat.om.XnatOptsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatOptsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_otherDicomScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_otherDicomScanData.java
deleted file mode 100644
index 570a74d0470e940d83f7eaad4187e62813beaab7..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_otherDicomScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_otherDicomScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_otherDicomScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_otherDicomSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_otherDicomSessionData.java
deleted file mode 100644
index e07828bf6282d9bc9e8ac97cba9375d6b9dadcb3..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_otherDicomSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_otherDicomSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_otherDicomSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatOtherdicomsessiondata om = new org.nrg.xdat.om.XnatOtherdicomsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatOtherdicomsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_pVisitData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_pVisitData.java
deleted file mode 100644
index fb9b410e87cb9450e0f89fd168e41de6e5d282ab..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_pVisitData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_pVisitData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_pVisitData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_petScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_petScanData.java
deleted file mode 100644
index b4846e09efe60139bd36fd8a71c5bd966a0efa1f..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_petScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_petScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_petScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_petSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_petSessionData.java
deleted file mode 100644
index 8115a386794cd884a69acfb636f09efde2bdb6ce..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_petSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_petSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_petSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatPetsessiondata om = new org.nrg.xdat.om.XnatPetsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatPetsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_petmrSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_petmrSessionData.java
deleted file mode 100644
index 8474b39851c897dccf213122984f21b64b01b4d2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_petmrSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_petmrSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_petmrSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatPetmrsessiondata om = new org.nrg.xdat.om.XnatPetmrsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatPetmrsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_projectData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_projectData.java
deleted file mode 100644
index a264a8043b0002e5a697d57c16ebfa0e321391f0..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_projectData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_projectData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_projectData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_qcAssessmentData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_qcAssessmentData.java
deleted file mode 100644
index 6b6858ce0a2ac15567737cdc136bc794f2ae5521..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_qcAssessmentData.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_qcAssessmentData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_qcAssessmentData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatQcassessmentdata om = new org.nrg.xdat.om.XnatQcassessmentdata(item);
- org.nrg.xdat.om.XnatMrsessiondata mr = om.getMrSessionData();
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatQcassessmentdata) as context parameter 'om'.");
- context.put("mr",mr);
- System.out.println("Loaded mr session object (org.nrg.xdat.om.XnatMrsessiondata) as context parameter 'mr'.");
- context.put("subject",mr.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_qcManualAssessorData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_qcManualAssessorData.java
deleted file mode 100644
index c39c305ce2667f28e97045eab51de46dc686107c..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_qcManualAssessorData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_qcManualAssessorData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_qcManualAssessorData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_reconstructedImageData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_reconstructedImageData.java
deleted file mode 100644
index 9671230e855787df540ae3eee7c0efa9ebc70e7e..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_reconstructedImageData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_reconstructedImageData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_reconstructedImageData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_regionResource.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_regionResource.java
deleted file mode 100644
index ed2fc29ef79a6010211b91d0566119b2529e43b5..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_regionResource.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_regionResource extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_regionResource.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_resourceCatalog.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_resourceCatalog.java
deleted file mode 100644
index 30e877caaec6a8f7c9568cc58a2f811837f2a23d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_resourceCatalog.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_resourceCatalog extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_resourceCatalog.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rfScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rfScanData.java
deleted file mode 100644
index 385a56f850e2b0c26ad159a39a5642b05c1b8f1b..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rfScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_rfScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_rfScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rfSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rfSessionData.java
deleted file mode 100644
index dbff58f2121dfd44c4033b61492e59f354f670c2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rfSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_rfSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_rfSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatRfsessiondata om = new org.nrg.xdat.om.XnatRfsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatRfsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rtImageScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rtImageScanData.java
deleted file mode 100644
index 00788fd70f1330f234d68fe3dac2119b895cf340..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rtImageScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_rtImageScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_rtImageScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rtSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rtSessionData.java
deleted file mode 100644
index 83870e40f8dde28708d350750f96035e6d9faecd..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_rtSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_rtSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_rtSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatRtsessiondata om = new org.nrg.xdat.om.XnatRtsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatRtsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_scScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_scScanData.java
deleted file mode 100644
index e6ff71a0f752ff7fd154ad389b52320a88203169..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_scScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_scScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_scScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_segScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_segScanData.java
deleted file mode 100644
index 317cefcea26697b723ab9ec78716c7e7314790a8..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_segScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_segScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_segScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_smScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_smScanData.java
deleted file mode 100644
index 651b40626a3cd366e9486c9e3d51d81db91e40a9..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_smScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_smScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_smScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_smSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_smSessionData.java
deleted file mode 100644
index 813f9de54c2cb42c878b8d656753d63addfc0e27..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_smSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_smSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_smSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatSmsessiondata om = new org.nrg.xdat.om.XnatSmsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatSmsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_srScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_srScanData.java
deleted file mode 100644
index b8974febea3157af219d7705439b24d3c37da862..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_srScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_srScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_srScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_srSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_srSessionData.java
deleted file mode 100644
index a857dabf0dc78c799137297d34a79819906cc4d2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_srSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_srSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_srSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatSrsessiondata om = new org.nrg.xdat.om.XnatSrsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatSrsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_subjectData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_subjectData.java
deleted file mode 100644
index 14c0b962b553c5a01c7f484223a20329542f1691..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_subjectData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_subjectData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_subjectData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_subjectVariablesData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_subjectVariablesData.java
deleted file mode 100644
index c7052b8ceefd28220bc5b32fdce5c8dc01e1a6a4..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_subjectVariablesData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_subjectVariablesData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_subjectVariablesData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatSubjectvariablesdata om = new org.nrg.xdat.om.XnatSubjectvariablesdata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatSubjectvariablesdata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_usScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_usScanData.java
deleted file mode 100644
index b0708a38914f9df217f0607c687bac7e8f603ce2..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_usScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_usScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_usScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_usSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_usSessionData.java
deleted file mode 100644
index 7223896d1b53eb97ea340bdbb06804eedd4db52d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_usSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_usSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_usSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatUssessiondata om = new org.nrg.xdat.om.XnatUssessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatUssessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_voiceAudioScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_voiceAudioScanData.java
deleted file mode 100644
index 207429e781dc2d26eb195e53e14d294570b46006..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_voiceAudioScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_voiceAudioScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_voiceAudioScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xa3DScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xa3DScanData.java
deleted file mode 100644
index a0850141fc075be86d7b28cb077c5651c9dfa92b..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xa3DScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_xa3DScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_xa3DScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xa3DSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xa3DSessionData.java
deleted file mode 100644
index 49fb8cfa3da5c820cddf9e44226a4709fe8d8d9a..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xa3DSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_xa3DSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_xa3DSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatXa3dsessiondata om = new org.nrg.xdat.om.XnatXa3dsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatXa3dsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xaScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xaScanData.java
deleted file mode 100644
index 4fd14653e16570db7eb3b79e60416dc31523c4b9..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xaScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_xaScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_xaScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xaSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xaSessionData.java
deleted file mode 100644
index e0c2a53447f79608c933a4c8a6a6168be051702d..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xaSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_xaSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_xaSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatXasessiondata om = new org.nrg.xdat.om.XnatXasessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatXasessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcScanData.java
deleted file mode 100644
index 481b92d93c5e92d2025baa5f64f7f8050ec81314..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_xcScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_xcScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcSessionData.java
deleted file mode 100644
index d8270a5bcb95c797f78540fc54c96140c05b1875..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_xcSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_xcSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatXcsessiondata om = new org.nrg.xdat.om.XnatXcsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatXcsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcvScanData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcvScanData.java
deleted file mode 100644
index 0844b7fa769abe64316d1bc2e653eff4ddb52158..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcvScanData.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_xcvScanData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_xcvScanData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- }}
diff --git a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcvSessionData.java b/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcvSessionData.java
deleted file mode 100644
index b9156350013c9227bd9d1a86d015d6126d347405..0000000000000000000000000000000000000000
--- a/src/main/java/org/nrg/xdat/turbine/modules/screens/XDATScreen_report_xnat_xcvSessionData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.turbine.modules.screens;
-import org.apache.turbine.util.RunData;
-import org.apache.velocity.context.Context;
-import org.nrg.xdat.turbine.modules.screens.SecureReport;
-
-/**
- * @author XDAT
- *
- */
-public class XDATScreen_report_xnat_xcvSessionData extends SecureReport {
- public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(XDATScreen_report_xnat_xcvSessionData.class);
- /* (non-Javadoc)
- * @see org.nrg.xdat.turbine.modules.screens.SecureReport#finalProcessing(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
- */
- public void finalProcessing(RunData data, Context context) {
- try{
- org.nrg.xdat.om.XnatXcvsessiondata om = new org.nrg.xdat.om.XnatXcvsessiondata(item);
- context.put("om",om);
- System.out.println("Loaded om object (org.nrg.xdat.om.XnatXcvsessiondata) as context parameter 'om'.");
- context.put("subject",om.getSubjectData());
- System.out.println("Loaded subject object (org.nrg.xdat.om.XnatSubjectdata) as context parameter 'subject'.");
- } catch(Exception e){}
- }}
diff --git a/src/main/java/org/nrg/xnat/actions/postArchive/ClearStudyRoutingAction.java b/src/main/java/org/nrg/xnat/actions/postArchive/ClearStudyRoutingAction.java
index b48a19210c290f1a6aa9806e25f47773bafffaad..27f215669a8d5bceeacac172fa85880f5e0578a9 100644
--- a/src/main/java/org/nrg/xnat/actions/postArchive/ClearStudyRoutingAction.java
+++ b/src/main/java/org/nrg/xnat/actions/postArchive/ClearStudyRoutingAction.java
@@ -2,7 +2,7 @@ package org.nrg.xnat.actions.postArchive;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.XDAT;
import org.nrg.xdat.om.XnatImagesessiondata;
import org.nrg.xdat.services.StudyRoutingService;
diff --git a/src/main/java/org/nrg/xnat/ajax/GrantProjectAccess.java b/src/main/java/org/nrg/xnat/ajax/GrantProjectAccess.java
index 87acc64cfaf7a00e1b41b31e1c3b7b312276e5c4..43c0230eed9bd50b908ff3dd85fb89dd85396adc 100644
--- a/src/main/java/org/nrg/xnat/ajax/GrantProjectAccess.java
+++ b/src/main/java/org/nrg/xnat/ajax/GrantProjectAccess.java
@@ -22,6 +22,7 @@ import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
import org.apache.velocity.context.Context;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.display.DisplayManager;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.turbine.utils.AdminUtils;
@@ -45,7 +46,7 @@ public class GrantProjectAccess {
}
RunData data = rundataService.getRunData(req, response, sc);
Context context = TurbineVelocity.getContext(data);
- UserI user = TurbineUtils.getUser(data);
+ UserI user = XDAT.getUserDetails();
XnatProjectdata project = XnatProjectdata.getXnatProjectdatasById(projectID, user, false);
diff --git a/src/main/java/org/nrg/xnat/archive/GradualDicomImporter.java b/src/main/java/org/nrg/xnat/archive/GradualDicomImporter.java
index f1cfb0c0b6d09fd6e197383bd36db89c6fdb7691..ffa912bfcf1ec1ec0c0670886e663a05ef1d9f26 100644
--- a/src/main/java/org/nrg/xnat/archive/GradualDicomImporter.java
+++ b/src/main/java/org/nrg/xnat/archive/GradualDicomImporter.java
@@ -18,8 +18,8 @@ import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.PersistenceConfiguration;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.dcm4che2.data.*;
import org.dcm4che2.io.DicomInputStream;
import org.dcm4che2.io.DicomOutputStream;
diff --git a/src/main/java/org/nrg/xnat/archive/PrearcSessionArchiver.java b/src/main/java/org/nrg/xnat/archive/PrearcSessionArchiver.java
index 33f1df8217dd55fdd8757bd8de2550859a554a4e..f218a6ddc483ad30defc3a6b66161828e1e1cadd 100644
--- a/src/main/java/org/nrg/xnat/archive/PrearcSessionArchiver.java
+++ b/src/main/java/org/nrg/xnat/archive/PrearcSessionArchiver.java
@@ -12,8 +12,8 @@ package org.nrg.xnat.archive;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ClientException;
import org.nrg.action.ServerException;
import org.nrg.dicomtools.filters.DicomFilterService;
diff --git a/src/main/java/org/nrg/xnat/archive/PrearcSessionValidator.java b/src/main/java/org/nrg/xnat/archive/PrearcSessionValidator.java
index f3518c8310ef334fe1043a2c460b3a40ee8f2abb..24ad218fd633f541ef98833a7b3614136d00f295 100644
--- a/src/main/java/org/nrg/xnat/archive/PrearcSessionValidator.java
+++ b/src/main/java/org/nrg/xnat/archive/PrearcSessionValidator.java
@@ -15,7 +15,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ClientException;
import org.nrg.action.ServerException;
import org.nrg.xdat.model.XnatImagescandataI;
diff --git a/src/main/java/org/nrg/xnat/archive/Rename.java b/src/main/java/org/nrg/xnat/archive/Rename.java
index 1a78d2a2118f9a6875a1d4593ded53645467b379..9b58c87d7fe8956d0b2d62233904830ea27115a6 100644
--- a/src/main/java/org/nrg/xnat/archive/Rename.java
+++ b/src/main/java/org/nrg/xnat/archive/Rename.java
@@ -219,7 +219,7 @@ public class Rename implements Callable<File>{
this.updateStep(workflow, setStep(STEP.EXECUTE_SQL));
//Execute SQL
- executeSQL(cache,user,XFT.buildLogFileName(i));
+ executeSQL(cache,user);
this.updateStep(workflow, setStep(STEP.DELETE_OLD_DIR));
//if successful, move old directory to cache)
@@ -407,8 +407,8 @@ public class Rename implements Callable<File>{
* @return
* @throws Exception
*/
- protected static void executeSQL(final DBItemCache cache, final UserI user, final String logFileName) throws Exception{
- DBAction.executeCache(cache, user, user.getDBName(), logFileName);
+ protected static void executeSQL(final DBItemCache cache, final UserI user) throws Exception{
+ DBAction.executeCache(cache, user, user.getDBName());
}
/**
diff --git a/src/main/java/org/nrg/xnat/configuration/WebConfig.java b/src/main/java/org/nrg/xnat/configuration/WebConfig.java
index d2e4900f9fbd4e5d5f09df57334ebeae401cd398..297f294b6788fef581d7ed4614a821864a1a298c 100644
--- a/src/main/java/org/nrg/xnat/configuration/WebConfig.java
+++ b/src/main/java/org/nrg/xnat/configuration/WebConfig.java
@@ -1,5 +1,6 @@
package org.nrg.xnat.configuration;
+import org.nrg.framework.annotations.XapiRestController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.MessageSource;
@@ -29,10 +30,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
public class WebConfig extends WebMvcConfigurerAdapter {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
- registry.addResourceHandler("**/swagger-ui.html")
- .addResourceLocations("classpath:/META-INF/resources/");
- registry.addResourceHandler("/webjars/**")
- .addResourceLocations("classpath:/META-INF/resources/webjars/");
+ registry.addResourceHandler("**/swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
}
@Bean
@@ -43,10 +42,10 @@ public class WebConfig extends WebMvcConfigurerAdapter {
@Bean
public ViewResolver viewResolver() {
return new InternalResourceViewResolver() {{
- setViewClass(JstlView.class);
- setPrefix("/WEB-INF/views/");
- setSuffix(".jsp");
- }};
+ setViewClass(JstlView.class);
+ setPrefix("/WEB-INF/views/");
+ setSuffix(".jsp");
+ }};
}
@Bean
@@ -59,23 +58,11 @@ public class WebConfig extends WebMvcConfigurerAdapter {
@Bean
public Docket api() {
_log.debug("Initializing the Swagger Docket object");
- return new Docket(DocumentationType.SWAGGER_2)
- .select()
- .apis(RequestHandlerSelectors.basePackage("org.nrg.xapi.rest"))
- .paths(PathSelectors.any())
- .build()
- .apiInfo(apiInfo());
+ return new Docket(DocumentationType.SWAGGER_2).select().apis(RequestHandlerSelectors.withClassAnnotation(XapiRestController.class)).paths(PathSelectors.any()).build().apiInfo(apiInfo());
}
private ApiInfo apiInfo() {
- return new ApiInfo(
- "XNAT REST API",
- "The XNAT REST API (XAPI) functions provide remote programmatic access to XNAT internal functions.",
- "1.7.0",
- "http://www.xnat.org",
- "info@xnat.org",
- "Simplified 2-Clause BSD",
- "API license URL");
+ return new ApiInfo("XNAT REST API", "The XNAT REST API (XAPI) functions provide access to XNAT internal functions for remote clients.", "1.7.0", "http://www.xnat.org", "info@xnat.org", "Simplified 2-Clause BSD", "API license URL");
}
private static final Logger _log = LoggerFactory.getLogger(WebConfig.class);
diff --git a/src/main/java/org/nrg/xnat/event/listeners/AutomatedScriptHandler.java b/src/main/java/org/nrg/xnat/event/listeners/AutomatedScriptHandler.java
index 2d9a5b9c63ef15d74ef8dffa8345969f080bdfc3..3102d310ef22beeafedc15bad95453788600ab02 100755
--- a/src/main/java/org/nrg/xnat/event/listeners/AutomatedScriptHandler.java
+++ b/src/main/java/org/nrg/xnat/event/listeners/AutomatedScriptHandler.java
@@ -6,7 +6,7 @@ import reactor.bus.Event;
import reactor.bus.EventBus;
import reactor.fn.Consumer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.automation.entities.Script;
import org.nrg.automation.services.ScriptRunnerService;
import org.nrg.framework.constants.Scope;
diff --git a/src/main/java/org/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java b/src/main/java/org/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java
index f4b948b28de1316ae6ee18f7e766dc1bff9da113..30690dbe06bfbd07dd4586d768681d359639e023 100644
--- a/src/main/java/org/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java
+++ b/src/main/java/org/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java
@@ -3,8 +3,8 @@ package org.nrg.xnat.event.listeners;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.xmlbeans.XmlException;
import org.nrg.framework.services.SerializerService;
import org.nrg.pipeline.xmlbeans.AllResolvedStepsDocument;
diff --git a/src/main/java/org/nrg/xnat/event/listeners/WorkflowStatusEventHandlerAbst.java b/src/main/java/org/nrg/xnat/event/listeners/WorkflowStatusEventHandlerAbst.java
index f5860b8c1ba988d30ed413afc085e1e34b7bd004..fddc98c029f19da14506166c064b260c0ce4f8e7 100644
--- a/src/main/java/org/nrg/xnat/event/listeners/WorkflowStatusEventHandlerAbst.java
+++ b/src/main/java/org/nrg/xnat/event/listeners/WorkflowStatusEventHandlerAbst.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.event.listeners;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.nrg.xft.event.WorkflowStatusEvent;
import org.nrg.xft.event.persist.PersistentWorkflowUtils;
diff --git a/src/main/java/org/nrg/xnat/helpers/PrearcImporterHelper.java b/src/main/java/org/nrg/xnat/helpers/PrearcImporterHelper.java
index 8c3db38b7abcb181705acbc36c3225c10f0a48a2..90ffa81b287bfdef8c9f3f2ba742b078b54c00c3 100644
--- a/src/main/java/org/nrg/xnat/helpers/PrearcImporterHelper.java
+++ b/src/main/java/org/nrg/xnat/helpers/PrearcImporterHelper.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.nrg.action.ActionException;
import org.nrg.action.ClientException;
diff --git a/src/main/java/org/nrg/xnat/helpers/dicom/DicomHeaderDump.java b/src/main/java/org/nrg/xnat/helpers/dicom/DicomHeaderDump.java
index 4feb8ece642ab5c3e1a8370ff5646c8eb732e75a..87f9ef933299498749c66ed9dd574249cc6c4cd6 100644
--- a/src/main/java/org/nrg/xnat/helpers/dicom/DicomHeaderDump.java
+++ b/src/main/java/org/nrg/xnat/helpers/dicom/DicomHeaderDump.java
@@ -11,7 +11,7 @@
package org.nrg.xnat.helpers.dicom;
import com.google.common.collect.ImmutableMap;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.dcm4che2.data.DicomElement;
import org.dcm4che2.data.DicomObject;
import org.dcm4che2.data.DicomObjectToStringParam;
@@ -130,7 +130,7 @@ public final class DicomHeaderDump {
}
public static String escapeHTML(String o){
- return (o==null)?null: StringEscapeUtils.escapeHtml(o);
+ return (o==null)?null: StringEscapeUtils.escapeHtml4(o);
}
/**
diff --git a/src/main/java/org/nrg/xnat/helpers/merge/MergeCatCatalog.java b/src/main/java/org/nrg/xnat/helpers/merge/MergeCatCatalog.java
index dbc08e44cdb437f13dd2c30a239d47a32bde1af8..f65223de829a14aa6c2e4b56f8c572fc52cebaf8 100644
--- a/src/main/java/org/nrg/xnat/helpers/merge/MergeCatCatalog.java
+++ b/src/main/java/org/nrg/xnat/helpers/merge/MergeCatCatalog.java
@@ -14,7 +14,7 @@
*/
package org.nrg.xnat.helpers.merge;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.bean.CatEntryBean;
import org.nrg.xdat.model.CatCatalogI;
import org.nrg.xdat.model.CatDcmentryI;
diff --git a/src/main/java/org/nrg/xnat/helpers/merge/MergeUtils.java b/src/main/java/org/nrg/xnat/helpers/merge/MergeUtils.java
index 4e99832ce1f406d17fc3919cf4a63fec4177eb3b..feeaf09657af247ff1fe1be9d41d0d63d459824c 100644
--- a/src/main/java/org/nrg/xnat/helpers/merge/MergeUtils.java
+++ b/src/main/java/org/nrg/xnat/helpers/merge/MergeUtils.java
@@ -12,7 +12,7 @@ package org.nrg.xnat.helpers.merge;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.model.XnatImagescandataI;
import org.nrg.xdat.model.XnatResourceI;
diff --git a/src/main/java/org/nrg/xnat/helpers/merge/SessionOverwriteCheck.java b/src/main/java/org/nrg/xnat/helpers/merge/SessionOverwriteCheck.java
index fc67bf8f6ede84508bba047457b6ca6b8bc072b1..d6db6de57a35cc31ae5de536557e7589139d1e3c 100644
--- a/src/main/java/org/nrg/xnat/helpers/merge/SessionOverwriteCheck.java
+++ b/src/main/java/org/nrg/xnat/helpers/merge/SessionOverwriteCheck.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.merge;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.bean.CatCatalogBean;
import org.nrg.xdat.model.*;
import org.nrg.xft.event.EventMetaI;
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/DatabaseSession.java b/src/main/java/org/nrg/xnat/helpers/prearchive/DatabaseSession.java
index b6946e6fa64def310f72fc501b5e8696f7d2a19f..c0ce5946557e792f6068d5640afd7ded78012c50 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/DatabaseSession.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/DatabaseSession.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.prearchive;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/FileSystemSessionTrawler.java b/src/main/java/org/nrg/xnat/helpers/prearchive/FileSystemSessionTrawler.java
index 7bb8f40e34a7d2719fc55a7ac03389056658cadb..b79ef8e666c85a191cf0f3975b8d570b3cff4a07 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/FileSystemSessionTrawler.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/FileSystemSessionTrawler.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.prearchive;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.turbine.utils.AdminUtils;
import org.slf4j.Logger;
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
index d58d93021bded32c9753b4f6300ea6dd3eee9b93..d24fc998c91f0adb9b095dc615647eacf16f0cb3 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
@@ -13,7 +13,7 @@ package org.nrg.xnat.helpers.prearchive;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ClientException;
import org.nrg.automation.entities.Script;
import org.nrg.automation.services.ScriptService;
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcTableBuilder.java b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcTableBuilder.java
index 0acdc79989eb8ab5ceebeda68eb29fd65651ba32..816eb750e55c06485daffba625fc28f990aff442 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcTableBuilder.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcTableBuilder.java
@@ -14,7 +14,7 @@
*/
package org.nrg.xnat.helpers.prearchive;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.framework.constants.PrearchiveCode;
import org.nrg.xdat.bean.XnatImagesessiondataBean;
import org.nrg.xdat.bean.reader.XDATXMLReader;
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcUriParserUtils.java b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcUriParserUtils.java
index 616af5c6958199912542203eb35055e84f59e543..e83ae009f5e39ca4f03ea5edaadf17436ff2bf49 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcUriParserUtils.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcUriParserUtils.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.prearchive;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.restlet.data.CharacterSet;
import org.restlet.data.Form;
import org.restlet.data.Reference;
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcUtils.java b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcUtils.java
index 37aadd0b5fd933c1c51d830ff5c72a4a19eb6b92..61a3cf53f572f187e54adeefd51a2c1677aea71e 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcUtils.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcUtils.java
@@ -13,7 +13,7 @@ package org.nrg.xnat.helpers.prearchive;
import com.google.common.collect.Lists;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.config.entities.Configuration;
import org.nrg.framework.constants.Scope;
import org.nrg.xdat.XDAT;
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/SessionXMLRebuilder.java b/src/main/java/org/nrg/xnat/helpers/prearchive/SessionXMLRebuilder.java
index e27d1bf64e12f1cbe5c1b02864d2ea977d9ec03d..88c0f5ecee8bf211c2c9f4c522e5a6fd688b184d 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/SessionXMLRebuilder.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/SessionXMLRebuilder.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.prearchive;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.XDAT;
import org.nrg.xft.exception.InvalidPermissionException;
import org.nrg.xft.security.UserI;
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/handlers/PrearchiveMoveHandler.java b/src/main/java/org/nrg/xnat/helpers/prearchive/handlers/PrearchiveMoveHandler.java
index 4241f86813b1e6b48d4b60b12e8a708e55eb62ee..95dfd8576f009d063bb0048ce3dad5cf7359533d 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/handlers/PrearchiveMoveHandler.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/handlers/PrearchiveMoveHandler.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.helpers.prearchive.handlers;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.XDAT;
import org.nrg.xdat.bean.XnatImagesessiondataBean;
import org.nrg.xdat.bean.XnatPetmrsessiondataBean;
diff --git a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectAssessResourceImpl.java b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectAssessResourceImpl.java
index d3daa42494c3c14d3624b5b02c45d32f2407aa30..d16844cfcc8731d9536009edb837a020f06bbb77 100644
--- a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectAssessResourceImpl.java
+++ b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectAssessResourceImpl.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.resource.direct;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatImageassessordata;
import org.nrg.xdat.om.XnatImagesessiondata;
diff --git a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectExptResourceImpl.java b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectExptResourceImpl.java
index a760d1830eaf814f560cd1fae98b07c0e398c1bc..1a75ead4e33010ef8125415f428608aebbfc932d 100644
--- a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectExptResourceImpl.java
+++ b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectExptResourceImpl.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.resource.direct;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.base.BaseElement;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.*;
diff --git a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectProjResourceImpl.java b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectProjResourceImpl.java
index 84c0932e499a778ff56ad8f766d5136dc414bac6..2eae3f914ff76e161ee60d1184747fd75ee50dcd 100644
--- a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectProjResourceImpl.java
+++ b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectProjResourceImpl.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.resource.direct;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.base.BaseElement;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatExperimentdata;
diff --git a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectReconResourceImpl.java b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectReconResourceImpl.java
index 6f9b126a9eb8f653c0148ac6a88f98f5b923d627..542c94bc7b7017fa62df0e03a5cd7fb3cc64e270 100644
--- a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectReconResourceImpl.java
+++ b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectReconResourceImpl.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.resource.direct;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatImagesessiondata;
import org.nrg.xdat.om.XnatProjectdata;
diff --git a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectScanResourceImpl.java b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectScanResourceImpl.java
index 6082b53a369e03de54b84af875bab8f39e5abd61..e2ed3d0882e8cd46240bd30a057501205de355a5 100644
--- a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectScanResourceImpl.java
+++ b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectScanResourceImpl.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.resource.direct;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatImagescandata;
import org.nrg.xdat.om.XnatImagesessiondata;
diff --git a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectSubjResourceImpl.java b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectSubjResourceImpl.java
index 3d0eea14615c150b1aa02b5d719312a3793b6fc2..8b7886bd5cf2400e75862491601770103385ed12 100644
--- a/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectSubjResourceImpl.java
+++ b/src/main/java/org/nrg/xnat/helpers/resource/direct/DirectSubjResourceImpl.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.resource.direct;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.om.XnatResource;
diff --git a/src/main/java/org/nrg/xnat/helpers/resource/direct/ResourceModifierA.java b/src/main/java/org/nrg/xnat/helpers/resource/direct/ResourceModifierA.java
index 3f1bb9b7b4b2d40b191eb119c51f3e16fcfee1e5..d54d43d94494958744542b9c96ed3aadc0efa2e2 100644
--- a/src/main/java/org/nrg/xnat/helpers/resource/direct/ResourceModifierA.java
+++ b/src/main/java/org/nrg/xnat/helpers/resource/direct/ResourceModifierA.java
@@ -15,7 +15,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.bean.CatCatalogBean;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatAbstractresource;
diff --git a/src/main/java/org/nrg/xnat/helpers/transactions/TransactionUtils.java b/src/main/java/org/nrg/xnat/helpers/transactions/TransactionUtils.java
index 7f5a2bde6914384e9f505468c43fc820130bc071..616d1f895c548f54e4a8f9a98d7c0ed29f6fb58c 100644
--- a/src/main/java/org/nrg/xnat/helpers/transactions/TransactionUtils.java
+++ b/src/main/java/org/nrg/xnat/helpers/transactions/TransactionUtils.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.transactions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class TransactionUtils {
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptAssessorURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptAssessorURI.java
index ef90573778c78320e4143b01fa73767ee48309ca..65b611518f7c41f2109a7b719c9ee765b79ba8f1 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptAssessorURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptAssessorURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatExperimentdata;
import org.nrg.xdat.om.XnatImageassessordata;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptReconURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptReconURI.java
index c480c101308e161464ffdb8038a0022317d2a53d..71c47857d16ecaa6775cf6704746a7338e4043ef 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptReconURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptReconURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatExperimentdata;
import org.nrg.xdat.om.XnatImagesessiondata;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptScanURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptScanURI.java
index 3343d18a39843e2e14bfc8826f3cabb91f4238fe..7a93fb0c96488cf2cf082a55ae53c01f88586a23 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptScanURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptScanURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatExperimentdata;
import org.nrg.xdat.om.XnatImagescandata;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptURI.java
index a28d8a0c33c66135906eb0a17f975c79c0587097..8917e48ae7a964ff0368cae7402f6de7a07f9f3e 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesExptURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatExperimentdata;
import org.nrg.xdat.om.XnatProjectdata;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssExptURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssExptURI.java
index 7d2f0fac0c1975e5ac66231cd6a6bbbd0a916957..9360bf385368c596affa8ead018f4957a286af21 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssExptURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssExptURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatExperimentdata;
import org.nrg.xdat.om.XnatImageassessordata;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssReconURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssReconURI.java
index 79f8b155d6d73d25c3ac09026adca1b38161e763..f7872ff2597043ca831504793b32a3babc08c7b7 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssReconURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssReconURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatReconstructedimagedata;
import org.nrg.xnat.helpers.uri.URIManager;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssScanURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssScanURI.java
index e0212e567fadc357d7990bb1a9c2780dc7e4ede2..7f705940c6e68ac50db0fbdd8a7a4365b2bc7f98 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssScanURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjAssScanURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatImagescandata;
import org.nrg.xdat.om.XnatImagesessiondata;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjExptURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjExptURI.java
index b4568dd8f2a0ad67c4d28a9598e65f66eed302a0..383a62dabb36ae0379928af0b593df307863c606 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjExptURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjExptURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatExperimentdata;
import org.nrg.xdat.om.XnatProjectdata;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjURI.java
index 60d16d66f11e576ee7eff585d5363d084a7ee7c0..0b3c01368aaf0e489a1fd9326fb1a8c3bcf512ca 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjSubjURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.om.XnatSubjectdata;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjURI.java
index b6e0f147de067c40eaa76a1174459306009c7995..43aa1242cb2a81ef2ec2b8ccb8faa41337bcff42 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesProjURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xnat.helpers.uri.URIManager;
diff --git a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesSubjURI.java b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesSubjURI.java
index dd2d1c0a1219026636019f1385bc9889acc59a52..7214ff9c5746e383909a7e18fc4febaa2af97373 100644
--- a/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesSubjURI.java
+++ b/src/main/java/org/nrg/xnat/helpers/uri/archive/impl/ResourcesSubjURI.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.helpers.uri.archive.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.model.XnatAbstractresourceI;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.om.XnatSubjectdata;
diff --git a/src/main/java/org/nrg/xnat/itemBuilders/FileHistoryBuilderAbst.java b/src/main/java/org/nrg/xnat/itemBuilders/FileHistoryBuilderAbst.java
index 19f3846c56631bfc73e8211461d3d59013fbe582..f097286f7dd852d9d4364bcc214f64fe8951cc0d 100644
--- a/src/main/java/org/nrg/xnat/itemBuilders/FileHistoryBuilderAbst.java
+++ b/src/main/java/org/nrg/xnat/itemBuilders/FileHistoryBuilderAbst.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.itemBuilders;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.nrg.xdat.om.XnatResourcecatalog;
import org.nrg.xft.XFTItem;
diff --git a/src/main/java/org/nrg/xnat/itemBuilders/FileSummaryBuilder.java b/src/main/java/org/nrg/xnat/itemBuilders/FileSummaryBuilder.java
index b4bca49852b3cedb0eb81315fd100a5fdca2dd83..1fcdd64dfcb875b9e9ed4eed5876bafc12f5fc00 100644
--- a/src/main/java/org/nrg/xnat/itemBuilders/FileSummaryBuilder.java
+++ b/src/main/java/org/nrg/xnat/itemBuilders/FileSummaryBuilder.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.itemBuilders;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.om.XnatResourcecatalog;
import org.nrg.xft.XFTItem;
import org.nrg.xft.presentation.FlattenedItem.FlattenedItemModifierI;
diff --git a/src/main/java/org/nrg/xnat/restlet/XNATApplication.java b/src/main/java/org/nrg/xnat/restlet/XNATApplication.java
index 64cd207498146e2b2f62cfd9ab2cbc677f6f90ab..3d3cda9a1476a6028808b6d04a45de0fb361b7a8 100755
--- a/src/main/java/org/nrg/xnat/restlet/XNATApplication.java
+++ b/src/main/java/org/nrg/xnat/restlet/XNATApplication.java
@@ -11,7 +11,7 @@
package org.nrg.xnat.restlet;
import com.google.common.base.Joiner;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.nrg.config.exceptions.ConfigServiceException;
import org.nrg.framework.exceptions.NrgServiceRuntimeException;
diff --git a/src/main/java/org/nrg/xnat/restlet/actions/AutomationBasedImporter.java b/src/main/java/org/nrg/xnat/restlet/actions/AutomationBasedImporter.java
index 90207e1afc30ebedb2bee1b9650b3b7d2506669e..0cd57f8add0be061f25e7782780a419f84284954 100644
--- a/src/main/java/org/nrg/xnat/restlet/actions/AutomationBasedImporter.java
+++ b/src/main/java/org/nrg/xnat/restlet/actions/AutomationBasedImporter.java
@@ -27,7 +27,7 @@ import com.google.common.collect.Maps;
import java.util.concurrent.Callable;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.log4j.Logger;
import org.nrg.action.ClientException;
diff --git a/src/main/java/org/nrg/xnat/restlet/actions/PrearcImporterA.java b/src/main/java/org/nrg/xnat/restlet/actions/PrearcImporterA.java
index 3734086b19d31f12059866565bc87a11bd80c628..c3751a6cf8eb8ec90a2a7789f4a9734a55201091 100644
--- a/src/main/java/org/nrg/xnat/restlet/actions/PrearcImporterA.java
+++ b/src/main/java/org/nrg/xnat/restlet/actions/PrearcImporterA.java
@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.nrg.action.ActionException;
import org.nrg.action.ClientException;
diff --git a/src/main/java/org/nrg/xnat/restlet/actions/SessionImporter.java b/src/main/java/org/nrg/xnat/restlet/actions/SessionImporter.java
index 35c0039376c34186c4ab41dd0df4475d77b24841..415d80201bd8795fe7a4097fb37a2190ab7e4128 100644
--- a/src/main/java/org/nrg/xnat/restlet/actions/SessionImporter.java
+++ b/src/main/java/org/nrg/xnat/restlet/actions/SessionImporter.java
@@ -18,7 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.nrg.action.ActionException;
import org.nrg.action.ClientException;
diff --git a/src/main/java/org/nrg/xnat/restlet/actions/importer/ImporterHandlerA.java b/src/main/java/org/nrg/xnat/restlet/actions/importer/ImporterHandlerA.java
index 3c497ce31fb09aaee4356f8b92f9f88eed0c5fb7..e84358d0321293205465d50341d80025182e6a35 100644
--- a/src/main/java/org/nrg/xnat/restlet/actions/importer/ImporterHandlerA.java
+++ b/src/main/java/org/nrg/xnat/restlet/actions/importer/ImporterHandlerA.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.actions.importer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.nrg.action.ClientException;
import org.nrg.action.ServerException;
diff --git a/src/main/java/org/nrg/xnat/restlet/extensions/AuthenticationRestlet.java b/src/main/java/org/nrg/xnat/restlet/extensions/AuthenticationRestlet.java
index 9251919e524c97cf039d21b05a944de1e9a9aa6e..5eeb09a19aa46d748f9d0981af176a241fbd35a2 100644
--- a/src/main/java/org/nrg/xnat/restlet/extensions/AuthenticationRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/extensions/AuthenticationRestlet.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.extensions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nrg.xdat.XDAT;
@@ -23,6 +23,7 @@ import org.restlet.resource.Variant;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -92,13 +93,14 @@ public class AuthenticationRestlet extends Resource {
UsernamePasswordAuthenticationToken authRequest = manager.buildUPTokenForAuthMethod(_authMethod, _username, _password);
Authentication authentication = manager.authenticate(authRequest);
if (authentication.isAuthenticated()) {
- succeed();
+ succeed(authentication);
} else {
fail();
}
}
- private void succeed() {
+ private void succeed(final Authentication authentication) {
+ SecurityContextHolder.getContext().setAuthentication(authentication);
getResponse().setStatus(Status.SUCCESS_OK, "OK");
}
diff --git a/src/main/java/org/nrg/xnat/restlet/extensions/PipelineDetailsRestlet.java b/src/main/java/org/nrg/xnat/restlet/extensions/PipelineDetailsRestlet.java
index 117eb76a178e0ad5db3717ecae704b808e157dc7..21d2c567edefc58df2f460119721ce68607579a8 100644
--- a/src/main/java/org/nrg/xnat/restlet/extensions/PipelineDetailsRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/extensions/PipelineDetailsRestlet.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.extensions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.pipeline.PipelineRepositoryManager;
import org.nrg.pipeline.utils.PipelineFileUtils;
import org.nrg.pipeline.xmlbeans.PipelineData;
diff --git a/src/main/java/org/nrg/xnat/restlet/extensions/ScanQualityLabelRestlet.java b/src/main/java/org/nrg/xnat/restlet/extensions/ScanQualityLabelRestlet.java
index 46755a18a0be1ccd30d2825e51317615d4a1304a..a0f6977fba1c62393a0e23c341878a5e165c473f 100644
--- a/src/main/java/org/nrg/xnat/restlet/extensions/ScanQualityLabelRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/extensions/ScanQualityLabelRestlet.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.extensions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.json.JSONException;
import org.json.JSONObject;
import org.nrg.xnat.restlet.XnatRestlet;
diff --git a/src/main/java/org/nrg/xnat/restlet/extensions/SendEmailVerification.java b/src/main/java/org/nrg/xnat/restlet/extensions/SendEmailVerification.java
index ae4d241e55d7801505efe9f6564e598233893e90..55a3fdd790442313bae121fe7069973d7559c89c 100644
--- a/src/main/java/org/nrg/xnat/restlet/extensions/SendEmailVerification.java
+++ b/src/main/java/org/nrg/xnat/restlet/extensions/SendEmailVerification.java
@@ -10,15 +10,10 @@
*/
package org.nrg.xnat.restlet.extensions;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.lang.StringEscapeUtils;
import org.nrg.mail.services.EmailRequestLogService;
import org.nrg.xdat.XDAT;
import org.nrg.xdat.security.helpers.Users;
import org.nrg.xdat.turbine.utils.AdminUtils;
-import org.nrg.xft.ItemI;
import org.nrg.xft.security.UserI;
import org.nrg.xnat.restlet.XnatRestlet;
import org.nrg.xnat.restlet.resources.SecureResource;
@@ -30,6 +25,9 @@ import org.restlet.data.Status;
import org.restlet.resource.Resource;
import org.restlet.resource.Variant;
+import java.util.Date;
+import java.util.List;
+
@XnatRestlet(value = {"/services/sendEmailVerification"}, secure = false)
public class SendEmailVerification extends Resource {
@@ -55,7 +53,7 @@ public class SendEmailVerification extends Resource {
}
// Send email and log request.
- AdminUtils.sendNewUserVerificationEmail(getXDATUser(StringEscapeUtils.escapeSql(email)));
+ AdminUtils.sendNewUserVerificationEmail(getXDATUser(email));
requests.logEmailRequest(email, new Date ());
}
catch(ExceededRequestsException e){
diff --git a/src/main/java/org/nrg/xnat/restlet/extensions/SessionCountRestlet.java b/src/main/java/org/nrg/xnat/restlet/extensions/SessionCountRestlet.java
index ffbfce967799b9f0ef46a5383a30d533e58d3f03..dadb93ed63ebf8ff62dc07a5ae50e686ec964779 100644
--- a/src/main/java/org/nrg/xnat/restlet/extensions/SessionCountRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/extensions/SessionCountRestlet.java
@@ -12,7 +12,7 @@ package org.nrg.xnat.restlet.extensions;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nrg.xdat.XDAT;
diff --git a/src/main/java/org/nrg/xnat/restlet/extensions/StudyRoutingRestlet.java b/src/main/java/org/nrg/xnat/restlet/extensions/StudyRoutingRestlet.java
index ca58a9ff04d29a62396208aba5fd09865d617aa8..fbbb4e6736b453086b77309d0e58f8c82e9c4aa3 100644
--- a/src/main/java/org/nrg/xnat/restlet/extensions/StudyRoutingRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/extensions/StudyRoutingRestlet.java
@@ -12,7 +12,7 @@ package org.nrg.xnat.restlet.extensions;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.XDAT;
import org.nrg.xdat.security.SecurityManager;
import org.nrg.xdat.security.helpers.Permissions;
diff --git a/src/main/java/org/nrg/xnat/restlet/extensions/UserRolesRestlet.java b/src/main/java/org/nrg/xnat/restlet/extensions/UserRolesRestlet.java
index bcbe08b91c23e2042ba99f7f9d51d4a553c427c2..ebc9829bbb6d5ae336d5b3a9a950bf19de6b5066 100644
--- a/src/main/java/org/nrg/xnat/restlet/extensions/UserRolesRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/extensions/UserRolesRestlet.java
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.Hashtable;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.nrg.xdat.om.XdatRoleType;
import org.nrg.xdat.security.helpers.Roles;
diff --git a/src/main/java/org/nrg/xnat/restlet/extensions/UserSettingsRestlet.java b/src/main/java/org/nrg/xnat/restlet/extensions/UserSettingsRestlet.java
index c0e4474383c9b4cebea78fe556b7585afe51669d..ff5da74b9b8534f8a9174cf0aac365711dc5d344 100644
--- a/src/main/java/org/nrg/xnat/restlet/extensions/UserSettingsRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/extensions/UserSettingsRestlet.java
@@ -12,7 +12,7 @@ package org.nrg.xnat.restlet.extensions;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nrg.mail.services.EmailRequestLogService;
diff --git a/src/main/java/org/nrg/xnat/restlet/extensions/WorkflowsRestlet.java b/src/main/java/org/nrg/xnat/restlet/extensions/WorkflowsRestlet.java
index a0323c141726aaf61e55aecf6b9d7f5e86db9e78..7e48694ec8e4abc26e66761b30bd507ef873260d 100644
--- a/src/main/java/org/nrg/xnat/restlet/extensions/WorkflowsRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/extensions/WorkflowsRestlet.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.extensions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.om.WrkWorkflowdata;
import org.nrg.xdat.om.XnatExperimentdata;
import org.nrg.xdat.turbine.utils.PopulateItem;
diff --git a/src/main/java/org/nrg/xnat/restlet/files/utils/RestFileUtils.java b/src/main/java/org/nrg/xnat/restlet/files/utils/RestFileUtils.java
index 2f9a826824fcdfee5b521554820a20b001290a29..e790ad9306ee26f436f2d50294a13424f7e7e608 100644
--- a/src/main/java/org/nrg/xnat/restlet/files/utils/RestFileUtils.java
+++ b/src/main/java/org/nrg/xnat/restlet/files/utils/RestFileUtils.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.files.utils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.om.*;
import java.io.File;
diff --git a/src/main/java/org/nrg/xnat/restlet/guard/XnatSecureGuard.java b/src/main/java/org/nrg/xnat/restlet/guard/XnatSecureGuard.java
index cddb49f122d5a68430bf41453ff3b07f170b11a0..6ca69473a091f45a35c29e331ed882b1328910f7 100644
--- a/src/main/java/org/nrg/xnat/restlet/guard/XnatSecureGuard.java
+++ b/src/main/java/org/nrg/xnat/restlet/guard/XnatSecureGuard.java
@@ -10,12 +10,6 @@
*/
package org.nrg.xnat.restlet.guard;
-import java.util.UUID;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
import org.apache.turbine.util.TurbineException;
import org.nrg.xdat.XDAT;
import org.nrg.xdat.entities.AliasToken;
@@ -26,23 +20,22 @@ import org.nrg.xdat.turbine.modules.actions.SecureAction;
import org.nrg.xft.XFT;
import org.nrg.xft.security.UserI;
import org.nrg.xnat.restlet.representations.RESTLoginRepresentation;
-import org.nrg.xnat.restlet.resources.SecureResource;
import org.nrg.xnat.restlet.util.BrowserDetector;
import org.nrg.xnat.restlet.util.BrowserDetectorI;
import org.nrg.xnat.restlet.util.RequestUtil;
import org.restlet.Filter;
-import org.restlet.data.ChallengeRequest;
-import org.restlet.data.ChallengeResponse;
-import org.restlet.data.ChallengeScheme;
-import org.restlet.data.MediaType;
-import org.restlet.data.Request;
-import org.restlet.data.Response;
-import org.restlet.data.Status;
+import org.restlet.data.*;
import org.restlet.resource.Representation;
import org.restlet.resource.StringRepresentation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.UUID;
public class XnatSecureGuard extends Filter {
- static org.apache.log4j.Logger logger = Logger.getLogger(XnatSecureGuard.class);
+ private static final Logger logger = LoggerFactory.getLogger(XnatSecureGuard.class);
private static final String HTTP_REALM = "XNAT Protected Area";
/**
@@ -52,7 +45,7 @@ public class XnatSecureGuard extends Filter {
*/
@Override
protected int beforeHandle(Request request, Response response) {
- if (authenticate(request, response)) {
+ if (authenticate(request)) {
return CONTINUE;
} else {
unauthorized(request, response);
@@ -96,71 +89,47 @@ public class XnatSecureGuard extends Filter {
return _aliasTokenService;
}
- private boolean authenticate(Request request, Response response) {
+ private boolean authenticate(Request request) {
// THIS BREAKS THE TRADITIONAL REST MODEL
// But, if the user is already logged into the website and navigates
// to a REST GET, they shouldn't have to re-login , TO
final HttpServletRequest httpRequest = getHttpServletRequest(request);
- final UserI sessionUser = getSessionUser(httpRequest);
+ final UserI sessionUser = XDAT.getUserDetails();
if (sessionUser != null) {
- //Check for a CsrfToken if necessary.
- try {
- //isCsrfTokenOk either returns true or throws an exception...
- SecureAction.isCsrfTokenOk(httpRequest,false);
- } catch (Exception e){
- throw new RuntimeException(e);//LOL.
+ //Check for a CsrfToken if necessary.
+ try {
+ //isCsrfTokenOk either returns true or throws an exception...
+ SecureAction.isCsrfTokenOk(httpRequest, false);
+ } catch (Exception e) {
+ throw new RuntimeException(e);//LOL.
+ }
+ return true;
+ } else {
+ UserI user;
+ final ChallengeResponse challengeResponse = request.getChallengeResponse();
+ if (challengeResponse != null) {
+ user = authenticateBasic(challengeResponse);
+ if (user != null) {
+ httpRequest.getSession().setAttribute("XNAT_CSRF", UUID.randomUUID().toString());
+ return true;
}
-
- attachUser(request, sessionUser);
- return true;
- } else {
- try {
- UserI user = null;
- final ChallengeResponse challengeResponse = request
- .getChallengeResponse();
- if (challengeResponse != null) {
- user = authenticateBasic(challengeResponse);
- if (user != null) {
- attachUser(request, user);
- httpRequest.getSession().setAttribute("XNAT_CSRF", UUID.randomUUID().toString());
+ }
+ else if (!XFT.GetRequireLogin()) {
+ try {
+ HttpSession session = httpRequest.getSession();
+ session.removeAttribute("loggedin");
+ user=Users.getGuest();
+ if (user!=null) {
return true;
}
+ } catch (Exception e) {
+ logger.error("",e);
}
- else if (!XFT.GetRequireLogin()) {
- try {
- HttpSession session = httpRequest.getSession();
- session.removeAttribute("loggedin");
- user=Users.getGuest();
- if (user!=null) {
- attachUser(request, user);
- return true;
- }
- } catch (Exception e) {
- logger.error("",e);
- }
- }
- } catch (RuntimeException e) {
- // We let this return an error to cause a 500 to return to the user. The only other
- // option is to throw a 401. But this wouldn't inform the user that there was an error.
- throw e;
}
}
return false;
}
- private UserI getSessionUser(HttpServletRequest httpRequest) {
- if(XDAT.getUserDetails()!=null){
- return XDAT.getUserDetails();
- }
- else{
- return (UserI) httpRequest.getSession().getAttribute(SecureResource.USER_ATTRIBUTE);
- }
- }
-
- private void attachUser(Request request, UserI user) {
- request.getAttributes().put(SecureResource.USER_ATTRIBUTE, user);
- }
-
private UserI authenticateBasic(ChallengeResponse challengeResponse) {
final String username = challengeResponse.getIdentifier();
final String password = new String(challengeResponse.getSecret());
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/AutomationResource.java b/src/main/java/org/nrg/xnat/restlet/resources/AutomationResource.java
index c0d62b297e404d0fc4dae92f524856a2d6cb75c1..125a6171355ec5b466bd11520cb43041553bd80e 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/AutomationResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/AutomationResource.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
import org.nrg.action.ServerException;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ConfigResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ConfigResource.java
index f24d5ab934a9884e76cf81afb0a0e122b37609b9..385f97f399e4fe5141794cf386315501ba2f131a 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ConfigResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ConfigResource.java
@@ -12,7 +12,7 @@ package org.nrg.xnat.restlet.resources;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ClientException;
import org.nrg.config.entities.Configuration;
import org.nrg.config.exceptions.ConfigServiceException;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/EventResource.java b/src/main/java/org/nrg/xnat/restlet/resources/EventResource.java
index 928689f8d727f946d1340afd128dcad2edb07657..3c1fa83987e032ca02f7b93c0efe706ee39c3c48 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/EventResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/EventResource.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
import org.hibernate.HibernateException;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ExperimentResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ExperimentResource.java
index 9b4c07ee446227f8cec7688e74efa08dd553e340..6f02c0c8241836b0bc5ab1baf4c81182cbd920b5 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ExperimentResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ExperimentResource.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ActionException;
import org.nrg.transaction.TransactionException;
import org.nrg.xdat.base.BaseElement;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ExptAssessmentResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ExptAssessmentResource.java
index 5e784d5c957002b8ba73e3677bfce6aac6ff11a2..3434d2f224972c6dfb6bdd1345566ccabf04f0a0 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ExptAssessmentResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ExptAssessmentResource.java
@@ -68,7 +68,7 @@ public class ExptAssessmentResource extends ItemResource {
String assessedID= (String)getParameter(request,"ASSESSED_ID");
if(assessedID!=null){
- if(assesed==null && assessedID!=null){
+ if(assesed == null){
assesed = XnatExperimentdata.getXnatExperimentdatasById(assessedID, user, false);
if (assesed != null && (proj != null && !assesed.hasProject(proj.getId()))) {
assesed = null;
@@ -93,8 +93,8 @@ public class ExptAssessmentResource extends ItemResource {
this.getVariants().add(new Variant(MediaType.TEXT_HTML));
this.getVariants().add(new Variant(MediaType.TEXT_XML));
}
- }else{
- response.setStatus(Status.CLIENT_ERROR_NOT_FOUND,"Unable to find assessed experiment '" + TurbineUtils.escapeParam(assessedID) + "'");
+ } else {
+ response.setStatus(Status.CLIENT_ERROR_NOT_FOUND, "Unable to find assessed experiment, no ID submitted or found.");
}
this.fieldMapping.putAll(XMLPathShortcuts.getInstance().getShortcuts(XMLPathShortcuts.DERIVED_DATA,false));
@@ -108,15 +108,13 @@ public class ExptAssessmentResource extends ItemResource {
@Override
public void handlePut() {
- XFTItem item = null;
-
try {
XFTItem template=null;
if (existing!=null && !this.isQueryVariableTrue("allowDataDeletion")){
template=existing.getItem().getCurrentDBVersion();
}
- item=this.loadItem(null,true,template);
+ XFTItem item=this.loadItem(null,true,template);
if(item==null){
String xsiType=this.getQueryVariable("xsiType");
@@ -150,7 +148,7 @@ public class ExptAssessmentResource extends ItemResource {
if(pp.getProject().equals(newProject.getId())){
matched=(XnatExperimentdataShare)pp;
if(newLabel!=null && !pp.getLabel().equals(newLabel)){
- ((XnatExperimentdataShare)pp).setLabel(newLabel);
+ pp.setLabel(newLabel);
BaseXnatExperimentdata.SaveSharedProject((XnatExperimentdataShare)pp, assessor, user,newEventInstance(EventUtils.CATEGORY.DATA,(getAction()!=null)?getAction():EventUtils.RENAME_IN_SHARED_PROJECT));
}
break;
@@ -188,12 +186,12 @@ public class ExptAssessmentResource extends ItemResource {
}
if(Permissions.canCreate(user, assessor.getXSIType()+"/project", newProject.getId())){
- XnatExperimentdataShare pp= new XnatExperimentdataShare((UserI)user);
+ XnatExperimentdataShare pp= new XnatExperimentdataShare(user);
pp.setProject(newProject.getId());
if(newLabel!=null)pp.setLabel(newLabel);
pp.setProperty("sharing_share_xnat_experimentda_id", assessor.getId());
- BaseXnatExperimentdata.SaveSharedProject((XnatExperimentdataShare)pp, assessor, user,newEventInstance(EventUtils.CATEGORY.DATA,(getAction()!=null)?getAction():"Shared into additional project"));
+ BaseXnatExperimentdata.SaveSharedProject(pp, assessor, user, newEventInstance(EventUtils.CATEGORY.DATA, (getAction() != null) ? getAction() : "Shared into additional project"));
}else{
this.getResponse().setStatus(Status.CLIENT_ERROR_FORBIDDEN,"Specified user account has insufficient create privileges for experiments in the " + newProject.getId() + " project.");
return;
@@ -207,11 +205,9 @@ public class ExptAssessmentResource extends ItemResource {
this.returnDefaultRepresentation();
}else{
this.getResponse().setStatus(Status.CLIENT_ERROR_NOT_FOUND,"Unable to identify project: " + newProjectS);
- return;
}
}else{
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
- return;
}
}else{
if(assessor.getLabel()==null){
@@ -332,18 +328,18 @@ public class ExptAssessmentResource extends ItemResource {
}
//check for unexpected modifications of ID, Project and label
- if(existing !=null && !org.apache.commons.lang.StringUtils.equals(existing.getId(),assessor.getId())){
+ if(existing !=null && !StringUtils.equals(existing.getId(),assessor.getId())){
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST,"ID cannot be modified");
return;
}
- if(existing !=null && !org.apache.commons.lang.StringUtils.equals(existing.getProject(),assessor.getProject())){
+ if(existing !=null && !StringUtils.equals(existing.getProject(),assessor.getProject())){
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST,"Project must be modified through separate URI.");
return;
}
//MATCHED
- if(existing !=null && !org.apache.commons.lang.StringUtils.equals(existing.getLabel(),assessor.getLabel())){
+ if(existing !=null && !StringUtils.equals(existing.getLabel(),assessor.getLabel())){
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST,"Label must be modified through separate URI.");
return;
}
@@ -361,7 +357,6 @@ public class ExptAssessmentResource extends ItemResource {
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
} catch (ActionException e) {
this.getResponse().setStatus(e.getStatus(),e.getMessage());
- return;
} catch (Exception e) {
this.getResponse().setStatus(Status.SERVER_ERROR_INTERNAL);
logger.error("",e);
@@ -427,7 +422,6 @@ public class ExptAssessmentResource extends ItemResource {
if(msg!=null){
WorkflowUtils.fail(wrk, c);
this.getResponse().setStatus(Status.CLIENT_ERROR_FORBIDDEN,msg);
- return;
}else{
WorkflowUtils.complete(wrk, c);
}
@@ -439,12 +433,10 @@ public class ExptAssessmentResource extends ItemResource {
}
logger.error("",e);
this.getResponse().setStatus(Status.SERVER_ERROR_INTERNAL,e.getMessage());
- return;
}
} catch (EventRequirementAbsent e1) {
logger.error("",e1);
this.getResponse().setStatus(Status.CLIENT_ERROR_FORBIDDEN,e1.getMessage());
- return;
}
}
@@ -462,7 +454,7 @@ public class ExptAssessmentResource extends ItemResource {
if(assessor!=null){
String filepath = this.getRequest().getResourceRef().getRemainingPart();
- if(filepath!=null && filepath.indexOf("?")>-1){
+ if(filepath!=null && filepath.contains("?")){
filepath = filepath.substring(0,filepath.indexOf("?"));
}
@@ -471,37 +463,37 @@ public class ExptAssessmentResource extends ItemResource {
}
if(filepath!=null && filepath.equals("status")){
return returnStatus(assessor,mt);
- }else if(filepath!=null && filepath.startsWith("projects")){
+ }else if (filepath != null && filepath.startsWith("projects")) {
XFTTable t = new XFTTable();
- ArrayList<String> al = new ArrayList<String>();
+ ArrayList<String> al = new ArrayList<>();
al.add("label");
al.add("ID");
al.add("Secondary_ID");
al.add("Name");
t.initTable(al);
- Object[] row=new Object[4];
- row[0]=assessor.getLabel();
+ Object[] row = new Object[4];
+ row[0] = assessor.getLabel();
XnatProjectdata primary = assessor.getPrimaryProject(false);
- row[1]=primary.getId();
- row[2]=primary.getSecondaryId();
- row[3]=primary.getName();
+ row[1] = primary.getId();
+ row[2] = primary.getSecondaryId();
+ row[3] = primary.getName();
t.rows().add(row);
- for(Map.Entry<XnatProjectdataI, String> entry: assessor.getProjectDatas().entrySet()){
- row=new Object[4];
- row[0]=entry.getValue();
- row[1]=entry.getKey().getId();
- row[2]=entry.getKey().getSecondaryId();
- row[3]=entry.getKey().getName();
+ for (Map.Entry<XnatProjectdataI, String> entry : assessor.getProjectDatas().entrySet()) {
+ row = new Object[4];
+ row[0] = entry.getValue();
+ row[1] = entry.getKey().getId();
+ row[2] = entry.getKey().getSecondaryId();
+ row[3] = entry.getKey().getName();
t.rows().add(row);
}
- Hashtable<String,Object> params=new Hashtable<String,Object>();
- if(t!=null)params.put("totalRecords", t.size());
+ Hashtable<String, Object> params = new Hashtable<String, Object>();
+ params.put("totalRecords", t.size());
return representTable(t, mt, params);
- }else{
- return this.representItem(assessor.getItem(),mt);
+ } else {
+ return this.representItem(assessor.getItem(), mt);
}
}else{
this.getResponse().setStatus(Status.CLIENT_ERROR_NOT_FOUND,"Unable to find the specified experiment.");
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/PARResource.java b/src/main/java/org/nrg/xnat/restlet/resources/PARResource.java
index 644d3308d9961e7a10cca825db125e414880462e..e90dede4a5bdcd374b33b31fd7afb00958eb125c 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/PARResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/PARResource.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.security.helpers.Roles;
import org.nrg.xft.XFTTable;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ProjSubExptAsstList.java b/src/main/java/org/nrg/xnat/restlet/resources/ProjSubExptAsstList.java
index f489e01e88dbb5994bc5b62531908f011830868f..bda8a4b1c41693b59f9412daed093fd1a245e129 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ProjSubExptAsstList.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ProjSubExptAsstList.java
@@ -165,7 +165,7 @@ public class ProjSubExptAsstList extends QueryOrganizerResource {
}
if(!matched){
- XnatExperimentdataShare pp= new XnatExperimentdataShare((UserI)user);
+ XnatExperimentdataShare pp= new XnatExperimentdataShare(user);
pp.setProject(this.proj.getId());
assessor.setSharing_share(pp);
}
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ProjectGroupResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ProjectGroupResource.java
index 5af58320686fc74d62f190890929b0231b78a93c..87a625ec3ce5d54b2ceedb2d8a7d3d19ba8a9553 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ProjectGroupResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ProjectGroupResource.java
@@ -5,8 +5,8 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.NumberUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.security.ElementSecurity;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ProjectMemberResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ProjectMemberResource.java
index f3ea2a2b37c479b71c95d4bff742286ecf293904..d1c057a323b076a59ab58eedec843b7d27c3e18b 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ProjectMemberResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ProjectMemberResource.java
@@ -17,7 +17,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.velocity.VelocityContext;
import org.nrg.action.ActionException;
import org.nrg.xdat.display.DisplayManager;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ProjectResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ProjectResource.java
index 92b3a5e14f7f5e556e59d2f256acf9a4bc1c44f5..285997498b1aa4f2d12b7884f5b169fcf23e3aac 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ProjectResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ProjectResource.java
@@ -196,7 +196,7 @@ public class ProjectResource extends ItemResource {
} else if (filepath.startsWith("prearchive_code/")) {
String qc = filepath.substring(16);
if (!qc.equals("")) {
- if (XDAT.getBoolSiteConfigurationProperty("project.allow-auto-archive", true) || org.apache.commons.lang.StringUtils.equals(qc, "0")) {
+ if (XDAT.getBoolSiteConfigurationProperty("project.allow-auto-archive", true) || StringUtils.equals(qc, "0")) {
ArcProject ap = project.getArcSpecification();
try {
Integer qcI = Integer.valueOf(qc);
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ProjectUserListResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ProjectUserListResource.java
index 12a5322df1983e49ea4e95d1d9b5279a0813a7ba..9acf245cb52daca54bc32a064de693a2908ff4fd 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ProjectUserListResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ProjectUserListResource.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.config.services.ConfigService;
import org.nrg.framework.constants.Scope;
import org.nrg.xdat.XDAT;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ProjtExptPipelineResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ProjtExptPipelineResource.java
index 196e45df03687083c7185ce2bbbff0965785b666..f82bb483fa8daa66ce538349502ae605425c888d 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ProjtExptPipelineResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ProjtExptPipelineResource.java
@@ -19,7 +19,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.xmlbeans.XmlOptions;
import org.nrg.pipeline.XnatPipelineLauncher;
import org.nrg.pipeline.utils.PipelineFileUtils;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/RestMockCallMapRestlet.java b/src/main/java/org/nrg/xnat/restlet/resources/RestMockCallMapRestlet.java
index 3a4288bec00d1e6060509e788c88f46e9ef941c8..86936594d0b342b73bd78f49117323f0775b7f23 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/RestMockCallMapRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/RestMockCallMapRestlet.java
@@ -11,7 +11,7 @@
package org.nrg.xnat.restlet.resources;
import com.fasterxml.jackson.core.type.TypeReference;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.nrg.xdat.XDAT;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ScriptResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ScriptResource.java
index 92905f33715529813799ac44dc1fa818d0d313e7..059d174c4ddbcbc19d8e4bc660e84ad4ad800922 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ScriptResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ScriptResource.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ClientException;
import org.nrg.action.ServerException;
import org.nrg.automation.entities.Script;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ScriptRunnerResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ScriptRunnerResource.java
index 31c458d3f9c1ab0c9ccea2fac9adc76cecaf1556..17c26725c7f27ee004488390968035cad5eb2099 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ScriptRunnerResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ScriptRunnerResource.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.automation.runners.ScriptRunner;
import org.nrg.automation.services.ScriptRunnerService;
import org.nrg.xdat.XDAT;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ScriptTriggerResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ScriptTriggerResource.java
index 4564240f0462576250900051802ada2ec4df64a4..efb570006e92de8cb8b34b3377472683f9ab721c 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ScriptTriggerResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ScriptTriggerResource.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ClientException;
import org.nrg.action.ServerException;
import org.nrg.automation.entities.ScriptTrigger;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ScriptTriggerTemplateResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ScriptTriggerTemplateResource.java
index 4ebd8205034dd6b4f209daeebab30585696fb367..23100cdf0a6c52931b2816620924f262849903c6 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ScriptTriggerTemplateResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ScriptTriggerTemplateResource.java
@@ -1,7 +1,7 @@
package org.nrg.xnat.restlet.resources;
import com.google.common.base.Joiner;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ClientException;
import org.nrg.automation.entities.ScriptTrigger;
import org.nrg.automation.entities.ScriptTriggerTemplate;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/ScriptVersionsResource.java b/src/main/java/org/nrg/xnat/restlet/resources/ScriptVersionsResource.java
index b017b3a32cf3b26115a0f0a71550b293427a9080..6e4d199b6db4f531c4579eeb785620a06989a8cc 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/ScriptVersionsResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/ScriptVersionsResource.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.automation.entities.Script;
import org.nrg.automation.services.ScriptRunnerService;
import org.nrg.automation.services.ScriptService;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/SecureResource.java b/src/main/java/org/nrg/xnat/restlet/resources/SecureResource.java
index 2cae4c5dec609851d4972adc70997f0a5ec3581b..bbea23ef661161b13e926b35e95b7830b1b3e032 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/SecureResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/SecureResource.java
@@ -17,7 +17,7 @@ import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.fileupload.DefaultFileItemFactory;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.util.TurbineException;
import org.json.JSONException;
@@ -96,8 +96,6 @@ public abstract class SecureResource extends Resource {
private static final String ACTION = "action";
- public static final String USER_ATTRIBUTE = "user";
-
public static final String HANDLER = "handler";
public static Logger logger = Logger.getLogger(SecureResource.class);
@@ -152,7 +150,7 @@ public abstract class SecureResource extends Resource {
// expects that the user exists in the session (either via traditional
// session or set via the XnatSecureGuard
- user = (UserI) getRequest().getAttributes().get(USER_ATTRIBUTE);
+ user = XDAT.getUserDetails();
filepath = getRequest().getResourceRef().getRemainingPart();
if (filepath != null) {
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/SubjAssessmentResource.java b/src/main/java/org/nrg/xnat/restlet/resources/SubjAssessmentResource.java
index 5818f324a04ecb4bb83d8e144784f37389d6ca51..41cc777e60fe9db733e99ef6ece3c8cdaee60daf 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/SubjAssessmentResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/SubjAssessmentResource.java
@@ -336,7 +336,7 @@ public class SubjAssessmentResource extends SubjAssessmentAbst {
if(this.subject!=null){
expt.setSubjectId(this.subject.getId());
}else{
- if(StringUtils.isBlank(expt.getSubjectId()) && org.apache.commons.lang.StringUtils.isNotEmpty(subID)){
+ if(StringUtils.isBlank(expt.getSubjectId()) && StringUtils.isNotEmpty(subID)){
expt.setSubjectId(subID);
}
@@ -528,18 +528,18 @@ public class SubjAssessmentResource extends SubjAssessmentAbst {
//check for unexpected modifications of ID, Project and label
- if(existing !=null && !org.apache.commons.lang.StringUtils.equals(existing.getId(),expt.getId())){
+ if(existing !=null && !StringUtils.equals(existing.getId(),expt.getId())){
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST,"ID cannot be modified");
return;
}
- if(existing !=null && !org.apache.commons.lang.StringUtils.equals(existing.getProject(),expt.getProject())){
+ if(existing !=null && !StringUtils.equals(existing.getProject(),expt.getProject())){
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST,"Project must be modified through separate URI.");
return;
}
//MATCHED
- if(existing !=null && !org.apache.commons.lang.StringUtils.equals(existing.getLabel(),expt.getLabel())){
+ if(existing !=null && !StringUtils.equals(existing.getLabel(),expt.getLabel())){
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST,"Label must be modified through separate URI.");
return;
}
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/SubjectResource.java b/src/main/java/org/nrg/xnat/restlet/resources/SubjectResource.java
index b5b2d008fdcee2ac6f20e1b36cfd0035c91cb44d..6fd78b27600d8d7689460089a998aa85e66a56ab 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/SubjectResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/SubjectResource.java
@@ -365,12 +365,12 @@ public class SubjectResource extends ItemResource {
//check for unexpected modifications of ID and Project
- if(existing !=null && !org.apache.commons.lang.StringUtils.equals(existing.getId(),sub.getId())){
+ if(existing !=null && !StringUtils.equals(existing.getId(),sub.getId())){
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST,"ID cannot be modified");
return;
}
- if(existing !=null && !org.apache.commons.lang.StringUtils.equals(existing.getProject(),sub.getProject())){
+ if(existing !=null && !StringUtils.equals(existing.getProject(),sub.getProject())){
this.getResponse().setStatus(Status.CLIENT_ERROR_BAD_REQUEST,"Project must be modified through separate URI.");
return;
}
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/UserAuth.java b/src/main/java/org/nrg/xnat/restlet/resources/UserAuth.java
index 6ed5b14197b9f00cfdf5464fc6c668614fdefe5c..3b6a2a0e8187d5e4a28538c607836974aa90a91c 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/UserAuth.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/UserAuth.java
@@ -10,6 +10,7 @@
*/
package org.nrg.xnat.restlet.resources;
+import org.nrg.xdat.XDAT;
import org.nrg.xft.security.UserI;
import org.restlet.Context;
import org.restlet.data.MediaType;
@@ -21,41 +22,40 @@ import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
public class UserAuth extends SecureResource {
-
- public UserAuth(Context context, Request request, Response response) {
- super(context, request, response);
-
- getVariants().add(new Variant(MediaType.TEXT_PLAIN));
- }
-
- @Override
- public Representation represent(Variant variant) throws ResourceException {
- return userAuthRepresentation();
- }
-
- private Representation userAuthRepresentation() {
- UserI loggedInUser = (UserI) getRequest().getAttributes().get(USER_ATTRIBUTE);
- return new StringRepresentation(String.format("User '%s' is logged in.", loggedInUser.getUsername()),
- MediaType.TEXT_PLAIN);
- }
-
- @Override
- public boolean allowGet() {
- return true;
- }
-
- @Override
- public boolean allowDelete() {
- return false;
- }
-
- @Override
- public boolean allowPost() {
- return false;
- }
-
- @Override
- public boolean allowPut() {
- return false;
- }
+
+ public UserAuth(Context context, Request request, Response response) {
+ super(context, request, response);
+
+ getVariants().add(new Variant(MediaType.TEXT_PLAIN));
+ }
+
+ @Override
+ public Representation represent(Variant variant) throws ResourceException {
+ return userAuthRepresentation();
+ }
+
+ private Representation userAuthRepresentation() {
+ UserI loggedInUser = XDAT.getUserDetails();
+ return new StringRepresentation(String.format("User '%s' is logged in.", loggedInUser.getUsername()), MediaType.TEXT_PLAIN);
+ }
+
+ @Override
+ public boolean allowGet() {
+ return true;
+ }
+
+ @Override
+ public boolean allowDelete() {
+ return false;
+ }
+
+ @Override
+ public boolean allowPost() {
+ return false;
+ }
+
+ @Override
+ public boolean allowPut() {
+ return false;
+ }
}
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/UserSession.java b/src/main/java/org/nrg/xnat/restlet/resources/UserSession.java
index 3808a7b95acc0707a8d5dfb6f2e1d4401d57fdd7..6d0ba78e7197f37d293fd961b132f4e01ed15c6a 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/UserSession.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/UserSession.java
@@ -10,10 +10,6 @@
*/
package org.nrg.xnat.restlet.resources;
-import java.util.UUID;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.nrg.xdat.security.helpers.UserHelper;
import org.nrg.xft.security.UserI;
import org.restlet.Context;
@@ -25,6 +21,8 @@ import org.restlet.resource.ResourceException;
import org.restlet.resource.StringRepresentation;
import org.restlet.resource.Variant;
+import java.util.UUID;
+
public class UserSession extends SecureResource {
protected UserI user = null;
@@ -34,10 +32,7 @@ public class UserSession extends SecureResource {
getVariants().add(new Variant(MediaType.TEXT_PLAIN));
// copy the user from the request into the session
- getHttpSession().setAttribute(USER_ATTRIBUTE, getRequest().getAttributes().get(USER_ATTRIBUTE));
-
getHttpSession().setAttribute("userHelper", UserHelper.getUserHelperService(user));
-
getHttpSession().setAttribute("XNAT_CSRF", UUID.randomUUID().toString());
}
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/WorkflowEventResource.java b/src/main/java/org/nrg/xnat/restlet/resources/WorkflowEventResource.java
index e4f20b81d7278832dd76b671b9e884343ac7243c..34f582af225cd1b4184c4e784bdf45e4473f9c7c 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/WorkflowEventResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/WorkflowEventResource.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.restlet.resources;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.XDAT;
import org.nrg.xft.XFTTable;
import org.nrg.xft.exception.DBPoolException;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/files/CatalogResource.java b/src/main/java/org/nrg/xnat/restlet/resources/files/CatalogResource.java
index 89eb9a4b7c0270b88a0744696c1989124af47315..92215dadbcec79231109fc11e239404e5480a868 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/files/CatalogResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/files/CatalogResource.java
@@ -77,7 +77,7 @@ public class CatalogResource extends XNATCatalogTemplate {
private void checkForNonEmptyFilePath(String remainingUrlPart) {
// we don't care about path separators or query parameters
// everything else will be rejected
- filePathIsEmpty = org.apache.commons.lang.StringUtils.isBlank(remainingUrlPart)
+ filePathIsEmpty = StringUtils.isBlank(remainingUrlPart)
|| remainingUrlPart.matches("^/+") || remainingUrlPart.matches("^/*\\?.*");
}
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/files/FileList.java b/src/main/java/org/nrg/xnat/restlet/resources/files/FileList.java
index 5a417cd6cda812dd409fdfbf3670bcf30dda03e1..4f5f9c11b2c1dd4e1d79a83d3fee6dfc50eb116a 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/files/FileList.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/files/FileList.java
@@ -14,8 +14,8 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
import org.apache.commons.io.filefilter.FileFileFilter;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.nrg.action.ActionException;
import org.nrg.action.ClientException;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/files/XNATTemplate.java b/src/main/java/org/nrg/xnat/restlet/resources/files/XNATTemplate.java
index 7bce7fc3f91afeb419caf7dd1488a91e5e6393e3..56190dcc6cb764f6531cb5e43b99aacc4f2f3eb7 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/files/XNATTemplate.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/files/XNATTemplate.java
@@ -10,6 +10,7 @@
*/
package org.nrg.xnat.restlet.resources.files;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.bean.CatCatalogBean;
import org.nrg.xdat.model.XnatImageassessordataI;
import org.nrg.xdat.om.*;
@@ -319,11 +320,7 @@ public class XNATTemplate extends SecureResource {
}
public boolean allowMultipleMatches(){
- if(this instanceof FileList && this.getRequest().getMethod().equals(Method.GET)){
- return true;
- }else{
- return false;
- }
+ return this instanceof FileList && this.getRequest().getMethod().equals(Method.GET);
}
public ItemI getSecurityItem(){
@@ -349,7 +346,7 @@ public class XNATTemplate extends SecureResource {
}
public boolean insertCatalag(XnatResourcecatalog catResource,EventMetaI ci)
- throws InvalidArchiveStructure, Exception {
+ throws Exception {
java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat(
XNATRestConstants.PREARCHIVE_TIMESTAMP);
String uploadID = formatter.format(Calendar.getInstance().getTime());
@@ -672,10 +669,8 @@ public class XNATTemplate extends SecureResource {
for (String resourceID : resourceIDs) {
if (c++ > 0)
query.append(" OR ");
- if (org.apache.commons.lang.StringUtils
- .isNumeric(resourceID)) {
- query
- .append(" (map.xnat_abstractresource_xnat_abstractresource_id=");
+ if (StringUtils.isNumeric(resourceID)) {
+ query.append(" (map.xnat_abstractresource_xnat_abstractresource_id=");
query.append(resourceID);
query.append(" OR abst.label='");
query.append(resourceID);
@@ -721,7 +716,7 @@ public class XNATTemplate extends SecureResource {
for (String resourceID : resourceIDs) {
if (c++ > 0)
query.append(" OR ");
- if (org.apache.commons.lang.StringUtils
+ if (StringUtils
.isNumeric(resourceID)) {
query
.append(" (map.xnat_abstractresource_xnat_abstractresource_id=");
@@ -769,7 +764,7 @@ public class XNATTemplate extends SecureResource {
for (String resourceID : resourceIDs) {
if (c++ > 0)
query.append(" OR ");
- if (org.apache.commons.lang.StringUtils
+ if (StringUtils
.isNumeric(resourceID)) {
query.append(" (abst.xnat_abstractresource_id=");
query.append(resourceID);
@@ -826,7 +821,7 @@ public class XNATTemplate extends SecureResource {
for (String resourceID : resourceIDs) {
if (c++ > 0)
query.append(" OR ");
- if (org.apache.commons.lang.StringUtils
+ if (StringUtils
.isNumeric(resourceID)) {
query
.append(" (map.xnat_abstractresource_xnat_abstractresource_id=");
@@ -879,7 +874,7 @@ public class XNATTemplate extends SecureResource {
for (String resourceID : resourceIDs) {
if (c++ > 0)
query.append(" OR ");
- if (org.apache.commons.lang.StringUtils
+ if (StringUtils
.isNumeric(resourceID)) {
query
.append(" (map.xnat_abstractresource_xnat_abstractresource_id=");
@@ -1016,7 +1011,7 @@ public class XNATTemplate extends SecureResource {
for (String resourceID : resourceIDs) {
if (c++ > 0)
query.append(" OR ");
- if (org.apache.commons.lang.StringUtils
+ if (StringUtils
.isNumeric(resourceID)) {
query.append(" (xnat_abstractresource_id=");
query.append(resourceID);
@@ -1062,7 +1057,7 @@ public class XNATTemplate extends SecureResource {
for (String resourceID : resourceIDs) {
if (c++ > 0)
query.append(" OR ");
- if (org.apache.commons.lang.StringUtils
+ if (StringUtils
.isNumeric(resourceID)) {
query
.append(" (map.xnat_abstractresource_xnat_abstractresource_id=");
@@ -1109,7 +1104,7 @@ public class XNATTemplate extends SecureResource {
for (String resourceID : resourceIDs) {
if (c++ > 0)
query.append(" OR ");
- if (org.apache.commons.lang.StringUtils
+ if (StringUtils
.isNumeric(resourceID)) {
query
.append(" (map.xnat_abstractresource_xnat_abstractresource_id=");
@@ -1153,7 +1148,7 @@ public class XNATTemplate extends SecureResource {
for (String resourceID : resourceIDs) {
if (c++ > 0)
query.append(" OR ");
- if (org.apache.commons.lang.StringUtils
+ if (StringUtils
.isNumeric(resourceID)) {
query
.append(" (map.xnat_abstractresource_xnat_abstractresource_id=");
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcScanResource.java b/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcScanResource.java
index 3f65aaad960e0c9dbf4643d211a0161cc0268a44..2991c2c756c74d2cf7ec0f6d11097402979838bf 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcScanResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcScanResource.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.nrg.action.ActionException;
import org.nrg.action.ClientException;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionListResource.java b/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionListResource.java
index ca0bf7e8c3d472a1a6c6a9269893ff813d928a00..dac3dee8635ab0727f9287cb5ea70728df1968a3 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionListResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionListResource.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.resources.prearchive;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.security.helpers.Roles;
import org.nrg.xft.XFTTable;
import org.nrg.xnat.helpers.prearchive.*;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionResource.java b/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionResource.java
index acca0069830899665697dc113031cb571677dd35..f45fc030f16f6e8e9b9c6486b4921f4e2a6f0581 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionResource.java
@@ -14,7 +14,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.TurbineException;
import org.nrg.action.ActionException;
import org.nrg.action.ClientException;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionResourceFiles.java b/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionResourceFiles.java
index 844200e2a22cd2a7c890e56ccd87a68148cea95a..6e168de15586cc9df6075832f79487d3f8fa1401 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionResourceFiles.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/prearchive/PrearcSessionResourceFiles.java
@@ -15,7 +15,7 @@
package org.nrg.xnat.restlet.resources.prearchive;
import com.google.common.collect.Lists;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ActionException;
import org.nrg.dcm.Dcm2Jpg;
import org.nrg.xdat.model.CatCatalogI;
diff --git a/src/main/java/org/nrg/xnat/restlet/services/AliasTokenRestlet.java b/src/main/java/org/nrg/xnat/restlet/services/AliasTokenRestlet.java
index d350265ad6dee320eeeb091c6b96735b179dd5b1..e73a29c357afcfa2408c6c642e294ebd2e0b435c 100644
--- a/src/main/java/org/nrg/xnat/restlet/services/AliasTokenRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/services/AliasTokenRestlet.java
@@ -11,7 +11,7 @@
package org.nrg.xnat.restlet.services;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.XDAT;
import org.nrg.xdat.entities.AliasToken;
import org.nrg.xdat.security.helpers.Roles;
diff --git a/src/main/java/org/nrg/xnat/restlet/services/Archiver.java b/src/main/java/org/nrg/xnat/restlet/services/Archiver.java
index 70d1700ea0ee358d63aae8cb2099901f68dda924..c7948346acb4e1f5e46c4abd3f3fe041e93c3ffa 100644
--- a/src/main/java/org/nrg/xnat/restlet/services/Archiver.java
+++ b/src/main/java/org/nrg/xnat/restlet/services/Archiver.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ActionException;
import org.nrg.action.ClientException;
import org.nrg.status.StatusListenerI;
diff --git a/src/main/java/org/nrg/xnat/restlet/services/FeatureDefinitionRestlet.java b/src/main/java/org/nrg/xnat/restlet/services/FeatureDefinitionRestlet.java
index 9e61479b6b797cb8c8342403830ecece2d604ca0..21aa94687256275359691772274137e1fe72e545 100644
--- a/src/main/java/org/nrg/xnat/restlet/services/FeatureDefinitionRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/services/FeatureDefinitionRestlet.java
@@ -7,8 +7,8 @@ import java.util.Hashtable;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/src/main/java/org/nrg/xnat/restlet/services/Importer.java b/src/main/java/org/nrg/xnat/restlet/services/Importer.java
index e0a67f595b0bdfcbd9029e94aa595b47472f5302..e73c3a720f082576e74c4ac9ac5c3bcae0c1e1a3 100644
--- a/src/main/java/org/nrg/xnat/restlet/services/Importer.java
+++ b/src/main/java/org/nrg/xnat/restlet/services/Importer.java
@@ -11,7 +11,7 @@
package org.nrg.xnat.restlet.services;
import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ClientException;
import org.nrg.action.ServerException;
import org.nrg.framework.constants.PrearchiveCode;
diff --git a/src/main/java/org/nrg/xnat/restlet/services/MoveFiles.java b/src/main/java/org/nrg/xnat/restlet/services/MoveFiles.java
index 43781d73ffcfaa5c21dfb64fcbfc88d9cb4f3087..8f65fd6dca2b8fb3f8bf82e611f11c72a6a317ba 100644
--- a/src/main/java/org/nrg/xnat/restlet/services/MoveFiles.java
+++ b/src/main/java/org/nrg/xnat/restlet/services/MoveFiles.java
@@ -13,7 +13,7 @@ package org.nrg.xnat.restlet.services;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ActionException;
import org.nrg.action.ClientException;
import org.nrg.xft.event.EventMetaI;
diff --git a/src/main/java/org/nrg/xnat/restlet/services/SettingsRestlet.java b/src/main/java/org/nrg/xnat/restlet/services/SettingsRestlet.java
index 5625fdcfef13fe6c9bc871ca79efc491c07652b4..5763aa252b656e9b1802799f024908605192e660 100644
--- a/src/main/java/org/nrg/xnat/restlet/services/SettingsRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/services/SettingsRestlet.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.services;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.hibernate.PropertyNotFoundException;
import org.nrg.config.entities.Configuration;
import org.nrg.config.exceptions.ConfigServiceException;
@@ -42,6 +42,7 @@ import org.nrg.xnat.security.FilterSecurityInterceptorBeanPostProcessor;
import org.nrg.xnat.security.XnatExpiredPasswordFilter;
import org.nrg.xnat.turbine.utils.ArcSpecManager;
import org.nrg.xnat.utils.BuildDirScriptRunnerOutputAdapter;
+import org.nrg.xnat.utils.XnatHttpUtils;
import org.restlet.Context;
import org.restlet.data.*;
import org.restlet.resource.Representation;
@@ -133,7 +134,8 @@ public class SettingsRestlet extends SecureResource {
settings.putAll(XDAT.getSiteConfiguration());
settings.put("siteId", getSiteId());
- settings.put("siteUrl", _arcSpec.getSiteUrl());
+ final String siteUrl = StringUtils.isBlank(_arcSpec.getSiteUrl()) ? XnatHttpUtils.getServerRoot(getHttpServletRequest()) : _arcSpec.getSiteUrl();
+ settings.put("siteUrl", siteUrl);
settings.put("siteAdminEmail", _arcSpec.getSiteAdminEmail());
settings.put("smtpHost", _arcSpec.getSmtpHost());
settings.put("requireLogin", _arcSpec.getRequireLogin());
diff --git a/src/main/java/org/nrg/xnat/restlet/services/mail/MailRestlet.java b/src/main/java/org/nrg/xnat/restlet/services/mail/MailRestlet.java
index c25cec3d8426d8c2f48c79debc46a9d7cfeac92c..113758c079cfd9f9410817966113d430b0153039 100644
--- a/src/main/java/org/nrg/xnat/restlet/services/mail/MailRestlet.java
+++ b/src/main/java/org/nrg/xnat/restlet/services/mail/MailRestlet.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.restlet.services.mail;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/org/nrg/xnat/restlet/util/RequestUtil.java b/src/main/java/org/nrg/xnat/restlet/util/RequestUtil.java
index 335ab80dbbfb5fe460908342f9c8d86bda66ce6e..a28e3093874f49d5832c8cc37ae31201b5f1b909 100644
--- a/src/main/java/org/nrg/xnat/restlet/util/RequestUtil.java
+++ b/src/main/java/org/nrg/xnat/restlet/util/RequestUtil.java
@@ -15,7 +15,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xnat.restlet.resources.SecureResource;
import org.restlet.data.MediaType;
import org.restlet.data.Request;
diff --git a/src/main/java/org/nrg/xnat/security/OnXnatLogin.java b/src/main/java/org/nrg/xnat/security/OnXnatLogin.java
index ce210bebbd8ea0c7d61941319637010a49e9fb0b..f8e20eff78af4e2216a21defb4ec5d63e336e07d 100644
--- a/src/main/java/org/nrg/xnat/security/OnXnatLogin.java
+++ b/src/main/java/org/nrg/xnat/security/OnXnatLogin.java
@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.security.helpers.UserHelper;
import org.nrg.xdat.security.helpers.Users;
import org.nrg.xdat.turbine.utils.AccessLogger;
@@ -45,19 +46,7 @@ public class OnXnatLogin extends SavedRequestAwareAuthenticationSuccessHandler {
}
try{
- SecurityContext securityContext = SecurityContextHolder.getContext();
-
- UserI user= null;
- Object principal = securityContext.getAuthentication().getPrincipal();
-
- if(principal instanceof UserI){
- user = (UserI)principal;
- }
- else if (principal instanceof String){
- user = Users.getUser((String)principal);
- }
-
- request.getSession().setAttribute("user", user);
+ final UserI user = XDAT.getUserDetails();
request.getSession().setAttribute("XNAT_CSRF", UUID.randomUUID().toString());
java.util.Date today = java.util.Calendar.getInstance(java.util.TimeZone.getDefault()).getTime();
diff --git a/src/main/java/org/nrg/xnat/security/XnatAuthenticationEntryPoint.java b/src/main/java/org/nrg/xnat/security/XnatAuthenticationEntryPoint.java
index 82c7d4ffb3840d395502f587e34425ce55b04f5e..3c08027aa4f2df48283a2f49a53f6133d101458b 100644
--- a/src/main/java/org/nrg/xnat/security/XnatAuthenticationEntryPoint.java
+++ b/src/main/java/org/nrg/xnat/security/XnatAuthenticationEntryPoint.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.security;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.security.core.AuthenticationException;
diff --git a/src/main/java/org/nrg/xnat/security/XnatAuthenticationFilter.java b/src/main/java/org/nrg/xnat/security/XnatAuthenticationFilter.java
index b1d2a3a991dff3fb3e470ebcc66955be91d2e086..dfb1c279d4fcf688fb55e839c0a243016625f35c 100644
--- a/src/main/java/org/nrg/xnat/security/XnatAuthenticationFilter.java
+++ b/src/main/java/org/nrg/xnat/security/XnatAuthenticationFilter.java
@@ -11,7 +11,7 @@
package org.nrg.xnat.security;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nrg.xdat.security.helpers.Users;
diff --git a/src/main/java/org/nrg/xnat/security/XnatBasicAuthenticationFilter.java b/src/main/java/org/nrg/xnat/security/XnatBasicAuthenticationFilter.java
index f66650103f9190dc8fdb64b32b6e2ad4f923f904..3f78e5c302dbff21e245cd6c03eac236615f2a63 100644
--- a/src/main/java/org/nrg/xnat/security/XnatBasicAuthenticationFilter.java
+++ b/src/main/java/org/nrg/xnat/security/XnatBasicAuthenticationFilter.java
@@ -11,8 +11,8 @@
package org.nrg.xnat.security;
import com.google.common.collect.Maps;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.security.helpers.UserHelper;
-import org.nrg.xdat.security.helpers.Users;
import org.nrg.xdat.turbine.utils.AccessLogger;
import org.nrg.xdat.turbine.utils.AdminUtils;
import org.nrg.xft.XFTItem;
@@ -25,7 +25,6 @@ import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.codec.Base64;
import org.springframework.security.web.AuthenticationEntryPoint;
@@ -37,8 +36,6 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFi
import javax.inject.Inject;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -154,23 +151,7 @@ public class XnatBasicAuthenticationFilter extends BasicAuthenticationFilter {
protected void onSuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
Authentication authResult) throws IOException {
try {
- SecurityContext securityContext = SecurityContextHolder.getContext();
-
- UserI user = null;
- Object principal = securityContext.getAuthentication().getPrincipal();
-
- if (principal instanceof UserI) {
- user = (UserI) principal;
- } else if (principal instanceof String) {
- user = Users.getUser((String) principal);
- }
-
- if (user == null) {
- throw new RuntimeException("Unable to find user object for principal: " + principal);
- }
-
- request.getSession().setAttribute("user", user);
-
+ final UserI user = XDAT.getUserDetails();
Object lock = locks.get(user.getID());
if (lock == null) {
locks.put(user.getID(), new Object());
diff --git a/src/main/java/org/nrg/xnat/security/XnatExpiredPasswordFilter.java b/src/main/java/org/nrg/xnat/security/XnatExpiredPasswordFilter.java
index 290dc4f5b4094cd4874a1960cb48199e8112b2c3..845c9706d383ab2941ad2b4fa646893c7fe2c6e2 100644
--- a/src/main/java/org/nrg/xnat/security/XnatExpiredPasswordFilter.java
+++ b/src/main/java/org/nrg/xnat/security/XnatExpiredPasswordFilter.java
@@ -14,6 +14,7 @@ import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.nrg.config.exceptions.SiteConfigurationException;
import org.nrg.config.services.SiteConfigurationService;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.entities.AliasToken;
import org.nrg.xdat.entities.UserRole;
import org.nrg.xdat.om.ArcArchivespecification;
@@ -65,7 +66,7 @@ public class XnatExpiredPasswordFilter extends GenericFilterBean {
public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
final HttpServletRequest request = (HttpServletRequest) req;
final HttpServletResponse response = (HttpServletResponse) res;
- UserI user = (UserI) request.getSession().getAttribute("user");
+ UserI user = XDAT.getUserDetails();
Object passwordExpired = request.getSession().getAttribute("expired");
// MIGRATION: Need to remove arcspec.
ArcArchivespecification _arcSpec = ArcSpecManager.GetInstance();
diff --git a/src/main/java/org/nrg/xnat/security/XnatArcSpecFilter.java b/src/main/java/org/nrg/xnat/security/XnatInitCheckFilter.java
similarity index 81%
rename from src/main/java/org/nrg/xnat/security/XnatArcSpecFilter.java
rename to src/main/java/org/nrg/xnat/security/XnatInitCheckFilter.java
index 1545fd542cbe36063814b1ef903ac0045d236675..cd2826f9b4c75d8918e599d4894842864aefc73e 100644
--- a/src/main/java/org/nrg/xnat/security/XnatArcSpecFilter.java
+++ b/src/main/java/org/nrg/xnat/security/XnatInitCheckFilter.java
@@ -1,5 +1,5 @@
/*
- * org.nrg.xnat.security.XnatArcSpecFilter
+ * org.nrg.xnat.security.XnatInitCheckFilter
* XNAT http://www.xnat.org
* Copyright (c) 2014, Washington University School of Medicine
* All Rights Reserved
@@ -21,14 +21,16 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.om.ArcArchivespecification;
import org.nrg.xdat.security.helpers.Roles;
import org.nrg.xdat.turbine.utils.TurbineUtils;
import org.nrg.xft.security.UserI;
import org.nrg.xnat.turbine.utils.ArcSpecManager;
+import org.nrg.xnat.utils.XnatHttpUtils;
import org.springframework.web.filter.GenericFilterBean;
-public class XnatArcSpecFilter extends GenericFilterBean {
+public class XnatInitCheckFilter extends GenericFilterBean {
@Override
public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
@@ -42,7 +44,7 @@ public class XnatArcSpecFilter extends GenericFilterBean {
//If arc spec has already been set, do not redirect.
chain.doFilter(req, res);
} else {
- final UserI user = (UserI) request.getSession().getAttribute("user");
+ final UserI user = XDAT.getUserDetails();
final String uri = request.getRequestURI();
if (user == null) {
@@ -70,12 +72,15 @@ public class XnatArcSpecFilter extends GenericFilterBean {
// (NB: I tried putting this check up with the basic auth check,
// but you get this weird redirect with 2 login pages on the same screen. Seems to work here).
chain.doFilter(req, res);
- } else if (Roles.isSiteAdmin(user)) {
- //Otherwise, if the user has administrative permissions, direct the user to the configuration page.
- response.sendRedirect(TurbineUtils.GetFullServerPath() + _configurationPath);
} else {
- //The arc spec is not set but the user does not have administrative permissions. Direct the user to an error page.
- response.sendRedirect(TurbineUtils.GetFullServerPath() + _nonAdminErrorPath);
+ final String serverPath = XnatHttpUtils.getServerRoot(request);
+ if (Roles.isSiteAdmin(user)) {
+ //Otherwise, if the user has administrative permissions, direct the user to the configuration page.
+ response.sendRedirect(serverPath + _configurationPath);
+ } else {
+ //The arc spec is not set but the user does not have administrative permissions. Direct the user to an error page.
+ response.sendRedirect(serverPath + _nonAdminErrorPath);
+ }
}
} catch (Exception e) {
logger.error("Error checking user role in the Arc Spec Filter.", e);
@@ -114,5 +119,5 @@ public class XnatArcSpecFilter extends GenericFilterBean {
private String _initializationPath = "";
private String _configurationPath = "";
private String _nonAdminErrorPath = "";
- private final List<String> _exemptedPaths = new ArrayList<String>();
+ private final List<String> _exemptedPaths = new ArrayList<>();
}
diff --git a/src/main/java/org/nrg/xnat/security/XnatProviderManager.java b/src/main/java/org/nrg/xnat/security/XnatProviderManager.java
index f24ad389eaa090bc8922d22050936c37b1282e13..429e320f499a7fdf90ed2bdce9c12eba5c308cb8 100644
--- a/src/main/java/org/nrg/xnat/security/XnatProviderManager.java
+++ b/src/main/java/org/nrg/xnat/security/XnatProviderManager.java
@@ -11,8 +11,8 @@
package org.nrg.xnat.security;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.VelocityContext;
diff --git a/src/main/java/org/nrg/xnat/security/XnatSessionEventPublisher.java b/src/main/java/org/nrg/xnat/security/XnatSessionEventPublisher.java
index 438179c1e7e775115bdbf3613630e2f341f16896..19ccdfc73c6697c8febcfabf450391473484302e 100644
--- a/src/main/java/org/nrg/xnat/security/XnatSessionEventPublisher.java
+++ b/src/main/java/org/nrg/xnat/security/XnatSessionEventPublisher.java
@@ -11,11 +11,14 @@
package org.nrg.xnat.security;
import org.nrg.xft.security.UserI;
-import org.nrg.xnat.restlet.resources.SecureResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
import org.springframework.security.web.session.HttpSessionCreatedEvent;
import org.springframework.security.web.session.HttpSessionDestroyedEvent;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -64,13 +67,20 @@ public class XnatSessionEventPublisher implements HttpSessionListener, ServletCo
final Date today = Calendar.getInstance(TimeZone.getDefault()).getTime();
try {
- final UserI user = (UserI) event.getSession().getAttribute(SecureResource.USER_ATTRIBUTE);
- if (user != null) {
- final String userId = user.getID().toString();
- final Timestamp stamp = new Timestamp(today.getTime());
- //sessionId's aren't guaranteed to be unique forever. But, the likelihood of sessionId and userId not forming a unique combo with a null logout_date is slim.
- //noinspection SqlDialectInspection,SqlNoDataSourceInspection,SqlResolve
- _template.execute("UPDATE xdat_user_login SET logout_date='" + stamp + "' WHERE logout_date is null and session_id='" + sessionId + "' and user_xdat_user_id='" + userId + "';");
+ final Object contextCandidate = event.getSession().getAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY);
+ if (contextCandidate != null && contextCandidate instanceof SecurityContext) {
+ final SecurityContext context = (SecurityContext) contextCandidate;
+ final Authentication authentication = context.getAuthentication();
+ if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) {
+ final Object userCandidate = authentication.getPrincipal();
+ if (userCandidate != null && userCandidate instanceof UserI) {
+ final String userId = ((UserI) userCandidate).getID().toString();
+ final Timestamp stamp = new Timestamp(today.getTime());
+ //sessionId's aren't guaranteed to be unique forever. But, the likelihood of sessionId and userId not forming a unique combo with a null logout_date is slim.
+ //noinspection SqlDialectInspection,SqlNoDataSourceInspection,SqlResolve
+ _template.execute("UPDATE xdat_user_login SET logout_date='" + stamp + "' WHERE logout_date is null and session_id='" + sessionId + "' and user_xdat_user_id='" + userId + "';");
+ }
+ }
}
} catch (Exception e) {
//remember, anonymous gets a session, too. Those won't be in the table. Fail silently.
diff --git a/src/main/java/org/nrg/xnat/security/alias/AliasTokenAuthenticationProvider.java b/src/main/java/org/nrg/xnat/security/alias/AliasTokenAuthenticationProvider.java
index 250e2bc5cbf8489a7510a25948b001961cae7872..37e51060c440680d3dafb24710bc3f8bbd149651 100644
--- a/src/main/java/org/nrg/xnat/security/alias/AliasTokenAuthenticationProvider.java
+++ b/src/main/java/org/nrg/xnat/security/alias/AliasTokenAuthenticationProvider.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.security.alias;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.xdat.entities.AliasToken;
import org.nrg.xdat.security.helpers.Users;
import org.nrg.xdat.services.AliasTokenService;
diff --git a/src/main/java/org/nrg/xnat/security/config/AuthenticationProviderAggregator.java b/src/main/java/org/nrg/xnat/security/config/AuthenticationProviderAggregator.java
index c6ed207eb8eabfd11fc7afc48873ffadc0e94b3c..f5b0ce3a17eac17d1b7b9c8c086b4ab4782d5a81 100644
--- a/src/main/java/org/nrg/xnat/security/config/AuthenticationProviderAggregator.java
+++ b/src/main/java/org/nrg/xnat/security/config/AuthenticationProviderAggregator.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.security.config;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.security.authentication.AuthenticationProvider;
import java.util.*;
diff --git a/src/main/java/org/nrg/xnat/security/config/LdapAuthenticationProviderConfigurator.java b/src/main/java/org/nrg/xnat/security/config/LdapAuthenticationProviderConfigurator.java
index d24ad353a0747f3aa7a75454b8244ae068cf01ac..874b2d0dc1deafda2dd9a250ab1c4fad4f108250 100644
--- a/src/main/java/org/nrg/xnat/security/config/LdapAuthenticationProviderConfigurator.java
+++ b/src/main/java/org/nrg/xnat/security/config/LdapAuthenticationProviderConfigurator.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.security.config;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nrg.xnat.security.XnatLdapAuthoritiesPopulator;
diff --git a/src/main/java/org/nrg/xnat/security/config/PropertyAggregator.java b/src/main/java/org/nrg/xnat/security/config/PropertyAggregator.java
index e5cb2cc26568da6466499ac01b38932c09621219..4e056eda8af43b9df9338dbf7c0f0bc7e3253b78 100644
--- a/src/main/java/org/nrg/xnat/security/config/PropertyAggregator.java
+++ b/src/main/java/org/nrg/xnat/security/config/PropertyAggregator.java
@@ -1,6 +1,6 @@
package org.nrg.xnat.security.config;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/nrg/xnat/spawner/controllers/ManageElementsController.java b/src/main/java/org/nrg/xnat/spawner/controllers/ManageElementsController.java
index e806046f2010b4aecb9d9785dc8facdeb5896c34..6df849ad1921a08579334e354e666722e0b7da4f 100644
--- a/src/main/java/org/nrg/xnat/spawner/controllers/ManageElementsController.java
+++ b/src/main/java/org/nrg/xnat/spawner/controllers/ManageElementsController.java
@@ -12,27 +12,53 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import javax.inject.Inject;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@SuppressWarnings("SpringMVCViewInspection")
@Controller
-@RequestMapping(value = "/spawner/elements", produces = "application/json")
+@RequestMapping(value = "/spawner/manage", produces = "application/json")
public class ManageElementsController {
@RequestMapping
- public ModelAndView getAvailableElements() {
- final List<SpawnerElement> elements = _service.getAll();
- return new ModelAndView("spawner/elements", "elements", elements);
+ public ModelAndView getNamespaces() {
+ final List<String> namespaces = _service.getNamespaces();
+ return new ModelAndView("spawner/elements", "namespaces", namespaces);
}
- @RequestMapping(value = "{elementId}", method = RequestMethod.GET)
- public ModelAndView getElement(@PathVariable final String elementId) {
- final SpawnerElement element = _service.retrieve(elementId);
+ @RequestMapping("elements")
+ public ModelAndView getDefaultElements() {
+ return getNamespacedElements(SpawnerElement.DEFAULT_NAMESPACE);
+ }
+
+ @RequestMapping("elements/{namespace}")
+ public ModelAndView getNamespacedElements(@PathVariable("namespace") final String namespace) {
+ final Map<String, Object> models = new HashMap<>();
+ models.put("namespace", namespace);
+ models.put("namespaces", _service.getNamespaces());
+ models.put("elements", _service.getDefaultElements());
+ return new ModelAndView("spawner/elements", models);
+ }
+
+ @RequestMapping(value = "element/{elementId}", method = RequestMethod.GET)
+ public ModelAndView getDefaultElement(@PathVariable final String elementId) {
+ return getNamespacedElement(SpawnerElement.DEFAULT_NAMESPACE, elementId);
+ }
+
+ @RequestMapping(value = "element/{namespace}/{elementId}", method = RequestMethod.GET)
+ public ModelAndView getNamespacedElement(@PathVariable("namespace") final String namespace, @PathVariable final String elementId) {
+ final SpawnerElement element = _service.retrieve(namespace, elementId);
return new ModelAndView("spawner/element", element == null ? "error" : "elementId", element == null ? "The ID element " + elementId + " was not found in the system." : elementId);
}
- @RequestMapping(value = "{elementId}", method = RequestMethod.PUT)
- public ModelAndView setElement(@PathVariable final String elementId, @RequestBody final SpawnerElement element) {
+ @RequestMapping(value = "element/{elementId}", method = RequestMethod.PUT)
+ public ModelAndView setDefaultElement(@PathVariable final String elementId, @RequestBody final SpawnerElement element) {
+ return setNamespacedElement(SpawnerElement.DEFAULT_NAMESPACE, elementId, element);
+ }
+
+ @RequestMapping(value = "element/{namespace}/{elementId}", method = RequestMethod.PUT)
+ public ModelAndView setNamespacedElement(@PathVariable final String namespace, @PathVariable final String elementId, @RequestBody final SpawnerElement element) {
if (element == null) {
return new ModelAndView("spawner/element", "error", "No valid spawner element was found in your submitted data.");
}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java
index 04f0255793958e7e2e1bc2b53ba9437b3fedabf0..86a61a48fd8dafafa21e0323a0eb53c30c20bc60 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java
@@ -12,11 +12,12 @@ package org.nrg.xnat.turbine.modules.actions;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.Turbine;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.turbine.modules.actions.SecureAction;
import org.nrg.xdat.turbine.utils.TurbineUtils;
@@ -27,7 +28,7 @@ public class AcceptProjectAccess extends SecureAction {
@Override
public void doPerform(RunData data, Context context) throws Exception {
- UserI user = TurbineUtils.getUser(data);
+ UserI user = XDAT.getUserDetails();
if (user == null) {
user = (UserI) context.get("user");
}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/AddProject.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/AddProject.java
index 37352e2ef36f2bfec373caa55f3e5f6f42d8d0a6..6aae275a9734616b24e7a3c3da3256dc1d1e1f45 100755
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/AddProject.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/AddProject.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.actions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.modules.ScreenLoader;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/ConfirmRegister.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/ConfirmRegister.java
index 0e9057931147c2e5dd07288471a862ba11f3108f..069a156e7f8428f5d0bcce02e7055198e1fe88c5 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/ConfirmRegister.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/ConfirmRegister.java
@@ -12,7 +12,7 @@ package org.nrg.xnat.turbine.modules.actions;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.xdat.security.helpers.Users;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/CreateExperiment.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/CreateExperiment.java
index 5c4f9f5d3b8b517b6fff07296833abd51edf52a6..9d44f3233f8a2004b154d9728a567b2abfb8a617 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/CreateExperiment.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/CreateExperiment.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.actions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.xdat.schema.SchemaElement;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/DownloadImages.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/DownloadImages.java
index 5b115cfdf013bc2685ab8d8aed3217c9e8809ad4..a365a8181f6eb0bcdf44f09696ab29671a662119 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/DownloadImages.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/DownloadImages.java
@@ -11,7 +11,7 @@
package org.nrg.xnat.turbine.modules.actions;
import edu.sdsc.grid.io.GeneralFile;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/DownloadSessionsAction2.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/DownloadSessionsAction2.java
index ee2173ffe483733dce0d3037fa5869b4e4d6cef7..18190b742c2cabba01dd9a6228c08f13d108a915 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/DownloadSessionsAction2.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/DownloadSessionsAction2.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.actions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.xdat.bean.CatCatalogBean;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/EditImageSessionAction.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/EditImageSessionAction.java
index 0a4ca9c9403d34db0f53a028161998b131196061..9cb143a5ed5040ac8c7f294bd6df2f9362e5d78e 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/EditImageSessionAction.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/EditImageSessionAction.java
@@ -12,6 +12,7 @@ package org.nrg.xnat.turbine.modules.actions;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.security.XDATUser;
import org.nrg.xft.XFTItem;
import org.slf4j.Logger;
@@ -33,7 +34,7 @@ public class EditImageSessionAction extends ModifySubjectAssessorData {
try {
// Migration: Is there a UserI-friendly version of XDATUser.clearBrowseableElementDisplays() and its kin?
- ((XDATUser) data.getSession().getAttribute("user")).clearBrowseableElementDisplays();
+ ((XDATUser) XDAT.getUserDetails()).clearBrowseableElementDisplays();
if (item.getProperty("note") == null) {
item.setProperty("note", "NULL");
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/ManageProjectAccess.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/ManageProjectAccess.java
index b6e41c4b1254751014d357458303080824ff2aec..feba56fc7a2db917e3e7a20c8db6db6e5b900ca6 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/ManageProjectAccess.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/ManageProjectAccess.java
@@ -12,6 +12,7 @@ package org.nrg.xnat.turbine.modules.actions;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.om.base.BaseXnatProjectdata;
import org.nrg.xdat.security.helpers.Groups;
@@ -86,7 +87,7 @@ public class ManageProjectAccess extends SecureAction {
PersistentWorkflowUtils.save(wrk2, c);
}
if (sendmail) {
- context.put("user", TurbineUtils.getUser(data));
+ context.put("user", XDAT.getUserDetails());
context.put("server", TurbineUtils.GetFullServerPath());
context.put("process", "Transfer to the archive.");
context.put("system", TurbineUtils.GetSystemName());
@@ -120,7 +121,7 @@ public class ManageProjectAccess extends SecureAction {
PersistentWorkflowUtils.complete(wrk2, c);
}
if (sendmail) {
- context.put("user", TurbineUtils.getUser(data));
+ context.put("user", XDAT.getUserDetails());
context.put("server", TurbineUtils.GetFullServerPath());
context.put("process", "Transfer to the archive.");
context.put("system", TurbineUtils.GetSystemName());
@@ -154,7 +155,7 @@ public class ManageProjectAccess extends SecureAction {
PersistentWorkflowUtils.complete(wrk2, c);
}
if (sendmail) {
- context.put("user", TurbineUtils.getUser(data));
+ context.put("user", XDAT.getUserDetails());
context.put("server", TurbineUtils.GetFullServerPath());
context.put("process", "Transfer to the archive.");
context.put("system", TurbineUtils.GetSystemName());
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/ModifySubjectAssessorData.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/ModifySubjectAssessorData.java
index 5604167d83264afb3b9f1d5008106bebc6cfc2e4..c34f42666b2a38dd8ea0472507ea02006c89ccac 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/ModifySubjectAssessorData.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/ModifySubjectAssessorData.java
@@ -14,7 +14,7 @@ import java.util.Calendar;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/PipelineActions.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/PipelineActions.java
index 6d0c4ca4ecc7549a08d6d245f4e913fc4e69549c..942200b051ffcaa4582040e6315272e310e0881f 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/PipelineActions.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/PipelineActions.java
@@ -19,6 +19,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
@@ -294,7 +295,7 @@ public class PipelineActions extends SecureAction{
String key = (String)keys.next();
if (key.startsWith(pattern)) {
if (replace != null)
- rtn.put(org.apache.commons.lang.StringUtils.replace(key,replace,""),((String)org.nrg.xdat.turbine.utils.TurbineUtils.GetPassedParameter(key,data)));
+ rtn.put(StringUtils.replace(key, replace, ""), ((String)org.nrg.xdat.turbine.utils.TurbineUtils.GetPassedParameter(key, data)));
else
rtn.put(key,((String)org.nrg.xdat.turbine.utils.TurbineUtils.GetPassedParameter(key,data)));
}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/ProcessAccessRequest.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/ProcessAccessRequest.java
index ad314946d91de53b20eb7b712d4984fd5a164e2e..c927eca91e4d87ff8b55854667e50abe9cb3cd1c 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/ProcessAccessRequest.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/ProcessAccessRequest.java
@@ -14,7 +14,7 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.util.RunData;
import org.apache.velocity.Template;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/QDECAction.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/QDECAction.java
index 1685b926d979b54668bab1ed36278f19deaa8f12..a42b5801ba0f62963de1ec1aa53f4c5c831564e8 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/QDECAction.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/QDECAction.java
@@ -23,7 +23,7 @@ import java.util.Date;
import java.util.Enumeration;
import java.util.Hashtable;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.apache.xmlbeans.XmlOptions;
@@ -233,7 +233,7 @@ public class QDECAction extends ListingAction{
if (parts != null ) {
if (parts.length > 1) {
for (int i = 0; i < parts.length; i++) {
- rtn += StringUtils.capitalise(parts[i]);
+ rtn += StringUtils.capitalize(parts[i]);
}
}else if (parts.length == 1) {
rtn = parts[0];
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/ReportIssue.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/ReportIssue.java
index beade2b53e0eeefeb9cde97190fb74034570b6c5..1a0582049fab4e51623f7296bb63b20096ed5dad 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/ReportIssue.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/ReportIssue.java
@@ -16,7 +16,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.parser.ParameterParser;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATForgotLogin.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATForgotLogin.java
index e7b5c617e204dda1805fe791cdb46607083d1382..f9da05543396d95efc2d64a7e2b107d50327016f 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATForgotLogin.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATForgotLogin.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.actions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.xdat.turbine.utils.TurbineUtils;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATLoginUser.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATLoginUser.java
index ea1ca0f3e5560165b58988238b860da6e96e9ede..a368b9293907fb273adc2fcdbdc25ed1334207e6 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATLoginUser.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATLoginUser.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.actions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.modules.ActionLoader;
import org.apache.turbine.modules.actions.VelocityAction;
import org.apache.turbine.util.RunData;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java
index d3f6d92484cd9233004fe17957adebc945cabac2..ce98b18771f2b2458f751ebf0a9a161090d0bddf 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java
@@ -16,7 +16,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.Turbine;
import org.apache.turbine.modules.ActionLoader;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/DefaultPipelineScreen.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/DefaultPipelineScreen.java
index 4fd7d434b002b74329b11f0ef88b48577ba9ee5a..db9a989c8034e9e9306182acdf8541a25e9cac6d 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/DefaultPipelineScreen.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/DefaultPipelineScreen.java
@@ -158,9 +158,6 @@ public abstract class DefaultPipelineScreen extends SecureReport {
context.put("item", item.getItem());
if (XFT.VERBOSE)
System.out.println("Loaded item object (org.nrg.xft.ItemI) as context parameter 'item'.");
- context.put("user", TurbineUtils.getUser(data));
- if (XFT.VERBOSE)
- System.out.println("Loaded user object (org.nrg.xdat.security.UserI) as context parameter 'user'.");
context.put("element", SchemaElement.GetElement(item.getXSIType()));
context.put("search_element", TurbineUtils.GetPassedParameter("search_element", data));
context.put("search_field", TurbineUtils.GetPassedParameter("search_field", data));
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/EditScript.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/EditScript.java
index 73c579588be72d2c9437a9ccc6610dc2edc68198..bbd2bc73fcdd85b01e3b9882a3c47d44c1146e26 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/EditScript.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/EditScript.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.screens;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.automation.entities.Script;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java
index 3be8414f09b45371559250cbfdeadff8acaea16a..41e11d152b3b2a88a0f44bc9889ee8aa2b6e4199 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java
@@ -21,8 +21,8 @@ package org.nrg.xnat.turbine.modules.screens;/*
import java.sql.SQLException;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.modules.screens.VelocitySecureScreen;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
@@ -56,7 +56,7 @@ public class InactiveAccount extends VelocitySecureScreen {
context.put("topMessage", "Your account has been disabled due to inactivity.<br>" +
"Enter your email address to send a reactivation email.");
} else {
- UserI user = (UserI) data.getSession().getAttribute("user");
+ UserI user = XDAT.getUserDetails();
// If the user isn't already logged in...
if(user == null || user.getUsername().equals("guest")) {
@@ -87,7 +87,7 @@ public class InactiveAccount extends VelocitySecureScreen {
if(userID.toLowerCase().contains("script"))
{
e= new Exception("Illegal username <script> usage.");
- AdminUtils.sendAdminEmail("Possible Cross-site scripting attempt blocked", StringEscapeUtils.escapeHtml(userID));
+ AdminUtils.sendAdminEmail("Possible Cross-site scripting attempt blocked", StringEscapeUtils.escapeHtml4(userID));
log.error("",e);
data.setScreenTemplate("Error.vm");
data.getParameters().setString("exception", e.toString());
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/Index.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/Index.java
index 4fcc18635ad2bef853db38c058d44ad09f72f96c..b3e67183d26143bc5386f7b1dedf8e3b55571133 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/Index.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/Index.java
@@ -60,8 +60,6 @@ public class Index extends SecureScreen {
context.put("sub_count", UserHelper.getUserHelperService(user).getTotalCounts().get("xnat:subjectData"));
- context.put("user", user);
-
Long isd_count=(Long)PoolDBUtils.ReturnStatisticQuery("SELECT COUNT(*) FROM xnat_imageSessionData", "count", TurbineUtils.getUser(data).getDBName(), TurbineUtils.getUser(data).getUsername());
context.put("isd_count", isd_count);
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/LaunchUploadApplet.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/LaunchUploadApplet.java
index 739fb9436059b98b2fd1dea8f28ab38c1d01df2c..c38386745e7b0c3545c3afcacb9ce0c099f03412 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/LaunchUploadApplet.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/LaunchUploadApplet.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.screens;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.util.RunData;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/Page.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/Page.java
new file mode 100644
index 0000000000000000000000000000000000000000..e61e54d43eb5c0bde55c2cf0364fb3e1fe4ede6f
--- /dev/null
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/Page.java
@@ -0,0 +1,16 @@
+package org.nrg.xnat.turbine.modules.screens;
+
+import org.apache.turbine.util.RunData;
+import org.apache.velocity.context.Context;
+import org.nrg.xdat.security.helpers.UserHelper;
+import org.nrg.xdat.turbine.modules.screens.SecureScreen;
+import org.nrg.xdat.turbine.utils.TurbineUtils;
+import org.nrg.xft.security.UserI;
+
+
+public class Page extends SecureScreen {
+ @Override
+ protected void doBuildTemplate(RunData data, Context context) throws Exception {
+ //super.doBuildTemplate(data, context);
+ }
+}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/PipelineScreen.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/PipelineScreen.java
index d7968268c02ea861fdbce9a8214140555a6b86e5..adf02c39a2cbc606a9d91a7df714f84828a56dfb 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/PipelineScreen.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/PipelineScreen.java
@@ -164,12 +164,6 @@ public abstract class PipelineScreen extends SecureReport {
if(XFT.VERBOSE)System.out.println("Loaded item object (org.nrg.xft.ItemI) as context parameter 'item'.");
- context.put("user",TurbineUtils.getUser(data));
-
- if(XFT.VERBOSE)System.out.println("Loaded user object (org.nrg.xdat.security.UserI) as context parameter 'user'.");
-
-
-
context.put("element",org.nrg.xdat.schema.SchemaElement.GetElement(item.getXSIType()));
context.put("search_element",((String)org.nrg.xdat.turbine.utils.TurbineUtils.GetPassedParameter("search_element",data)));
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/RequestProjectAccessForm.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/RequestProjectAccessForm.java
index 9305e2ea2c859c22882c859d550bf7a4f6f260a1..a815bbc1a00f8ea21e55b1549d480faed173780b 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/RequestProjectAccessForm.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/RequestProjectAccessForm.java
@@ -12,6 +12,7 @@ package org.nrg.xnat.turbine.modules.screens;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.om.XnatProjectdata;
import org.nrg.xdat.security.helpers.Permissions;
import org.nrg.xdat.security.helpers.Users;
@@ -23,8 +24,8 @@ public class RequestProjectAccessForm extends SecureScreen {
private XnatProjectdata project = null;
@Override
protected void doBuildTemplate(RunData data, Context context) throws Exception {
- String p = ((String)org.nrg.xdat.turbine.utils.TurbineUtils.GetPassedParameter("project",data));
- UserI user = TurbineUtils.getUser(data);
+ String p = ((String) TurbineUtils.GetPassedParameter("project",data));
+ UserI user = XDAT.getUserDetails();
if (project==null){
project = XnatProjectdata.getXnatProjectdatasById(p, user, false);
}
@@ -35,8 +36,8 @@ public class RequestProjectAccessForm extends SecureScreen {
return;
}
- String access_level = ((String)org.nrg.xdat.turbine.utils.TurbineUtils.GetPassedParameter("access_level",data));
- Integer id = ((Integer)org.nrg.xdat.turbine.utils.TurbineUtils.GetPassedInteger("id",data));
+ String access_level = ((String) TurbineUtils.GetPassedParameter("access_level",data));
+ Integer id = TurbineUtils.GetPassedInteger("id", data);
UserI other =Users.getUser(id);
context.put("user", other);
@@ -48,7 +49,4 @@ public class RequestProjectAccessForm extends SecureScreen {
public boolean allowGuestAccess() {
return false;
}
-
-
-
}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_EditScript.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_EditScript.java
index 8bc5eee8dd8af3de03a1962859e3a625e70aa444..018bcd214dcc120441d7fffdaa0966e99c0ff0bc 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_EditScript.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_EditScript.java
@@ -12,17 +12,20 @@ package org.nrg.xnat.turbine.modules.screens;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.security.helpers.Roles;
import org.nrg.xdat.turbine.modules.screens.SecureScreen;
import org.nrg.xdat.turbine.utils.TurbineUtils;
+import org.nrg.xft.security.UserI;
import org.nrg.xnat.helpers.prearchive.PrearcUtils;
public class XDATScreen_EditScript extends SecureScreen {
@Override
protected void doBuildTemplate(RunData arg0, Context arg1) throws Exception {
- arg1.put("user", TurbineUtils.getUser(arg0).getUsername());
- if (Roles.isSiteAdmin(TurbineUtils.getUser(arg0))) {
+ final UserI user = XDAT.getUserDetails();
+ arg1.put("user", user.getUsername());
+ if (Roles.isSiteAdmin(user)) {
arg1.put("isAdmin","true");
}
else {
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
index 3b7fec4ff76c9b0971540510594da916a625b309..77262055a93092de560aef2bf42ea688290c3593 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
@@ -10,8 +10,8 @@
*/
package org.nrg.xnat.turbine.modules.screens;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
@@ -52,7 +52,7 @@ public class XDATScreen_UpdateUser extends SecureScreen {
context.put("item", user);
}
} else {
- user = (UserI) data.getSession().getAttribute("user");
+ user = XDAT.getUserDetails();
// If the user isn't already logged in...
if(user == null || user.getUsername().equals("guest")) {
@@ -64,12 +64,11 @@ public class XDATScreen_UpdateUser extends SecureScreen {
try
{
context.put("forgot", true);
- data.getSession().setAttribute("forgot",new Boolean(true));
+ data.getSession().setAttribute("forgot", true);
userID = XDAT.getContextService().getBean(AliasTokenService.class).validateToken(alias,Long.parseLong(secret));
if(userID!=null){
user = Users.getUser(userID);
- boolean forcePasswordChange = true;
- XDAT.loginUser(data, user, forcePasswordChange);
+ XDAT.loginUser(data, user, true);
}
else{
invalidInformation(data, context, "Change password opportunity expired. Change password requests can only be used once and expire after 24 hours. Please restart the change password process.");
@@ -82,11 +81,11 @@ public class XDATScreen_UpdateUser extends SecureScreen {
AccessLogger.LogActionAccess(data, "Failed Login by alias '" + alias + "': " + e.getMessage());
- if(userID.toLowerCase().contains("script"))
- {
- e= new Exception("Illegal username <script> usage.");
- AdminUtils.sendAdminEmail("Possible Cross-site scripting attempt blocked", StringEscapeUtils.escapeHtml(userID));
- log.error("",e);
+ if (userID == null || userID.toLowerCase().contains("script")) {
+ e = new Exception("Illegal username <script> usage.");
+ final String message = userID == null ? "No user ID found." : StringEscapeUtils.escapeHtml4(userID);
+ AdminUtils.sendAdminEmail("Possible Cross-site scripting attempt blocked", message);
+ log.error(message,e);
data.setScreenTemplate("Error.vm");
data.getParameters().setString("exception", e.toString());
return;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_add_experiment.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_add_experiment.java
index 0860c75933dab7ee98efb1a4aeaf152a756521f0..0c0682ffe8afca8dec5e527acbb0ab7aabf18608 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_add_experiment.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_add_experiment.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.screens;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.xdat.om.XnatSubjectdata;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_edit_scr_screeningAssessment.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_edit_scr_screeningAssessment.java
index 64fec9aad6aa770693fb40b659aa38e16b57742d..5e9ac863c4a6dac67480deb85b2e15c1c793feb7 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_edit_scr_screeningAssessment.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_edit_scr_screeningAssessment.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.screens;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.xdat.model.XnatImagescandataI;
@@ -97,12 +97,12 @@ public class XDATScreen_edit_scr_screeningAssessment extends org.nrg.xnat.turbin
if (al.size()>0 || claimedIDs.size()>0){
int count =al.size()+1;
- String full = org.apache.commons.lang.StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
+ String full = StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
temp_id = sessionLabel+labelExtension+ full;
while (al.contains(temp_id) || claimedIDs.contains(temp_id)){
count++;
- full =org.apache.commons.lang.StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
+ full =StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
temp_id = sessionLabel+labelExtension+ full;
}
@@ -111,7 +111,7 @@ public class XDATScreen_edit_scr_screeningAssessment extends org.nrg.xnat.turbin
return temp_id;
}else{
int count =1;
- String full = org.apache.commons.lang.StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
+ String full = StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
temp_id = sessionLabel+labelExtension+ full;
return temp_id;
}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_prearchives.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_prearchives.java
index d1327d584db7684cae0636c7eda271608bd64f34..da04fce93cf0bc812ba5bef2484ee57753bd53b1 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_prearchives.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_prearchives.java
@@ -12,33 +12,31 @@ package org.nrg.xnat.turbine.modules.screens;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.security.helpers.Roles;
import org.nrg.xdat.turbine.modules.screens.SecureScreen;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
import org.nrg.xnat.turbine.utils.XNATUtils;
import java.util.Hashtable;
+@SuppressWarnings("unused")
public class XDATScreen_prearchives extends SecureScreen {
/* (non-Javadoc)
* @see org.apache.turbine.modules.screens.VelocityScreen#doBuildTemplate(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
*/
protected void doBuildTemplate(final RunData data, final Context context) {
- try {
- context.put("user", TurbineUtils.getUser(data).getUsername());
- final Hashtable hash = XNATUtils.getInvestigatorsForRead("xnat:mrSessionData",data);
- context.put("investigators", hash);
+ try {
+ final Hashtable hash = XNATUtils.getInvestigatorsForRead("xnat:mrSessionData", data);
+ context.put("investigators", hash);
- if (data.getParameters().containsKey("project")) {
- context.put("project", org.nrg.xdat.turbine.utils.TurbineUtils.GetPassedParameter("project",data));
- }
- if(Roles.isSiteAdmin(TurbineUtils.getUser(data))){
- context.put("role","admin");
+ if (data.getParameters().containsKey("project")) {
+ context.put("project", org.nrg.xdat.turbine.utils.TurbineUtils.GetPassedParameter("project", data));
+ }
+ if (Roles.isSiteAdmin(XDAT.getUserDetails())) {
+ context.put("role", "admin");
+ }
+ } catch (Exception e) {
+ log.error(e);
}
- } catch (Exception e) {
- log.error(e);
- e.printStackTrace();
- }
}
-
}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_uploaded_xnat_imageSessionData.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_uploaded_xnat_imageSessionData.java
index d00fab1f7332b631bce0d69c8dfff1993a0f1c3b..3f2241644ddcbb4cb9be367b3274f6e6db7d3332 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_uploaded_xnat_imageSessionData.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_uploaded_xnat_imageSessionData.java
@@ -11,7 +11,7 @@
package org.nrg.xnat.turbine.modules.screens;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.xdat.base.BaseElement;
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XnatErrorScreen.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XnatErrorScreen.java
index 0cf831531814f5b440258019c78c3508cd957c4f..ac8d9b719c902f75af52428d8ea18fb544b7420c 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XnatErrorScreen.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XnatErrorScreen.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.turbine.modules.screens;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.modules.screens.VelocityErrorScreen;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
diff --git a/src/main/java/org/nrg/xnat/turbine/utils/IDGenerator.java b/src/main/java/org/nrg/xnat/turbine/utils/IDGenerator.java
index 9b460146f25db265835cffeb2249ebf6dbef8eaa..a1a066810915a5d8867963a3b50a37bd5dd972fd 100644
--- a/src/main/java/org/nrg/xnat/turbine/utils/IDGenerator.java
+++ b/src/main/java/org/nrg/xnat/turbine/utils/IDGenerator.java
@@ -87,12 +87,12 @@ public class IDGenerator implements IDGeneratorI {
if (al.size()>0 || claimedIDs.size()>0){
int count =al.size()+1;
- String full = org.apache.commons.lang.StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
+ String full = StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
temp_id = site+ full;
while (al.contains(temp_id) || claimedIDs.contains(temp_id)){
count++;
- full =org.apache.commons.lang.StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
+ full =StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
temp_id = site+ full;
}
@@ -101,7 +101,7 @@ public class IDGenerator implements IDGeneratorI {
return temp_id;
}else{
int count =1;
- String full = org.apache.commons.lang.StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
+ String full = StringUtils.leftPad((new Integer(count)).toString(), digits, '0');
temp_id = site+ full;
return temp_id;
}
diff --git a/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java b/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java
index bf86d90aa41ad9247430546944cf984d4b23ee9d..08d261b0ba7af174a1471c8accd3096c46e4d4f9 100644
--- a/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java
+++ b/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java
@@ -510,7 +510,7 @@ public class ProjectAccessRequest {
setUserId(user.getID());
setApproved(accept);
setApprovalDate(Calendar.getInstance().getTime());
- if (!org.apache.commons.lang.StringUtils.equalsIgnoreCase(parEmail, user.getEmail())) {
+ if (!StringUtils.equalsIgnoreCase(parEmail, user.getEmail())) {
setEmail(user.getEmail());
}
save(user);
diff --git a/src/main/java/org/nrg/xnat/turbine/utils/ScanQualityUtils.java b/src/main/java/org/nrg/xnat/turbine/utils/ScanQualityUtils.java
index c1273694492cfc59ebf55d9b2127b7c408c55a31..0a6bfe94dba1341a32078f2e848b3bed20246c2e 100644
--- a/src/main/java/org/nrg/xnat/turbine/utils/ScanQualityUtils.java
+++ b/src/main/java/org/nrg/xnat/turbine/utils/ScanQualityUtils.java
@@ -12,7 +12,7 @@ package org.nrg.xnat.turbine.utils;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.config.exceptions.ConfigServiceException;
import org.nrg.config.services.ConfigService;
import org.nrg.framework.constants.Scope;
diff --git a/src/main/java/org/nrg/xnat/turbine/utils/XNATUtils.java b/src/main/java/org/nrg/xnat/turbine/utils/XNATUtils.java
index 0dd27da59f1321e15014b24244ba8de5c7c20c10..618a40a0f538e3f3d57ad15e003987a58d7f7eb8 100644
--- a/src/main/java/org/nrg/xnat/turbine/utils/XNATUtils.java
+++ b/src/main/java/org/nrg/xnat/turbine/utils/XNATUtils.java
@@ -20,7 +20,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.collections.MultiMap;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.util.RunData;
import org.nrg.xdat.base.BaseElement;
diff --git a/src/main/java/org/nrg/xnat/utils/CatalogUtils.java b/src/main/java/org/nrg/xnat/utils/CatalogUtils.java
index 795973a032f7dfa3cc5cebe3e482200a3b3fd2d9..d630a6afdcddfe59e669f15d7cfb571fb1081b53 100755
--- a/src/main/java/org/nrg/xnat/utils/CatalogUtils.java
+++ b/src/main/java/org/nrg/xnat/utils/CatalogUtils.java
@@ -12,7 +12,7 @@ package org.nrg.xnat.utils;
import com.google.common.collect.Lists;
import com.twmacinta.util.MD5;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.config.entities.Configuration;
import org.nrg.config.exceptions.ConfigServiceException;
import org.nrg.framework.constants.Scope;
diff --git a/src/main/java/org/nrg/xnat/utils/ChecksumsSiteConfigurationListener.java b/src/main/java/org/nrg/xnat/utils/ChecksumsSiteConfigurationListener.java
index 2c6e4c861f7218ce1c0a3fa4ba77653ee05521ce..fba20d1cc79b9427886256507a65aa8ef18f601e 100644
--- a/src/main/java/org/nrg/xnat/utils/ChecksumsSiteConfigurationListener.java
+++ b/src/main/java/org/nrg/xnat/utils/ChecksumsSiteConfigurationListener.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.utils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.config.interfaces.SiteConfigurationPropertyChangedListener;
public class ChecksumsSiteConfigurationListener implements SiteConfigurationPropertyChangedListener {
diff --git a/src/main/java/org/nrg/xnat/utils/FileUtils.java b/src/main/java/org/nrg/xnat/utils/FileUtils.java
index cb0a9a88e27b95efb5029bf71f5622c9b1f76e04..1234010afc69c4b7df6767774ca236a100b2dd6c 100644
--- a/src/main/java/org/nrg/xnat/utils/FileUtils.java
+++ b/src/main/java/org/nrg/xnat/utils/FileUtils.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.utils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nrg.xft.XFT;
diff --git a/src/main/java/org/nrg/xnat/utils/ResourceUtils.java b/src/main/java/org/nrg/xnat/utils/ResourceUtils.java
index 56a1b063fbd2fd7b1041230289d3eec1726c610c..a525959e1a0b438edf10b90bb72ce543d8870292 100644
--- a/src/main/java/org/nrg/xnat/utils/ResourceUtils.java
+++ b/src/main/java/org/nrg/xnat/utils/ResourceUtils.java
@@ -10,7 +10,7 @@
*/
package org.nrg.xnat.utils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ActionException;
import org.nrg.action.ClientException;
import org.nrg.action.ServerException;
diff --git a/src/main/java/org/nrg/xnat/utils/XnatHttpUtils.java b/src/main/java/org/nrg/xnat/utils/XnatHttpUtils.java
index 6cb5a668e355a49b03eee966b61ab1c0df3d781b..238c25f6b6c9cee6b24769bfeba8ba037f7aad05 100644
--- a/src/main/java/org/nrg/xnat/utils/XnatHttpUtils.java
+++ b/src/main/java/org/nrg/xnat/utils/XnatHttpUtils.java
@@ -10,6 +10,7 @@
*/
package org.nrg.xnat.utils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.turbine.util.RunData;
import javax.servlet.http.Cookie;
@@ -32,4 +33,10 @@ public class XnatHttpUtils {
public static String getJSESSIONID(RunData runData) {
return getJSESSIONID(runData.getRequest());
}
+
+ public static String getServerRoot(final HttpServletRequest request) {
+ final String port = request.getServerPort() == 80 ? "" : ":" + request.getServerPort();
+ final String servletPath = StringUtils.defaultIfBlank(request.getContextPath(), "");
+ return String.format("%s://%s%s%s", request.getScheme(), request.getServerName(), port, servletPath);
+ }
}
diff --git a/src/main/webapp/WEB-INF/conf/InstanceSettings.xml.sample b/src/main/webapp/WEB-INF/conf/InstanceSettings.xml.sample
deleted file mode 100644
index a176477249c0a9a4b2ea8352e5fa38ab49692b19..0000000000000000000000000000000000000000
--- a/src/main/webapp/WEB-INF/conf/InstanceSettings.xml.sample
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Instance_Settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="schemas/xdat/instance.xsd"
- site_url="http://localhost:8080" admin_email="administrator@xnat.org"
- archive_root_path="/data/xnat/archive"
- prearchive_path="/data/xnat/prearchive" cache_path="/data/xnat/cache"
- smtp_server="mail.server" ftp_path="/data/xnat/ftp" build_path="/data/xnat/build"
- pipeline_path="/data/xnat/pipeline" require_login="true" user_registration="false"
- enable_csrf_token="true">
- <Databases>
- <Database Type="POSTGRESQL" Id="xnat" Driver="org.postgresql.Driver" Url="jdbc:postgresql://localhost/xnat"
- User="xnat" Pass="xnat" MaxConnections="10"/>
- </Databases>
- <Models>
- <Data_Model File_Name="security.xsd" File_Location="schemas/security" DB="xnat"/>
- <Data_Model File_Name="birnprov.xsd" File_Location="schemas/birn" DB="xnat"/>
- <Data_Model File_Name="xnat.xsd" File_Location="schemas/xnat" DB="xnat"/>
- <Data_Model File_Name="workflow.xsd" File_Location="schemas/pipeline" DB="xnat"/>
- <Data_Model File_Name="repository.xsd" File_Location="schemas/pipeline" DB="xnat"/>
- <Data_Model File_Name="project.xsd" File_Location="schemas/project" DB="xnat"/>
- <Data_Model File_Name="assessments.xsd" File_Location="schemas/assessments" DB="xnat"/>
- <Data_Model File_Name="catalog.xsd" File_Location="schemas/catalog" DB="xnat"/>
- <Data_Model File_Name="protocolValidation.xsd" File_Location="schemas/validation" DB="xnat"/>
- <Data_Model File_Name="screeningAssessment.xsd" File_Location="schemas/screening" DB="xnat"/>
- </Models>
-</Instance_Settings>
diff --git a/src/main/webapp/WEB-INF/conf/xnat-security.xml b/src/main/webapp/WEB-INF/conf/xnat-security.xml
index 408afbb2e10a6b399c48d40656f8af9067904eac..bd9d468303fd964233f4e9fd4b1a4d8f659eb383 100644
--- a/src/main/webapp/WEB-INF/conf/xnat-security.xml
+++ b/src/main/webapp/WEB-INF/conf/xnat-security.xml
@@ -80,7 +80,7 @@
<security:custom-filter position="CHANNEL_FILTER" ref="channelProcessingFilter"/>
<security:custom-filter before="FORM_LOGIN_FILTER" ref="customAuthenticationFilter"/>
<security:custom-filter after="BASIC_AUTH_FILTER" ref="customBasicAuthenticationFilter"/>
- <security:custom-filter before="REMEMBER_ME_FILTER" ref="arcSpecFilter"/>
+ <security:custom-filter before="REMEMBER_ME_FILTER" ref="xnatInitCheckFilter"/>
<security:custom-filter after="SECURITY_CONTEXT_FILTER" ref="expiredPasswordFilter"/>
<security:custom-filter position="CONCURRENT_SESSION_FILTER" ref="concurrencyFilter" />
<security:custom-filter position="LOGOUT_FILTER" ref="logoutFilter" />
@@ -123,6 +123,9 @@
<value>/scripts/**</value>
<value>/style/**</value>
<value>/themes/**</value>
+ <value>/files/**</value>
+ <value>/pages/**</value>
+ <value>/page/**</value>
<value>/applet/**</value>
</list>
</property>
@@ -218,7 +221,7 @@
<property name="emailVerificationDestination" value="/data/services/sendEmailVerification"/>
</bean>
- <bean id="arcSpecFilter" class="org.nrg.xnat.security.XnatArcSpecFilter">
+ <bean id="xnatInitCheckFilter" class="org.nrg.xnat.security.XnatInitCheckFilter">
<property name="initializationPath" value="/services/settings/initialize"/>
<property name="configurationPath" value="/app/template/Configuration.vm"/>
<property name="nonAdminErrorPath" value="/app/template/Unconfigured.vm"/>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 527141d8213104fa7dca48cbad3aea4cd9df343b..088099837bda4fb068894ee541f52bc31c0b2f26 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -15,6 +15,9 @@
<!-- -->
<!-- ======================================================================== -->
<welcome-file-list>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file>
<welcome-file>app</welcome-file>
</welcome-file-list>
diff --git a/src/main/webapp/pages/foo.jsp b/src/main/webapp/pages/foo.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..b88053549c9c05f3fc76783e524519bb46ba8a75
--- /dev/null
+++ b/src/main/webapp/pages/foo.jsp
@@ -0,0 +1,3 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<h1>Foo</h1>
diff --git a/src/main/webapp/schemas/assessments/assessments.xsd b/src/main/webapp/schemas/assessments/assessments.xsd
deleted file mode 100644
index 0a0107f44119e89a9c8b2daaf0f29dff0a9477aa..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/assessments/assessments.xsd
+++ /dev/null
@@ -1,884 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2007 sp2 (http://www.altova.com) by Washington University Radiolodical Science (Washington University in St. Louis) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xnat="http://nrg.wustl.edu/xnat" xmlns:xnat_a="http://nrg.wustl.edu/xnat_assessments" targetNamespace="http://nrg.wustl.edu/xnat_assessments" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:import namespace="http://nrg.wustl.edu/xnat" schemaLocation="../xnat/xnat.xsd"/>
- <xs:element name="SideEffectsPittsburgh" type="xnat_a:sideEffectsPittsburghData">
- <xs:annotation>
- <xs:documentation>Pittsburgh Side Effects Scale</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="YBOCS" type="xnat_a:ybocsData">
- <xs:annotation>
- <xs:documentation>Yale-Brown Obsessive-Compusive Scale</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="YGTSS" type="xnat_a:ygtssData">
- <xs:annotation>
- <xs:documentation>Yale Global Tic Severity Scale</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="UPDRS3" type="xnat_a:updrs3Data">
- <xs:annotation>
- <xs:documentation>Unified Parkinson Disease Rating Scale</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SCID" type="xnat_a:scidResearchData">
- <xs:annotation>
- <xs:documentation>Structured Clinical Interview for DSM Disorders</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="sideEffectsPittsburghData">
- <xs:annotation>
- <xs:documentation>Pittsburgh Side Effects Scale</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:subjectAssessorData">
- <xs:sequence>
- <xs:element name="motorTics" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="buccal_lingualMovements" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="picking_skin_fingers_nails_lip" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="worried_anxious" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="dull_tired_listless" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="sedation" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="stomachache" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="nausea_vomiting" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="crabby_irritable" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="tearful_sad_depressed" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="hallucinations" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="troubleSleeping" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="lossOfAppetite" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="troubleConcentrating_distractible" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="dizziness_lightheadedness" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="headaches" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="socialWithdrawal" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="dryMouth" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="palpitations" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ybocsData">
- <xs:annotation>
- <xs:documentation>Yale-Brown Obsessive Compulsive Scale</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:subjectAssessorData">
- <xs:sequence>
- <xs:element name="currentOrWorstEver" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Does this entry represent current or worst ever symptoms?</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="current"/>
- <xs:enumeration value="worst ever"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="timeOccupiedWithThoughts" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="thoughtsInterfereFunctioning" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="distressCaused" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="effortToResistThoughts" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="controlOverThoughts" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="timePerforming" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="behaviorsInterfereFunctioning" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="feelingIfPrevented" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="effortToResistBehaviors" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="behaviorDriveStrength" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="untilJustRight" type="xs:boolean" minOccurs="0"/>
- <xs:element name="untilJustRightAwareness" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Mental, physical, somewhere in between</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="untilJustRightPerceptions" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>How things look, how things feel, how things sound</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="whenStartUntilJustRight" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Before starting, at start, during</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="frequencyUntilJustRight" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="frequently"/>
- <xs:enumeration value="occasionally"/>
- <xs:enumeration value="hardly ever"/>
- <xs:enumeration value="never"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="firstUntilJustRightAge" type="xs:float" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ygtssData">
- <xs:annotation>
- <xs:documentation>Yale Global Tic Severity Scale</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:subjectAssessorData">
- <xs:sequence>
- <xs:element name="filledOutBy" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>self, parent, KJB, BS, etc.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="period" minOccurs="0">
- <xs:annotation>
- <xs:documentation>current or worst ever</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="current"/>
- <xs:enumeration value="worst ever"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="worstEverAge" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>only if worst ever</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="motor" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="number" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = none; 1 = single tic; 2 = 2-5 discrete tics; 3 = >5 discrete tics; 4 = at least one orchestrated pattern; 5 = >2 patterns</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="frequency" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = none; 1 = rarely; 2 = occasionally; 3 = frequently; 4 = almost always; 5 = always</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="intensity" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = absent; 1 = minimal; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="complexity" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = none; 1 = borderline; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="interference" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = none; 1 = minimal; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="inventory" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>list of tics during week being rated</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="phonic" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="number" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = none; 1 = single tic; 2 = 2-5 discrete tics; 3 = >5 discrete tics; 4 = at least one orchestrated pattern; 5 = >2 patterns</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="frequency" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = none; 1 = rarely; 2 = occasionally; 3 = frequently; 4 = almost always; 5 = always</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="intensity" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = absent; 1 = minimal; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="complexity" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = none; 1 = borderline; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="interference" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = none; 1 = minimal; 2 = mild; 3 = moderate; 4 = marked; 5 = severe</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="inventory" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>list of tics during week being rated</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="impairment" minOccurs="0">
- <xs:annotation>
- <xs:documentation>0 = none; 10 = minimal; 20 = mild; 30 = moderate; 40 = marked; 50 = severe</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="50"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="updrs3Data">
- <xs:annotation>
- <xs:documentation>Unified Parkinson's Disease Rating Scale</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:subjectAssessorData">
- <xs:sequence>
- <xs:element name="inScanner" type="xs:boolean" minOccurs="0"/>
- <xs:element name="clicker" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="right" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Right hand click count (usually best of 2)</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="left" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Left hand click count (usually best of 2)</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="interval">
- <xs:annotation>
- <xs:documentation>Number of seconds allowed for each clicker rating</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="tremorRest" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="face" minOccurs="0"/>
- <xs:element name="rue" minOccurs="0"/>
- <xs:element name="lue" minOccurs="0"/>
- <xs:element name="rle" minOccurs="0"/>
- <xs:element name="lle" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="rigidity" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="neck" minOccurs="0"/>
- <xs:element name="rue" minOccurs="0"/>
- <xs:element name="lue" minOccurs="0"/>
- <xs:element name="rle" minOccurs="0"/>
- <xs:element name="lle" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="handMovementsGrip" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="right" type="xs:integer" minOccurs="0"/>
- <xs:element name="left" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="facialExpression" type="xs:integer" minOccurs="0"/>
- <xs:element name="gait" type="xs:integer" minOccurs="0"/>
- <xs:element name="speech" type="xs:integer" minOccurs="0"/>
- <xs:element name="writing" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>not in UPDRS section III (?)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ariseFromChair" type="xs:integer" minOccurs="0"/>
- <xs:element name="actionPosturalTremor" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="right" type="xs:integer" minOccurs="0"/>
- <xs:element name="left" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="handsRAM" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="right" type="xs:integer" minOccurs="0"/>
- <xs:element name="left" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="fingerTaps" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="right" type="xs:integer" minOccurs="0"/>
- <xs:element name="left" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="posture" type="xs:integer" minOccurs="0"/>
- <xs:element name="posturalStability" type="xs:integer" minOccurs="0"/>
- <xs:element name="footTaps" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="right" type="xs:integer" minOccurs="0"/>
- <xs:element name="left" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="bodyBradykinesiaHypokinesia" type="xs:integer" minOccurs="0"/>
- <xs:element name="problem" type="xs:boolean" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="scidResearchData">
- <xs:annotation>
- <xs:documentation>Structured Clinical Interview for DSM-III-R (research version)</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:subjectAssessorData">
- <xs:sequence>
- <xs:element name="administrator" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Person administering the test</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="moodEpisodes" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="currentMajorDepressiveEpisode" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastMajorDepressiveEpisode" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentManicEpisode" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastManicEpisode" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentHypomanicEpisode" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastHypomanicEpisode" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentDysthmicEpisode" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentMoodDisorderDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastMoodDisorderDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentSubstanceInducedMoodDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSubstanceInducedMoodDisorder" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="psychoticSymptoms" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="currentDelusions" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastDelusions" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentHallucinations" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastHallucinations" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentDisorganizedSpeechBehavior" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastDisorganizedSpeechBehavior" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentCatatonicBehavior" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastCatatonicBehavior" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentNegativeSymptoms" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastNegativeSymptoms" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="psychoticDisorders" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="currentSchizophrenia" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSchizophrenia" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentParanoidType" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastParanoidType" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentCatatonicType" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastCatatonicType" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentDisorganizedType" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastDisorganizedType" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentUndifferentiatedType" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastUndifferentiatedType" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentResidualType" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastResidualType" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentSchizophreniformDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSchizophreniformDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentSchizoaffectiveDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSchizoaffectiveDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentDelusionalDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastDelusionalDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentBriefPsychoticDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastBriefPsychoticDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentPsychoticDisorderDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastPsychoticDisorderDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentSubstanceInducedPsychoticDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSubstanceInducedPsychoticDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentPsychoticDisorderNOS" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>not otherwise specified</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="pastPsychoticDisorderNOS" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>not otherwise specified</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="moodDisorders" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="currentBipolar1Disorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastBipolar1Disorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentBipolar2Disorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastBipolar2Disorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentOtherBipolarDisorder" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>cyclothymic disorder, bipolar disorder NOS</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="pastOtherBipolarDisorder" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>cyclothymic disorder, bipolar disorder NOS</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="currentMajorDepressiveDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastMajorDepressiveDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentDepressiveDisorderNOS" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>not otherwise specified</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="pastDepressiveDisorderNOS" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>not otherwise specified</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="substanceUseDisorders" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="currentAlcoholDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastAlcoholDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentAlcoholAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastAlcoholAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentAmphetamineDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastAmphetamineDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentAmphetamineAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastAmphetamineAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentCannabisDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastCannabisDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentCannabisAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastCannabisAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentCocaineDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastCocaineDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentCocaineAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastCocaineAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentHallucinogenDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastHallucinogenDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentHallucinogenAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastHallucinogenAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentOpioidDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastOpioidDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentOpioidAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastOpioidAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentPhencyclidineDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastPhencyclidineDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentPhencyclidineAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastPhencyclidineAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentSedativeHypnoticAnxiolyticDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSedativeHypnoticAnxiolyticDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentSedativeHypnoticAnxiolyticAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSedativeHypnoticAnxiolyticAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentPolysubstanceDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastPolysubstanceDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentOtherOrUnknownDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastOtherOrUnknownDependence" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentOtherOrUnknownAbuse" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastOtherOrUnknownAbuse" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="anxietyDisorders" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="currentPanicWithAgoraphobia" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastPanicWithAgoraphobia" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentPanicWithoutAgoraphobia" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastPanicWithoutAgoraphobia" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentAgoraphobiaWithoutPanicHx" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastAgoraphobiaWithoutPanicHx" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentSocialPhobia" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSocialPhobia" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentSpecificPhobia" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSpecificPhobia" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentOCD" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Obsessive-Compulsive Disorder</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="pastOCD" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Obsessive-Compulsive Disorder</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="currentPTSD" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Posttraumatic Stress Disorder</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="pastPTSD" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Posttraumatic Stress Disorder</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="currentGeneralizedAnxietyDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentAnxietyDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastAnxietyDueToMedicalCondition" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentSubstanceInducedAnxietyDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSubstanceInducedAnxietyDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentAnxietyDisorderNOS" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>not otherwise specified</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="pastAnxietyDisorderNOS" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>not otherwise specified</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="somatoformDisorders" minOccurs="0">
- <xs:annotation>
- <xs:documentation>current only</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="somatizationDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="undifferentiatedSomatformDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="painDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="hypochondriasis" type="xs:integer" minOccurs="0"/>
- <xs:element name="bodyDysmorphicDisorder" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="eatingDisorders" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="currentAnorexiaNervosa" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastAnorexiaNervosa" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentBulimiaNervosa" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastBulimiaNervosa" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentBingeEatingDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastBingeEatingDisorder" type="xs:integer" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="adjustmentDisorder" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>current only</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="optional" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="currentAcuteStressDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastAcuteStressDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentMinorDepressiveDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastMinorDepressiveDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="currentMixedAnxietyDepressiveDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastMixedAnxietyDepressiveDisorder" type="xs:integer" minOccurs="0"/>
- <xs:element name="pastSympomaticDetails" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Symptomatic details of past major depressive/manic episodes</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_scidResearchData_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_scidResearchData_display.xml
deleted file mode 100644
index 64da91d62fc74ee6938859d328ca09edcb849003..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_scidResearchData_display.xml
+++ /dev/null
@@ -1,1223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:scidResearchData" full-description="SCID" brief-description="SCID">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:scidResearchData','xnat_a:scidResearchData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:scidResearchData','xnat_a:scidResearchData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_A_SCIDRESEARCHDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat_a:scidResearchData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:scidResearchData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:scidResearchData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:scidResearchData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:scidResearchData/search_field/xnat_a:scidResearchData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:scidResearchData','xnat_a:scidResearchData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_A_SCIDRESEARCHDATA_PROJECT_IDENTIFIER" header="XNAT_A_SCIDRESEARCHDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_a_scidresearchdata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:scidResearchData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:scidResearchData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:scidResearchData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:scidResearchData/search_field/xnat_a:scidResearchData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_scidresearchdata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:scidResearchData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_A_SCIDRESEARCHDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:scidResearchData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:scidResearchData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="ADMINISTRATOR" header="administrator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/administrator"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE" header="currentMajorDepressiveEpisode" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentMajorDepressiveEpisode"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE" header="pastMajorDepressiveEpisode" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastMajorDepressiveEpisode"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_CURRENTMANICEPISODE" header="currentManicEpisode" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentManicEpisode"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_PASTMANICEPISODE" header="pastManicEpisode" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastManicEpisode"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_CURRENTHYPOMANICEPISODE" header="currentHypomanicEpisode" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentHypomanicEpisode"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_PASTHYPOMANICEPISODE" header="pastHypomanicEpisode" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastHypomanicEpisode"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_CURRENTDYSTHMICEPISODE" header="currentDysthmicEpisode" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentDysthmicEpisode"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION" header="currentMoodDisorderDueToMedicalCondition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentMoodDisorderDueToMedicalCondition"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION" header="pastMoodDisorderDueToMedicalCondition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastMoodDisorderDueToMedicalCondition"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER" header="currentSubstanceInducedMoodDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/currentSubstanceInducedMoodDisorder"/>
- </DisplayField>
- <DisplayField id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER" header="pastSubstanceInducedMoodDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodEpisodes/pastSubstanceInducedMoodDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS" header="currentDelusions" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentDelusions"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_PASTDELUSIONS" header="pastDelusions" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastDelusions"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS" header="currentHallucinations" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentHallucinations"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS" header="pastHallucinations" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastHallucinations"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR" header="currentDisorganizedSpeechBehavior" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentDisorganizedSpeechBehavior"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR" header="pastDisorganizedSpeechBehavior" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastDisorganizedSpeechBehavior"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR" header="currentCatatonicBehavior" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentCatatonicBehavior"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR" header="pastCatatonicBehavior" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastCatatonicBehavior"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS" header="currentNegativeSymptoms" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/currentNegativeSymptoms"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS" header="pastNegativeSymptoms" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticSymptoms/pastNegativeSymptoms"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA" header="currentSchizophrenia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentSchizophrenia"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA" header="pastSchizophrenia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastSchizophrenia"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE" header="currentParanoidType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentParanoidType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE" header="pastParanoidType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastParanoidType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE" header="currentCatatonicType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentCatatonicType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTCATATONICTYPE" header="pastCatatonicType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastCatatonicType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE" header="currentDisorganizedType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentDisorganizedType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE" header="pastDisorganizedType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastDisorganizedType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE" header="currentUndifferentiatedType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentUndifferentiatedType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE" header="pastUndifferentiatedType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastUndifferentiatedType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE" header="currentResidualType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentResidualType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE" header="pastResidualType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastResidualType"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER" header="currentSchizophreniformDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentSchizophreniformDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER" header="pastSchizophreniformDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastSchizophreniformDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER" header="currentSchizoaffectiveDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentSchizoaffectiveDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER" header="pastSchizoaffectiveDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastSchizoaffectiveDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER" header="currentDelusionalDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentDelusionalDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER" header="pastDelusionalDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastDelusionalDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER" header="currentBriefPsychoticDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentBriefPsychoticDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER" header="pastBriefPsychoticDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastBriefPsychoticDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO" header="currentPsychoticDisorderDueToMedicalCondition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentPsychoticDisorderDueToMedicalCondition"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION" header="pastPsychoticDisorderDueToMedicalCondition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastPsychoticDisorderDueToMedicalCondition"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER" header="currentSubstanceInducedPsychoticDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentSubstanceInducedPsychoticDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER" header="pastSubstanceInducedPsychoticDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastSubstanceInducedPsychoticDisorder"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS" header="currentPsychoticDisorderNOS" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/currentPsychoticDisorderNOS"/>
- </DisplayField>
- <DisplayField id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS" header="pastPsychoticDisorderNOS" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/psychoticDisorders/pastPsychoticDisorderNOS"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER" header="currentBipolar1Disorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentBipolar1Disorder"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_PASTBIPOLAR1DISORDER" header="pastBipolar1Disorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastBipolar1Disorder"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER" header="currentBipolar2Disorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentBipolar2Disorder"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_PASTBIPOLAR2DISORDER" header="pastBipolar2Disorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastBipolar2Disorder"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER" header="currentOtherBipolarDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentOtherBipolarDisorder"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER" header="pastOtherBipolarDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastOtherBipolarDisorder"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER" header="currentMajorDepressiveDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentMajorDepressiveDisorder"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER" header="pastMajorDepressiveDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastMajorDepressiveDisorder"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS" header="currentDepressiveDisorderNOS" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/currentDepressiveDisorderNOS"/>
- </DisplayField>
- <DisplayField id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS" header="pastDepressiveDisorderNOS" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/moodDisorders/pastDepressiveDisorderNOS"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE" header="currentAlcoholDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentAlcoholDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE" header="pastAlcoholDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastAlcoholDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE" header="currentAlcoholAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentAlcoholAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE" header="pastAlcoholAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastAlcoholAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE" header="currentAmphetamineDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentAmphetamineDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE" header="pastAmphetamineDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastAmphetamineDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE" header="currentAmphetamineAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentAmphetamineAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE" header="pastAmphetamineAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastAmphetamineAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE" header="currentCannabisDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentCannabisDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE" header="pastCannabisDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastCannabisDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE" header="currentCannabisAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentCannabisAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE" header="pastCannabisAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastCannabisAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE" header="currentCocaineDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentCocaineDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE" header="pastCocaineDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastCocaineDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE" header="currentCocaineAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentCocaineAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE" header="pastCocaineAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastCocaineAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE" header="currentHallucinogenDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentHallucinogenDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE" header="pastHallucinogenDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastHallucinogenDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE" header="currentHallucinogenAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentHallucinogenAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE" header="pastHallucinogenAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastHallucinogenAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE" header="currentOpioidDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentOpioidDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE" header="pastOpioidDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastOpioidDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE" header="currentOpioidAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentOpioidAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE" header="pastOpioidAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastOpioidAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE" header="currentPhencyclidineDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentPhencyclidineDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE" header="pastPhencyclidineDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastPhencyclidineDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE" header="currentPhencyclidineAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentPhencyclidineAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE" header="pastPhencyclidineAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastPhencyclidineAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN" header="currentSedativeHypnoticAnxiolyticDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentSedativeHypnoticAnxiolyticDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE" header="pastSedativeHypnoticAnxiolyticDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastSedativeHypnoticAnxiolyticDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE" header="currentSedativeHypnoticAnxiolyticAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentSedativeHypnoticAnxiolyticAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE" header="pastSedativeHypnoticAnxiolyticAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastSedativeHypnoticAnxiolyticAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE" header="currentPolysubstanceDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentPolysubstanceDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE" header="pastPolysubstanceDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastPolysubstanceDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE" header="currentOtherOrUnknownDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentOtherOrUnknownDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE" header="pastOtherOrUnknownDependence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastOtherOrUnknownDependence"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE" header="currentOtherOrUnknownAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/currentOtherOrUnknownAbuse"/>
- </DisplayField>
- <DisplayField id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE" header="pastOtherOrUnknownAbuse" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/substanceUseDisorders/pastOtherOrUnknownAbuse"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA" header="currentPanicWithAgoraphobia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentPanicWithAgoraphobia"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA" header="pastPanicWithAgoraphobia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastPanicWithAgoraphobia"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA" header="currentPanicWithoutAgoraphobia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentPanicWithoutAgoraphobia"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA" header="pastPanicWithoutAgoraphobia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastPanicWithoutAgoraphobia"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX" header="currentAgoraphobiaWithoutPanicHx" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentAgoraphobiaWithoutPanicHx"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX" header="pastAgoraphobiaWithoutPanicHx" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastAgoraphobiaWithoutPanicHx"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA" header="currentSocialPhobia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentSocialPhobia"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTSOCIALPHOBIA" header="pastSocialPhobia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastSocialPhobia"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA" header="currentSpecificPhobia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentSpecificPhobia"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA" header="pastSpecificPhobia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastSpecificPhobia"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTOCD" header="currentOCD" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentOCD"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTOCD" header="pastOCD" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastOCD"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTPTSD" header="currentPTSD" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentPTSD"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTPTSD" header="pastPTSD" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastPTSD"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER" header="currentGeneralizedAnxietyDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentGeneralizedAnxietyDisorder"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION" header="currentAnxietyDueToMedicalCondition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentAnxietyDueToMedicalCondition"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION" header="pastAnxietyDueToMedicalCondition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastAnxietyDueToMedicalCondition"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER" header="currentSubstanceInducedAnxietyDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentSubstanceInducedAnxietyDisorder"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER" header="pastSubstanceInducedAnxietyDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastSubstanceInducedAnxietyDisorder"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS" header="currentAnxietyDisorderNOS" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/currentAnxietyDisorderNOS"/>
- </DisplayField>
- <DisplayField id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS" header="pastAnxietyDisorderNOS" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/anxietyDisorders/pastAnxietyDisorderNOS"/>
- </DisplayField>
- <DisplayField id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER" header="somatizationDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/somatizationDisorder"/>
- </DisplayField>
- <DisplayField id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER" header="undifferentiatedSomatformDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/undifferentiatedSomatformDisorder"/>
- </DisplayField>
- <DisplayField id="SOMATOFORMDISORDERS_PAINDISORDER" header="painDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/painDisorder"/>
- </DisplayField>
- <DisplayField id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS" header="hypochondriasis" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/hypochondriasis"/>
- </DisplayField>
- <DisplayField id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER" header="bodyDysmorphicDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/somatoformDisorders/bodyDysmorphicDisorder"/>
- </DisplayField>
- <DisplayField id="EATINGDISORDERS_CURRENTANOREXIANERVOSA" header="currentAnorexiaNervosa" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/currentAnorexiaNervosa"/>
- </DisplayField>
- <DisplayField id="EATINGDISORDERS_PASTANOREXIANERVOSA" header="pastAnorexiaNervosa" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/pastAnorexiaNervosa"/>
- </DisplayField>
- <DisplayField id="EATINGDISORDERS_CURRENTBULIMIANERVOSA" header="currentBulimiaNervosa" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/currentBulimiaNervosa"/>
- </DisplayField>
- <DisplayField id="EATINGDISORDERS_PASTBULIMIANERVOSA" header="pastBulimiaNervosa" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/pastBulimiaNervosa"/>
- </DisplayField>
- <DisplayField id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER" header="currentBingeEatingDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/currentBingeEatingDisorder"/>
- </DisplayField>
- <DisplayField id="EATINGDISORDERS_PASTBINGEEATINGDISORDER" header="pastBingeEatingDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/eatingDisorders/pastBingeEatingDisorder"/>
- </DisplayField>
- <DisplayField id="ADJUSTMENTDISORDER" header="adjustmentDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/adjustmentDisorder"/>
- </DisplayField>
- <DisplayField id="OPTIONAL_CURRENTACUTESTRESSDISORDER" header="currentAcuteStressDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/currentAcuteStressDisorder"/>
- </DisplayField>
- <DisplayField id="OPTIONAL_PASTACUTESTRESSDISORDER" header="pastAcuteStressDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/pastAcuteStressDisorder"/>
- </DisplayField>
- <DisplayField id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER" header="currentMinorDepressiveDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/currentMinorDepressiveDisorder"/>
- </DisplayField>
- <DisplayField id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER" header="pastMinorDepressiveDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/pastMinorDepressiveDisorder"/>
- </DisplayField>
- <DisplayField id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER" header="currentMixedAnxietyDepressiveDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/currentMixedAnxietyDepressiveDisorder"/>
- </DisplayField>
- <DisplayField id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER" header="pastMixedAnxietyDepressiveDisorder" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/pastMixedAnxietyDepressiveDisorder"/>
- </DisplayField>
- <DisplayField id="OPTIONAL_PASTSYMPOMATICDETAILS" header="pastSympomaticDetails" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:scidResearchData/optional/pastSympomaticDetails"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="ADMINISTRATOR"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="ADJUSTMENTDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="ADMINISTRATOR"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="ADJUSTMENTDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="ADMINISTRATOR"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="ADJUSTMENTDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ADMINISTRATOR"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="ADJUSTMENTDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SCID" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_A_SCIDRESEARCHDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="ADMINISTRATOR"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMAJORDEPRESSIVEEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_PASTHYPOMANICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTDYSTHMICEPISODE"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_PASTMOODDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="MOODEPISODES_CURRENTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="MOODEPISODES_PASTSUBSTANCEINDUCEDMOODDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDELUSIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTHALLUCINATIONS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTDISORGANIZEDSPEECHBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTCATATONICBEHAVIOR"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_CURRENTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICSYMPTOMS_PASTNEGATIVESYMPTOMS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIA"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPARANOIDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTCATATONICTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDISORGANIZEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTUNDIFFERENTIATEDTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTRESIDUALTYPE"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOPHRENIFORMDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSCHIZOAFFECTIVEDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTDELUSIONALDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTBRIEFPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERDUETOMEDICALCONDITIO"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTSUBSTANCEINDUCEDPSYCHOTICDISORDER"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_CURRENTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="PSYCHOTICDISORDERS_PASTPSYCHOTICDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR1DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTBIPOLAR2DISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTOTHERBIPOLARDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTMAJORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="MOODDISORDERS_CURRENTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="MOODDISORDERS_PASTDEPRESSIVEDISORDERNOS"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTALCOHOLABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTAMPHETAMINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCANNABISABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTCOCAINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTHALLUCINOGENABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOPIOIDABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPHENCYCLIDINEABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICDEPENDEN"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTSEDATIVEHYPNOTICANXIOLYTICABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTPOLYSUBSTANCEDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNDEPENDENCE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_CURRENTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="SUBSTANCEUSEDISORDERS_PASTOTHERORUNKNOWNABUSE"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPANICWITHOUTAGORAPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTAGORAPHOBIAWITHOUTPANICHX"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSOCIALPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSPECIFICPHOBIA"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTOCD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTPTSD"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTGENERALIZEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDUETOMEDICALCONDITION"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTSUBSTANCEINDUCEDANXIETYDISORDER"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_CURRENTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="ANXIETYDISORDERS_PASTANXIETYDISORDERNOS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_SOMATIZATIONDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_UNDIFFERENTIATEDSOMATFORMDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_PAINDISORDER"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_HYPOCHONDRIASIS"/>
- <DisplayFieldRef id="SOMATOFORMDISORDERS_BODYDYSMORPHICDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTANOREXIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBULIMIANERVOSA"/>
- <DisplayFieldRef id="EATINGDISORDERS_CURRENTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="EATINGDISORDERS_PASTBINGEEATINGDISORDER"/>
- <DisplayFieldRef id="ADJUSTMENTDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTACUTESTRESSDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMINORDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_CURRENTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTMIXEDANXIETYDEPRESSIVEDISORDER"/>
- <DisplayFieldRef id="OPTIONAL_PASTSYMPOMATICDETAILS"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_A_SCIDRESEARCHDATA_PROJECTS">
- <Mapping TableName="XNAT_A_SCIDRESEARCHDATA_PROJECTS">
- <MappingColumn rootElement="xnat_a:scidResearchData" fieldElement="xnat_a:scidResearchData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_A_SCIDRESEARCHDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:scidResearchData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_sideEffectsPittsburghData_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_sideEffectsPittsburghData_display.xml
deleted file mode 100644
index 58bc5189afe816a40e7b651acf32f8527d439bf2..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_sideEffectsPittsburghData_display.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:sideEffectsPittsburghData" full-description="SideEffectsPittsburgh" brief-description="SideEffectsPittsburgh">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:sideEffectsPittsburghData','xnat_a:sideEffectsPittsburghData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:sideEffectsPittsburghData','xnat_a:sideEffectsPittsburghData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat_a:sideEffectsPittsburghData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:sideEffectsPittsburghData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:sideEffectsPittsburghData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:sideEffectsPittsburghData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:sideEffectsPittsburghData/search_field/xnat_a:sideEffectsPittsburghData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:sideEffectsPittsburghData','xnat_a:sideEffectsPittsburghData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECT_IDENTIFIER" header="XNAT_A_SIDEEFFECTSPITTSBURGHDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_a_sideeffectspittsburghdata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:sideEffectsPittsburghData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:sideEffectsPittsburghData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:sideEffectsPittsburghData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:sideEffectsPittsburghData/search_field/xnat_a:sideEffectsPittsburghData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_sideeffectspittsburghdata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:sideEffectsPittsburghData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:sideEffectsPittsburghData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:sideEffectsPittsburghData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="MOTORTICS" header="motorTics" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/motorTics"/>
- </DisplayField>
- <DisplayField id="BUCCAL_LINGUALMOVEMENTS" header="buccal_lingualMovements" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/buccal_lingualMovements"/>
- </DisplayField>
- <DisplayField id="PICKING_SKIN_FINGERS_NAILS_LIP" header="picking_skin_fingers_nails_lip" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/picking_skin_fingers_nails_lip"/>
- </DisplayField>
- <DisplayField id="WORRIED_ANXIOUS" header="worried_anxious" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/worried_anxious"/>
- </DisplayField>
- <DisplayField id="DULL_TIRED_LISTLESS" header="dull_tired_listless" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/dull_tired_listless"/>
- </DisplayField>
- <DisplayField id="SEDATION" header="sedation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/sedation"/>
- </DisplayField>
- <DisplayField id="STOMACHACHE" header="stomachache" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/stomachache"/>
- </DisplayField>
- <DisplayField id="NAUSEA_VOMITING" header="nausea_vomiting" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/nausea_vomiting"/>
- </DisplayField>
- <DisplayField id="CRABBY_IRRITABLE" header="crabby_irritable" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/crabby_irritable"/>
- </DisplayField>
- <DisplayField id="TEARFUL_SAD_DEPRESSED" header="tearful_sad_depressed" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/tearful_sad_depressed"/>
- </DisplayField>
- <DisplayField id="HALLUCINATIONS" header="hallucinations" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/hallucinations"/>
- </DisplayField>
- <DisplayField id="TROUBLESLEEPING" header="troubleSleeping" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/troubleSleeping"/>
- </DisplayField>
- <DisplayField id="LOSSOFAPPETITE" header="lossOfAppetite" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/lossOfAppetite"/>
- </DisplayField>
- <DisplayField id="TROUBLECONCENTRATING_DISTRACTIBLE" header="troubleConcentrating_distractible" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/troubleConcentrating_distractible"/>
- </DisplayField>
- <DisplayField id="DIZZINESS_LIGHTHEADEDNESS" header="dizziness_lightheadedness" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/dizziness_lightheadedness"/>
- </DisplayField>
- <DisplayField id="HEADACHES" header="headaches" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/headaches"/>
- </DisplayField>
- <DisplayField id="SOCIALWITHDRAWAL" header="socialWithdrawal" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/socialWithdrawal"/>
- </DisplayField>
- <DisplayField id="DRYMOUTH" header="dryMouth" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/dryMouth"/>
- </DisplayField>
- <DisplayField id="PALPITATIONS" header="palpitations" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:sideEffectsPittsburghData/palpitations"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="MOTORTICS"/>
- <DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
- <DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
- <DisplayFieldRef id="WORRIED_ANXIOUS"/>
- <DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
- <DisplayFieldRef id="SEDATION"/>
- <DisplayFieldRef id="STOMACHACHE"/>
- <DisplayFieldRef id="NAUSEA_VOMITING"/>
- <DisplayFieldRef id="CRABBY_IRRITABLE"/>
- <DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
- <DisplayFieldRef id="HALLUCINATIONS"/>
- <DisplayFieldRef id="TROUBLESLEEPING"/>
- <DisplayFieldRef id="LOSSOFAPPETITE"/>
- <DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
- <DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
- <DisplayFieldRef id="HEADACHES"/>
- <DisplayFieldRef id="SOCIALWITHDRAWAL"/>
- <DisplayFieldRef id="DRYMOUTH"/>
- <DisplayFieldRef id="PALPITATIONS"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="MOTORTICS"/>
- <DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
- <DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
- <DisplayFieldRef id="WORRIED_ANXIOUS"/>
- <DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
- <DisplayFieldRef id="SEDATION"/>
- <DisplayFieldRef id="STOMACHACHE"/>
- <DisplayFieldRef id="NAUSEA_VOMITING"/>
- <DisplayFieldRef id="CRABBY_IRRITABLE"/>
- <DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
- <DisplayFieldRef id="HALLUCINATIONS"/>
- <DisplayFieldRef id="TROUBLESLEEPING"/>
- <DisplayFieldRef id="LOSSOFAPPETITE"/>
- <DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
- <DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
- <DisplayFieldRef id="HEADACHES"/>
- <DisplayFieldRef id="SOCIALWITHDRAWAL"/>
- <DisplayFieldRef id="DRYMOUTH"/>
- <DisplayFieldRef id="PALPITATIONS"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="MOTORTICS"/>
- <DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
- <DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
- <DisplayFieldRef id="WORRIED_ANXIOUS"/>
- <DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
- <DisplayFieldRef id="SEDATION"/>
- <DisplayFieldRef id="STOMACHACHE"/>
- <DisplayFieldRef id="NAUSEA_VOMITING"/>
- <DisplayFieldRef id="CRABBY_IRRITABLE"/>
- <DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
- <DisplayFieldRef id="HALLUCINATIONS"/>
- <DisplayFieldRef id="TROUBLESLEEPING"/>
- <DisplayFieldRef id="LOSSOFAPPETITE"/>
- <DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
- <DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
- <DisplayFieldRef id="HEADACHES"/>
- <DisplayFieldRef id="SOCIALWITHDRAWAL"/>
- <DisplayFieldRef id="DRYMOUTH"/>
- <DisplayFieldRef id="PALPITATIONS"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="MOTORTICS"/>
- <DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
- <DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
- <DisplayFieldRef id="WORRIED_ANXIOUS"/>
- <DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
- <DisplayFieldRef id="SEDATION"/>
- <DisplayFieldRef id="STOMACHACHE"/>
- <DisplayFieldRef id="NAUSEA_VOMITING"/>
- <DisplayFieldRef id="CRABBY_IRRITABLE"/>
- <DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
- <DisplayFieldRef id="HALLUCINATIONS"/>
- <DisplayFieldRef id="TROUBLESLEEPING"/>
- <DisplayFieldRef id="LOSSOFAPPETITE"/>
- <DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
- <DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
- <DisplayFieldRef id="HEADACHES"/>
- <DisplayFieldRef id="SOCIALWITHDRAWAL"/>
- <DisplayFieldRef id="DRYMOUTH"/>
- <DisplayFieldRef id="PALPITATIONS"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SideEffectsPittsburgh" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="MOTORTICS"/>
- <DisplayFieldRef id="BUCCAL_LINGUALMOVEMENTS"/>
- <DisplayFieldRef id="PICKING_SKIN_FINGERS_NAILS_LIP"/>
- <DisplayFieldRef id="WORRIED_ANXIOUS"/>
- <DisplayFieldRef id="DULL_TIRED_LISTLESS"/>
- <DisplayFieldRef id="SEDATION"/>
- <DisplayFieldRef id="STOMACHACHE"/>
- <DisplayFieldRef id="NAUSEA_VOMITING"/>
- <DisplayFieldRef id="CRABBY_IRRITABLE"/>
- <DisplayFieldRef id="TEARFUL_SAD_DEPRESSED"/>
- <DisplayFieldRef id="HALLUCINATIONS"/>
- <DisplayFieldRef id="TROUBLESLEEPING"/>
- <DisplayFieldRef id="LOSSOFAPPETITE"/>
- <DisplayFieldRef id="TROUBLECONCENTRATING_DISTRACTIBLE"/>
- <DisplayFieldRef id="DIZZINESS_LIGHTHEADEDNESS"/>
- <DisplayFieldRef id="HEADACHES"/>
- <DisplayFieldRef id="SOCIALWITHDRAWAL"/>
- <DisplayFieldRef id="DRYMOUTH"/>
- <DisplayFieldRef id="PALPITATIONS"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECTS">
- <Mapping TableName="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECTS">
- <MappingColumn rootElement="xnat_a:sideEffectsPittsburghData" fieldElement="xnat_a:sideEffectsPittsburghData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_A_SIDEEFFECTSPITTSBURGHDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:sideEffectsPittsburghData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_updrs3Data_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_updrs3Data_display.xml
deleted file mode 100644
index 0a53eb901c80d7b87147483c8f2e5fd2c7480775..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_updrs3Data_display.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:updrs3Data" full-description="UPDRS3" brief-description="UPDRS3">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:updrs3Data','xnat_a:updrs3Data.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:updrs3Data','xnat_a:updrs3Data.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_A_UPDRS3DATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat_a:updrs3Data.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:updrs3Data">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:updrs3Data/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:updrs3Data/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:updrs3Data/search_field/xnat_a:updrs3Data.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:updrs3Data','xnat_a:updrs3Data.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.project"/>
- </DisplayField>
- <DisplayField id="XNAT_A_UPDRS3DATA_PROJECT_IDENTIFIER" header="XNAT_A_UPDRS3DATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_a_updrs3data_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:updrs3Data">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:updrs3Data/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:updrs3Data/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:updrs3Data/search_field/xnat_a:updrs3Data.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_updrs3data_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:updrs3Data.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_A_UPDRS3DATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:updrs3Data') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:updrs3Data.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSCANNER" header="inScanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/inScanner"/>
- </DisplayField>
- <DisplayField id="CLICKER_RIGHT" header="right" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/clicker/right"/>
- </DisplayField>
- <DisplayField id="CLICKER_LEFT" header="left" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/clicker/left"/>
- </DisplayField>
- <DisplayField id="CLICKER_INTERVAL" header="interval" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/clicker/interval"/>
- </DisplayField>
- <DisplayField id="TREMORREST_FACE" header="face" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/face"/>
- </DisplayField>
- <DisplayField id="TREMORREST_RUE" header="rue" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/rue"/>
- </DisplayField>
- <DisplayField id="TREMORREST_LUE" header="lue" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/lue"/>
- </DisplayField>
- <DisplayField id="TREMORREST_RLE" header="rle" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/rle"/>
- </DisplayField>
- <DisplayField id="TREMORREST_LLE" header="lle" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/tremorRest/lle"/>
- </DisplayField>
- <DisplayField id="RIGIDITY_NECK" header="neck" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/neck"/>
- </DisplayField>
- <DisplayField id="RIGIDITY_RUE" header="rue" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/rue"/>
- </DisplayField>
- <DisplayField id="RIGIDITY_LUE" header="lue" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/lue"/>
- </DisplayField>
- <DisplayField id="RIGIDITY_RLE" header="rle" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/rle"/>
- </DisplayField>
- <DisplayField id="RIGIDITY_LLE" header="lle" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/rigidity/lle"/>
- </DisplayField>
- <DisplayField id="HANDMOVEMENTSGRIP_RIGHT" header="right" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/handMovementsGrip/right"/>
- </DisplayField>
- <DisplayField id="HANDMOVEMENTSGRIP_LEFT" header="left" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/handMovementsGrip/left"/>
- </DisplayField>
- <DisplayField id="FACIALEXPRESSION" header="facialExpression" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/facialExpression"/>
- </DisplayField>
- <DisplayField id="GAIT" header="gait" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/gait"/>
- </DisplayField>
- <DisplayField id="SPEECH" header="speech" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/speech"/>
- </DisplayField>
- <DisplayField id="WRITING" header="writing" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/writing"/>
- </DisplayField>
- <DisplayField id="ARISEFROMCHAIR" header="ariseFromChair" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/ariseFromChair"/>
- </DisplayField>
- <DisplayField id="ACTIONPOSTURALTREMOR_RIGHT" header="right" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/actionPosturalTremor/right"/>
- </DisplayField>
- <DisplayField id="ACTIONPOSTURALTREMOR_LEFT" header="left" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/actionPosturalTremor/left"/>
- </DisplayField>
- <DisplayField id="HANDSRAM_RIGHT" header="right" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/handsRAM/right"/>
- </DisplayField>
- <DisplayField id="HANDSRAM_LEFT" header="left" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/handsRAM/left"/>
- </DisplayField>
- <DisplayField id="FINGERTAPS_RIGHT" header="right" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/fingerTaps/right"/>
- </DisplayField>
- <DisplayField id="FINGERTAPS_LEFT" header="left" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/fingerTaps/left"/>
- </DisplayField>
- <DisplayField id="POSTURE" header="posture" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/posture"/>
- </DisplayField>
- <DisplayField id="POSTURALSTABILITY" header="posturalStability" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/posturalStability"/>
- </DisplayField>
- <DisplayField id="FOOTTAPS_RIGHT" header="right" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/footTaps/right"/>
- </DisplayField>
- <DisplayField id="FOOTTAPS_LEFT" header="left" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/footTaps/left"/>
- </DisplayField>
- <DisplayField id="BODYBRADYKINESIAHYPOKINESIA" header="bodyBradykinesiaHypokinesia" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/bodyBradykinesiaHypokinesia"/>
- </DisplayField>
- <DisplayField id="PROBLEM" header="problem" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:updrs3Data/problem"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="INSCANNER"/>
- <DisplayFieldRef id="CLICKER_RIGHT"/>
- <DisplayFieldRef id="CLICKER_LEFT"/>
- <DisplayFieldRef id="CLICKER_INTERVAL"/>
- <DisplayFieldRef id="TREMORREST_FACE"/>
- <DisplayFieldRef id="TREMORREST_RUE"/>
- <DisplayFieldRef id="TREMORREST_LUE"/>
- <DisplayFieldRef id="TREMORREST_RLE"/>
- <DisplayFieldRef id="TREMORREST_LLE"/>
- <DisplayFieldRef id="RIGIDITY_NECK"/>
- <DisplayFieldRef id="RIGIDITY_RUE"/>
- <DisplayFieldRef id="RIGIDITY_LUE"/>
- <DisplayFieldRef id="RIGIDITY_RLE"/>
- <DisplayFieldRef id="RIGIDITY_LLE"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
- <DisplayFieldRef id="FACIALEXPRESSION"/>
- <DisplayFieldRef id="GAIT"/>
- <DisplayFieldRef id="SPEECH"/>
- <DisplayFieldRef id="WRITING"/>
- <DisplayFieldRef id="ARISEFROMCHAIR"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
- <DisplayFieldRef id="HANDSRAM_RIGHT"/>
- <DisplayFieldRef id="HANDSRAM_LEFT"/>
- <DisplayFieldRef id="FINGERTAPS_RIGHT"/>
- <DisplayFieldRef id="FINGERTAPS_LEFT"/>
- <DisplayFieldRef id="POSTURE"/>
- <DisplayFieldRef id="POSTURALSTABILITY"/>
- <DisplayFieldRef id="FOOTTAPS_RIGHT"/>
- <DisplayFieldRef id="FOOTTAPS_LEFT"/>
- <DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
- <DisplayFieldRef id="PROBLEM"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="INSCANNER"/>
- <DisplayFieldRef id="CLICKER_RIGHT"/>
- <DisplayFieldRef id="CLICKER_LEFT"/>
- <DisplayFieldRef id="CLICKER_INTERVAL"/>
- <DisplayFieldRef id="TREMORREST_FACE"/>
- <DisplayFieldRef id="TREMORREST_RUE"/>
- <DisplayFieldRef id="TREMORREST_LUE"/>
- <DisplayFieldRef id="TREMORREST_RLE"/>
- <DisplayFieldRef id="TREMORREST_LLE"/>
- <DisplayFieldRef id="RIGIDITY_NECK"/>
- <DisplayFieldRef id="RIGIDITY_RUE"/>
- <DisplayFieldRef id="RIGIDITY_LUE"/>
- <DisplayFieldRef id="RIGIDITY_RLE"/>
- <DisplayFieldRef id="RIGIDITY_LLE"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
- <DisplayFieldRef id="FACIALEXPRESSION"/>
- <DisplayFieldRef id="GAIT"/>
- <DisplayFieldRef id="SPEECH"/>
- <DisplayFieldRef id="WRITING"/>
- <DisplayFieldRef id="ARISEFROMCHAIR"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
- <DisplayFieldRef id="HANDSRAM_RIGHT"/>
- <DisplayFieldRef id="HANDSRAM_LEFT"/>
- <DisplayFieldRef id="FINGERTAPS_RIGHT"/>
- <DisplayFieldRef id="FINGERTAPS_LEFT"/>
- <DisplayFieldRef id="POSTURE"/>
- <DisplayFieldRef id="POSTURALSTABILITY"/>
- <DisplayFieldRef id="FOOTTAPS_RIGHT"/>
- <DisplayFieldRef id="FOOTTAPS_LEFT"/>
- <DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
- <DisplayFieldRef id="PROBLEM"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="INSCANNER"/>
- <DisplayFieldRef id="CLICKER_RIGHT"/>
- <DisplayFieldRef id="CLICKER_LEFT"/>
- <DisplayFieldRef id="CLICKER_INTERVAL"/>
- <DisplayFieldRef id="TREMORREST_FACE"/>
- <DisplayFieldRef id="TREMORREST_RUE"/>
- <DisplayFieldRef id="TREMORREST_LUE"/>
- <DisplayFieldRef id="TREMORREST_RLE"/>
- <DisplayFieldRef id="TREMORREST_LLE"/>
- <DisplayFieldRef id="RIGIDITY_NECK"/>
- <DisplayFieldRef id="RIGIDITY_RUE"/>
- <DisplayFieldRef id="RIGIDITY_LUE"/>
- <DisplayFieldRef id="RIGIDITY_RLE"/>
- <DisplayFieldRef id="RIGIDITY_LLE"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
- <DisplayFieldRef id="FACIALEXPRESSION"/>
- <DisplayFieldRef id="GAIT"/>
- <DisplayFieldRef id="SPEECH"/>
- <DisplayFieldRef id="WRITING"/>
- <DisplayFieldRef id="ARISEFROMCHAIR"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
- <DisplayFieldRef id="HANDSRAM_RIGHT"/>
- <DisplayFieldRef id="HANDSRAM_LEFT"/>
- <DisplayFieldRef id="FINGERTAPS_RIGHT"/>
- <DisplayFieldRef id="FINGERTAPS_LEFT"/>
- <DisplayFieldRef id="POSTURE"/>
- <DisplayFieldRef id="POSTURALSTABILITY"/>
- <DisplayFieldRef id="FOOTTAPS_RIGHT"/>
- <DisplayFieldRef id="FOOTTAPS_LEFT"/>
- <DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
- <DisplayFieldRef id="PROBLEM"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="INSCANNER"/>
- <DisplayFieldRef id="CLICKER_RIGHT"/>
- <DisplayFieldRef id="CLICKER_LEFT"/>
- <DisplayFieldRef id="CLICKER_INTERVAL"/>
- <DisplayFieldRef id="TREMORREST_FACE"/>
- <DisplayFieldRef id="TREMORREST_RUE"/>
- <DisplayFieldRef id="TREMORREST_LUE"/>
- <DisplayFieldRef id="TREMORREST_RLE"/>
- <DisplayFieldRef id="TREMORREST_LLE"/>
- <DisplayFieldRef id="RIGIDITY_NECK"/>
- <DisplayFieldRef id="RIGIDITY_RUE"/>
- <DisplayFieldRef id="RIGIDITY_LUE"/>
- <DisplayFieldRef id="RIGIDITY_RLE"/>
- <DisplayFieldRef id="RIGIDITY_LLE"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
- <DisplayFieldRef id="FACIALEXPRESSION"/>
- <DisplayFieldRef id="GAIT"/>
- <DisplayFieldRef id="SPEECH"/>
- <DisplayFieldRef id="WRITING"/>
- <DisplayFieldRef id="ARISEFROMCHAIR"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
- <DisplayFieldRef id="HANDSRAM_RIGHT"/>
- <DisplayFieldRef id="HANDSRAM_LEFT"/>
- <DisplayFieldRef id="FINGERTAPS_RIGHT"/>
- <DisplayFieldRef id="FINGERTAPS_LEFT"/>
- <DisplayFieldRef id="POSTURE"/>
- <DisplayFieldRef id="POSTURALSTABILITY"/>
- <DisplayFieldRef id="FOOTTAPS_RIGHT"/>
- <DisplayFieldRef id="FOOTTAPS_LEFT"/>
- <DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
- <DisplayFieldRef id="PROBLEM"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="UPDRS3" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_A_UPDRS3DATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="INSCANNER"/>
- <DisplayFieldRef id="CLICKER_RIGHT"/>
- <DisplayFieldRef id="CLICKER_LEFT"/>
- <DisplayFieldRef id="CLICKER_INTERVAL"/>
- <DisplayFieldRef id="TREMORREST_FACE"/>
- <DisplayFieldRef id="TREMORREST_RUE"/>
- <DisplayFieldRef id="TREMORREST_LUE"/>
- <DisplayFieldRef id="TREMORREST_RLE"/>
- <DisplayFieldRef id="TREMORREST_LLE"/>
- <DisplayFieldRef id="RIGIDITY_NECK"/>
- <DisplayFieldRef id="RIGIDITY_RUE"/>
- <DisplayFieldRef id="RIGIDITY_LUE"/>
- <DisplayFieldRef id="RIGIDITY_RLE"/>
- <DisplayFieldRef id="RIGIDITY_LLE"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_RIGHT"/>
- <DisplayFieldRef id="HANDMOVEMENTSGRIP_LEFT"/>
- <DisplayFieldRef id="FACIALEXPRESSION"/>
- <DisplayFieldRef id="GAIT"/>
- <DisplayFieldRef id="SPEECH"/>
- <DisplayFieldRef id="WRITING"/>
- <DisplayFieldRef id="ARISEFROMCHAIR"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_RIGHT"/>
- <DisplayFieldRef id="ACTIONPOSTURALTREMOR_LEFT"/>
- <DisplayFieldRef id="HANDSRAM_RIGHT"/>
- <DisplayFieldRef id="HANDSRAM_LEFT"/>
- <DisplayFieldRef id="FINGERTAPS_RIGHT"/>
- <DisplayFieldRef id="FINGERTAPS_LEFT"/>
- <DisplayFieldRef id="POSTURE"/>
- <DisplayFieldRef id="POSTURALSTABILITY"/>
- <DisplayFieldRef id="FOOTTAPS_RIGHT"/>
- <DisplayFieldRef id="FOOTTAPS_LEFT"/>
- <DisplayFieldRef id="BODYBRADYKINESIAHYPOKINESIA"/>
- <DisplayFieldRef id="PROBLEM"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_A_UPDRS3DATA_PROJECTS">
- <Mapping TableName="XNAT_A_UPDRS3DATA_PROJECTS">
- <MappingColumn rootElement="xnat_a:updrs3Data" fieldElement="xnat_a:updrs3Data.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_A_UPDRS3DATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:updrs3Data' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_ybocsData_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_ybocsData_display.xml
deleted file mode 100644
index e7747ab79bb60ba35d419f16ad7c8a7cdc7378c9..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_ybocsData_display.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:ybocsData" full-description="YBOCS" brief-description="YBOCS">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ybocsData','xnat_a:ybocsData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ybocsData','xnat_a:ybocsData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_A_YBOCSDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat_a:ybocsData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:ybocsData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:ybocsData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:ybocsData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:ybocsData/search_field/xnat_a:ybocsData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ybocsData','xnat_a:ybocsData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_A_YBOCSDATA_PROJECT_IDENTIFIER" header="XNAT_A_YBOCSDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_a_ybocsdata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:ybocsData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:ybocsData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:ybocsData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:ybocsData/search_field/xnat_a:ybocsData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_ybocsdata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:ybocsData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_A_YBOCSDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:ybocsData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:ybocsData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="CURRENTORWORSTEVER" header="currentOrWorstEver" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/currentOrWorstEver"/>
- </DisplayField>
- <DisplayField id="TIMEOCCUPIEDWITHTHOUGHTS" header="timeOccupiedWithThoughts" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/timeOccupiedWithThoughts"/>
- </DisplayField>
- <DisplayField id="THOUGHTSINTERFEREFUNCTIONING" header="thoughtsInterfereFunctioning" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/thoughtsInterfereFunctioning"/>
- </DisplayField>
- <DisplayField id="DISTRESSCAUSED" header="distressCaused" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/distressCaused"/>
- </DisplayField>
- <DisplayField id="EFFORTTORESISTTHOUGHTS" header="effortToResistThoughts" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/effortToResistThoughts"/>
- </DisplayField>
- <DisplayField id="CONTROLOVERTHOUGHTS" header="controlOverThoughts" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/controlOverThoughts"/>
- </DisplayField>
- <DisplayField id="TIMEPERFORMING" header="timePerforming" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/timePerforming"/>
- </DisplayField>
- <DisplayField id="BEHAVIORSINTERFEREFUNCTIONING" header="behaviorsInterfereFunctioning" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/behaviorsInterfereFunctioning"/>
- </DisplayField>
- <DisplayField id="FEELINGIFPREVENTED" header="feelingIfPrevented" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/feelingIfPrevented"/>
- </DisplayField>
- <DisplayField id="EFFORTTORESISTBEHAVIORS" header="effortToResistBehaviors" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/effortToResistBehaviors"/>
- </DisplayField>
- <DisplayField id="BEHAVIORDRIVESTRENGTH" header="behaviorDriveStrength" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/behaviorDriveStrength"/>
- </DisplayField>
- <DisplayField id="UNTILJUSTRIGHT" header="untilJustRight" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/untilJustRight"/>
- </DisplayField>
- <DisplayField id="UNTILJUSTRIGHTAWARENESS" header="untilJustRightAwareness" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/untilJustRightAwareness"/>
- </DisplayField>
- <DisplayField id="UNTILJUSTRIGHTPERCEPTIONS" header="untilJustRightPerceptions" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/untilJustRightPerceptions"/>
- </DisplayField>
- <DisplayField id="WHENSTARTUNTILJUSTRIGHT" header="whenStartUntilJustRight" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/whenStartUntilJustRight"/>
- </DisplayField>
- <DisplayField id="FREQUENCYUNTILJUSTRIGHT" header="frequencyUntilJustRight" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/frequencyUntilJustRight"/>
- </DisplayField>
- <DisplayField id="FIRSTUNTILJUSTRIGHTAGE" header="firstUntilJustRightAge" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ybocsData/firstUntilJustRightAge"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="CURRENTORWORSTEVER"/>
- <DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
- <DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="DISTRESSCAUSED"/>
- <DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
- <DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
- <DisplayFieldRef id="TIMEPERFORMING"/>
- <DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="FEELINGIFPREVENTED"/>
- <DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
- <DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
- <DisplayFieldRef id="UNTILJUSTRIGHT"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
- <DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="CURRENTORWORSTEVER"/>
- <DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
- <DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="DISTRESSCAUSED"/>
- <DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
- <DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
- <DisplayFieldRef id="TIMEPERFORMING"/>
- <DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="FEELINGIFPREVENTED"/>
- <DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
- <DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
- <DisplayFieldRef id="UNTILJUSTRIGHT"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
- <DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="CURRENTORWORSTEVER"/>
- <DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
- <DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="DISTRESSCAUSED"/>
- <DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
- <DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
- <DisplayFieldRef id="TIMEPERFORMING"/>
- <DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="FEELINGIFPREVENTED"/>
- <DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
- <DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
- <DisplayFieldRef id="UNTILJUSTRIGHT"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
- <DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="CURRENTORWORSTEVER"/>
- <DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
- <DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="DISTRESSCAUSED"/>
- <DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
- <DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
- <DisplayFieldRef id="TIMEPERFORMING"/>
- <DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="FEELINGIFPREVENTED"/>
- <DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
- <DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
- <DisplayFieldRef id="UNTILJUSTRIGHT"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
- <DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="YBOCS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_A_YBOCSDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="CURRENTORWORSTEVER"/>
- <DisplayFieldRef id="TIMEOCCUPIEDWITHTHOUGHTS"/>
- <DisplayFieldRef id="THOUGHTSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="DISTRESSCAUSED"/>
- <DisplayFieldRef id="EFFORTTORESISTTHOUGHTS"/>
- <DisplayFieldRef id="CONTROLOVERTHOUGHTS"/>
- <DisplayFieldRef id="TIMEPERFORMING"/>
- <DisplayFieldRef id="BEHAVIORSINTERFEREFUNCTIONING"/>
- <DisplayFieldRef id="FEELINGIFPREVENTED"/>
- <DisplayFieldRef id="EFFORTTORESISTBEHAVIORS"/>
- <DisplayFieldRef id="BEHAVIORDRIVESTRENGTH"/>
- <DisplayFieldRef id="UNTILJUSTRIGHT"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTAWARENESS"/>
- <DisplayFieldRef id="UNTILJUSTRIGHTPERCEPTIONS"/>
- <DisplayFieldRef id="WHENSTARTUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FREQUENCYUNTILJUSTRIGHT"/>
- <DisplayFieldRef id="FIRSTUNTILJUSTRIGHTAGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_A_YBOCSDATA_PROJECTS">
- <Mapping TableName="XNAT_A_YBOCSDATA_PROJECTS">
- <MappingColumn rootElement="xnat_a:ybocsData" fieldElement="xnat_a:ybocsData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_A_YBOCSDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:ybocsData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/assessments/display/xnat_a_ygtssData_display.xml b/src/main/webapp/schemas/assessments/display/xnat_a_ygtssData_display.xml
deleted file mode 100644
index b842197a9a31fdc1fe8f3bfb13c07e6169b5ed91..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/assessments/display/xnat_a_ygtssData_display.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat_a:ygtssData" full-description="YGTSS" brief-description="YGTSS">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ygtssData','xnat_a:ygtssData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ygtssData','xnat_a:ygtssData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_A_YGTSSDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat_a:ygtssData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:ygtssData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:ygtssData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:ygtssData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:ygtssData/search_field/xnat_a:ygtssData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat_a:ygtssData','xnat_a:ygtssData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_A_YGTSSDATA_PROJECT_IDENTIFIER" header="XNAT_A_YGTSSDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_a_ygtssdata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat_a:ygtssData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat_a:ygtssData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat_a:ygtssData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat_a:ygtssData/search_field/xnat_a:ygtssData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_a_ygtssdata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:ygtssData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_A_YGTSSDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat_a:ygtssData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat_a:ygtssData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="FILLEDOUTBY" header="filledOutBy" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/filledOutBy"/>
- </DisplayField>
- <DisplayField id="PERIOD" header="period" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/period"/>
- </DisplayField>
- <DisplayField id="WORSTEVERAGE" header="worstEverAge" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/worstEverAge"/>
- </DisplayField>
- <DisplayField id="MOTOR_NUMBER" header="number" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/number"/>
- </DisplayField>
- <DisplayField id="MOTOR_FREQUENCY" header="frequency" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/frequency"/>
- </DisplayField>
- <DisplayField id="MOTOR_INTENSITY" header="intensity" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/intensity"/>
- </DisplayField>
- <DisplayField id="MOTOR_COMPLEXITY" header="complexity" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/complexity"/>
- </DisplayField>
- <DisplayField id="MOTOR_INTERFERENCE" header="interference" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/interference"/>
- </DisplayField>
- <DisplayField id="MOTOR_INVENTORY" header="inventory" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/motor/inventory"/>
- </DisplayField>
- <DisplayField id="PHONIC_NUMBER" header="number" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/number"/>
- </DisplayField>
- <DisplayField id="PHONIC_FREQUENCY" header="frequency" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/frequency"/>
- </DisplayField>
- <DisplayField id="PHONIC_INTENSITY" header="intensity" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/intensity"/>
- </DisplayField>
- <DisplayField id="PHONIC_COMPLEXITY" header="complexity" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/complexity"/>
- </DisplayField>
- <DisplayField id="PHONIC_INTERFERENCE" header="interference" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/interference"/>
- </DisplayField>
- <DisplayField id="PHONIC_INVENTORY" header="inventory" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/phonic/inventory"/>
- </DisplayField>
- <DisplayField id="IMPAIRMENT" header="impairment" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat_a:ygtssData/impairment"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="FILLEDOUTBY"/>
- <DisplayFieldRef id="PERIOD"/>
- <DisplayFieldRef id="WORSTEVERAGE"/>
- <DisplayFieldRef id="MOTOR_NUMBER"/>
- <DisplayFieldRef id="MOTOR_FREQUENCY"/>
- <DisplayFieldRef id="MOTOR_INTENSITY"/>
- <DisplayFieldRef id="MOTOR_COMPLEXITY"/>
- <DisplayFieldRef id="MOTOR_INTERFERENCE"/>
- <DisplayFieldRef id="MOTOR_INVENTORY"/>
- <DisplayFieldRef id="PHONIC_NUMBER"/>
- <DisplayFieldRef id="PHONIC_FREQUENCY"/>
- <DisplayFieldRef id="PHONIC_INTENSITY"/>
- <DisplayFieldRef id="PHONIC_COMPLEXITY"/>
- <DisplayFieldRef id="PHONIC_INTERFERENCE"/>
- <DisplayFieldRef id="PHONIC_INVENTORY"/>
- <DisplayFieldRef id="IMPAIRMENT"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="FILLEDOUTBY"/>
- <DisplayFieldRef id="PERIOD"/>
- <DisplayFieldRef id="WORSTEVERAGE"/>
- <DisplayFieldRef id="MOTOR_NUMBER"/>
- <DisplayFieldRef id="MOTOR_FREQUENCY"/>
- <DisplayFieldRef id="MOTOR_INTENSITY"/>
- <DisplayFieldRef id="MOTOR_COMPLEXITY"/>
- <DisplayFieldRef id="MOTOR_INTERFERENCE"/>
- <DisplayFieldRef id="MOTOR_INVENTORY"/>
- <DisplayFieldRef id="PHONIC_NUMBER"/>
- <DisplayFieldRef id="PHONIC_FREQUENCY"/>
- <DisplayFieldRef id="PHONIC_INTENSITY"/>
- <DisplayFieldRef id="PHONIC_COMPLEXITY"/>
- <DisplayFieldRef id="PHONIC_INTERFERENCE"/>
- <DisplayFieldRef id="PHONIC_INVENTORY"/>
- <DisplayFieldRef id="IMPAIRMENT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="FILLEDOUTBY"/>
- <DisplayFieldRef id="PERIOD"/>
- <DisplayFieldRef id="WORSTEVERAGE"/>
- <DisplayFieldRef id="MOTOR_NUMBER"/>
- <DisplayFieldRef id="MOTOR_FREQUENCY"/>
- <DisplayFieldRef id="MOTOR_INTENSITY"/>
- <DisplayFieldRef id="MOTOR_COMPLEXITY"/>
- <DisplayFieldRef id="MOTOR_INTERFERENCE"/>
- <DisplayFieldRef id="MOTOR_INVENTORY"/>
- <DisplayFieldRef id="PHONIC_NUMBER"/>
- <DisplayFieldRef id="PHONIC_FREQUENCY"/>
- <DisplayFieldRef id="PHONIC_INTENSITY"/>
- <DisplayFieldRef id="PHONIC_COMPLEXITY"/>
- <DisplayFieldRef id="PHONIC_INTERFERENCE"/>
- <DisplayFieldRef id="PHONIC_INVENTORY"/>
- <DisplayFieldRef id="IMPAIRMENT"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="FILLEDOUTBY"/>
- <DisplayFieldRef id="PERIOD"/>
- <DisplayFieldRef id="WORSTEVERAGE"/>
- <DisplayFieldRef id="MOTOR_NUMBER"/>
- <DisplayFieldRef id="MOTOR_FREQUENCY"/>
- <DisplayFieldRef id="MOTOR_INTENSITY"/>
- <DisplayFieldRef id="MOTOR_COMPLEXITY"/>
- <DisplayFieldRef id="MOTOR_INTERFERENCE"/>
- <DisplayFieldRef id="MOTOR_INVENTORY"/>
- <DisplayFieldRef id="PHONIC_NUMBER"/>
- <DisplayFieldRef id="PHONIC_FREQUENCY"/>
- <DisplayFieldRef id="PHONIC_INTENSITY"/>
- <DisplayFieldRef id="PHONIC_COMPLEXITY"/>
- <DisplayFieldRef id="PHONIC_INTERFERENCE"/>
- <DisplayFieldRef id="PHONIC_INVENTORY"/>
- <DisplayFieldRef id="IMPAIRMENT"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="YGTSS" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_A_YGTSSDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="FILLEDOUTBY"/>
- <DisplayFieldRef id="PERIOD"/>
- <DisplayFieldRef id="WORSTEVERAGE"/>
- <DisplayFieldRef id="MOTOR_NUMBER"/>
- <DisplayFieldRef id="MOTOR_FREQUENCY"/>
- <DisplayFieldRef id="MOTOR_INTENSITY"/>
- <DisplayFieldRef id="MOTOR_COMPLEXITY"/>
- <DisplayFieldRef id="MOTOR_INTERFERENCE"/>
- <DisplayFieldRef id="MOTOR_INVENTORY"/>
- <DisplayFieldRef id="PHONIC_NUMBER"/>
- <DisplayFieldRef id="PHONIC_FREQUENCY"/>
- <DisplayFieldRef id="PHONIC_INTENSITY"/>
- <DisplayFieldRef id="PHONIC_COMPLEXITY"/>
- <DisplayFieldRef id="PHONIC_INTERFERENCE"/>
- <DisplayFieldRef id="PHONIC_INVENTORY"/>
- <DisplayFieldRef id="IMPAIRMENT"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_A_YGTSSDATA_PROJECTS">
- <Mapping TableName="XNAT_A_YGTSSDATA_PROJECTS">
- <MappingColumn rootElement="xnat_a:ygtssData" fieldElement="xnat_a:ygtssData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_A_YGTSSDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat_a:ygtssData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/birn/birnprov.xsd b/src/main/webapp/schemas/birn/birnprov.xsd
deleted file mode 100644
index a5c82198e11d96780f350b6749c6f6dc46f728aa..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/birn/birnprov.xsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by Dan Marcus (Washington University) -->
-<xs:schema targetNamespace="http://www.nbirn.net/prov" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:prov="http://www.nbirn.net/prov" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="process" type="prov:process"/>
- <xs:complexType name="process">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="processStep" type="prov:processStep" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="processStep">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="program">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true" size="5000"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="version" type="xs:string"/>
- <xs:attribute name="arguments" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field size="5000"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="timestamp" type="xs:dateTime">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="cvs" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:minLength value="0"></xs:minLength>
- <xs:maxLength value="5000"></xs:maxLength>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="user" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="user_name"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="machine" type="xs:string"/>
- <xs:element name="platform">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="version" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="compiler" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="version" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="library" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="version" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/catalog/catalog.xsd b/src/main/webapp/schemas/catalog/catalog.xsd
deleted file mode 100644
index f8ac8cb9ef80caded036c682c7fb2b87308180c9..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/catalog/catalog.xsd
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/catalog" xmlns:cat="http://nrg.wustl.edu/catalog" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="Catalog" type="cat:catalog"/>
- <xs:element name="Entry" type="cat:entry"/>
- <xs:element name="DCMCatalog" type="cat:dcmCatalog"/>
- <xs:complexType name="catalog">
- <xs:sequence minOccurs="0">
- <xs:element name="metaFields" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="metaField" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="tags" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="tag" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="sets" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="entrySet" type="cat:catalog" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="entries" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="entry" type="cat:entry" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string" use="optional"/>
- <xs:attribute name="name" type="xs:string" use="optional"/>
- <xs:attribute name="description" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="entry">
- <xs:sequence minOccurs="0">
- <xs:element name="metaFields" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="metaField" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="tags" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="tag" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="URI" type="xs:anyURI" use="required"/>
- <xs:attribute name="ID" type="xs:string" use="optional"/>
- <xs:attribute name="name" type="xs:string" use="optional"/>
- <xs:attribute name="description" type="xs:string" use="optional"/>
- <xs:attribute name="format" type="xs:string" use="optional"/>
- <xs:attribute name="content" type="xs:string" use="optional"/>
- <xs:attribute name="cachePath" type="xs:string" use="optional"/>
- <xs:attribute name="createdTime" type="xs:dateTime" use="optional"/>
- <xs:attribute name="createdBy" type="xs:string" use="optional"/>
- <xs:attribute name="createdEventId" type="xs:integer" use="optional"/>
- <!-- BEGIN for use in audit trail -->
- <xs:attribute name="modifiedTime" type="xs:dateTime" use="optional"/>
- <xs:attribute name="modifiedBy" type="xs:string" use="optional"/>
- <xs:attribute name="modifiedEventId" type="xs:integer" use="optional"/>
- <!-- END for use in audit trail -->
- <xs:attribute name="digest" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="dcmEntry">
- <xs:complexContent>
- <xs:extension base="cat:entry">
- <xs:attribute name="UID" type="xs:string" use="optional"/>
- <xs:attribute name="instanceNumber" type="xs:integer" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="dcmCatalog">
- <xs:complexContent>
- <xs:extension base="cat:catalog">
- <xs:sequence minOccurs="0">
- <xs:element name="dimensions" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer"/>
- <xs:attribute name="y" type="xs:integer"/>
- <xs:attribute name="z" type="xs:integer"/>
- <xs:attribute name="volumes" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="voxelRes" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:float"/>
- <xs:attribute name="y" type="xs:float"/>
- <xs:attribute name="z" type="xs:float"/>
- <xs:attribute name="units" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="orientation" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="UID" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/catalog/display/cat_catalog_display.xml b/src/main/webapp/schemas/catalog/display/cat_catalog_display.xml
deleted file mode 100644
index 6f12e65af25e209d216c252457a7c3931fcf9fb2..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/catalog/display/cat_catalog_display.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="cat:catalog" full-description="Catalog" brief-description="Catalog">
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="cat:catalog.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="cat:catalog.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:catalog/ID"/>
- </DisplayField>
- <DisplayField id="NAME" header="name" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:catalog/name"/>
- </DisplayField>
- <DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:catalog/description"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="ID" default-sort-order="DESC" brief-description="Catalog" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="ID" default-sort-order="DESC" brief-description="Catalog" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/catalog/display/cat_dcmCatalog_display.xml b/src/main/webapp/schemas/catalog/display/cat_dcmCatalog_display.xml
deleted file mode 100644
index 9cee13c69956f48a9385ff99458095026a123614..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/catalog/display/cat_dcmCatalog_display.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="cat:dcmCatalog" full-description="DCMCatalog" brief-description="DCMCatalog">
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/ID"/>
- </DisplayField>
- <DisplayField id="NAME" header="name" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/name"/>
- </DisplayField>
- <DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/description"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="DIMENSIONS_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/dimensions/x"/>
- </DisplayField>
- <DisplayField id="DIMENSIONS_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/dimensions/y"/>
- </DisplayField>
- <DisplayField id="DIMENSIONS_Z" header="z" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/dimensions/z"/>
- </DisplayField>
- <DisplayField id="DIMENSIONS_VOLUMES" header="volumes" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/dimensions/volumes"/>
- </DisplayField>
- <DisplayField id="VOXELRES_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/voxelRes/x"/>
- </DisplayField>
- <DisplayField id="VOXELRES_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/voxelRes/y"/>
- </DisplayField>
- <DisplayField id="VOXELRES_Z" header="z" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/voxelRes/z"/>
- </DisplayField>
- <DisplayField id="VOXELRES_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/voxelRes/units"/>
- </DisplayField>
- <DisplayField id="ORIENTATION" header="orientation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/orientation"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:dcmCatalog/UID"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="ID" default-sort-order="DESC" brief-description="DCMCatalog" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="DIMENSIONS_X"/>
- <DisplayFieldRef id="DIMENSIONS_Y"/>
- <DisplayFieldRef id="DIMENSIONS_Z"/>
- <DisplayFieldRef id="DIMENSIONS_VOLUMES"/>
- <DisplayFieldRef id="VOXELRES_X"/>
- <DisplayFieldRef id="VOXELRES_Y"/>
- <DisplayFieldRef id="VOXELRES_Z"/>
- <DisplayFieldRef id="VOXELRES_UNITS"/>
- <DisplayFieldRef id="ORIENTATION"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="ID" default-sort-order="DESC" brief-description="DCMCatalog" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="DIMENSIONS_X"/>
- <DisplayFieldRef id="DIMENSIONS_Y"/>
- <DisplayFieldRef id="DIMENSIONS_Z"/>
- <DisplayFieldRef id="DIMENSIONS_VOLUMES"/>
- <DisplayFieldRef id="VOXELRES_X"/>
- <DisplayFieldRef id="VOXELRES_Y"/>
- <DisplayFieldRef id="VOXELRES_Z"/>
- <DisplayFieldRef id="VOXELRES_UNITS"/>
- <DisplayFieldRef id="ORIENTATION"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/catalog/display/cat_entry_display.xml b/src/main/webapp/schemas/catalog/display/cat_entry_display.xml
deleted file mode 100644
index 8aa79cf9858fc7f27f0fdd45a9c5829b2c0f81b5..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/catalog/display/cat_entry_display.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="cat:entry" full-description="Entry" brief-description="Entry">
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="cat:entry.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="cat:entry.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="URI" header="URI" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/URI"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/ID"/>
- </DisplayField>
- <DisplayField id="NAME" header="name" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/name"/>
- </DisplayField>
- <DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/description"/>
- </DisplayField>
- <DisplayField id="FORMAT" header="format" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/format"/>
- </DisplayField>
- <DisplayField id="CONTENT" header="content" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/content"/>
- </DisplayField>
- <DisplayField id="CACHEPATH" header="cachePath" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/cachePath"/>
- </DisplayField>
- <DisplayField id="CREATEDTIME" header="createdTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/createdTime"/>
- </DisplayField>
- <DisplayField id="CREATEDBY" header="createdBy" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/createdBy"/>
- </DisplayField>
- <DisplayField id="CREATEDEVENTID" header="createdEventId" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/createdEventId"/>
- </DisplayField>
- <DisplayField id="MODIFIEDTIME" header="modifiedTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/modifiedTime"/>
- </DisplayField>
- <DisplayField id="MODIFIEDBY" header="modifiedBy" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/modifiedBy"/>
- </DisplayField>
- <DisplayField id="MODIFIEDEVENTID" header="modifiedEventId" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/modifiedEventId"/>
- </DisplayField>
- <DisplayField id="DIGEST" header="digest" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="cat:entry/digest"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="URI" default-sort-order="DESC" brief-description="Entry" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="URI"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="FORMAT"/>
- <DisplayFieldRef id="CONTENT"/>
- <DisplayFieldRef id="CACHEPATH"/>
- <DisplayFieldRef id="CREATEDTIME"/>
- <DisplayFieldRef id="CREATEDBY"/>
- <DisplayFieldRef id="CREATEDEVENTID"/>
- <DisplayFieldRef id="MODIFIEDTIME"/>
- <DisplayFieldRef id="MODIFIEDBY"/>
- <DisplayFieldRef id="MODIFIEDEVENTID"/>
- <DisplayFieldRef id="DIGEST"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="URI" default-sort-order="DESC" brief-description="Entry" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="URI"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="FORMAT"/>
- <DisplayFieldRef id="CONTENT"/>
- <DisplayFieldRef id="CACHEPATH"/>
- <DisplayFieldRef id="CREATEDTIME"/>
- <DisplayFieldRef id="CREATEDBY"/>
- <DisplayFieldRef id="CREATEDEVENTID"/>
- <DisplayFieldRef id="MODIFIEDTIME"/>
- <DisplayFieldRef id="MODIFIEDBY"/>
- <DisplayFieldRef id="MODIFIEDEVENTID"/>
- <DisplayFieldRef id="DIGEST"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/ext/ext.xsd b/src/main/webapp/schemas/ext/ext.xsd
deleted file mode 100644
index 04a0c5a60b20124b5a137c7d9b7770f86f708808..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/ext/ext.xsd
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/ext/ext.xsd
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/7/14 12:19 PM
- -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/ext" xmlns:ext="http://nrg.wustl.edu/ext" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xnat="http://nrg.wustl.edu/xnat" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:import namespace="http://nrg.wustl.edu/xnat" schemaLocation="../xnat/xnat.xsd"/>
- <xs:element name="AtlasScalingFactor" type="ext:atlasScalingFactorData"/>
- <xs:element name="ClinicalAssessment" type="ext:clinicalAssessmentData"/>
- <xs:element name="SegmentationFast" type="ext:segmentationFastData"/>
- <xs:complexType name="atlasScalingFactorData">
- <xs:complexContent>
- <xs:extension base="xnat:mrAssessorData">
- <xs:sequence>
- <xs:element name="scalingFactor" type="xs:float"/>
- <xs:element name="eta" type="xs:float"/>
- <xs:element name="eICV" type="xs:float"/>
- <xs:element name="baseScanNumber" type="xs:string"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="clinicalAssessmentData">
- <xs:complexContent>
- <xs:extension base="xnat:subjectAssessorData">
- <xs:sequence>
- <xs:element name="Diagnosis" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>DIAG1 - 5; DX1-5</xs:documentation>
- <xs:appinfo>
- <xdat:field uniqueComposite="UNIQUE_NAME_VALUE">
- <xdat:relation uniqueComposite="UNIQUE_NAME_VALUE"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="type" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="primary"/>
- <xs:enumeration value="secondary"/>
- <xs:enumeration value="tertiary"/>
- <xs:enumeration value="additional"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="number" type="xs:integer" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="BloodPressure" minOccurs="0">
- <xs:annotation>
- <xs:documentation>SYSBP and DIASBP</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="HighBP_CS_Bool" type="xs:boolean" use="optional"/>
- <xs:attribute name="systolic" type="xs:integer" use="optional"/>
- <xs:attribute name="diastolic" type="xs:integer" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Neuro" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SBT" minOccurs="0">
- <xs:annotation>
- <xs:documentation>SBT; Katzman Short Blessed Test</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="30"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="MMSE" minOccurs="0">
- <xs:annotation>
- <xs:documentation>MMSE; Mini Mental State Exam</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="30"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Bdsc" minOccurs="0">
- <xs:annotation>
- <xs:documentation>BDSC; Blessed Dementia Scale, Cognitive Portion</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="10"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="CDR" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Clinical Dementia Rating</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="memory" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT110; CDR: memory</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="orientation" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT111; CDR: orientation</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="judgment_problem_solving" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT112; CDR: judgment and problem solving</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="community_affairs" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT113; CDR: community affairs</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="home_hobbies" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT114; CDR: home and hobbies</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="personal_care" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT115; CDR: personal care</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="sumbox" use="optional">
- <xs:annotation>
- <xs:documentation>SUMBOX; Summary score of boxes in CDR</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="18"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="rating" type="xs:float" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="ThinkingProblem_S_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT501; thinking according to S</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ThinkingProblem_CS_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT324; thinking according to CS</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ConsMemoryProblem_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT415; Consistent memory problems</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="StrokeBool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT015; strokes or tias</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Sx_Stroke_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>SX_STROKE; stroke symptoms</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Sx_Tia_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>SX_TIA; tia symptoms</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Movement" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Spasticity_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT121; spasticity</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Rigid" minOccurs="0">
- <xs:annotation>
- <xs:documentation>RIGID; Cogwhell rigidity</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="10"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Bradyk_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>BRADYK; bradykinesia</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Gait" minOccurs="0">
- <xs:annotation>
- <xs:documentation>GAIT; extrapyramidal disorder</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="AbnormalGait_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>INT572; abnormal/normal concerning gait</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Medication" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>INT601-604; INT615-INT617; INT624-626; INT632-633</xs:documentation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="UNIQUE_NAME_VALUE"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="UNIQUE_NAME_VALUE"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="type" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="cardiovascular"/>
- <xs:enumeration value="bp-heart"/>
- <xs:enumeration value="other"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="dose" type="xs:string" use="optional"/>
- <xs:attribute name="history" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Weight" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>WEIGHT; Body Weight (lbs.)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Diabetes_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>DIAB; Diabetes</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="HeartProblems_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>HEART; heart problems</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TobaccoUse_Bool" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>TOBAC; tobacco use</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="segmentationFastData">
- <xs:complexContent>
- <xs:extension base="xnat:mrAssessorData">
- <xs:sequence>
- <xs:element name="brainVolume" type="xnat:volumetricRegion"/>
- </xs:sequence>
- <xs:attribute name="brainPercent" type="xs:float"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/pipeline/build.xsd b/src/main/webapp/schemas/pipeline/build.xsd
deleted file mode 100644
index d3aa3a772c1ccb1d762c8e02345a65303839a221..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/pipeline/build.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/build" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:build="http://nrg.wustl.edu/build" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="Build" type="build:buildData">
- <xs:annotation>
- <xs:documentation>Comment describing your root element</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="imageSessionData">
- <xs:sequence>
- <xs:element name="pipeline" maxOccurs="unbounded">
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="build:pipelineData">
- <xs:attribute name="stepId" type="xs:string" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" type="xs:string" use="required"/>
- </xs:complexType>
- <xs:complexType name="pipelineParameterData">
- <xs:sequence>
- <xs:element name="parameter" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:choice minOccurs="0">
- <xs:element name="schemaLink" type="xs:string"/>
- <xs:element name="csvValues" type="xs:string"/>
- </xs:choice>
- <xs:element name="description" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="multipleValues" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="editable" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="batchParam" type="xs:boolean" use="optional" default="false"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="pipelineData">
- <xs:sequence>
- <xs:element name="displayText" type="xs:string">
- <xs:annotation>
- <xs:documentation>The text to be displayed on the web page for this pipeline. Used more like a title for the page</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="name" type="xs:string">
- <xs:annotation>
- <xs:documentation>Name of the pipeline</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="location" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Path to pipeline descriptor</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="description" type="xs:string">
- <xs:annotation>
- <xs:documentation>Short description of the pipeline</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="parameters" type="build:pipelineParameterData" minOccurs="0"/>
- <xs:element name="customwebpage" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Name of the custom page which will be used to display this pipeline step, if the auto generated page doesnt suit the user requirements</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="buildData">
- <xs:sequence>
- <xs:element name="project" type="build:imageSessionData" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/pipeline/display/workflowData_display.xml b/src/main/webapp/schemas/pipeline/display/workflowData_display.xml
deleted file mode 100644
index 11b8816105e20a2a73f51f5d58745e7640909647..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/pipeline/display/workflowData_display.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/pipeline/display/workflowData_display.xml
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/7/14 12:19 PM
- -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="wrk:workflowData" full-description="Workflow" brief-description="Workflow">
- <DisplayField id="DATA_TYPE" header="data_type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/data_type"/>
- </DisplayField>
- <DisplayField id="WORKFLOW_ID" header="Workflow ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/wrk_workflowdata_id"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/wrk:workflowData/search_field/wrk:workflowData.wrk_workflowdata_id">
- <InsertValue id="Field1" field="WORKFLOW_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','wrk:workflowData','wrk:workflowData.wrk_workflowdata_id');">
- <InsertValue id="Field1" field="WORKFLOW_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/ID"/>
- </DisplayField>
- <DisplayField id="EXTERNALID" header="ExternalID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/ExternalID"/>
- </DisplayField>
- <DisplayField id="CURRENT_STEP_LAUNCH_TIME" header="current_step_launch_time" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/current_step_launch_time"/>
- </DisplayField>
- <DisplayField id="CURRENT_STEP_ID" header="current_step_id" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/current_step_id"/>
- </DisplayField>
- <DisplayField id="STATUS" header="status" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/status"/>
- <Content type="sql">'<B>' || CASE @Field1 WHEN 'Complete' THEN '<FONT COLOR=green>Complete</FONT>' WHEN 'In Progress' THEN '<FONT COLOR=yellow>In Progress</FONT>' WHEN 'Running' THEN '<FONT COLOR=yellow>Running</FONT>' WHEN 'Queued' THEN '<FONT COLOR=orange>Queued</FONT>' WHEN 'Failed' THEN '<FONT COLOR=red>Failed</FONT>' ELSE '<FONT COLOR=orange>' || @Field1 || '</FONT>' END || '</B>' </Content>
- <HTML-Link>
- <Property name="TITLE" value="@Field1">
- <InsertValue id="Field1" field="CURRENT_STEP_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PIPELINE_NAME" header="pipeline_name" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/pipeline_name"/>
- </DisplayField>
- <DisplayField id="NEXT_STEP_ID" header="next_step_id" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/next_step_id"/>
- </DisplayField>
- <DisplayField id="STEP_DESCRIPTION" header="step_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/step_description"/>
- </DisplayField>
- <DisplayField id="LAUNCH_TIME" header="launch_time" visible="true" searchable="true" data-type="date">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/launch_time"/>
- </DisplayField>
- <DisplayField id="PERCENTAGECOMPLETE" header="percentageComplete" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/percentageComplete"/>
- </DisplayField>
- <DisplayField id="JOB_ID" header="Job ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/jobid"/>
- </DisplayField>
- <DisplayField id="LAST_MODIFIED" header="Modified" visible="true" searchable="true" data-type="date">
- <DisplayFieldElement name="Field1" schema-element="wrk:workflowData/meta/insert_date"/>
- <DisplayFieldElement name="Field2" schema-element="wrk:workflowData/meta/last_modified"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- </DisplayField>
- <DisplayField id="SESSION_LABEL" header="Session" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="SESSION_LABEL_VIEW" viewColumn="session_label"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/@Field2/search_field/@Field2.ID">
- <InsertValue id="Field1" field="ID"/>
- <InsertValue id="Field2" field="DATA_TYPE"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','@Field2','@Field2.ID');">
- <InsertValue id="Field1" field="ID"/>
- <InsertValue id="Field2" field="DATA_TYPE"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <ViewLink alias="SESSION_LABEL_VIEW">
- <Mapping TableName="SESSION_LABEL_VIEW">
- <MappingColumn rootElement="wrk:workflowData" fieldElement="wrk:workflowData.wrk_workflowdata_id" mapsTo="workflow_id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="SESSION_LABEL_VIEW" sql="SELECT DISTINCT ex.label AS session_label, ex.project AS project, wf.wrk_workflowdata_id AS workflow_id FROM wrk_workflowData wf LEFT JOIN xnat_experimentData ex ON ex.id = wf.id"/>
- <DisplayField id="PROJECT" header="Project" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="SESSION_LABEL_VIEW" viewColumn="project"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:projectData/search_field/xnat:projectData.ID">
- <InsertValue id="Field1" field="PROJECT"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:projectData','xnat:projectData.ID');">
- <InsertValue id="Field1" field="PROJECT"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="SUBJECT_LABEL" header="Subject" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="SUBJECT_LABEL_VIEW" viewColumn="subject_label"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <ViewLink alias="SUBJECT_LABEL_VIEW">
- <Mapping TableName="SUBJECT_LABEL_VIEW">
- <MappingColumn rootElement="wrk:workflowData" fieldElement="wrk:workflowData.wrk_workflowdata_id" mapsTo="workflow_id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="SUBJECT_LABEL_VIEW" sql="SELECT DISTINCT sub.label AS subject_label, wf.wrk_workflowdata_id AS workflow_id FROM wrk_workflowData wf LEFT JOIN xnat_subjectData sub ON sub.id = wf.id"/>
- <DisplayField id="USERFULLNAME" header="Userfullname" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="USERFULLNAME_VIEW" viewColumn="userfullname"/>
- </DisplayField>
- <DisplayField id="USERLOGIN" header="Userlogin" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="USERFULLNAME_VIEW" viewColumn="login"/>
- </DisplayField>
- <DisplayField id="USEREMAIL" header="Useremail" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="USERFULLNAME_VIEW" viewColumn="email"/>
- </DisplayField>
- <ViewLink alias="USERFULLNAME_VIEW">
- <Mapping TableName="USERFULLNAME_VIEW">
- <MappingColumn rootElement="wrk:workflowData" fieldElement="wrk:workflowData.wrk_workflowdata_id" mapsTo="workflow_id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="USERFULLNAME_VIEW" sql="SELECT wrk.wrk_workflowdata_id AS workflow_id, u.login, u.firstname, u.lastname, u.firstname || ' ' || u.lastname AS userfullname, u.email FROM wrk_workflowData wrk LEFT JOIN wrk_workflowdata_meta_data meta ON wrk.workflowData_info=meta.meta_data_id LEFT JOIN xdat_user u ON meta.insert_user_xdat_user_id=u.xdat_user_id"/>
- <DisplayVersion versionName="listing" default-order-by="LAST_MODIFIED" default-sort-order="DESC" brief-description="Workflow" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="WORKFLOW_ID"/>
- <DisplayFieldRef id="PIPELINE_NAME"/>
- <DisplayFieldRef id="LAUNCH_TIME"/>
- <DisplayFieldRef id="STATUS"/>
- <DisplayFieldRef id="CURRENT_STEP_ID"/>
- <DisplayFieldRef id="JOB_ID"/>
- <DisplayFieldRef id="USERFULLNAME"/>
- <DisplayFieldRef id="SESSION_LABEL"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/pipeline/repository.xsd b/src/main/webapp/schemas/pipeline/repository.xsd
deleted file mode 100644
index d3e32e43e2ccebf2f2a54358acd673a33f3c75ce..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/pipeline/repository.xsd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/pipe" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:pipe="http://nrg.wustl.edu/pipe" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="PipelineRepository">
- <xs:annotation>
- <xs:documentation>Comment describing your root element</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="pipeline" type="pipe:pipelineDetails" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Path to the pipeline descriptor document</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="pipelineDetails">
- <xs:sequence>
- <xs:element name="path" type="xs:string">
- <xs:annotation>
- <xs:documentation>Complete path to the pipeline</xs:documentation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="description" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1500"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="generatesElements" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The XNAT datatypes that this pipeline generates</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="element" type="xs:string" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="customwebpage" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The velocity template which is specific to this pipeline</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="parameters" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="parameter" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="name" type="xs:string"/>
- <xs:element name="values">
- <xs:complexType>
- <xs:choice>
- <xs:element name="schemaLink" type="xs:string"/>
- <xs:element name="csvValues" type="xs:string"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="description" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1500"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="appliesTo" type="xs:string" use="required"/>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/pipeline/workflow.xsd b/src/main/webapp/schemas/pipeline/workflow.xsd
deleted file mode 100644
index 3be2480bb04b96a9d3dc6f85164e16022ffa7b7f..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/pipeline/workflow.xsd
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/workflow" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:wrk="http://nrg.wustl.edu/workflow" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:complexType name="workflowData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element storeHistory="false"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="executionEnvironment" type="wrk:abstractExecutionEnvironment" minOccurs="0"/>
- <xs:element name="comments" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field size="10000"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="details" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field size="10000"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="justification" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field size="10000"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="description" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="src" type="xs:string" use="optional"/>
- <xs:attribute name="type" type="xs:string" use="optional"/>
- <xs:attribute name="category" type="xs:string" use="optional"/>
- <xs:attribute name="data_type" type="xs:string" use="required"/>
- <xs:attribute name="ID" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="ExternalID" type="xs:string" use="optional"/>
- <xs:attribute name="current_step_launch_time" type="xs:dateTime" use="optional"/>
- <xs:attribute name="current_step_id" type="xs:string" use="optional"/>
- <xs:attribute name="status" type="xs:string" use="required"/>
- <xs:attribute name="create_user" type="xs:string" use="optional"/>
- <xs:attribute name="pipeline_name" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="next_step_id" type="xs:string" use="optional"/>
- <xs:attribute name="step_description" type="xs:string" use="optional"/>
- <xs:attribute name="launch_time" type="xs:dateTime" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="percentageComplete" type="xs:string" use="optional"/>
- <xs:attribute name="jobID" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:element name="Workflow" type="wrk:workflowData"/>
- <xs:complexType name="abstractExecutionEnvironment"/>
- <xs:complexType name="xnatExecutionEnvironment">
- <xs:complexContent>
- <xs:extension base="wrk:abstractExecutionEnvironment">
- <xs:sequence>
- <xs:element name="pipeline" type="xs:string">
- <xs:annotation>
- <xs:documentation>Path to the pipeline which is to be launched</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="xnatuser" type="xs:string">
- <xs:annotation>
- <xs:documentation>Xnat User who launched the pipeline</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="host" type="xs:string">
- <xs:annotation>
- <xs:documentation>Xnat host on which the pipeline was launched</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="startAt" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Step id at which the pipeline was started</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="parameters" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Parameters which were passed to the pipeline</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="parameter" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field size="1000">
- <xdat:relation uniqueComposite="NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="notify" type="xs:string" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Email ID to which notification is to be sent</xs:documentation>
- <xs:appinfo>
- <xdat:field uniqueComposite="NOTIFY">
- <xdat:relation uniqueComposite="NOTIFY"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="dataType" type="xs:string">
- <xs:annotation>
- <xs:documentation>dataType as required by the workflow element</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="id" type="xs:string">
- <xs:annotation>
- <xs:documentation>is as required by the workflow element</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="supressNotification" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>Boolean flag to suppress success notification in case custom emails are being sent</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="log" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>path to log4j properties file</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="catalogPath" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>root path to the catalog</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="parameterFile" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The string content of this element is the xml as text</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="xml" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field size="10000"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="path" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/project/project.xsd b/src/main/webapp/schemas/project/project.xsd
deleted file mode 100644
index fc58f33e783b30c58a543291c78fb6f8e4934dd6..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/project/project.xsd
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/arc" xmlns:arc="http://nrg.wustl.edu/arc" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xdat="http://nrg.wustl.edu/xdat" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="ArchiveSpecification">
- <xs:annotation>
- <xs:documentation>Root Element</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="globalPaths" type="arc:pathInfo"/>
- <xs:element name="fieldSpecifications" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="fieldSpecification" type="arc:fieldSpecification" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="SPEC_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="projects" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="project" type="arc:project" minOccurs="0" maxOccurs="unbounded">
- <xs:unique name="projectId">
- <xs:selector xpath=".//arc:project"/>
- <xs:field xpath="@id"/>
- </xs:unique>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="emailSpecifications" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="new_user_registration" type="xs:boolean" default="true"/>
- <xs:attribute name="pipeline" type="xs:boolean" default="true"/>
- <xs:attribute name="project_access" type="xs:boolean" default="true"/>
- <xs:attribute name="transfer" type="xs:boolean" default="true"/>
- <xs:attribute name="page_email" type="xs:boolean" default="true"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="notification_types" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="notification_type" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="VALUE">
- <xdat:relation uniqueComposite="VALUE"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="email_addresses" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="dcm" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="dcm_host" type="xs:string" use="optional"/>
- <xs:attribute name="dcm_port" type="xs:string" use="optional"/>
- <xs:attribute name="dcm_ae" type="xs:string" use="optional"/>
- <xs:attribute name="http_url" type="xs:string" use="optional"/>
- <xs:attribute name="applet_link" type="xs:boolean" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="site_id" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="site_admin_email" type="xs:string" use="optional"/>
- <xs:attribute name="site_url" type="xs:string" use="optional"/>
- <xs:attribute name="smtp_host" type="xs:string" use="optional"/>
- <xs:attribute name="require_login" type="xs:boolean" use="optional"/>
- <xs:attribute name="enable_new_registrations" type="xs:boolean" use="optional"/>
- <xs:attribute name="enable_csrf_token" type="xs:boolean" use="optional"/>
- <xs:attribute name="quarantine_code" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation>Whether image data for this project should be placed in quarantine</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="prearchive_code" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation>0: all data placed in prearchive (default); 1: sessions which match precreated project, subject, and session id are auto-archived; 2: sessions which match precreated project and subject will be auto-archived; 3: sessions which match precreated projects will be auto-archived; 4: all sessions will be auto-archived</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="project">
- <xs:annotation>
- <xs:documentation>Describe specifications for a project identified by Attribute id</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="paths" type="arc:pathInfo" minOccurs="0"/>
- <xs:element name="fieldSpecifications" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="fieldSpecification" type="arc:fieldSpecification" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="SPEC_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="properties" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="property" type="arc:property" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="PROP_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="pipelines" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="descendants" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Pipelines for the entities that descend from a project</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="descendant" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="true" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- <xs:documentation>Specify pipelines for each of the descendant from a project eg xnat:subjectData, xnat:mrSessionData, xnat:petSessionData, cnda:segmentationData etc</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="pipeline" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="true" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="arc:pipelineData">
- <xs:attribute name="stepId" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="dependent" type="xs:boolean" use="optional" default="true"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="xsiType" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="pipeline" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Pipelines for the project</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="arc:pipelineData">
- <xs:attribute name="stepId" type="xs:string" use="required"/>
- <xs:attribute name="dependent" type="xs:boolean" use="optional" default="true">
- <xs:annotation>
- <xs:documentation>Specify true if this pipeline is launchable only when all the previous pipelines have completed succesfully. Set this value to false if this pipeline can be run independent of others. </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:unique name="pipelineId">
- <xs:selector xpath=".//arc:pipeline"/>
- <xs:field xpath="@stepId"/>
- </xs:unique>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="id" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="current_arc" type="xs:string" use="optional"/>
- <xs:attribute name="quarantine_code" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation>Whether image data for this project should be placed in quarantine</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="prearchive_code" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation>0: all data placed in prearchive (default); 1: sessions which match precreated project, subject, and session id are auto-archived; 2: sessions which match precreated project and subject will be auto-archived; 3: sessions which match precreated projects will be auto-archived; 4: all sessions will be auto-archived; 5: all sessions will be auto-archived and overwrite existing files</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="pipelineData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true" matchByValues="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="displayText" type="xs:string">
- <xs:annotation>
- <xs:documentation>The text to be displayed on the web page for this pipeline. Used more like a title for the page</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="name" type="xs:string">
- <xs:annotation>
- <xs:documentation>Name of the pipeline</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="location" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Path to pipeline descriptor</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="description" type="xs:string">
- <xs:annotation>
- <xs:documentation>Short description of the pipeline</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="parameters" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="parameter" type="arc:pipelineParameterData" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="PARAM_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="customwebpage" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Name of the custom page which will be used to display this pipeline step, if the auto generated page doesnt suit the user requirements</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="pipelineParameterData">
- <xs:sequence>
- <xs:choice minOccurs="0">
- <xs:element name="schemaLink" type="xs:string"/>
- <xs:element name="csvValues">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="selected" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:element name="description" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1500"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="PARAM_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="multipleValues" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="editable" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="batchParam" type="xs:boolean" use="optional" default="false"/>
- </xs:complexType>
- <xs:complexType name="pathInfo">
- <xs:sequence>
- <xs:element name="archivePath" type="xs:string" minOccurs="0"/>
- <xs:element name="prearchivePath" type="xs:string" minOccurs="0"/>
- <xs:element name="cachePath" type="xs:string" minOccurs="0"/>
- <xs:element name="buildPath" type="xs:string" minOccurs="0"/>
- <xs:element name="ftpPath" type="xs:string" minOccurs="0"/>
- <xs:element name="pipelinePath" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="property">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field size="10000"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="PROP_NAME" size="10000"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="fieldSpecification">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field size="10000"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SPEC_NAME" size="10000"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/screening/display/scr_screeningAssessment_display.xml b/src/main/webapp/schemas/screening/display/scr_screeningAssessment_display.xml
deleted file mode 100644
index 4494ea752c57f0fde716202ae2fa55d5e001ab37..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/screening/display/scr_screeningAssessment_display.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="scr:screeningAssessment" full-description="ScreeningAssessment" brief-description="ScreeningAssessment">
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','scr:screeningAssessment','scr:screeningAssessment.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','scr:screeningAssessment','scr:screeningAssessment.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.date"/>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="SCR_SCREENINGASSESSMENT_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.ID"/>
- <DisplayFieldElement name="Field2" schema-element="scr:screeningAssessment.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="scr:screeningAssessment">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="scr:screeningAssessment/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="scr:screeningAssessment/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/scr:screeningAssessment/search_field/scr:screeningAssessment.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','scr:screeningAssessment','scr:screeningAssessment.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.project"/>
- </DisplayField>
- <DisplayField id="SCR_SCREENINGASSESSMENT_PROJECT_IDENTIFIER" header="SCR_SCREENINGASSESSMENT ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">scr_screeningassessment_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="scr:screeningAssessment">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="scr:screeningAssessment/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="scr:screeningAssessment/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/scr:screeningAssessment/search_field/scr:screeningAssessment.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS scr_screeningassessment_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="scr:screeningAssessment.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="SCR_SCREENINGASSESSMENT_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='scr:screeningAssessment') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="scr:screeningAssessment.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="RATER" header="rater" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment/rater"/>
- </DisplayField>
- <DisplayField id="COMMENTS" header="comments" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment/comments"/>
- </DisplayField>
- <DisplayField id="PASS" header="pass" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="scr:screeningAssessment/pass"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ScreeningAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="SCR_SCREENINGASSESSMENT_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- </DisplayVersion>
- <ViewLink alias="SCR_SCREENINGASSESSMENT_PROJECTS">
- <Mapping TableName="SCR_SCREENINGASSESSMENT_PROJECTS">
- <MappingColumn rootElement="scr:screeningAssessment" fieldElement="scr:screeningAssessment.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="SCR_SCREENINGASSESSMENT_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='scr:screeningAssessment' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/screening/screeningAssessment.xsd b/src/main/webapp/schemas/screening/screeningAssessment.xsd
deleted file mode 100644
index fe4fa807c065c241ac0d116924ed35e486b93440..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/screening/screeningAssessment.xsd
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Mohana Ramaratnam (NRG INDIA) -->
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/scr" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:scr="http://nrg.wustl.edu/scr" xmlns:xnat="http://nrg.wustl.edu/xnat" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:import namespace="http://nrg.wustl.edu/xnat" schemaLocation="../xnat/xnat.xsd"/>
- <xs:complexType name="screeningAssessment">
- <xs:complexContent>
- <xs:extension base="xnat:imageAssessorData">
- <xs:sequence>
- <xs:element name="rater" type="xs:string" minOccurs="0"/>
- <xs:element name="comments" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="pass" type="xs:string" minOccurs="0"/>
- <xs:element name="scans" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="scan" type="scr:screeningScanData" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="scr_scan_id_fk" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="screeningScanData">
- <xs:sequence>
- <xs:element name="imageScan_ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="scr_scan_id_fk"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="comments" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="pass" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:element name="ScreeningAssessment" type="scr:screeningAssessment"/>
-</xs:schema>
diff --git a/src/main/webapp/schemas/search/search.xsd b/src/main/webapp/schemas/search/search.xsd
deleted file mode 100644
index 69e2afe3635d79501dfd9fc2670131f47c42328f..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/search/search.xsd
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/search" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:search="http://nrg.wustl.edu/search" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="Search" type="search:search"/>
- <xs:complexType name="search">
- <xs:sequence>
- <xs:element name="root_element_name">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string"/>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="joined_elements" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="joined_element" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="search:joinType"/>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="fields" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="field" type="search:fieldType" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single" uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="search_where" type="search:criteria_set" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="sort_by" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="element_name" type="xs:string" minOccurs="0"/>
- <xs:element name="field_ID" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string"/>
- <xs:attribute name="allow-diff-columns" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="brief-description" type="xs:string"/>
- <xs:attribute name="tag" type="xs:string" use="optional"/>
- <xs:attribute name="return_type" type="xs:string" use="optional"/>
- <xs:attribute name="paging" type="xs:boolean" use="optional"/>
- <xs:attribute name="page_size" type="xs:integer" use="optional"/>
- <xs:attribute name="page_num" type="xs:integer" use="optional"/>
- </xs:complexType>
- <xs:complexType name="criteria_set">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="criteria" type="search:criteria" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="child_set" type="search:criteria_set" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="method" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="AND"/>
- <xs:enumeration value="OR"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="criteria">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="field" type="xs:string" minOccurs="0"/>
- <xs:element name="comparison_type" type="xs:string" minOccurs="0"/>
- <xs:element name="custom_search" type="xs:string" minOccurs="0"/>
- <xs:element name="value" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="override_value_formatting" type="xs:boolean" use="optional" default="0"/>
- </xs:complexType>
- <xs:complexType name="fieldType" abstract="true">
- <xs:attribute name="header" type="xs:string" use="optional"/>
- <xs:attribute name="visible" type="xs:boolean" use="optional"/>
- <xs:attribute name="ID" type="xs:string" use="required"/>
- <xs:attribute name="aggregate" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="COUNT"/>
- <xs:enumeration value="MIN"/>
- <xs:enumeration value="MAX"/>
- <xs:enumeration value="SUM"/>
- <xs:enumeration value="CONCAT"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="joinType" abstract="true">
- <xs:attribute name="alias" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="schemaField">
- <xs:complexContent>
- <xs:extension base="search:fieldType">
- <xs:attribute name="XPATH" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="customField">
- <xs:complexContent>
- <xs:extension base="search:fieldType"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="schemaJoin">
- <xs:complexContent>
- <xs:extension base="search:joinType"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="dbViewJoin">
- <xs:complexContent>
- <xs:extension base="search:joinType"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="subQueryJoin">
- <xs:complexContent>
- <xs:extension base="search:joinType"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="preDefinedField">
- <xs:complexContent>
- <xs:extension base="search:fieldType"/>
- </xs:complexContent>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/security/display/element_security_display.xml b/src/main/webapp/schemas/security/display/element_security_display.xml
deleted file mode 100644
index 1543a6aac79ec8d71834e08ecf360c7bdd9aeec9..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/security/display/element_security_display.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:element_security">
<DisplayField id="ELEMENT_NAME" header="Element" visible="true">
<DisplayFieldElement name="Field1" schema-element="xdat:element_security.element_name"/>
<HTML-Link>
<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:element_security/search_field/xdat:element_security.element_name">
<InsertValue id="Field1" field="ELEMENT_NAME"/>
</Property>
<Property name="ONCLICK" value="return rpt('@Field1','xdat:element_security','xdat:element_security.element_name');">
<InsertValue id="Field1" field="ELEMENT_NAME"/>
</Property>
</HTML-Link>
</DisplayField>
<DisplayField id="SECURE" header="Secured" visible="true" sort-order="DESC" image="true">
<DisplayFieldElement name="Field1" schema-element="xdat:element_security.secure"/>
<Content type="sql">CASE @Field1 WHEN 1 THEN '/@WEBAPP/images/cg.gif' WHEN 0 THEN '/@WEBAPP/images/cr.gif' END</Content>
</DisplayField>
<DisplayField id="BROWSE" header="Browse" visible="true" sort-order="DESC" image="true">
<DisplayFieldElement name="Field1" schema-element="xdat:element_security.browse"/>
<Content type="sql">CASE @Field1 WHEN 1 THEN '/@WEBAPP/images/cg.gif' WHEN 0 THEN '/@WEBAPP/images/cr.gif' END</Content>
</DisplayField>
<DisplayField id="SEQUENCE" header="Order" visible="true" sort-order="ASC">
<DisplayFieldElement name="Field1" schema-element="xdat:element_security.sequence"/>
</DisplayField>
<DisplayVersion versionName="listing" default-order-by="ELEMENT_NAME" brief-description="Users" dark-color="DEDEDE" light-color="FFFFFF">
<DisplayFieldRef id="ELEMENT_NAME"/>
<DisplayFieldRef id="SECURE"/>
<DisplayFieldRef id="BROWSE"/>
</DisplayVersion>
</Displays>
\ No newline at end of file
diff --git a/src/main/webapp/schemas/security/display/role_type_display.xml b/src/main/webapp/schemas/security/display/role_type_display.xml
deleted file mode 100644
index 3754f40bf6ea3686b51f4a25cf18226b6bae30e5..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/security/display/role_type_display.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:role_type">
<DisplayField id="ROLE_NAME" header="Role" visible="true">
<DisplayFieldElement name="Field1" schema-element="xdat:role_type.role_name"/>
<HTML-Link>
<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:role_type/search_field/xdat:role_type.role_name">
<InsertValue id="Field1" field="ROLE_NAME"/>
</Property>
<Property name="ONCLICK" value="return rpt('@Field1','xdat:role_type','xdat:role_type.role_name');">
<InsertValue id="Field1" field="ROLE_NAME"/>
</Property>
</HTML-Link>
</DisplayField>
<DisplayField id="RPT" header="" visible="true" image="true">
<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
<HTML-Link>
<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:role_type/search_field/xdat:role_type.role_name">
<InsertValue id="Field1" field="ROLE_NAME"/>
</Property>
<Property name="ONCLICK" value="return rpt('@Field1','xdat:role_type','xdat:role_type.role_name');">
<InsertValue id="Field1" field="ROLE_NAME"/>
</Property>
</HTML-Link>
</DisplayField>
<DisplayField id="ACTIVE" header="" visible="true" image="true">
<DisplayFieldElement name="Field1" schema-element="xdat:role_type.meta.status"/>
<Content type="sql">CASE @Field1 WHEN 'active' THEN '/@WEBAPP/images/cg.gif' ELSE '/@WEBAPP/images/cr.gif' END</Content>
</DisplayField>
<DisplayField id="DESCRIPTION" header="Description" visible="true">
<DisplayFieldElement name="Field1" schema-element="xdat:role_type.description"/>
</DisplayField>
<DisplayField id="ACTION_COUNT" header="Actions" visible="true">
<DisplayFieldElement name="Field1" viewName="ROLE_COUNT" viewColumn="ACTION_COUNT"/>
</DisplayField>
<DisplayField id="SEQ" header="Sequence" visible="true">
<DisplayFieldElement name="Field1" schema-element="xdat:role_type.sequence"/>
</DisplayField>
<DisplayVersion versionName="listing" default-order-by="ROLE_NAME" brief-description="Users" dark-color="DEDEDE" light-color="FFFFFF">
<DisplayFieldRef id="ROLE_NAME"/>
<DisplayFieldRef id="DESCRIPTION"/>
<DisplayFieldRef id="SEQ"/>
<DisplayFieldRef id="ACTION_COUNT"/>
</DisplayVersion>
<ViewLink alias="ROLE_COUNT">
<Mapping TableName="ROLE_COUNT">
<MappingColumn rootElement="xdat:role_type" fieldElement="xdat:role_type.role_name" mapsTo="role1"/>
</Mapping>
</ViewLink>
<SQLView name="ROLE_COUNT" sql="SELECT role_name AS role1,COUNT (map.xdat_a_xdat_action_type_allowe_xdat_role_type_id) AS ACTION_COUNT FROM xdat_role_type role LEFT JOIN xdat_a_xdat_action_type_allowe_xdat_role_type map ON role.role_name=map.xdat_role_type_role_name GROUP BY role_name"/>
</Displays>
diff --git a/src/main/webapp/schemas/security/display/user_display.xml b/src/main/webapp/schemas/security/display/user_display.xml
deleted file mode 100644
index 485a7fff64a57616e6a4b59786322365bc92b094..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/security/display/user_display.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:user">
- <DisplayField id="LOGIN" header="Username" visible="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:user.login"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:user/search_field/xdat:user.login">
- <InsertValue id="Field1" field="LOGIN"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xdat:user','xdat:user.login');">
- <InsertValue id="Field1" field="LOGIN"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="SU" header="" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/su.jpg'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/XDATSudoLogin/sudo_login/@Field1">
- <InsertValue id="Field1" field="LOGIN"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:user/search_field/xdat:user.login">
- <InsertValue id="Field1" field="LOGIN"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xdat:user','xdat:user.login');">
- <InsertValue id="Field1" field="LOGIN"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="ACTIVE" header="Auth." visible="true" image="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:user.meta.status"/>
- <Content type="sql">CASE @Field1 WHEN 'active' THEN '/@WEBAPP/images/cg.gif' ELSE '/@WEBAPP/images/cr.gif' END</Content>
- </DisplayField>
- <DisplayField id="FIRST" header="First name" visible="true" sort-order="ASC">
- <DisplayFieldElement name="Field1" schema-element="xdat:user.firstname"/>
- </DisplayField>
- <DisplayField id="LAST" header="Last name" visible="true" sort-order="ASC">
- <DisplayFieldElement name="Field1" schema-element="xdat:user.lastname"/>
- </DisplayField>
- <DisplayField id="FIRST_LAST" header="Name" visible="true" sort-order="ASC">
- <DisplayFieldElement name="Field1" schema-element="xdat:user.firstname"/>
- <DisplayFieldElement name="Field2" schema-element="xdat:user.lastname"/>
- <Content type="sql">@Field2 || ', ' || @Field1</Content>
- </DisplayField>
- <DisplayField id="EMAIL" header="Email" visible="true" sort-order="ASC">
- <DisplayFieldElement name="Field1" schema-element="xdat:user.email"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return email('@Field1');">
- <InsertValue id="Field1" field="EMAIL"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="LAST_LOGIN" header="Last Login" visible="true" sort-order="ASC">
- <DisplayFieldElement name="Field1" viewName="LAST_LOGIN" viewColumn="LOGIN_DATE"/>
- <Content type="sql">CAST (@Field1 AS VARCHAR)</Content>
- </DisplayField>
- <DisplayField id="SESSION_ID" header="Session Id" visible="true" sort-order="ASC">
- <DisplayFieldElement name="Field1" viewName="SESSION_ID" viewColumn="SESSION_ID"/>
- <Content type="sql">CAST (@Field1 AS VARCHAR)</Content>
- </DisplayField>
- <DisplayField id="ENABLED" header="Enabled" visible="true" sort-order="DESC" image="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:user.enabled"/>
- <Content type="sql">CASE @Field1 WHEN 1 THEN '/@WEBAPP/images/cg.gif' WHEN 0 THEN '/@WEBAPP/images/cr.gif' END</Content>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="FIRST_LAST" brief-description="Users" dark-color="DEDEDE" light-color="FFFFFF">
- <DisplayFieldRef id="SU"/>
- <DisplayFieldRef id="LOGIN"/>
- <DisplayFieldRef id="FIRST_LAST"/>
- <DisplayFieldRef id="EMAIL"/>
- <DisplayFieldRef id="LAST_LOGIN"/>
- <DisplayFieldRef id="ACTIVE"/>
- <DisplayFieldRef id="ENABLED"/>
- </DisplayVersion>
- <ViewLink alias="LAST_LOGIN">
- <Mapping TableName="LAST_LOGIN">
- <MappingColumn rootElement="xdat:user" fieldElement="xdat:user.xdat_user_id" mapsTo="USER_ID"/>
- </Mapping>
- </ViewLink>
- <SQLView name="LAST_LOGIN" sql="select DISTINCT ON (user_xdat_user_id) user_xdat_user_id AS USER_ID, login_date FROM xdat_user_login ORDER BY user_xdat_user_id,login_date DESC"/>
- <SQLFunction name="sortedstrings " content="CREATE TYPE sortedstrings AS
- (strings "varchar",
- sort_order int4);"/>
- <SQLFunction name="getnextview" content="CREATE OR REPLACE FUNCTION getnextview() RETURNS name AS
-E' DECLARE my_record RECORD; viewName name;
-BEGIN FOR my_record IN SELECT c.relname FROM pg_catalog.pg_class AS c LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace
-WHERE c.relkind IN (''v'') AND n.nspname NOT IN (''pg_catalog'', ''pg_toast'') AND pg_catalog.pg_table_is_visible(c.oid) LIMIT 1
-LOOP viewName := my_record.relname; END LOOP; RETURN (viewName); END; ' LANGUAGE 'plpgsql' VOLATILE;"/>
- <SQLFunction name="viewcount" content="CREATE OR REPLACE FUNCTION viewcount() RETURNS int8 AS E' DECLARE my_record RECORD; counter int8;
-BEGIN FOR my_record IN SELECT * FROM (SELECT COUNT (c.relname) AS view_count FROM pg_catalog.pg_class AS c
-LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace WHERE c.relkind IN (''v'') AND n.nspname
-NOT IN (''pg_catalog'', ''pg_toast'') AND pg_catalog.pg_table_is_visible(c.oid) LIMIT 1) AS COUNT_TABLE LOOP counter := my_record.view_count;
-END LOOP; RETURN (counter); END; ' LANGUAGE 'plpgsql' VOLATILE;"/>
- <SQLFunction name="getsortedstring" content="CREATE OR REPLACE FUNCTION getsortedstring("varchar", int4) RETURNS sortedstrings AS E'DECLARE sorted_strings sortedStrings%ROWTYPE;
-BEGIN sorted_strings.strings:=$1; sorted_strings.sort_order:=$2; return sorted_strings; END;' LANGUAGE 'plpgsql' VOLATILE;"/>
- <SQLFunction name="removeviews" content="CREATE OR REPLACE FUNCTION removeviews() RETURNS varchar AS E' DECLARE viewName name; viewCounter int8;
-BEGIN SELECT INTO viewName getnextview(); SELECT INTO viewCounter viewCount(); WHILE (viewCounter > 0) LOOP
-EXECUTE ''DROP VIEW ''|| viewName || '' CASCADE''; RAISE NOTICE ''DROPPED %. % more.'',viewName,viewCounter; SELECT INTO viewName getnextview();
-SELECT INTO viewCounter viewCount(); END LOOP; RETURN (''DONE''); END; ' LANGUAGE 'plpgsql' VOLATILE;"/>
- <SQLFunction name="stringstosortedtable" content="CREATE OR REPLACE FUNCTION stringstosortedtable(varchar[])
- RETURNS SETOF sortedstrings AS
-'DECLARE
-ss sortedstrings%ROWTYPE;
-i int4;
-BEGIN
- i :=1 ;
- WHILE ($1[i] IS NOT NULL)
- LOOP
- FOR ss IN
- SELECT * FROM getSortedString($1[i],i)
- LOOP
- RAISE NOTICE ''SORTED STRING: %,%'',ss.strings,ss.sort_order;
- RETURN NEXT ss;
- END LOOP;
- i:=i+1;
- END LOOP;
- RETURN;
-END;'
- LANGUAGE 'plpgsql' VOLATILE;"/>
-</Displays>
diff --git a/src/main/webapp/schemas/security/display/xdat_infoEntry_display.xml b/src/main/webapp/schemas/security/display/xdat_infoEntry_display.xml
deleted file mode 100644
index 519c309c5da556926da4666a15b409363008f443..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/security/display/xdat_infoEntry_display.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/security/display/xdat_infoEntry_display.xml
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/7/14 12:19 PM
- -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:infoEntry" full-description="Info" brief-description="Info">
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xdat:infoEntry.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xdat:infoEntry.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="DATE" header="date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:infoEntry/date"/>
- </DisplayField>
- <DisplayField id="TITLE" header="title" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:infoEntry/title"/>
- </DisplayField>
- <DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:infoEntry/description"/>
- </DisplayField>
- <DisplayField id="LINK" header="link" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:infoEntry/link"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="Info" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="TITLE"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="LINK"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="Info" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="TITLE"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="LINK"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/security/display/xdat_newsEntry_display.xml b/src/main/webapp/schemas/security/display/xdat_newsEntry_display.xml
deleted file mode 100644
index a055ff9b529f0f26237c3ee5f577bec18e0c7ebb..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/security/display/xdat_newsEntry_display.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/security/display/xdat_newsEntry_display.xml
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/7/14 12:19 PM
- -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:newsEntry" full-description="News" brief-description="News">
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xdat:newsEntry.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xdat:newsEntry.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="DATE" header="date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:newsEntry/date"/>
- </DisplayField>
- <DisplayField id="TITLE" header="title" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:newsEntry/title"/>
- </DisplayField>
- <DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:newsEntry/description"/>
- </DisplayField>
- <DisplayField id="LINK" header="link" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:newsEntry/link"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="News" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="TITLE"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="LINK"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="News" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="TITLE"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="LINK"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/security/display/xdat_stored_search_display.xml b/src/main/webapp/schemas/security/display/xdat_stored_search_display.xml
deleted file mode 100644
index a5f8d0b3a552e582a653d33321f81dc69d5e23a8..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/security/display/xdat_stored_search_display.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/security/display/xdat_stored_search_display.xml
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/7/14 12:19 PM
- -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:stored_search" full-description="Bundles" brief-description="Bundles">
- <DisplayField id="ROOT_ELEMENT_NAME" header="pivot" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:stored_search/root_element_name"/>
- </DisplayField>
- <DisplayField id="SORT_BY_ELEMENT_NAME" header="sort by" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:stored_search/sort_by/element_name"/>
- </DisplayField>
- <DisplayField id="SORT_BY_FIELD_ID" header="sort by" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:stored_search/sort_by/field_ID"/>
- </DisplayField>
- <DisplayField id="LAYERED_SEQUENCE" header="Sequence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:stored_search/layeredSequence"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:stored_search/ID"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:stored_search/search_field/xdat:stored_search.ID">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xdat:stored_search','xdat:stored_search.ID');">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DESCRIPTION" header="Full Desc" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:stored_search/description"/>
- </DisplayField>
- <DisplayField id="BRIEF_DESCRIPTION" header="Brief Desc" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xdat:stored_search/brief-description"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="ROOT_ELEMENT_NAME" default-sort-order="DESC" brief-description="bundle" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="BRIEF_DESCRIPTION"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="ROOT_ELEMENT_NAME"/>
- <DisplayFieldRef id="SORT_BY_ELEMENT_NAME"/>
- <DisplayFieldRef id="SORT_BY_FIELD_ID"/>
- <DisplayFieldRef id="LAYERED_SEQUENCE"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/security/display/xdat_userGroup_display.xml b/src/main/webapp/schemas/security/display/xdat_userGroup_display.xml
deleted file mode 100644
index bb1a5a9eea98c370e57d484acc257f0e70362ffd..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/security/display/xdat_userGroup_display.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xdat:userGroup">
<DisplayField id="ID" header="ID" visible="true">
<DisplayFieldElement name="Field1" schema-element="xdat:userGroup.id"/>
<HTML-Link>
<Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xdat:userGroup/search_field/xdat:userGroup.ID">
<InsertValue id="Field1" field="ID"/>
</Property>
<!--<Property name="ONCLICK" value="return rpt('@Field1','xdat:userGroup','xdat:userGroup.ID');">-->
<!--<InsertValue id="Field1" field="ID"/>-->
<!--</Property>-->
</HTML-Link>
</DisplayField>
<DisplayField id="DISPLAY_NAME" header="Name" visible="true" sort-order="ASC">
<DisplayFieldElement name="Field1" schema-element="xdat:userGroup.displayName"/>
</DisplayField>
<DisplayVersion versionName="listing" default-order-by="ID" brief-description="Users" dark-color="DEDEDE" light-color="FFFFFF">
<DisplayFieldRef id="ID"/>
<DisplayFieldRef id="DISPLAY_NAME"/>
</DisplayVersion>
</Displays>
\ No newline at end of file
diff --git a/src/main/webapp/schemas/security/security.xsd b/src/main/webapp/schemas/security/security.xsd
deleted file mode 100644
index 5d5ed6335cd19348217c060e0993f70f0b34a123..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/security/security.xsd
+++ /dev/null
@@ -1,865 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/security" xmlns:xdat="http://nrg.wustl.edu/security" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="security">
- <xs:annotation>
- <xs:documentation>Comment describing your root element</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="groups" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="group" type="xdat:userGroup" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="users" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="user" type="xdat:user" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="roles" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="role" type="xdat:role_type" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="actions" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="action" type="xdat:action_type" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="element_security_set" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="element_security" type="xdat:element_security" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="newsList" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="news" type="xdat:newsEntry" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="infoList" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="info" type="xdat:infoEntry" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="system" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="require_login" type="xs:boolean" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="element_access">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="element_name"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="secondary_password" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="encrypt" type="xs:boolean"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="secure_ip" type="xs:string" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="UNIQUE">
- <xdat:relation uniqueComposite="UNIQUE" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="permissions" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="allow_set" type="xdat:field_mapping_set" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="element_name" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="user_access,group_access"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="field_mapping">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true" displayIdentifiers="field_value"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:attribute name="field" type="xs:string" use="required"/>
- <xs:attribute name="field_value" type="xs:string" use="required"/>
- <xs:attribute name="create_element" type="xs:boolean" default="false"/>
- <xs:attribute name="read_element" type="xs:boolean" default="false"/>
- <xs:attribute name="edit_element" type="xs:boolean" default="false"/>
- <xs:attribute name="delete_element" type="xs:boolean" default="false"/>
- <xs:attribute name="active_element" type="xs:boolean" default="false"/>
- <xs:attribute name="comparison_type">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="equals"/>
- <xs:enumeration value="greater than"/>
- <xs:enumeration value="less than"/>
- <xs:enumeration value="greater than or equals"/>
- <xs:enumeration value="less than or equals"/>
- <xs:enumeration value="like"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="field_mapping_set">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true" displayIdentifiers="method"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="allow" type="xdat:field_mapping" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="sub_set" type="xdat:field_mapping_set" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="method">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="AND"/>
- <xs:enumeration value="OR"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="role_type">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="role_name"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="allowed_actions" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="allowed_action" type="xdat:action_type" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="multi"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="role_name" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field size="255">
- <xdat:sqlField primaryKey="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string" use="optional"/>
- <xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
- </xs:complexType>
- <xs:complexType name="action_type">
- <xs:attribute name="action_name" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="display_name" type="xs:string" use="optional"/>
- <xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
- </xs:complexType>
- <xs:complexType name="primary_security_field">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="primary_security_field"/>
- <xdat:field uniqueComposite="UNIQUE" size="255"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleContent>
- <xs:extension base="xs:string"/>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="element_security">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="element_name"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="primary_security_fields" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="primary_security_field" type="xdat:primary_security_field" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="UNIQUE" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="element_actions" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="element_action" type="xdat:element_action_type" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single" uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="listing_actions" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="listing_action" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="element_action_name"/>
- <xdat:field>
- <xdat:relation relationType="single" uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="element_action_name" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="display_name" type="xs:string" use="required"/>
- <xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
- <xs:attribute name="image" type="xs:string" use="optional"/>
- <xs:attribute name="popup" type="xs:string" use="optional"/>
- <xs:attribute name="secureAccess" use="optional" type="xs:string"/>
- <xs:attribute name="secureFeature" use="optional" type="xs:string"/>
- <xs:attribute name="parameterString" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="element_name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="secondary_password" type="xs:boolean"/>
- <xs:attribute name="secure_ip" type="xs:boolean" default="false"/>
- <xs:attribute name="secure" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="browse" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
- <xs:attribute name="quarantine" type="xs:boolean" use="optional"/>
- <xs:attribute name="pre_load" type="xs:boolean" use="optional" default="false"/>
- <xs:attribute name="searchable" type="xs:boolean" use="optional"/>
- <xs:attribute name="secure_read" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="secure_edit" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="secure_create" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="secure_delete" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="accessible" type="xs:boolean" use="optional"/>
- <xs:attribute name="usage" type="xs:string" use="optional"/>
- <xs:attribute name="singular" type="xs:string" use="optional"/>
- <xs:attribute name="plural" type="xs:string" use="optional"/>
- <xs:attribute name="category" type="xs:string" use="optional"/>
- <xs:attribute name="code" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="element_action_type">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="element_action_name"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:attribute name="element_action_name" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="display_name" type="xs:string" use="required"/>
- <xs:attribute name="sequence" type="xs:integer" use="optional" default="0"/>
- <xs:attribute name="image" type="xs:string" use="optional"/>
- <xs:attribute name="popup" type="xs:string" use="optional"/>
- <xs:attribute name="secureAccess" use="optional" type="xs:string"/>
- <xs:attribute name="secureFeature" use="optional" type="xs:string"/>
- <xs:attribute name="parameterString" type="xs:string" use="optional"/>
- <xs:attribute name="grouping" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="user">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="login"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="login">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="firstname" minOccurs="0"/>
- <xs:element name="lastname" minOccurs="0"/>
- <xs:element name="email" minOccurs="0"/>
- <xs:element name="primary_password" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field xmlDisplay="root"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="encrypt" type="xs:boolean"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element ref="xdat:element_access" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field xmlDisplay="root">
- <xdat:relation uniqueComposite="user_access" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="assigned_roles" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="assigned_role" type="xdat:role_type" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field xmlDisplay="root">
- <xdat:relation relationType="multi"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="quarantine_path" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="groups" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="groupID" type="xs:string" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="groupID"/>
- <xdat:field displayName="user group" uniqueComposite="true" baseElement="xdat:userGroup" baseCol="ID">
- <xdat:relation relationType="single" uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="enabled" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="verified" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="salt" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:attributeGroup name="meta_element">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element addin="extension"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:attribute name="element_name">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="250"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:attributeGroup>
- <xs:complexType name="meta_data">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element addin="global"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="insert_date" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="insert_user" type="xdat:user" minOccurs="0"/>
- <xs:element name="activation_date" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="activation_user" type="xdat:user" minOccurs="0"/>
- <xs:element name="last_modified" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="row_last_modified" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="xft_version" type="xs:string" minOccurs="0"/>
- <xs:element name="origin" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="meta_data_id" type="xs:integer" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true" autoIncrement="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="shareable" type="xs:boolean" default="1"/>
- <xs:attribute name="status" default="quarantine">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="active"/>
- <xs:enumeration value="quarantine"/>
- <xs:enumeration value="obsolete"/>
- <xs:enumeration value="deleted"/>
- <xs:enumeration value="locked"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="modified" type="xs:boolean" default="0"/>
- </xs:complexType>
- <xs:complexType name="history">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element addin="history" skipSql="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="new_row" type="xs:anyType">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field local_map="true" unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="change_user" type="xdat:user" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="change_user"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="history_id" type="xs:integer">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true" autoIncrement="true" name="history_id"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="change_date" type="xs:dateTime"/>
- <xs:attribute name="previous_change_date" type="xs:dateTime"/>
- </xs:complexType>
- <xs:complexType name="change_info">
- <xs:sequence>
- <xs:element name="change_user" type="xdat:user" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="change_user"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="comment" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="change_date" type="xs:dateTime"/>
- <xs:attribute name="event_id" type="xs:integer"/>
- <xs:attribute name="xdat_change_info_id" type="xs:long">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true" type="bigserial" autoIncrement="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="user_login">
- <xs:sequence>
- <xs:element name="login_date" type="xs:dateTime" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="UNIQUE"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="logout_date" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="session_id" type="xs:string" minOccurs="0"/>
- <xs:element name="ip_address" type="xs:string" minOccurs="0"/>
- <xs:element name="user" type="xdat:user">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="UNIQUE">
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="stored_search">
- <xs:sequence>
- <xs:element name="root_element_name" type="xs:string"/>
- <xs:element name="search_field" type="xdat:search_field" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single" uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="search_where" type="xdat:criteria_set" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="sort_by" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="element_name" type="xs:string" minOccurs="0"/>
- <xs:element name="field_ID" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="allowed_user" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single" uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="login" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="allowed_groups" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="groupID" type="xs:string" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true">
- <xdat:relation relationType="single" uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string"/>
- <xs:attribute name="layeredSequence" type="xs:string" use="optional"/>
- <xs:attribute name="allow-diff-columns" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="secure" type="xs:boolean" use="optional" default="true"/>
- <xs:attribute name="brief-description" type="xs:string"/>
- <xs:attribute name="tag" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="criteria_set">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true" displayIdentifiers="method"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="criteria" type="xdat:criteria" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="child_set" type="xdat:criteria_set" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="method" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="AND"/>
- <xs:enumeration value="OR"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="criteria">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true" displayIdentifiers="schema_field"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="schema_field" type="xs:string" minOccurs="0"/>
- <xs:element name="comparison_type" type="xs:string" minOccurs="0"/>
- <xs:element name="custom_search" type="xs:string" minOccurs="0"/>
- <xs:element name="value" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="override_value_formatting" type="xs:boolean" use="optional" default="0"/>
- </xs:complexType>
- <xs:complexType name="search_field">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true" displayIdentifiers="field_ID"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="element_name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="field_ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="sequence" type="xs:integer"/>
- <xs:element name="type" type="xs:string"/>
- <xs:element name="header" minOccurs="0"/>
- <xs:element name="value" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="visible" type="xs:boolean" use="optional"/>
- </xs:complexType>
- <xs:element name="bundle" type="xdat:stored_search"/>
- <xs:complexType name="access_log">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="login" type="xs:string"/>
- <xs:element name="access_date" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="ip" type="xs:string" minOccurs="0"/>
- <xs:element name="method" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="report"/>
- <xs:enumeration value="edit"/>
- <xs:enumeration value="pdf"/>
- <xs:enumeration value="xml"/>
- <xs:enumeration value="transfer"/>
- <xs:enumeration value="build"/>
- <xs:enumeration value="activation"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="userGroup">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="ID"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element ref="xdat:element_access" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="group_access" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="displayName" type="xs:string"/>
- <xs:attribute name="tag" type="xs:string"/>
- </xs:complexType>
- <xs:element name="UserGroup" type="xdat:userGroup"/>
- <xs:element name="XDATUser" type="xdat:user"/>
- <xs:element name="Search">
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="xdat:stored_search">
- <xs:attribute name="page" type="xs:integer" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="newsEntry">
- <xs:sequence minOccurs="0">
- <xs:element name="date" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="title" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="description" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="link" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="infoEntry">
- <xs:sequence minOccurs="0">
- <xs:element name="date" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="title" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="description" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="link" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- <xs:element name="News" type="xdat:newsEntry"/>
- <xs:element name="Info" type="xdat:infoEntry"/>
-</xs:schema>
diff --git a/src/main/webapp/schemas/validation/display/val_protocolData_display.xml b/src/main/webapp/schemas/validation/display/val_protocolData_display.xml
deleted file mode 100644
index d2566fb75617a0b5e17f9bd91cc9d6e85962c60d..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/validation/display/val_protocolData_display.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="val:protocolData" full-description="ProtocolVal" brief-description="ProtocolVal">
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="val:protocolData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','val:protocolData','val:protocolData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','val:protocolData','val:protocolData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="val:protocolData.date"/>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="VAL_PROTOCOLDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="val:protocolData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="val:protocolData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="val:protocolData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="val:protocolData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="val:protocolData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/val:protocolData/search_field/val:protocolData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','val:protocolData','val:protocolData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="val:protocolData.project"/>
- </DisplayField>
- <DisplayField id="VAL_PROTOCOLDATA_PROJECT_IDENTIFIER" header="VAL_PROTOCOLDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">val_protocoldata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="val:protocolData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="val:protocolData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="val:protocolData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/val:protocolData/search_field/val:protocolData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS val_protocoldata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="val:protocolData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="val:protocolData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="val:protocolData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="VAL_PROTOCOLDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='val:protocolData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="val:protocolData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="CHECK_STATUS" header="status" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="val:protocolData/check/status"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="CHECK_STATUS"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="CHECK_STATUS"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="CHECK_STATUS"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="CHECK_STATUS"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ProtocolVal" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="VAL_PROTOCOLDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="CHECK_STATUS"/>
- </DisplayVersion>
- <ViewLink alias="VAL_PROTOCOLDATA_PROJECTS">
- <Mapping TableName="VAL_PROTOCOLDATA_PROJECTS">
- <MappingColumn rootElement="val:protocolData" fieldElement="val:protocolData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="VAL_PROTOCOLDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='val:protocolData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/validation/protocolValidation.xsd b/src/main/webapp/schemas/validation/protocolValidation.xsd
deleted file mode 100644
index f05035dd8b270ba065448bbd2c2af089671148dc..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/validation/protocolValidation.xsd
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Mohana Ramaratnam (NRG INDIA) -->
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/val" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:val="http://nrg.wustl.edu/val" xmlns:xnat="http://nrg.wustl.edu/xnat" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:import namespace="http://nrg.wustl.edu/xnat" schemaLocation="../xnat/xnat.xsd"/>
- <xs:complexType name="protocolData">
- <xs:complexContent>
- <xs:extension base="xnat:imageAssessorData">
- <xs:sequence minOccurs="0">
- <xs:element name="check" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="conditions" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="condition" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="SCAN_CHECK_ID"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="verified" type="xs:string" minOccurs="0"/>
- <xs:element name="diagnosis" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SCAN_CHECK_ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="status" type="xs:string"/>
- <xs:attribute name="xmlpath" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="comments" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="comment" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="SES_COMMENT_DATE"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="username" type="xs:string"/>
- <xs:attribute name="dateTime" type="xs:dateTime" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SES_COMMENT_DATE"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="additionalVal" type="val:additionalVal" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="status" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="scans" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="scan_check" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="SCAN_ID"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="conditions" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="condition" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="SCAN_CONDITION_ID"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="verified" type="xs:string" minOccurs="0"/>
- <xs:element name="diagnosis" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SCAN_CONDITION_ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="status" type="xs:string"/>
- <xs:attribute name="xmlpath" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="comments" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="comment" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="SCAN_COMMENT_DATE"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="username" type="xs:string"/>
- <xs:attribute name="dateTime" type="xs:dateTime" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SCAN_COMMENT_DATE"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="additionalVal" type="val:additionalVal" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="SCAN_ID" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SCAN_ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="status" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:element name="ProtocolVal" type="val:protocolData"/>
- <xs:complexType name="additionalVal"/>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xdat/PlexiViewer.xsd b/src/main/webapp/schemas/xdat/PlexiViewer.xsd
deleted file mode 100644
index 7106c788bedca75ac63039b10fe7a528ece2b728..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xdat/PlexiViewer.xsd
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Mohana Ramaratnam (Washington University) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:complexType name="LayoutDescription">
- <xs:sequence>
- <xs:element name="Coordinates">
- <xs:complexType>
- <xs:attribute name="originX" type="xs:integer" use="required"/>
- <xs:attribute name="originY" type="xs:integer" use="required"/>
- <xs:attribute name="originZ" type="xs:integer" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="voxelSize" type="xs:integer" use="required"/>
- </xs:complexType>
- <xs:element name="Layout" type="LayoutDescription"/>
- <xs:element name="CropDetails">
- <xs:annotation>
- <xs:documentation>The information here will be used by the plexiConverter to crop the image</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="startSlice" type="xs:integer" use="optional"/>
- <xs:attribute name="endSlice" type="xs:integer" use="optional"/>
- <xs:attribute name="X" type="xs:integer" use="required"/>
- <xs:attribute name="Y" type="xs:integer" use="required"/>
- <xs:attribute name="width" type="xs:integer" use="required"/>
- <xs:attribute name="height" type="xs:integer" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="MontageView">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="transverse">
- <xs:complexType>
- <xs:attribute name="start_slice" type="xs:int" use="required"/>
- <xs:attribute name="end_slice" type="xs:int" use="required"/>
- <xs:attribute name="slice_spacing" type="xs:int" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="sagittal">
- <xs:complexType>
- <xs:attribute name="start_slice" type="xs:int" use="required"/>
- <xs:attribute name="end_slice" type="xs:int" use="required"/>
- <xs:attribute name="slice_spacing" type="xs:int" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="coronal">
- <xs:complexType>
- <xs:attribute name="start_slice" type="xs:int" use="required"/>
- <xs:attribute name="end_slice" type="xs:int" use="required"/>
- <xs:attribute name="slice_spacing" type="xs:int" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="scale" type="xs:float" use="optional" default="1"/>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="SchemaLinkType">
- <xs:attribute name="element" type="xs:string" use="required"/>
- <xs:attribute name="value" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:element name="Viewer">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="PlexiViewer" maxOccurs="unbounded">
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="PlexiViewerType">
- <xs:attribute name="sessionType" type="xs:string" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="PlexiViewerType">
- <xs:sequence>
- <xs:element name="DefaultLoResType" type="xs:string"/>
- <xs:element name="ThumbnailArchiveLocation" type="xs:string"/>
- <xs:element name="LoResArchiveLocation" type="xs:string"/>
- <xs:element name="CacheLocation" type="xs:string"/>
- <xs:element ref="Layout" maxOccurs="unbounded"/>
- <xs:element name="ViewableItem" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>A collection of images which are viewable. A reconstructed image for a scan may also be viewable. The attribute type will correspond to type/code for the scan/reconstructed image/assessor </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SchemaLink" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Match the ELEMENT.FIELD to the viewable-Item.ID</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="SchemaLinkType"/>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="UserInterface">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="LinkedDropDown" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="viewableItemType" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="selectionPriority" type="xs:int" use="optional"/>
- <xs:attribute name="displayText" type="xs:string" use="optional"/>
- <xs:attribute name="allowedToChooseFiles" type="xs:boolean" use="optional" default="false"/>
- <xs:attribute name="allowedToChooseID" type="xs:boolean" use="optional" default="false"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Thumbnail" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="CropDetails" minOccurs="0"/>
- <xs:element name="Slice" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="number" type="xs:int" use="required"/>
- <xs:attribute name="orientation" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="converterClassName" type="xs:string" use="required"/>
- <xs:attribute name="format" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Lo-Res" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="CropDetails" minOccurs="0"/>
- <xs:element ref="MontageView"/>
- <xs:element name="Parameter" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Keep track of parameters that might have to be passed in order to convert. EG Dbar and Asigma images need a scaleFactor in order to convert into 8 bit.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="attribute" type="xs:string" use="required"/>
- <xs:attribute name="value" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" type="xs:string" use="required"/>
- <xs:attribute name="converterClassName" type="xs:string" use="required"/>
- <xs:attribute name="format" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Hi-Res" minOccurs="0">
- <xs:annotation>
- <xs:documentation>The class (formatConverterClassName) will convert the Hi-Res image from one format to the other. Eg MPRAGE images are converted to 4dfp using imato4dfp</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Layer" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>The attribute num will decide the layer on which the image gets inserted. For only one image/layer put only one entry. </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="SchemaLinkType">
- <xs:attribute name="num" type="xs:int" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="LayoutRef">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element ref="MontageView"/>
- </xs:sequence>
- <xs:attribute name="formatConverterClass" type="xs:string" use="optional"/>
- <xs:attribute name="format" type="xs:string" use="required"/>
- <xs:attribute name="minIntensity" type="xs:float" use="optional"/>
- <xs:attribute name="maxIntensity" type="xs:float" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" type="xs:string" use="required"/>
- <xs:attribute name="imageViewerClassName" type="xs:string" use="optional"/>
- <xs:attribute name="displayCondition" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xdat/display.xsd b/src/main/webapp/schemas/xdat/display.xsd
deleted file mode 100644
index 136d8f44d44bf7282d8ba7c9edeb7e1646063ea6..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xdat/display.xsd
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/display" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:display="http://nrg.wustl.edu/display" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="Displays">
- <xs:annotation>
- <xs:documentation>Comment describing your root element</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="display:Arc-Definition" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="display:Arc" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="DisplayField" maxOccurs="unbounded">
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="display:FieldType">
- <xs:attribute name="html-content" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="visible" type="xs:boolean"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="DisplayVersion" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="HTML-Header" type="display:HTML-Cell" minOccurs="0"/>
- <xs:element name="DisplayFieldRef" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="header" type="xs:string" use="optional"/>
- <xs:attribute name="element_name" type="xs:string" use="optional"/>
- <xs:attribute name="type" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="COUNT"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="value" type="xs:string" use="optional"/>
- <xs:attribute name="visible" type="xs:boolean" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="versionName" type="xs:string" use="required"/>
- <xs:attribute name="default-order-by" type="xs:string" use="required"/>
- <xs:attribute name="brief-description" type="xs:string"/>
- <xs:attribute name="dark-color" type="xs:string"/>
- <xs:attribute name="light-color" type="xs:string"/>
- <xs:attribute name="default-sort-order" type="xs:string"/>
- <xs:attribute name="allow-diff-columns" type="xs:boolean"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="SchemaLink" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="display:Mapping" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="element" type="xs:string" use="required"/>
- <xs:attribute name="type">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="mapping"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="alias" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="ViewLink" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="display:Mapping"/>
- </xs:sequence>
- <xs:attribute name="alias" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="SQLView" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="sql" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="SQLFunction" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="content" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="schema-element" type="xs:string"/>
- <xs:attribute name="HTML-header-link" type="xs:string"/>
- <xs:attribute name="value_field" type="xs:string" use="optional"/>
- <xs:attribute name="display_field" type="xs:string" use="optional"/>
- <xs:attribute name="display_label" type="xs:string" use="optional"/>
- <xs:attribute name="brief-description" type="xs:string"/>
- <xs:attribute name="full-description" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Mapping">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="MappingColumn" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="rootElement" type="xs:string"/>
- <xs:attribute name="fieldElement"/>
- <xs:attribute name="mapsTo" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="TableName" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="DisplayFieldElement">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="schema-element" type="xs:string" use="optional"/>
- <xs:attribute name="viewName" type="xs:string"/>
- <xs:attribute name="viewColumn" type="xs:string"/>
- <xs:attribute name="xdat-type">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="COUNT"/>
- <xs:enumeration value="WHERE"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="HTML-Cell">
- <xs:attribute name="width" type="xs:integer"/>
- <xs:attribute name="height" type="xs:integer"/>
- <xs:attribute name="valign">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="bottom"/>
- <xs:enumeration value="top"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="align">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="left"/>
- <xs:enumeration value="right"/>
- <xs:enumeration value="center"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="serverLink" type="xs:string"/>
- </xs:complexType>
- <xs:element name="Arc-Definition">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="CommonField" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="type" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="DATE"/>
- <xs:enumeration value="INTEGER"/>
- <xs:enumeration value="STRING"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="Bridge-Element">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="field" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Filter" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="field" type="xs:string" use="required"/>
- <xs:attribute name="filterType" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="closest"/>
- <xs:enumeration value="before"/>
- <xs:enumeration value="equals"/>
- <xs:enumeration value="distinct"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="Id" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Arc">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="CommonField" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="local-field" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="FieldType">
- <xs:sequence>
- <xs:element ref="display:DisplayFieldElement" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="Content" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="type">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="sql"/>
- <xs:enumeration value="java"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="HTML-Link" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SecureLink" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="securityMappingValue" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="displayFieldId" type="xs:string" use="required"/>
- <xs:attribute name="schemaElementMap" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="elementName" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Property" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="InsertValue" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="id"/>
- <xs:attribute name="field"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name">
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="value"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="HTML-Cell" type="display:HTML-Cell" minOccurs="0"/>
- <xs:element name="HTML-Image" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="width" type="xs:integer"/>
- <xs:attribute name="height" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="description" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="header" type="xs:string" use="required"/>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="image" type="xs:boolean" default="false"/>
- <xs:attribute name="sort-by"/>
- <xs:attribute name="sort-order">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="ASC"/>
- <xs:enumeration value="DESC"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="searchable" type="xs:boolean"/>
- <xs:attribute name="data-type">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="integer"/>
- <xs:enumeration value="string"/>
- <xs:enumeration value="float"/>
- <xs:enumeration value="date"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="SubQueryField">
- <xs:complexContent>
- <xs:extension base="display:FieldType">
- <xs:sequence minOccurs="0">
- <xs:element name="SubQuery" type="xs:string" minOccurs="0"/>
- <xs:element name="MappingColumns" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="MappingColumn" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="schemaField" type="xs:string"/>
- <xs:attribute name="queryField" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xdat/instance.xsd b/src/main/webapp/schemas/xdat/instance.xsd
deleted file mode 100644
index 7ef2e2e6c405eb74cc61479b04fae9244d235839..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xdat/instance.xsd
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="Instance_Settings">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Databases">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Database">
- <xs:complexType>
- <xs:attribute name="Type">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="POSTGRESQL"/>
- <xs:enumeration value="MYSQL"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="Id" type="xs:string"/>
- <xs:attribute name="Url" type="xs:string"/>
- <xs:attribute name="User" type="xs:string"/>
- <xs:attribute name="Pass" type="xs:string"/>
- <xs:attribute name="Driver" type="xs:string"/>
- <xs:attribute name="MaxConnections" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Package" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="Name" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Models">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data_Model" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="File_Name" type="xs:string"/>
- <xs:attribute name="File_Location" type="xs:string"/>
- <xs:attribute name="DB" type="xs:string"/>
- <xs:attribute name="package" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Data_Type_Codes" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Type_Code_Mapping" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="Model_Id" type="xs:string"/>
- <xs:attribute name="Model_Element" type="xs:string"/>
- <xs:attribute name="Code" type="xs:string"/>
- <xs:attribute name="Brief_Description" type="xs:string"/>
- <xs:attribute name="Full_Description" type="xs:string"/>
- <xs:attribute name="Log_Location" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Pivots" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Pivot" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="Model_Id" type="xs:string"/>
- <xs:attribute name="Model_Element" type="xs:string"/>
- <xs:attribute name="Mapping1" type="xs:string"/>
- <xs:attribute name="Mapping2" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="admin_email" type="xs:string"/>
- <xs:attribute name="smtp_server" type="xs:string" use="optional"/>
- <xs:attribute name="archive_root_path" type="xs:string" use="optional"/>
- <xs:attribute name="cache_path" type="xs:string" use="optional"/>
- <xs:attribute name="prearchive_path" type="xs:string" use="optional"/>
- <xs:attribute name="site_url" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xdat/xdat.xsd b/src/main/webapp/schemas/xdat/xdat.xsd
deleted file mode 100644
index ec113fd2d332528c4d07d83ae15eaf02f7afa835..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xdat/xdat.xsd
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/xdat" xmlns="http://nrg.wustl.edu/xdat" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="rule">
- <xs:complexType>
- <xs:attribute name="name" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="required"/>
- <xs:enumeration value="minLength"/>
- <xs:enumeration value="maxLength"/>
- <xs:enumeration value="mask"/>
- <xs:enumeration value="notANumberMessage"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="value" type="xs:string" use="required"/>
- <xs:attribute name="message" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="sqlField">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="optional"/>
- <xs:attribute name="primaryKey" use="optional" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="type" use="optional" default="VARCHAR">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="BIT"/>
- <xs:enumeration value="TINYINT"/>
- <xs:enumeration value="SMALLINT"/>
- <xs:enumeration value="INTEGER"/>
- <xs:enumeration value="BIGINT"/>
- <xs:enumeration value="FLOAT"/>
- <xs:enumeration value="REAL"/>
- <xs:enumeration value="NUMERIC"/>
- <xs:enumeration value="DECIMAL"/>
- <xs:enumeration value="CHAR"/>
- <xs:enumeration value="VARCHAR"/>
- <xs:enumeration value="LONGVARCHAR"/>
- <xs:enumeration value="DATE"/>
- <xs:enumeration value="TIME"/>
- <xs:enumeration value="TIMESTAMP"/>
- <xs:enumeration value="BINARY"/>
- <xs:enumeration value="VARBINARY"/>
- <xs:enumeration value="LONGVARBINARY"/>
- <xs:enumeration value="NULL"/>
- <xs:enumeration value="OTHER"/>
- <xs:enumeration value="JAVA_OBJECT"/>
- <xs:enumeration value="DISTINCT"/>
- <xs:enumeration value="STRUCT"/>
- <xs:enumeration value="ARRAY"/>
- <xs:enumeration value="BLOB"/>
- <xs:enumeration value="CLOB"/>
- <xs:enumeration value="REF"/>
- <xs:enumeration value="BOOLEANINT"/>
- <xs:enumeration value="BOOLEANCHAR"/>
- <xs:enumeration value="DOUBLE"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="autoIncrement" use="optional" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="index" type="xs:string" use="optional"/>
- <xs:attribute name="key" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="relation">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="duplicateRelationship" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="FieldMapping" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="localField" type="xs:string" use="required"/>
- <xs:attribute name="foreignField" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="elementName" type="xs:string"/>
- <xs:attribute name="id" type="xs:string"/>
- <xs:attribute name="foreignField" type="xs:string"/>
- <xs:attribute name="localField" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="foreignKeyName" type="xs:string" use="optional"/>
- <xs:attribute name="foreignKeyTable" type="xs:string" use="optional"/>
- <xs:attribute name="foreignCol" type="xs:string" use="optional"/>
- <xs:attribute name="onDelete" use="optional" default="none">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="cascade"/>
- <xs:enumeration value="setnull"/>
- <xs:enumeration value="restrict"/>
- <xs:enumeration value="none"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="onUpdate" use="optional" default="none">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="cascade"/>
- <xs:enumeration value="setnull"/>
- <xs:enumeration value="restrict"/>
- <xs:enumeration value="none"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="relationType" type="xs:string" use="optional"/>
- <xs:attribute name="uniqueComposite" type="xs:string" use="optional"/>
- <xs:attribute name="relationName" type="xs:string" use="optional"/>
- <xs:attribute name="unique" type="xs:boolean" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="field">
- <xs:complexType>
- <xs:all>
- <xs:element ref="sqlField" minOccurs="0"/>
- <xs:element ref="relation" minOccurs="0"/>
- <xs:element ref="rule" minOccurs="0"/>
- </xs:all>
- <xs:attribute name="displayName" type="xs:string" use="optional"/>
- <xs:attribute name="size" type="xs:int" use="optional"/>
- <xs:attribute name="expose" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="single"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="unique" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="uniqueComposite" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="xmlOnly" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="baseElement" type="xs:string" use="optional"/>
- <xs:attribute name="baseCol" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="sqlElement">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="element">
- <xs:complexType>
- <xs:all>
- <xs:element ref="sqlElement" minOccurs="0"/>
- </xs:all>
- <xs:attribute name="storeHistory" type="xs:boolean" use="optional"/>
- <xs:attribute name="impliedRef" type="xs:string" use="optional"/>
- <xs:attribute name="ignoreWarnings" type="xs:boolean"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="container">
- <xs:complexType>
- <xs:all>
- <xs:element name="elements">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="element" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="fields">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="field" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:all>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/src/main/webapp/schemas/xnat/display/mrSessionData_display.xml b/src/main/webapp/schemas/xnat/display/mrSessionData_display.xml
deleted file mode 100644
index 4ea27ca48fc4a91ee0a47b79e59101fe7585b472..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/mrSessionData_display.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Tim Olsen (Washington University) -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mrSessionData" full-description="MR Session" brief-description="MR Session">
- <Arc-Definition Id="ASSESSOR">
- <CommonField id="EXPT_ID" type="STRING"/>
- <CommonField id="ASSESSED_EXPT_ID" type="STRING"/>
- <Bridge-Element name="xnat:mrSessionData" field="SESSION_ID"/>
- <Filter field="EXPT_ID" filterType="distinct"/>
- <Filter field="ASSESSED_EXPT_ID" filterType="equals"/>
- </Arc-Definition>
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="SESSION_ID"/>
- </Arc>
- <DisplayField id="SESSION_ID" header="Session" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.ID"/>
- <HTML-Link>
- <SecureLink elementName="xnat:mrSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mrSessionData/sharing/share/project"/>
- </SecureLink>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
- <InsertValue id="Field1" field="SESSION_ID"/>
- </Property>
- </HTML-Link>
- <description>MR Session Accession Number</description>
- </DisplayField>
- <DisplayField id="VIEW" header="" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/v.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return viewer('@Field1');">
- <InsertValue id="Field1" field="SESSION_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="false" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.subject_ID"/>
- <description>Subject Accession Number</description>
- </DisplayField>
- <DisplayField id="SUBJECT_LABEL" header="Subject Label" data-type="String" searchable="true">
- <DisplayFieldElement name="Field1" viewName="SUBJECT_LABEL" viewColumn="SUBJECT_LABEL"/>
- </DisplayField>
- <DisplayField id="RPT" header="" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
- <InsertValue id="Field1" field="SESSION_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true" data-type="date" sort-order="DESC">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
- <description>MR Session Date (DATE)</description>
- </DisplayField>
- <DisplayField id="DATE_CHAR" header="Date" visible="true" sort-by="DATE" sort-order="DESC">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
- <Content type="sql">CAST(@Field1 AS VARCHAR)</Content>
- <description>MR Session Date (String)</description>
- </DisplayField>
- <DisplayField id="INVEST_SEARCH" header="PI" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.investigator.firstname"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:mrSessionData.investigator.lastname"/>
- <Content type="sql">@Field1 || ' ' || @Field2</Content>
- <description>Primary Investigator (first and last name)</description>
- </DisplayField>
- <DisplayField id="INVEST" header="PI" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.investigator.lastname"/>
- <description>Primary Investigator (last name)</description>
- </DisplayField>
- <DisplayField id="INVEST_ID" header="PI" visible="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.investigator.xnat_investigatorData_id"/>
- </DisplayField>
- <DisplayField id="INVEST_CSV" header="PI" visible="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.investigator.lastname"/>
- </DisplayField>
- <DisplayField id="MR_NOTES" header="Notes" visible="true" data-type="string">
- <DisplayFieldElement name="COL1" schema-element="xnat:mrSessionData.note"/>
- <Content type="sql">substring(@COL1 FROM 0 FOR 10)</Content>
- </DisplayField>
- <DisplayField id="MR_NOTES_CSV" header="Notes" visible="true" data-type="string">
- <DisplayFieldElement name="COL1" schema-element="xnat:mrSessionData.note"/>
- <Content type="sql">@COL1</Content>
- </DisplayField>
- <DisplayField id="OPERATOR" header="Operator" visible="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.operator"/>
- <Content type="sql">substring(@Field1 FROM 0 FOR 6)</Content>
- </DisplayField>
- <DisplayField id="TYPE" header="Type" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.session_type"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="Scanner" visible="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.scanner"/>
- </DisplayField>
- <DisplayField id="MARKER" header="Marker" visible="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.marker"/>
- <Content type="sql">substring(@Field1 FROM 0 FOR 6)</Content>
- </DisplayField>
- <DisplayField id="STABILIZATION" header="Stabilization" visible="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.stabilization"/>
- <Content type="sql">substring(@Field1 FROM 0 FOR 6)</Content>
- </DisplayField>
- <DisplayField id="OPERATOR_CSV" header="Operator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.operator"/>
- </DisplayField>
- <DisplayField id="SCANNER_CSV" header="Scanner" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.scanner"/>
- </DisplayField>
- <DisplayField id="MARKER_CSV" header="Marker" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.marker"/>
- </DisplayField>
- <DisplayField id="STABILIZATION_CSV" header="Stabilization" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.stabilization"/>
- </DisplayField>
- <DisplayField id="GEN_AGE" header="Age" visible="true" searchable="true" data-type="float">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <DisplayFieldElement name="Field4" schema-element="xnat:mrSessionData.age"/>
- <Content type="sql">CAST(ROUND(CAST(COALESCE(@Field4,EXTRACT(YEAR FROM AGE(@Field1, @Field2)),(EXTRACT(YEAR FROM @Field1)) - (@Field3)) AS numeric),2) AS numeric)</Content>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="float">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <DisplayFieldElement name="Field5" schema-element="xnat:demographicData.age"/>
- <DisplayFieldElement name="Field4" schema-element="xnat:mrSessionData.age"/>
- <Content type="sql">CAST(FLOOR(CAST(COALESCE(@Field4,@Field5,EXTRACT(YEAR FROM AGE(@Field1, @Field2)),(EXTRACT(YEAR FROM @Field1)) - (@Field3)) AS numeric)) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="DTI Count" id="DTI_COUNT" data-type="integer" searchable="true">
- <DisplayFieldElement name="Field1" viewName="DTI_COUNT" viewColumn="DTI_COUNT"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="date">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.meta.insert_date"/>
- <description>Date session was archived</description>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.meta.insert_user.login"/>
- <description>User who archived session</description>
- </DisplayField>
- <DisplayField id="LAST_MODIFIED" header="Modified" visible="true" searchable="true" data-type="date">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.meta.insert_date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:mrSessionData.meta.last_modified"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- </DisplayField>
- <DisplayField id="MR_SCAN_COUNT_AGG" header="Scans" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="MR_SCAN_COUNT_AGG" viewColumn="TYPE_COUNT"/>
- <description>Aggregated Scan Counts</description>
- </DisplayField>
- <DisplayField id="WORKFLOW_STATUS" header="Process">
- <DisplayFieldElement name="Field1" viewName="ORDERED_WORKFLOWS" viewColumn="STATUS"/>
- <DisplayFieldElement name="Field2" viewName="ORDERED_WORKFLOWS" viewColumn="PIPELINE_NAME"/>
- <Content type="sql">'<B>' || CASE @Field1 WHEN 'Complete' THEN '<FONT COLOR=green>' || @Field2 || '</FONT>' WHEN 'In Progress' THEN '<FONT COLOR=SlateGrey>' || @Field2 || '</FONT>' WHEN 'Running' THEN '<FONT COLOR=SlateGrey>' || @Field2 || '</FONT>' WHEN 'Queued' THEN '<FONT COLOR=orange>' || @Field2 || '</FONT>' WHEN 'Failed' THEN '<FONT COLOR=red>' || @Field2 || '</FONT>' ELSE '<FONT COLOR=orange>' || @Field2 || '</FONT>' END || '</B>'</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="MR_PROJECTS" viewColumn="PROJECTS"/>
- <description>All Projects for this session</description>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.project"/>
- <description>Primary Project for this session</description>
- </DisplayField>
- <DisplayField id="MR_PROJECT_IDENTIFIER" header="MR ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">mr_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:mrSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mrSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:mrSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:mrSessionData/search_field/xnat:mrSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="SESSION_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
- <InsertValue id="Field1" field="SESSION_ID"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS mr_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:mrSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.label"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:mrSessionData.ID"/>
- <Content type="sql">COALESCE(@Field1, @Field2)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:mrSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mrSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:mrSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:mrSessionData/search_field/xnat:mrSessionData.ID">
- <InsertValue id="Field1" field="SESSION_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
- <InsertValue id="Field1" field="SESSION_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- <description>Session ID</description>
- </DisplayField>
- <DisplayField id="MR_EXPT_COUNT" header="Count" visible="true" searchable="false" data-type="integer" xsi:type="SubQueryField">
- <Content type="sql">mr_project_count</Content>
- <SubQuery>SELECT COUNT(*) as mr_project_count, imagesession_id FROM xnat_mrAssessorData sad LEFT JOIN xnat_imageAssessorData iad ON sad.id=iad.id LEFT JOIN xnat_experimentData ex ON sad.ID=ex.ID JOIN xdat_meta_element xme ON ex.extension=xme.xdat_meta_element_id WHERE xme.element_name='@WHERE' GROUP BY imagesession_id</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:mrSessionData.ID" queryField="imagesession_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="XNAT_MRSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS mrsession_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:mrSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:mrSessionData.ID" queryField="mrsession_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" dark-color="DEDEDE" light-color="FFFFFF" default-sort-order="DESC">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="MR_SCAN_COUNT_AGG"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" dark-color="DEDEDE" light-color="FFFFFF" default-sort-order="DESC">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="MR_SCAN_COUNT_AGG"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" dark-color="DEDEDE" light-color="FFFFFF" default-sort-order="DESC">
- <DisplayFieldRef id="MR_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="MR_SCAN_COUNT_AGG"/>
- </DisplayVersion>
- <DisplayVersion versionName="root" default-order-by="DATE" dark-color="DEDEDE" light-color="FFFFFF" default-sort-order="DESC">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="brief" default-order-by="MR_NOTES" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
- <DisplayFieldRef id="MR_NOTES"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="OPERATOR" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
- <DisplayFieldRef id="MR_NOTES"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="COHORT" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="MARKER"/>
- <DisplayFieldRef id="STABILIZATION"/>
- </DisplayVersion>
- <DisplayVersion versionName="brief_csv" default-order-by="MR_NOTES" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
- <DisplayFieldRef id="MR_NOTES_CSV"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed_csv" default-order-by="MR_NOTES" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
- <DisplayFieldRef id="MR_NOTES_CSV"/>
- <DisplayFieldRef id="OPERATOR_CSV"/>
- <DisplayFieldRef id="COHORT" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="SCANNER_CSV"/>
- <DisplayFieldRef id="MARKER_CSV"/>
- <DisplayFieldRef id="STABILIZATION_CSV"/>
- </DisplayVersion>
- <DisplayVersion versionName="core" default-order-by="SESSION" brief-description="Mr Session" dark-color="dedede" light-color="ffffff">
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="core_csv" default-order-by="EXPT_DATE">
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER_TEXT" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="meta_data" default-order-by="SES" brief-description="Mr Session" dark-color="99FF99" light-color="CCFFCC">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="VIEW"/>
- <DisplayFieldRef id="SESSION_ID"/>
- <DisplayFieldRef id="LAST_MODIFIED"/>
- <DisplayFieldRef id="INVEST"/>
- <DisplayFieldRef id="INSERT_USER"/>
- <DisplayFieldRef id="PREARCHIVE"/>
- </DisplayVersion>
- <ViewLink alias="ORDERED_WORKFLOWS">
- <Mapping TableName="ORDERED_WORKFLOWS">
- <MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="MR_PROJECTS">
- <Mapping TableName="MR_PROJECTS">
- <MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="MR_SCAN_COUNT_AGG">
- <Mapping TableName="MR_SCAN_COUNT_AGG">
- <MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="image_session_id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="DTI_COUNT">
- <Mapping TableName="DTI_COUNT">
- <MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="image_session_id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="SUBJECT_LABEL">
- <Mapping TableName="SUBJECT_LABEL">
- <MappingColumn rootElement="xnat:mrSessionData" fieldElement="xnat:mrSessionData.ID" mapsTo="image_session_id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="mr_scan_count_agg" sql="SELECT image_session_id, TRIM(', ' FROM xs_a_concat(TYPE_COUNT || ', ')) AS TYPE_COUNT FROM (SELECT image_session_id, (TYPE || '(' || COUNT(id) || ')') AS TYPE_COUNT FROM xnat_imageScanData GROUP BY image_session_id,TYPE ORDER BY image_session_id,TYPE) _TYPES GROUP BY image_session_id"/>
- <SQLView name="MR_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:mrSessionData' GROUP BY expt.id,expt.project"/>
- <SQLView name="ordered_workflows" sql="SELECT wrk_workflowdata.id, status, wrk_workflowdata_id,
- CASE pipeline_name
- WHEN 'Transfer'::text THEN 'Archive'::text
- ELSE
- CASE xs_lastposition('/'::text, pipeline_name::text) WHEN 0 THEN pipeline_name ELSE
- substring(substring(pipeline_name::text, xs_lastposition('/'::text, pipeline_name::text) + 1), 1, xs_lastposition('.'::text, substring(pipeline_name::text, xs_lastposition('/'::text, pipeline_name::text) + 1)) - 1)
- END END AS pipeline_name
- FROM wrk_workflowdata
- RIGHT JOIN ( SELECT wrk_workflowdata.id, max(wrk_workflowdata.launch_time) AS launch_time
- FROM wrk_workflowdata
- GROUP BY wrk_workflowdata.id) wrk_max ON wrk_workflowdata.id::text = wrk_max.id::text AND wrk_workflowdata.launch_time = wrk_max.launch_time"/>
- <SQLView name="DTI_COUNT" sql="SELECT image_session_id,COUNT(*) AS DTI_COUNT FROM xnat_imagescandata WHERE series_description LIKE '%DTI%' OR type LIKE '%DTI%' GROUP BY image_session_id"/>
- <SQLView name="SUBJECT_LABEL" sql="SELECT isd.id AS image_session_id, sd.label AS subject_label from xnat_imageSessionData isd left join xnat_subjectassessordata sad on isd.id = sad.id LEFT JOIN xnat_subjectdata sd ON sad.subject_id = sd.id;"/>
- <SQLFunction name="xs_lastPosition" content="CREATE OR REPLACE FUNCTION xs_lastPosition(text, text)
- RETURNS int4 AS
-$BODY$
- DECLARE
- t text;
- i int4:=0;
- begin
- t = $2;
- WHILE(POSITION($1 in t)!=0) LOOP
- i = i + POSITION($1 in t);
- t = substring(t from (POSITION($1 in t) + 1));
- END LOOP;
- RETURN i;
- END;
-$BODY$
- LANGUAGE 'plpgsql' VOLATILE;"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/subjectData_display.xml b/src/main/webapp/schemas/xnat/display/subjectData_display.xml
deleted file mode 100644
index 98af29a24ee24a3cfb623446d316d61a0f39cd1c..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/subjectData_display.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/display/subjectData_display.xml
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/7/14 12:19 PM
- -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:subjectData" brief-description="Subjects">
- <Arc-Definition Id="PARTICIPANT_EXPERIMENT">
- <CommonField id="DATE" type="DATE"/>
- <CommonField id="PART_ID" type="STRING"/>
- <CommonField id="EXPT_ID" type="STRING"/>
- <Bridge-Element name="xnat:subjectData" field="SUBJECT_ID"/>
- <Filter field="EXPT_ID" filterType="distinct"/>
- <Filter field="DATE" filterType="closest"/>
- <Filter field="PART_ID" filterType="equals"/>
- </Arc-Definition>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="SUBJECTID" header="Subject" visible="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="date">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="GENDER" header="Gender" visible="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:demographicData.gender"/>
- </DisplayField>
- <DisplayField id="GENDER_TEXT" header="M/F" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:demographicData.gender"/>
- <Content type="sql">CASE @Field1 WHEN 'male' THEN 'M' WHEN 'female' THEN 'F' ELSE 'U' END</Content>
- </DisplayField>
- <DisplayField id="HANDEDNESS" header="Hand" visible="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:demographicData.handedness"/>
- </DisplayField>
- <DisplayField id="HANDEDNESS_TEXT" header="Hand" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:demographicData.handedness"/>
- <Content type="sql">CASE LOWER(@Field1) WHEN 'left' THEN 'L' WHEN 'right' THEN 'R' WHEN 'ambidextrous' THEN 'A' WHEN 'r' THEN 'R' WHEN 'l' THEN 'L' WHEN 'a' THEN 'A' END</Content>
- </DisplayField>
- <DisplayField id="DOB" header="YOB" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:demographicData.yob"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <Content type="sql">CAST(FLOOR(COALESCE(@Field1,EXTRACT(YEAR FROM @Field2))) AS INTEGER)</Content>
- </DisplayField>
- <DisplayField id="EDUC" header="Education" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:demographicData.education"/>
- </DisplayField>
- <DisplayField id="SES" header="Ses" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:demographicData.ses"/>
- </DisplayField>
- <DisplayField id="MR_COUNT" header="MR Count" visible="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData" xdat-type="COUNT"/>
- </DisplayField>
- <DisplayField id="INVEST_CSV" header="PI" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectData.investigator.lastname"/>
- </DisplayField>
- <DisplayField id="PROJECTS" header="Projects" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="SUB_PROJECTS" viewColumn="PROJECTS"/>
- <description>All projects tied to a subject</description>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectData.project"/>
- <description>Subject's primary project</description>
- </DisplayField>
- <DisplayField id="SUB_GROUP" header="Group" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectData.group"/>
- </DisplayField>
- <DisplayField header="Subject" id="SUBJECT_LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectData.label"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:subjectData.ID"/>
- <Content type="sql">COALESCE(@Field1, @Field2)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:subjectData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:subjectData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:subjectData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID">
- <InsertValue id="Field1" field="SUBJECTID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECTID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField header="Subject" id="SHARED_LABEL" data-type="string" searchable="false">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectData/sharing/share/label"/>
- </DisplayField>
- <DisplayField id="SUB_PROJECT_IDENTIFIER" header="Subject" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">sub_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:subjectData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:subjectData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:subjectData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID/project/@Field2">
- <InsertValue id="Field1" field="SUBJECTID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECTID"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT CASE WHEN label='' THEN id WHEN label IS NULL THEN id ELSE label END AS sub_project_id,id AS subject_id FROM (SELECT id,project,label FROM xnat_subjectdata sub WHERE project='@WHERE' UNION SELECT subject_id,project,label FROM xnat_projectParticipant pp WHERE project='@WHERE')SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:subjectData.ID" queryField="subject_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="SUB_EXPT_COUNT" header="Count" visible="true" searchable="false" data-type="integer" xsi:type="SubQueryField">
- <Content type="sql">sub_project_count</Content>
- <SubQuery>SELECT COUNT(*) as sub_project_count, subject_id FROM xnat_subjectAssessorData sad LEFT JOIN xnat_experimentData ex ON sad.ID=ex.ID JOIN xdat_meta_element xme ON ex.extension=xme.xdat_meta_element_id WHERE xme.element_name='@WHERE' GROUP BY subject_id</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:subjectData.ID" queryField="subject_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="XNAT_SUBJECTDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( fields_field_xnat_subjectdata_id) fields_field_xnat_subjectdata_id AS subject_id,field FROM xnat_subjectData_field WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:subjectData.ID" queryField="subject_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="ADD_IDS" header="Labels" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="SUBJECT_IDS" viewColumn="ADDIDS"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID">
- <InsertValue id="Field1" field="SUBJECTID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECTID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RACE" header="Race" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:demographicData.race"/>
- </DisplayField>
- <DisplayField id="ETHNICITY" header="Ethnicity" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:demographicData.ethnicity"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="SUBJECT_ID" brief-description="Subject Data" dark-color="DEDEDE" light-color="FFFFFF">
- <DisplayFieldRef id="SUBJECT_LABEL"/>
- <DisplayFieldRef id="GENDER"/>
- <DisplayFieldRef id="HANDEDNESS"/>
- <DisplayFieldRef id="DOB"/>
- <DisplayFieldRef id="EDUC"/>
- <DisplayFieldRef id="SES"/>
- <DisplayFieldRef id="MR_COUNT"/>
- </DisplayVersion>
- <DisplayVersion versionName="brief" default-order-by="SUBJECT_ID" brief-description="Subject Data" dark-color="DEDEDE" light-color="FFFFFF">
- <DisplayFieldRef id="SUBJECT_LABEL"/>
- <DisplayFieldRef id="GENDER"/>
- <DisplayFieldRef id="HANDEDNESS"/>
- <DisplayFieldRef id="DOB"/>
- <DisplayFieldRef id="EDUC"/>
- <DisplayFieldRef id="SES"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="SUBJECTID" brief-description="Participant Demographics" dark-color="DEDEDE" light-color="FFFFFF">
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="GENDER_TEXT"/>
- <DisplayFieldRef id="HANDEDNESS_TEXT"/>
- <DisplayFieldRef id="DOB"/>
- </DisplayVersion>
- <ViewLink alias="SUB_PROJECTS">
- <Mapping TableName="SUB_PROJECTS">
- <MappingColumn rootElement="xnat:subjectData" fieldElement="xnat:subjectData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="SUBJECT_IDS">
- <Mapping TableName="SUBJECT_IDS">
- <MappingColumn rootElement="xnat:subjectData" fieldElement="xnat:subjectData.ID" mapsTo="subject_id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="SUBJECT_IDS" sql="SELECT sub.ID as subject_id,sub.label ||', '|| TRIM(', ' FROM xs_a_concat(pp.label || ', ')) AS ADDIDS FROM xnat_subjectData sub LEFT JOIN xnat_projectParticipant pp ON sub.id=pp.subject_id WHERE subject_id IS NOT NULL GROUP BY ID,sub.label"/>
- <SQLView name="SUB_PROJECTS" sql="SELECT id, ',<' || sub.project || '>' || xs_a_concat(',<' || shared.project || '>') AS PROJECTS FROM xnat_subjectData sub LEFT JOIN xnat_projectParticipant shared ON sub.id=shared.subject_id GROUP BY sub.id,sub.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_crScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_crScanData_display.xml
deleted file mode 100644
index 153b69a741e22dca7a46ad4800c1da7af2e447cb..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_crScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:crScanData" full-description="CRScan" brief-description="CRScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:crScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="CRScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="CRScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_crSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_crSessionData_display.xml
deleted file mode 100644
index 14b1b3275b60ced5330f56e513bff7901055c0d9..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_crSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:crSessionData" full-description="CRSession" brief-description="CRSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:crSessionData','xnat:crSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:crSessionData','xnat:crSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_CRSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:crSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:crSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:crSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:crSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:crSessionData/search_field/xnat:crSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:crSessionData','xnat:crSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_CRSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_CRSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_crsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:crSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:crSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:crSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:crSessionData/search_field/xnat:crSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_crsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:crSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:crSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_CRSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:crSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:crSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="CRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_CRSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_CRSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_CRSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:crSessionData" fieldElement="xnat:crSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_CRSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:crSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ctScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ctScanData_display.xml
deleted file mode 100644
index a70c7be2f0153b396af4c12487c86c0d9242a9c9..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ctScanData_display.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ctScanData" full-description="CTScan" brief-description="CTScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/voxelRes/units"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/voxelRes/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/voxelRes/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_Z" header="z" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/voxelRes/z"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ORIENTATION" header="orientation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/orientation"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FOV_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/fov/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FOV_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/fov/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RESCALE_INTERCEPT" header="intercept" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/rescale/intercept"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RESCALE_SLOPE" header="slope" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/rescale/slope"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_KVP" header="kvp" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/kvp"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ACQUISITIONNUMBER" header="acquisitionNumber" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/acquisitionNumber"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_IMAGETYPE" header="imageType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/imageType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_OPTIONS" header="options" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/options"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_COLLECTIONDIAMETER" header="collectionDiameter" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/collectionDiameter"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DISTANCESOURCETODETECTOR" header="distanceSourceToDetector" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/distanceSourceToDetector"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DISTANCESOURCETOPATIENT" header="distanceSourceToPatient" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/distanceSourceToPatient"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_GANTRYTILT" header="gantryTilt" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/gantryTilt"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_TABLEHEIGHT" header="tableHeight" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/tableHeight"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ROTATIONDIRECTION" header="rotationDirection" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/rotationDirection"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_EXPOSURETIME" header="exposureTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/exposureTime"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_XRAYTUBECURRENT" header="xrayTubeCurrent" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/xrayTubeCurrent"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_EXPOSURE" header="exposure" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/exposure"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FILTER" header="filter" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/filter"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_GENERATORPOWER" header="generatorPower" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/generatorPower"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_CONVOLUTIONKERNEL" header="convolutionKernel" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/convolutionKernel"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_COLLIMATIONWIDTH_SINGLE" header="single" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/collimationWidth/single"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_COLLIMATIONWIDTH_TOTAL" header="total" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/collimationWidth/total"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_TABLESPEED" header="tableSpeed" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/tableSpeed"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_TABLEFEEDPERROTATION" header="tableFeedPerRotation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/tableFeedPerRotation"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PITCHFACTOR" header="pitchFactor" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/pitchFactor"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ESTIMATEDDOSESAVING_MODULATION" header="modulation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/estimatedDoseSaving/modulation"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ESTIMATEDDOSESAVING" header="estimatedDoseSaving" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/estimatedDoseSaving"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_CTDIVOL" header="ctDIvol" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/ctDIvol"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DERIVATION" header="derivation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/parameters/derivation"/>
- </DisplayField>
- <DisplayField id="DCMVALIDATION" header="dcmValidation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/dcmValidation"/>
- </DisplayField>
- <DisplayField id="DCMVALIDATION_STATUS" header="status" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctScanData/dcmValidation/status"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="CTScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
- <DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
- <DisplayFieldRef id="PARAMETERS_FOV_X"/>
- <DisplayFieldRef id="PARAMETERS_FOV_Y"/>
- <DisplayFieldRef id="PARAMETERS_RESCALE_INTERCEPT"/>
- <DisplayFieldRef id="PARAMETERS_RESCALE_SLOPE"/>
- <DisplayFieldRef id="PARAMETERS_KVP"/>
- <DisplayFieldRef id="PARAMETERS_ACQUISITIONNUMBER"/>
- <DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
- <DisplayFieldRef id="PARAMETERS_OPTIONS"/>
- <DisplayFieldRef id="PARAMETERS_COLLECTIONDIAMETER"/>
- <DisplayFieldRef id="PARAMETERS_DISTANCESOURCETODETECTOR"/>
- <DisplayFieldRef id="PARAMETERS_DISTANCESOURCETOPATIENT"/>
- <DisplayFieldRef id="PARAMETERS_GANTRYTILT"/>
- <DisplayFieldRef id="PARAMETERS_TABLEHEIGHT"/>
- <DisplayFieldRef id="PARAMETERS_ROTATIONDIRECTION"/>
- <DisplayFieldRef id="PARAMETERS_EXPOSURETIME"/>
- <DisplayFieldRef id="PARAMETERS_XRAYTUBECURRENT"/>
- <DisplayFieldRef id="PARAMETERS_EXPOSURE"/>
- <DisplayFieldRef id="PARAMETERS_FILTER"/>
- <DisplayFieldRef id="PARAMETERS_GENERATORPOWER"/>
- <DisplayFieldRef id="PARAMETERS_CONVOLUTIONKERNEL"/>
- <DisplayFieldRef id="PARAMETERS_COLLIMATIONWIDTH_SINGLE"/>
- <DisplayFieldRef id="PARAMETERS_COLLIMATIONWIDTH_TOTAL"/>
- <DisplayFieldRef id="PARAMETERS_TABLESPEED"/>
- <DisplayFieldRef id="PARAMETERS_TABLEFEEDPERROTATION"/>
- <DisplayFieldRef id="PARAMETERS_PITCHFACTOR"/>
- <DisplayFieldRef id="PARAMETERS_ESTIMATEDDOSESAVING_MODULATION"/>
- <DisplayFieldRef id="PARAMETERS_ESTIMATEDDOSESAVING"/>
- <DisplayFieldRef id="PARAMETERS_CTDIVOL"/>
- <DisplayFieldRef id="PARAMETERS_DERIVATION"/>
- <DisplayFieldRef id="DCMVALIDATION"/>
- <DisplayFieldRef id="DCMVALIDATION_STATUS"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="CTScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
- <DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
- <DisplayFieldRef id="PARAMETERS_FOV_X"/>
- <DisplayFieldRef id="PARAMETERS_FOV_Y"/>
- <DisplayFieldRef id="PARAMETERS_RESCALE_INTERCEPT"/>
- <DisplayFieldRef id="PARAMETERS_RESCALE_SLOPE"/>
- <DisplayFieldRef id="PARAMETERS_KVP"/>
- <DisplayFieldRef id="PARAMETERS_ACQUISITIONNUMBER"/>
- <DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
- <DisplayFieldRef id="PARAMETERS_OPTIONS"/>
- <DisplayFieldRef id="PARAMETERS_COLLECTIONDIAMETER"/>
- <DisplayFieldRef id="PARAMETERS_DISTANCESOURCETODETECTOR"/>
- <DisplayFieldRef id="PARAMETERS_DISTANCESOURCETOPATIENT"/>
- <DisplayFieldRef id="PARAMETERS_GANTRYTILT"/>
- <DisplayFieldRef id="PARAMETERS_TABLEHEIGHT"/>
- <DisplayFieldRef id="PARAMETERS_ROTATIONDIRECTION"/>
- <DisplayFieldRef id="PARAMETERS_EXPOSURETIME"/>
- <DisplayFieldRef id="PARAMETERS_XRAYTUBECURRENT"/>
- <DisplayFieldRef id="PARAMETERS_EXPOSURE"/>
- <DisplayFieldRef id="PARAMETERS_FILTER"/>
- <DisplayFieldRef id="PARAMETERS_GENERATORPOWER"/>
- <DisplayFieldRef id="PARAMETERS_CONVOLUTIONKERNEL"/>
- <DisplayFieldRef id="PARAMETERS_COLLIMATIONWIDTH_SINGLE"/>
- <DisplayFieldRef id="PARAMETERS_COLLIMATIONWIDTH_TOTAL"/>
- <DisplayFieldRef id="PARAMETERS_TABLESPEED"/>
- <DisplayFieldRef id="PARAMETERS_TABLEFEEDPERROTATION"/>
- <DisplayFieldRef id="PARAMETERS_PITCHFACTOR"/>
- <DisplayFieldRef id="PARAMETERS_ESTIMATEDDOSESAVING_MODULATION"/>
- <DisplayFieldRef id="PARAMETERS_ESTIMATEDDOSESAVING"/>
- <DisplayFieldRef id="PARAMETERS_CTDIVOL"/>
- <DisplayFieldRef id="PARAMETERS_DERIVATION"/>
- <DisplayFieldRef id="DCMVALIDATION"/>
- <DisplayFieldRef id="DCMVALIDATION_STATUS"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ctSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ctSessionData_display.xml
deleted file mode 100644
index 84b377e68127a7281b141035f63918bb3a322072..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ctSessionData_display.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/display/xnat_ctSessionData_display.xml
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/7/14 12:19 PM
- -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ctSessionData" full-description="CTSession" brief-description="CTSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ctSessionData','xnat:ctSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ctSessionData','xnat:ctSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(EXTRACT(YEAR FROM AGE(@Field1, @Field2)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_CTSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:ctSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:ctSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ctSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ctSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ctSessionData/search_field/xnat:ctSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ctSessionData','xnat:ctSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_CTSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_CTSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_ctsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:ctSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ctSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ctSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ctSessionData/search_field/xnat:ctSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ctSessionData','xnat:ctSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_ctsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:ctSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_CTSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:ctSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:ctSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="DCMACCESSIONNUMBER" header="dcmAccessionNumber" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData/dcmAccessionNumber"/>
- </DisplayField>
- <DisplayField id="DCMPATIENTID" header="dcmPatientId" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData/dcmPatientId"/>
- </DisplayField>
- <DisplayField id="DCMPATIENTNAME" header="dcmPatientName" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData/dcmPatientName"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ctSessionData/UID"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="DCMACCESSIONNUMBER"/>
- <DisplayFieldRef id="DCMPATIENTID"/>
- <DisplayFieldRef id="DCMPATIENTNAME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="DCMACCESSIONNUMBER"/>
- <DisplayFieldRef id="DCMPATIENTID"/>
- <DisplayFieldRef id="DCMPATIENTNAME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="DCMACCESSIONNUMBER"/>
- <DisplayFieldRef id="DCMPATIENTID"/>
- <DisplayFieldRef id="DCMPATIENTNAME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="DCMACCESSIONNUMBER"/>
- <DisplayFieldRef id="DCMPATIENTID"/>
- <DisplayFieldRef id="DCMPATIENTNAME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="CTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_CTSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="DCMACCESSIONNUMBER"/>
- <DisplayFieldRef id="DCMPATIENTID"/>
- <DisplayFieldRef id="DCMPATIENTNAME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_CTSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_CTSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:ctSessionData" fieldElement="xnat:ctSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_CTSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:ctSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialScanData_display.xml
deleted file mode 100644
index 053d37561e9d8fe743c02def98ceb8c3a176dcfe..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:dx3DCraniofacialScanData" full-description="DX3DCraniofacialScan" brief-description="DX3DCraniofacialScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="DX3DCraniofacialScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="DX3DCraniofacialScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialSessionData_display.xml
deleted file mode 100644
index c33a9492e8d78dc12d0cd1dcfe6845945655d981..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_dx3DCraniofacialSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:dx3DCraniofacialSessionData" full-description="DX3DCraniofacialSession" brief-description="DX3DCraniofacialSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:dx3DCraniofacialSessionData','xnat:dx3DCraniofacialSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:dx3DCraniofacialSessionData','xnat:dx3DCraniofacialSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:dx3DCraniofacialSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:dx3DCraniofacialSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:dx3DCraniofacialSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:dx3DCraniofacialSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:dx3DCraniofacialSessionData/search_field/xnat:dx3DCraniofacialSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:dx3DCraniofacialSessionData','xnat:dx3DCraniofacialSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_DX3DCRANIOFACIALSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_dx3dcraniofacialsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:dx3DCraniofacialSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:dx3DCraniofacialSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:dx3DCraniofacialSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:dx3DCraniofacialSessionData/search_field/xnat:dx3DCraniofacialSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_dx3dcraniofacialsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:dx3DCraniofacialSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dx3DCraniofacialSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_DX3DCRANIOFACIALSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:dx3DCraniofacialSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:dx3DCraniofacialSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="DX3DCraniofacialSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:dx3DCraniofacialSessionData" fieldElement="xnat:dx3DCraniofacialSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_DX3DCRANIOFACIALSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:dx3DCraniofacialSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_dxScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_dxScanData_display.xml
deleted file mode 100644
index c66359c16a6287b582148db0a60355f842a68759..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_dxScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:dxScanData" full-description="DXScan" brief-description="DXScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="DXScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="DXScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_dxSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_dxSessionData_display.xml
deleted file mode 100644
index ccebdb0263878db15da786ad145948e0a0321b31..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_dxSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:dxSessionData" full-description="DXSession" brief-description="DXSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:dxSessionData','xnat:dxSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:dxSessionData','xnat:dxSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_DXSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:dxSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:dxSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:dxSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:dxSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:dxSessionData/search_field/xnat:dxSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:dxSessionData','xnat:dxSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_DXSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_DXSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_dxsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:dxSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:dxSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:dxSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:dxSessionData/search_field/xnat:dxSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_dxsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:dxSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:dxSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_DXSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:dxSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:dxSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="DXSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_DXSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_DXSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_DXSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:dxSessionData" fieldElement="xnat:dxSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_DXSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:dxSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ecgScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ecgScanData_display.xml
deleted file mode 100644
index 10dfda62ef50c7c1040af01b6a8cc41ea1ab3e3f..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ecgScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ecgScanData" full-description="ECGScan" brief-description="ECGScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ECGScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ECGScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ecgSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ecgSessionData_display.xml
deleted file mode 100644
index 762b68218107658500f3e7ec63e2517df8aba32b..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ecgSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ecgSessionData" full-description="ECGSession" brief-description="ECGSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ecgSessionData','xnat:ecgSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ecgSessionData','xnat:ecgSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_ECGSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:ecgSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:ecgSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ecgSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ecgSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ecgSessionData/search_field/xnat:ecgSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ecgSessionData','xnat:ecgSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_ECGSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_ECGSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_ecgsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:ecgSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ecgSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ecgSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ecgSessionData/search_field/xnat:ecgSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_ecgsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:ecgSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ecgSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_ECGSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:ecgSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:ecgSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ECGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_ECGSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_ECGSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_ECGSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:ecgSessionData" fieldElement="xnat:ecgSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_ECGSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:ecgSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_eegScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_eegScanData_display.xml
deleted file mode 100644
index 8a7de468d19d412096899e18c132ea31a4151764..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_eegScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:eegScanData" full-description="EEGScan" brief-description="EEGScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="EEGScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="EEGScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_eegSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_eegSessionData_display.xml
deleted file mode 100644
index 5a0ee7eb6b7363519a0768097fb46e1c403fd7ec..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_eegSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:eegSessionData" full-description="EEGSession" brief-description="EEGSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:eegSessionData','xnat:eegSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:eegSessionData','xnat:eegSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_EEGSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:eegSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:eegSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:eegSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:eegSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:eegSessionData/search_field/xnat:eegSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:eegSessionData','xnat:eegSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_EEGSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_EEGSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_eegsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:eegSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:eegSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:eegSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:eegSessionData/search_field/xnat:eegSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_eegsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:eegSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:eegSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_EEGSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:eegSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:eegSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="EEGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_EEGSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_EEGSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_EEGSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:eegSessionData" fieldElement="xnat:eegSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_EEGSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:eegSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_epsScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_epsScanData_display.xml
deleted file mode 100644
index d42bfa61ad460e04d1a3f8a5b35d7452b8788de3..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_epsScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:epsScanData" full-description="EPSScan" brief-description="EPSScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="EPSScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="EPSScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_epsSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_epsSessionData_display.xml
deleted file mode 100644
index 0dfb7d37dca72da21dfe7b958ff5b0f2cbf8424d..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_epsSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:epsSessionData" full-description="EPSSession" brief-description="EPSSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:epsSessionData','xnat:epsSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:epsSessionData','xnat:epsSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_EPSSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:epsSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:epsSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:epsSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:epsSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:epsSessionData/search_field/xnat:epsSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:epsSessionData','xnat:epsSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_EPSSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_EPSSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_epssessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:epsSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:epsSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:epsSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:epsSessionData/search_field/xnat:epsSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_epssessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:epsSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:epsSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_EPSSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:epsSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:epsSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="EPSSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_EPSSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_EPSSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_EPSSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:epsSessionData" fieldElement="xnat:epsSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_EPSSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:epsSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_esScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_esScanData_display.xml
deleted file mode 100644
index eec9f8b567f3dfa975a540552c5389407d9da9de..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_esScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:esScanData" full-description="ESScan" brief-description="ESScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ESScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ESScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_esSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_esSessionData_display.xml
deleted file mode 100644
index 36fb337d2c7e0b0ead54c29433a8a822aa4fd928..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_esSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:esSessionData" full-description="ESSession" brief-description="ESSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:esSessionData','xnat:esSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:esSessionData','xnat:esSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_ESSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:esSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:esSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:esSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:esSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:esSessionData/search_field/xnat:esSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:esSessionData','xnat:esSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_ESSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_ESSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_essessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:esSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:esSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:esSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:esSessionData/search_field/xnat:esSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_essessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:esSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_ESSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:esSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:esSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ESSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_ESSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_ESSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_ESSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:esSessionData" fieldElement="xnat:esSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_ESSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:esSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_esvScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_esvScanData_display.xml
deleted file mode 100644
index dd5ba844a791a16cd9da49358a3fe041e1618ca9..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_esvScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:esvScanData" full-description="ESVScan" brief-description="ESVScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ESVScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ESVScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_esvSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_esvSessionData_display.xml
deleted file mode 100644
index 7a6e39e6b6ca260354fa1db8e588a10046dbf3d6..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_esvSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:esvSessionData" full-description="ESVSession" brief-description="ESVSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:esvSessionData','xnat:esvSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:esvSessionData','xnat:esvSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_ESVSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:esvSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:esvSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:esvSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:esvSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:esvSessionData/search_field/xnat:esvSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:esvSessionData','xnat:esvSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_ESVSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_ESVSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_esvsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:esvSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:esvSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:esvSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:esvSessionData/search_field/xnat:esvSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_esvsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:esvSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:esvSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_ESVSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:esvSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:esvSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="ESVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_ESVSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_ESVSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_ESVSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:esvSessionData" fieldElement="xnat:esvSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_ESVSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:esvSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_fieldDefinitionGroup_display.xml b/src/main/webapp/schemas/xnat/display/xnat_fieldDefinitionGroup_display.xml
deleted file mode 100644
index d31914f9217dff268603f26bbe854e9dfadb7b1d..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_fieldDefinitionGroup_display.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:fieldDefinitionGroup" full-description="FieldDefinitionSet" brief-description="FieldDefinitionSet">
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/ID"/>
- </DisplayField>
- <DisplayField id="DATA_TYPE" header="data-type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/data-type"/>
- </DisplayField>
- <DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/description"/>
- </DisplayField>
- <DisplayField id="SHAREABLE" header="shareable" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/shareable"/>
- </DisplayField>
- <DisplayField id="PROJECT_SPECIFIC" header="project-specific" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:fieldDefinitionGroup/project-specific"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="ID" default-sort-order="DESC" brief-description="FieldDefinitionSet" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="DATA_TYPE"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="SHAREABLE"/>
- <DisplayFieldRef id="PROJECT_SPECIFIC"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="ID" default-sort-order="DESC" brief-description="FieldDefinitionSet" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="DATA_TYPE"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="SHAREABLE"/>
- <DisplayFieldRef id="PROJECT_SPECIFIC"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_genericData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_genericData_display.xml
deleted file mode 100644
index ae85fbc8e0f52e3325da1028a9943e66f2f11a2e..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_genericData_display.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:genericData" full-description="Generic" brief-description="Generic">
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:genericData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:genericData','xnat:genericData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:genericData','xnat:genericData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:genericData.date"/>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_GENERICDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:genericData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:genericData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:genericData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:genericData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:genericData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:genericData/search_field/xnat:genericData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:genericData','xnat:genericData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:genericData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_GENERICDATA_PROJECT_IDENTIFIER" header="XNAT_GENERICDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_genericdata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:genericData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:genericData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:genericData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:genericData/search_field/xnat:genericData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_genericdata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:genericData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:genericData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:genericData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_GENERICDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:genericData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:genericData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="Generic" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_GENERICDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="DATE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_GENERICDATA_PROJECTS">
- <Mapping TableName="XNAT_GENERICDATA_PROJECTS">
- <MappingColumn rootElement="xnat:genericData" fieldElement="xnat:genericData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_GENERICDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:genericData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_gmScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_gmScanData_display.xml
deleted file mode 100644
index cf05627cb4869f8d72e9ee55d2744344272c2fcb..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_gmScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:gmScanData" full-description="GMScan" brief-description="GMScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="GMScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="GMScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_gmSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_gmSessionData_display.xml
deleted file mode 100644
index 1f08f32b646edf089547991f6d5ff536569e7bcf..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_gmSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:gmSessionData" full-description="GMSession" brief-description="GMSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:gmSessionData','xnat:gmSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:gmSessionData','xnat:gmSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_GMSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:gmSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:gmSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:gmSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:gmSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:gmSessionData/search_field/xnat:gmSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:gmSessionData','xnat:gmSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_GMSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_GMSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_gmsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:gmSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:gmSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:gmSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:gmSessionData/search_field/xnat:gmSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_gmsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:gmSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_GMSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:gmSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:gmSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="GMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_GMSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_GMSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_GMSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:gmSessionData" fieldElement="xnat:gmSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_GMSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:gmSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_gmvScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_gmvScanData_display.xml
deleted file mode 100644
index b56d831b948db621d7682d2e3387f6e7d35fcfce..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_gmvScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:gmvScanData" full-description="GMVScan" brief-description="GMVScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="GMVScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="GMVScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_gmvSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_gmvSessionData_display.xml
deleted file mode 100644
index 099be6ce52213e60f1df989780ff4553c3e126d6..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_gmvSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:gmvSessionData" full-description="GMVSession" brief-description="GMVSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:gmvSessionData','xnat:gmvSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:gmvSessionData','xnat:gmvSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_GMVSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:gmvSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:gmvSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:gmvSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:gmvSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:gmvSessionData/search_field/xnat:gmvSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:gmvSessionData','xnat:gmvSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_GMVSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_GMVSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_gmvsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:gmvSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:gmvSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:gmvSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:gmvSessionData/search_field/xnat:gmvSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_gmvsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:gmvSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:gmvSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_GMVSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:gmvSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:gmvSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="GMVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_GMVSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_GMVSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_GMVSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:gmvSessionData" fieldElement="xnat:gmvSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_GMVSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:gmvSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_hdScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_hdScanData_display.xml
deleted file mode 100644
index c24f7855a84c3bd0bdfe6893bf87056a20b32e02..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_hdScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:hdScanData" full-description="HDScan" brief-description="HDScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="HDScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="HDScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_hdSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_hdSessionData_display.xml
deleted file mode 100644
index 6f75ace8a2c4aeddc1fd4363c8e4d8976941fe91..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_hdSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:hdSessionData" full-description="HDSession" brief-description="HDSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:hdSessionData','xnat:hdSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:hdSessionData','xnat:hdSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_HDSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:hdSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:hdSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:hdSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:hdSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:hdSessionData/search_field/xnat:hdSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:hdSessionData','xnat:hdSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_HDSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_HDSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_hdsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:hdSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:hdSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:hdSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:hdSessionData/search_field/xnat:hdSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_hdsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:hdSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:hdSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_HDSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:hdSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:hdSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="HDSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_HDSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_HDSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_HDSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:hdSessionData" fieldElement="xnat:hdSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_HDSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:hdSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_investigatorData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_investigatorData_display.xml
deleted file mode 100644
index a826f7642569bcfbc678d582f88a0e97f2acf828..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_investigatorData_display.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
<Displays schema-element="xnat:investigatorData" value_field="INVESTIGATOR_ID" display_field="INVESTIGATOR_NAME" display_label="Investigator" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd">
<DisplayField id="INVESTIGATOR_ID" header="Investigator Id" visible="true">
<DisplayFieldElement name="Field1" schema-element="xnat:investigatorData.xnat_investigatorData_id"/>
</DisplayField>
<DisplayField id="RPT" header="" visible="true" image="true">
<Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
<HTML-Link>
<Property name="HREF" value="none"/>
<Property name="ONCLICK" value="return rpt('@Field1','xnat:investigatorData','xnat:investigatorData.xnat_investigatorData_id');">
<InsertValue id="Field1" field="INVESTIGATOR_ID"/>
</Property>
</HTML-Link>
</DisplayField>
<DisplayField id="INVESTIGATOR_NAME" header="Name" visible="true">
<DisplayFieldElement name="Field2" schema-element="xnat:investigatorData.firstname"/>
<DisplayFieldElement name="Field3" schema-element="xnat:investigatorData.lastname"/>
<Content type="sql">@Field2 || ' ' || @Field3</Content>
</DisplayField>
<DisplayField id="EMAIL" header="Email" visible="true">
<DisplayFieldElement name="Field1" schema-element="xnat:investigatorData.email"/>
</DisplayField>
<DisplayField id="PHONE" header="Phone" visible="true">
<DisplayFieldElement name="Field1" schema-element="xnat:investigatorData.phone"/>
</DisplayField>
<DisplayVersion versionName="listing" default-order-by="INVESTIGATOR_ID" brief-description="Investigator" dark-color="99FF99" light-color="CCFFCC">
<DisplayFieldRef id="RPT"/>
<DisplayFieldRef id="INVESTIGATOR_ID"/>
<DisplayFieldRef id="INVESTIGATOR_NAME"/>
<DisplayFieldRef id="EMAIL"/>
<DisplayFieldRef id="PHONE"/>
</DisplayVersion>
</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ioScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ioScanData_display.xml
deleted file mode 100644
index 5f78b458d286d72ab78879f21296127f08e70bd5..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ioScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ioScanData" full-description="IOScan" brief-description="IOScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="IOScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="IOScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_ioSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_ioSessionData_display.xml
deleted file mode 100644
index 0327b2761b99b56dd8d2f85c2e1bab66f4214dfb..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_ioSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:ioSessionData" full-description="IOSession" brief-description="IOSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ioSessionData','xnat:ioSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ioSessionData','xnat:ioSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_IOSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:ioSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:ioSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ioSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ioSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ioSessionData/search_field/xnat:ioSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:ioSessionData','xnat:ioSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_IOSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_IOSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_iosessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:ioSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:ioSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:ioSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:ioSessionData/search_field/xnat:ioSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_iosessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:ioSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:ioSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_IOSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:ioSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:ioSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="IOSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_IOSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_IOSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_IOSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:ioSessionData" fieldElement="xnat:ioSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_IOSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:ioSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_megScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_megScanData_display.xml
deleted file mode 100644
index 361420f4eff848f5564bc8064e1e791fc3d5d245..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_megScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:megScanData" full-description="MEGScan" brief-description="MEGScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:megScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MEGScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MEGScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_megSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_megSessionData_display.xml
deleted file mode 100644
index c49663cd852381e14a7c5e533115a1484e0beff1..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_megSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:megSessionData" full-description="MEGSession" brief-description="MEGSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:megSessionData','xnat:megSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:megSessionData','xnat:megSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_MEGSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:megSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:megSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:megSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:megSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:megSessionData/search_field/xnat:megSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:megSessionData','xnat:megSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_MEGSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_MEGSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_megsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:megSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:megSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:megSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:megSessionData/search_field/xnat:megSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_megsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:megSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:megSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_MEGSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:megSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:megSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="MEGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_MEGSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_MEGSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_MEGSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:megSessionData" fieldElement="xnat:megSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_MEGSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:megSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_mgScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_mgScanData_display.xml
deleted file mode 100644
index 61f9373e7b9795768b083ad74778634425d536ab..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_mgScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mgScanData" full-description="MGScan" brief-description="MGScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MGScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MGScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_mgSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_mgSessionData_display.xml
deleted file mode 100644
index fdde47aafcfb3012018e7423a8f8e5504499b001..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_mgSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mgSessionData" full-description="MGSession" brief-description="MGSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:mgSessionData','xnat:mgSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:mgSessionData','xnat:mgSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_MGSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:mgSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:mgSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mgSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:mgSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:mgSessionData/search_field/xnat:mgSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:mgSessionData','xnat:mgSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_MGSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_MGSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_mgsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:mgSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:mgSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:mgSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:mgSessionData/search_field/xnat:mgSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_mgsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:mgSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mgSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_MGSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:mgSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:mgSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="MGSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_MGSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_MGSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_MGSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:mgSessionData" fieldElement="xnat:mgSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_MGSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:mgSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_mrScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_mrScanData_display.xml
deleted file mode 100644
index 9f198558f6114d733bd13c9ee98026f89ede8059..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_mrScanData_display.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mrScanData" full-description="MRScan" brief-description="MRScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="COIL" header="coil" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/coil"/>
- </DisplayField>
- <DisplayField id="FIELDSTRENGTH" header="fieldStrength" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/fieldStrength"/>
- </DisplayField>
- <DisplayField id="MARKER" header="marker" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/marker"/>
- </DisplayField>
- <DisplayField id="STABILIZATION" header="stabilization" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/stabilization"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/voxelRes/units"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/voxelRes/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/voxelRes/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_Z" header="z" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/voxelRes/z"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ORIENTATION" header="orientation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/orientation"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FOV_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/fov/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FOV_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/fov/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MATRIX_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/matrix/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MATRIX_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/matrix/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PARTITIONS" header="partitions" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/partitions"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_TR" header="tr" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/tr"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_TE" header="te" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/te"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_TI" header="ti" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/ti"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FLIP" header="flip" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/flip"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_SEQUENCE" header="sequence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/sequence"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ORIGIN" header="origin" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/origin"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_IMAGETYPE" header="imageType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/imageType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_SCANSEQUENCE" header="scanSequence" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/scanSequence"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_SEQVARIANT" header="seqVariant" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/seqVariant"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_SCANOPTIONS" header="scanOptions" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/scanOptions"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ACQTYPE" header="acqType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/acqType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_COIL" header="coil" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/coil"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DTIACQCOUNT" header="dtiAcqCount" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/dtiAcqCount"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PIXELBANDWIDTH" header="pixelBandwidth" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/pixelBandwidth"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DIFFUSION_BVALUES" header="bValues" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/diffusion/bValues"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DIFFUSION_DIRECTIONALITY" header="directionality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/diffusion/directionality"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DIFFUSION_ORIENTATIONS" header="orientations" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/diffusion/orientations"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DIFFUSION_ANISOTROPYTYPE" header="anisotropyType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/parameters/diffusion/anisotropyType"/>
- </DisplayField>
- <DisplayField id="DCMVALIDATION" header="dcmValidation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/dcmValidation"/>
- </DisplayField>
- <DisplayField id="DCMVALIDATION_STATUS" header="status" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrScanData/dcmValidation/status"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MRScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="COIL"/>
- <DisplayFieldRef id="FIELDSTRENGTH"/>
- <DisplayFieldRef id="MARKER"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
- <DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
- <DisplayFieldRef id="PARAMETERS_FOV_X"/>
- <DisplayFieldRef id="PARAMETERS_FOV_Y"/>
- <DisplayFieldRef id="PARAMETERS_MATRIX_X"/>
- <DisplayFieldRef id="PARAMETERS_MATRIX_Y"/>
- <DisplayFieldRef id="PARAMETERS_PARTITIONS"/>
- <DisplayFieldRef id="PARAMETERS_TR"/>
- <DisplayFieldRef id="PARAMETERS_TE"/>
- <DisplayFieldRef id="PARAMETERS_TI"/>
- <DisplayFieldRef id="PARAMETERS_FLIP"/>
- <DisplayFieldRef id="PARAMETERS_SEQUENCE"/>
- <DisplayFieldRef id="PARAMETERS_ORIGIN"/>
- <DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
- <DisplayFieldRef id="PARAMETERS_SCANSEQUENCE"/>
- <DisplayFieldRef id="PARAMETERS_SEQVARIANT"/>
- <DisplayFieldRef id="PARAMETERS_SCANOPTIONS"/>
- <DisplayFieldRef id="PARAMETERS_ACQTYPE"/>
- <DisplayFieldRef id="PARAMETERS_COIL"/>
- <DisplayFieldRef id="PARAMETERS_DTIACQCOUNT"/>
- <DisplayFieldRef id="PARAMETERS_PIXELBANDWIDTH"/>
- <DisplayFieldRef id="PARAMETERS_DIFFUSION_BVALUES"/>
- <DisplayFieldRef id="PARAMETERS_DIFFUSION_DIRECTIONALITY"/>
- <DisplayFieldRef id="PARAMETERS_DIFFUSION_ORIENTATIONS"/>
- <DisplayFieldRef id="PARAMETERS_DIFFUSION_ANISOTROPYTYPE"/>
- <DisplayFieldRef id="DCMVALIDATION"/>
- <DisplayFieldRef id="DCMVALIDATION_STATUS"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MRScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="COIL"/>
- <DisplayFieldRef id="FIELDSTRENGTH"/>
- <DisplayFieldRef id="MARKER"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
- <DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
- <DisplayFieldRef id="PARAMETERS_FOV_X"/>
- <DisplayFieldRef id="PARAMETERS_FOV_Y"/>
- <DisplayFieldRef id="PARAMETERS_MATRIX_X"/>
- <DisplayFieldRef id="PARAMETERS_MATRIX_Y"/>
- <DisplayFieldRef id="PARAMETERS_PARTITIONS"/>
- <DisplayFieldRef id="PARAMETERS_TR"/>
- <DisplayFieldRef id="PARAMETERS_TE"/>
- <DisplayFieldRef id="PARAMETERS_TI"/>
- <DisplayFieldRef id="PARAMETERS_FLIP"/>
- <DisplayFieldRef id="PARAMETERS_SEQUENCE"/>
- <DisplayFieldRef id="PARAMETERS_ORIGIN"/>
- <DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
- <DisplayFieldRef id="PARAMETERS_SCANSEQUENCE"/>
- <DisplayFieldRef id="PARAMETERS_SEQVARIANT"/>
- <DisplayFieldRef id="PARAMETERS_SCANOPTIONS"/>
- <DisplayFieldRef id="PARAMETERS_ACQTYPE"/>
- <DisplayFieldRef id="PARAMETERS_COIL"/>
- <DisplayFieldRef id="PARAMETERS_DTIACQCOUNT"/>
- <DisplayFieldRef id="PARAMETERS_PIXELBANDWIDTH"/>
- <DisplayFieldRef id="PARAMETERS_DIFFUSION_BVALUES"/>
- <DisplayFieldRef id="PARAMETERS_DIFFUSION_DIRECTIONALITY"/>
- <DisplayFieldRef id="PARAMETERS_DIFFUSION_ORIENTATIONS"/>
- <DisplayFieldRef id="PARAMETERS_DIFFUSION_ANISOTROPYTYPE"/>
- <DisplayFieldRef id="DCMVALIDATION"/>
- <DisplayFieldRef id="DCMVALIDATION_STATUS"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_mrsScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_mrsScanData_display.xml
deleted file mode 100644
index a0b68375060c107a01798d163b8f058f9fab3f10..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_mrsScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:mrsScanData" full-description="MRSScan" brief-description="MRSScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrsScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MRSScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="MRSScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_nmScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_nmScanData_display.xml
deleted file mode 100644
index 58f8d7c9b259fa294e5af5caa483509b75f4b1a0..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_nmScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:nmScanData" full-description="NMScan" brief-description="NMScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="NMScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="NMScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_nmSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_nmSessionData_display.xml
deleted file mode 100644
index e56a48497c6dfdb8390620201080c604e65df3e5..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_nmSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:nmSessionData" full-description="NMSession" brief-description="NMSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:nmSessionData','xnat:nmSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:nmSessionData','xnat:nmSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_NMSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:nmSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:nmSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:nmSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:nmSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:nmSessionData/search_field/xnat:nmSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:nmSessionData','xnat:nmSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_NMSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_NMSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_nmsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:nmSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:nmSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:nmSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:nmSessionData/search_field/xnat:nmSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_nmsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:nmSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:nmSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_NMSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:nmSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:nmSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="NMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_NMSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_NMSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_NMSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:nmSessionData" fieldElement="xnat:nmSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_NMSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:nmSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_opScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_opScanData_display.xml
deleted file mode 100644
index 17e108201b0720cf7dd2f7d75dd9874132227122..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_opScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:opScanData" full-description="OPScan" brief-description="OPScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:opScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OPScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OPScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_opSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_opSessionData_display.xml
deleted file mode 100644
index 73a5a175a3482c2de8f35897f44facfa5cfd623c..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_opSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:opSessionData" full-description="OPSession" brief-description="OPSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:opSessionData','xnat:opSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:opSessionData','xnat:opSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_OPSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:opSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:opSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:opSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:opSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:opSessionData/search_field/xnat:opSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:opSessionData','xnat:opSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_OPSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_OPSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_opsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:opSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:opSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:opSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:opSessionData/search_field/xnat:opSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_opsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:opSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:opSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_OPSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:opSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:opSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="OPSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_OPSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_OPSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_OPSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:opSessionData" fieldElement="xnat:opSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_OPSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:opSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_optScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_optScanData_display.xml
deleted file mode 100644
index 4c17f60e67809c93d01b7ebe39e82d5a54c7fdb9..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_optScanData_display.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:optScanData" full-description="OPTScan" brief-description="OPTScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/voxelRes/units"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/voxelRes/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/voxelRes/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_VOXELRES_Z" header="z" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/voxelRes/z"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FOV_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/fov/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FOV_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/fov/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_LATERALITY" header="laterality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/laterality"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ILLUMINATION_WAVELENGTH" header="illumination_wavelength" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/illumination_wavelength"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ILLUMINATION_POWER" header="illumination_power" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/illumination_power"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_IMAGETYPE" header="imageType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/parameters/imageType"/>
- </DisplayField>
- <DisplayField id="DCMVALIDATION" header="dcmValidation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/dcmValidation"/>
- </DisplayField>
- <DisplayField id="DCMVALIDATION_STATUS" header="status" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optScanData/dcmValidation/status"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OPTScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
- <DisplayFieldRef id="PARAMETERS_FOV_X"/>
- <DisplayFieldRef id="PARAMETERS_FOV_Y"/>
- <DisplayFieldRef id="PARAMETERS_LATERALITY"/>
- <DisplayFieldRef id="PARAMETERS_ILLUMINATION_WAVELENGTH"/>
- <DisplayFieldRef id="PARAMETERS_ILLUMINATION_POWER"/>
- <DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
- <DisplayFieldRef id="DCMVALIDATION"/>
- <DisplayFieldRef id="DCMVALIDATION_STATUS"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OPTScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_UNITS"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_X"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Y"/>
- <DisplayFieldRef id="PARAMETERS_VOXELRES_Z"/>
- <DisplayFieldRef id="PARAMETERS_FOV_X"/>
- <DisplayFieldRef id="PARAMETERS_FOV_Y"/>
- <DisplayFieldRef id="PARAMETERS_LATERALITY"/>
- <DisplayFieldRef id="PARAMETERS_ILLUMINATION_WAVELENGTH"/>
- <DisplayFieldRef id="PARAMETERS_ILLUMINATION_POWER"/>
- <DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
- <DisplayFieldRef id="DCMVALIDATION"/>
- <DisplayFieldRef id="DCMVALIDATION_STATUS"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_optSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_optSessionData_display.xml
deleted file mode 100644
index 97be9d033b187dbc090127216e031142549f71c6..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_optSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:optSessionData" full-description="OPTSession" brief-description="OPTSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:optSessionData','xnat:optSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:optSessionData','xnat:optSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_OPTSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:optSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:optSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:optSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:optSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:optSessionData/search_field/xnat:optSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:optSessionData','xnat:optSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_OPTSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_OPTSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_optsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:optSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:optSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:optSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:optSessionData/search_field/xnat:optSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_optsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:optSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:optSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_OPTSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:optSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:optSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="OPTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_OPTSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_OPTSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_OPTSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:optSessionData" fieldElement="xnat:optSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_OPTSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:optSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_otherDicomScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_otherDicomScanData_display.xml
deleted file mode 100644
index 20154a1293f533852bfdb2bae37ae00e8606a3d8..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_otherDicomScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:otherDicomScanData" full-description="OtherDicomScan" brief-description="OtherDicomScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OtherDicomScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="OtherDicomScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_otherDicomSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_otherDicomSessionData_display.xml
deleted file mode 100644
index e350529dc82fcdafa9531a39d0e1fb9efeac2dd0..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_otherDicomSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:otherDicomSessionData" full-description="OtherDicomSession" brief-description="OtherDicomSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:otherDicomSessionData','xnat:otherDicomSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:otherDicomSessionData','xnat:otherDicomSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_OTHERDICOMSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:otherDicomSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:otherDicomSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:otherDicomSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:otherDicomSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:otherDicomSessionData/search_field/xnat:otherDicomSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:otherDicomSessionData','xnat:otherDicomSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_OTHERDICOMSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_OTHERDICOMSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_otherdicomsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:otherDicomSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:otherDicomSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:otherDicomSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:otherDicomSessionData/search_field/xnat:otherDicomSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_otherdicomsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:otherDicomSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:otherDicomSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_OTHERDICOMSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:otherDicomSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:otherDicomSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="OtherDicomSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_OTHERDICOMSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_OTHERDICOMSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_OTHERDICOMSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:otherDicomSessionData" fieldElement="xnat:otherDicomSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_OTHERDICOMSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:otherDicomSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_pVisitData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_pVisitData_display.xml
deleted file mode 100644
index 4a8b214d90d191d010cbae5c518ca34a2da20308..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_pVisitData_display.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:pVisitData" full-description="PVisit" brief-description="PVisit">
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="SUB_PROJECT_IDENTIFIER" header="Subject" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">sub_project_id</Content>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectData/search_field/xnat:subjectData.ID/project/@Field2">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT CASE WHEN subject_label='' THEN subject_id WHEN subject_label IS NULL THEN subject_id ELSE subject_label END AS sub_project_id,Visit_id FROM (SELECT visit.id AS VISIT_ID,sub.id AS SUBJECT_ID,sub.project AS SUBJECT_PROJECT, sub.label AS SUBJECT_LABEL FROM xnat_pVisitData visit LEFT JOIN xnat_subjectdata sub ON visit.subject_id=sub.id WHERE project='@WHERE' UNION SELECT visit.id, pp.subject_id,pp.project,pp.label FROM xnat_pVisitData visit LEFT JOIN xnat_projectParticipant pp ON visit.subject_id=pp.subject_id WHERE project='@WHERE')SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:pVisitData.ID" queryField="visit_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:pVisitData','xnat:pVisitData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:pVisitData','xnat:pVisitData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.date"/>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_PVISITDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:pVisitData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:pVisitData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:pVisitData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:pVisitData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:pVisitData/search_field/xnat:pVisitData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:pVisitData','xnat:pVisitData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_PVISITDATA_PROJECT_IDENTIFIER" header="XNAT_PVISITDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_pvisitdata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:pVisitData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:pVisitData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:pVisitData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:pVisitData/search_field/xnat:pVisitData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_pvisitdata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:pVisitData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_PVISITDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:pVisitData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:pVisitData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="VISIT_TYPE" header="visit_type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/visit_type"/>
- </DisplayField>
- <DisplayField id="VISIT_NAME" header="visit_name" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/visit_name"/>
- </DisplayField>
- <DisplayField id="CLOSED" header="closed" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/closed"/>
- </DisplayField>
- <DisplayField id="TERMINAL" header="terminal" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/terminal"/>
- </DisplayField>
- <DisplayField id="PROTOCOLVERSION" header="protocolVersion" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/protocolVersion"/>
- </DisplayField>
- <DisplayField id="PROTOCOLID" header="protocolId" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:pVisitData/protocolId"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="VISIT_TYPE"/>
- <DisplayFieldRef id="VISIT_NAME"/>
- <DisplayFieldRef id="CLOSED"/>
- <DisplayFieldRef id="TERMINAL"/>
- <DisplayFieldRef id="PROTOCOLVERSION"/>
- <DisplayFieldRef id="PROTOCOLID"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="VISIT_TYPE"/>
- <DisplayFieldRef id="VISIT_NAME"/>
- <DisplayFieldRef id="CLOSED"/>
- <DisplayFieldRef id="TERMINAL"/>
- <DisplayFieldRef id="PROTOCOLVERSION"/>
- <DisplayFieldRef id="PROTOCOLID"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="VISIT_TYPE"/>
- <DisplayFieldRef id="VISIT_NAME"/>
- <DisplayFieldRef id="CLOSED"/>
- <DisplayFieldRef id="TERMINAL"/>
- <DisplayFieldRef id="PROTOCOLVERSION"/>
- <DisplayFieldRef id="PROTOCOLID"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="VISIT_TYPE"/>
- <DisplayFieldRef id="VISIT_NAME"/>
- <DisplayFieldRef id="CLOSED"/>
- <DisplayFieldRef id="TERMINAL"/>
- <DisplayFieldRef id="PROTOCOLVERSION"/>
- <DisplayFieldRef id="PROTOCOLID"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="PVisit" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_PVISITDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="VISIT_TYPE"/>
- <DisplayFieldRef id="VISIT_NAME"/>
- <DisplayFieldRef id="CLOSED"/>
- <DisplayFieldRef id="TERMINAL"/>
- <DisplayFieldRef id="PROTOCOLVERSION"/>
- <DisplayFieldRef id="PROTOCOLID"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_PVISITDATA_PROJECTS">
- <Mapping TableName="XNAT_PVISITDATA_PROJECTS">
- <MappingColumn rootElement="xnat:pVisitData" fieldElement="xnat:pVisitData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_PVISITDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:pVisitData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_petScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_petScanData_display.xml
deleted file mode 100644
index 05fadd090c301ff0c2de581aefdde22b3f85628a..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_petScanData_display.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:petScanData" full-description="PETScan" brief-description="PETScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ORIENTATION" header="orientation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/orientation"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ORIGINALFILENAME" header="originalFileName" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/originalFileName"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_SYSTEMTYPE" header="systemType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/systemType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FILETYPE" header="fileType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/fileType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_TRANSAXIALFOV" header="transaxialFOV" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/transaxialFOV"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ACQTYPE" header="acqType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/acqType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FACILITY" header="facility" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/facility"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_NUMPLANES" header="numPlanes" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numPlanes"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FRAMES_NUMFRAMES" header="numFrames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/frames/numFrames"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_NUMGATES" header="numGates" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numGates"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PLANESEPARATION" header="planeSeparation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/planeSeparation"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_BINSIZE" header="binSize" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/binSize"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DATATYPE" header="dataType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dataType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DIMENSIONS_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dimensions/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DIMENSIONS_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dimensions/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DIMENSIONS_Z" header="z" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dimensions/z"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DIMENSIONS_NUM" header="num" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/dimensions/num"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_OFFSET_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/offset/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_OFFSET_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/offset/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_OFFSET_Z" header="z" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/offset/z"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RECONZOOM" header="reconZoom" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/reconZoom"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PIXELSIZE_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/pixelSize/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PIXELSIZE_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/pixelSize/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PIXELSIZE_Z" header="z" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/pixelSize/z"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FILTERCODE" header="filterCode" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/filterCode"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RESOLUTION_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/resolution/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RESOLUTION_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/resolution/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RESOLUTION_Z" header="z" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/resolution/z"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_NUMRELEMENTS" header="numRElements" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numRElements"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_NUMANGLES" header="numAngles" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numAngles"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ZROTATIONANGLE" header="ZRotationAngle" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZRotationAngle"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PROCESSINGCODE" header="processingCode" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/processingCode"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_GATEDURATION" header="gateDuration" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/gateDuration"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RWAVEOFFSET" header="rWaveOffset" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/rWaveOffset"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_NUMACCEPTEDBEATS" header="numAcceptedBeats" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/numAcceptedBeats"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FILTER_CUTOFF" header="cutoff" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/filter/cutoff"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ANNOTATION" header="annotation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/annotation"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_1_1" header="MT_1_1" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_1_1"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_1_2" header="MT_1_2" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_1_2"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_1_3" header="MT_1_3" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_1_3"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_1_4" header="MT_1_4" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_1_4"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_2_1" header="MT_2_1" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_2_1"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_2_2" header="MT_2_2" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_2_2"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_2_3" header="MT_2_3" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_2_3"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_2_4" header="MT_2_4" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_2_4"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_3_1" header="MT_3_1" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_3_1"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_3_2" header="MT_3_2" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_3_2"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_3_3" header="MT_3_3" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_3_3"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_MT_3_4" header="MT_3_4" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/MT_3_4"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RFILTER_CUTOFF" header="cutoff" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/RFilter/cutoff"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RFILTER_RESOLUTION" header="resolution" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/RFilter/resolution"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RFILTER_CODE" header="code" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/RFilter/code"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RFILTER_ORDER" header="order" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/RFilter/order"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ZFILTER_CUTOFF" header="cutoff" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZFilter/cutoff"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ZFILTER_RESOLUTION" header="resolution" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZFilter/resolution"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ZFILTER_CODE" header="code" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZFilter/code"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ZFILTER_ORDER" header="order" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ZFilter/order"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_SCATTERTYPE" header="scatterType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/scatterType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RECONTYPE" header="reconType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/reconType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_RECONVIEWS" header="reconViews" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/reconViews"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_BEDPOSITION" header="bedPosition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/bedPosition"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ECATCALIBRATIONFACTOR" header="ecatCalibrationFactor" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/parameters/ecatCalibrationFactor"/>
- </DisplayField>
- <DisplayField id="ECATVALIDATION" header="ecatValidation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/ecatValidation"/>
- </DisplayField>
- <DisplayField id="ECATVALIDATION_STATUS" header="status" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petScanData/ecatValidation/status"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="PETScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
- <DisplayFieldRef id="PARAMETERS_ORIGINALFILENAME"/>
- <DisplayFieldRef id="PARAMETERS_SYSTEMTYPE"/>
- <DisplayFieldRef id="PARAMETERS_FILETYPE"/>
- <DisplayFieldRef id="PARAMETERS_TRANSAXIALFOV"/>
- <DisplayFieldRef id="PARAMETERS_ACQTYPE"/>
- <DisplayFieldRef id="PARAMETERS_FACILITY"/>
- <DisplayFieldRef id="PARAMETERS_NUMPLANES"/>
- <DisplayFieldRef id="PARAMETERS_FRAMES_NUMFRAMES"/>
- <DisplayFieldRef id="PARAMETERS_NUMGATES"/>
- <DisplayFieldRef id="PARAMETERS_PLANESEPARATION"/>
- <DisplayFieldRef id="PARAMETERS_BINSIZE"/>
- <DisplayFieldRef id="PARAMETERS_DATATYPE"/>
- <DisplayFieldRef id="PARAMETERS_DIMENSIONS_X"/>
- <DisplayFieldRef id="PARAMETERS_DIMENSIONS_Y"/>
- <DisplayFieldRef id="PARAMETERS_DIMENSIONS_Z"/>
- <DisplayFieldRef id="PARAMETERS_DIMENSIONS_NUM"/>
- <DisplayFieldRef id="PARAMETERS_OFFSET_X"/>
- <DisplayFieldRef id="PARAMETERS_OFFSET_Y"/>
- <DisplayFieldRef id="PARAMETERS_OFFSET_Z"/>
- <DisplayFieldRef id="PARAMETERS_RECONZOOM"/>
- <DisplayFieldRef id="PARAMETERS_PIXELSIZE_X"/>
- <DisplayFieldRef id="PARAMETERS_PIXELSIZE_Y"/>
- <DisplayFieldRef id="PARAMETERS_PIXELSIZE_Z"/>
- <DisplayFieldRef id="PARAMETERS_FILTERCODE"/>
- <DisplayFieldRef id="PARAMETERS_RESOLUTION_X"/>
- <DisplayFieldRef id="PARAMETERS_RESOLUTION_Y"/>
- <DisplayFieldRef id="PARAMETERS_RESOLUTION_Z"/>
- <DisplayFieldRef id="PARAMETERS_NUMRELEMENTS"/>
- <DisplayFieldRef id="PARAMETERS_NUMANGLES"/>
- <DisplayFieldRef id="PARAMETERS_ZROTATIONANGLE"/>
- <DisplayFieldRef id="PARAMETERS_PROCESSINGCODE"/>
- <DisplayFieldRef id="PARAMETERS_GATEDURATION"/>
- <DisplayFieldRef id="PARAMETERS_RWAVEOFFSET"/>
- <DisplayFieldRef id="PARAMETERS_NUMACCEPTEDBEATS"/>
- <DisplayFieldRef id="PARAMETERS_FILTER_CUTOFF"/>
- <DisplayFieldRef id="PARAMETERS_ANNOTATION"/>
- <DisplayFieldRef id="PARAMETERS_MT_1_1"/>
- <DisplayFieldRef id="PARAMETERS_MT_1_2"/>
- <DisplayFieldRef id="PARAMETERS_MT_1_3"/>
- <DisplayFieldRef id="PARAMETERS_MT_1_4"/>
- <DisplayFieldRef id="PARAMETERS_MT_2_1"/>
- <DisplayFieldRef id="PARAMETERS_MT_2_2"/>
- <DisplayFieldRef id="PARAMETERS_MT_2_3"/>
- <DisplayFieldRef id="PARAMETERS_MT_2_4"/>
- <DisplayFieldRef id="PARAMETERS_MT_3_1"/>
- <DisplayFieldRef id="PARAMETERS_MT_3_2"/>
- <DisplayFieldRef id="PARAMETERS_MT_3_3"/>
- <DisplayFieldRef id="PARAMETERS_MT_3_4"/>
- <DisplayFieldRef id="PARAMETERS_RFILTER_CUTOFF"/>
- <DisplayFieldRef id="PARAMETERS_RFILTER_RESOLUTION"/>
- <DisplayFieldRef id="PARAMETERS_RFILTER_CODE"/>
- <DisplayFieldRef id="PARAMETERS_RFILTER_ORDER"/>
- <DisplayFieldRef id="PARAMETERS_ZFILTER_CUTOFF"/>
- <DisplayFieldRef id="PARAMETERS_ZFILTER_RESOLUTION"/>
- <DisplayFieldRef id="PARAMETERS_ZFILTER_CODE"/>
- <DisplayFieldRef id="PARAMETERS_ZFILTER_ORDER"/>
- <DisplayFieldRef id="PARAMETERS_SCATTERTYPE"/>
- <DisplayFieldRef id="PARAMETERS_RECONTYPE"/>
- <DisplayFieldRef id="PARAMETERS_RECONVIEWS"/>
- <DisplayFieldRef id="PARAMETERS_BEDPOSITION"/>
- <DisplayFieldRef id="PARAMETERS_ECATCALIBRATIONFACTOR"/>
- <DisplayFieldRef id="ECATVALIDATION"/>
- <DisplayFieldRef id="ECATVALIDATION_STATUS"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="PETScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
- <DisplayFieldRef id="PARAMETERS_ORIGINALFILENAME"/>
- <DisplayFieldRef id="PARAMETERS_SYSTEMTYPE"/>
- <DisplayFieldRef id="PARAMETERS_FILETYPE"/>
- <DisplayFieldRef id="PARAMETERS_TRANSAXIALFOV"/>
- <DisplayFieldRef id="PARAMETERS_ACQTYPE"/>
- <DisplayFieldRef id="PARAMETERS_FACILITY"/>
- <DisplayFieldRef id="PARAMETERS_NUMPLANES"/>
- <DisplayFieldRef id="PARAMETERS_FRAMES_NUMFRAMES"/>
- <DisplayFieldRef id="PARAMETERS_NUMGATES"/>
- <DisplayFieldRef id="PARAMETERS_PLANESEPARATION"/>
- <DisplayFieldRef id="PARAMETERS_BINSIZE"/>
- <DisplayFieldRef id="PARAMETERS_DATATYPE"/>
- <DisplayFieldRef id="PARAMETERS_DIMENSIONS_X"/>
- <DisplayFieldRef id="PARAMETERS_DIMENSIONS_Y"/>
- <DisplayFieldRef id="PARAMETERS_DIMENSIONS_Z"/>
- <DisplayFieldRef id="PARAMETERS_DIMENSIONS_NUM"/>
- <DisplayFieldRef id="PARAMETERS_OFFSET_X"/>
- <DisplayFieldRef id="PARAMETERS_OFFSET_Y"/>
- <DisplayFieldRef id="PARAMETERS_OFFSET_Z"/>
- <DisplayFieldRef id="PARAMETERS_RECONZOOM"/>
- <DisplayFieldRef id="PARAMETERS_PIXELSIZE_X"/>
- <DisplayFieldRef id="PARAMETERS_PIXELSIZE_Y"/>
- <DisplayFieldRef id="PARAMETERS_PIXELSIZE_Z"/>
- <DisplayFieldRef id="PARAMETERS_FILTERCODE"/>
- <DisplayFieldRef id="PARAMETERS_RESOLUTION_X"/>
- <DisplayFieldRef id="PARAMETERS_RESOLUTION_Y"/>
- <DisplayFieldRef id="PARAMETERS_RESOLUTION_Z"/>
- <DisplayFieldRef id="PARAMETERS_NUMRELEMENTS"/>
- <DisplayFieldRef id="PARAMETERS_NUMANGLES"/>
- <DisplayFieldRef id="PARAMETERS_ZROTATIONANGLE"/>
- <DisplayFieldRef id="PARAMETERS_PROCESSINGCODE"/>
- <DisplayFieldRef id="PARAMETERS_GATEDURATION"/>
- <DisplayFieldRef id="PARAMETERS_RWAVEOFFSET"/>
- <DisplayFieldRef id="PARAMETERS_NUMACCEPTEDBEATS"/>
- <DisplayFieldRef id="PARAMETERS_FILTER_CUTOFF"/>
- <DisplayFieldRef id="PARAMETERS_ANNOTATION"/>
- <DisplayFieldRef id="PARAMETERS_MT_1_1"/>
- <DisplayFieldRef id="PARAMETERS_MT_1_2"/>
- <DisplayFieldRef id="PARAMETERS_MT_1_3"/>
- <DisplayFieldRef id="PARAMETERS_MT_1_4"/>
- <DisplayFieldRef id="PARAMETERS_MT_2_1"/>
- <DisplayFieldRef id="PARAMETERS_MT_2_2"/>
- <DisplayFieldRef id="PARAMETERS_MT_2_3"/>
- <DisplayFieldRef id="PARAMETERS_MT_2_4"/>
- <DisplayFieldRef id="PARAMETERS_MT_3_1"/>
- <DisplayFieldRef id="PARAMETERS_MT_3_2"/>
- <DisplayFieldRef id="PARAMETERS_MT_3_3"/>
- <DisplayFieldRef id="PARAMETERS_MT_3_4"/>
- <DisplayFieldRef id="PARAMETERS_RFILTER_CUTOFF"/>
- <DisplayFieldRef id="PARAMETERS_RFILTER_RESOLUTION"/>
- <DisplayFieldRef id="PARAMETERS_RFILTER_CODE"/>
- <DisplayFieldRef id="PARAMETERS_RFILTER_ORDER"/>
- <DisplayFieldRef id="PARAMETERS_ZFILTER_CUTOFF"/>
- <DisplayFieldRef id="PARAMETERS_ZFILTER_RESOLUTION"/>
- <DisplayFieldRef id="PARAMETERS_ZFILTER_CODE"/>
- <DisplayFieldRef id="PARAMETERS_ZFILTER_ORDER"/>
- <DisplayFieldRef id="PARAMETERS_SCATTERTYPE"/>
- <DisplayFieldRef id="PARAMETERS_RECONTYPE"/>
- <DisplayFieldRef id="PARAMETERS_RECONVIEWS"/>
- <DisplayFieldRef id="PARAMETERS_BEDPOSITION"/>
- <DisplayFieldRef id="PARAMETERS_ECATCALIBRATIONFACTOR"/>
- <DisplayFieldRef id="ECATVALIDATION"/>
- <DisplayFieldRef id="ECATVALIDATION_STATUS"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_petSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_petSessionData_display.xml
deleted file mode 100644
index 110454a7a3c264a9e3d5b438fd5f910469e98e32..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_petSessionData_display.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/display/xnat_petSessionData_display.xml
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/7/14 12:19 PM
- -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:petSessionData" full-description="PETSession" brief-description="PETSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:petSessionData','xnat:petSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:petSessionData','xnat:petSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="float">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <DisplayFieldElement name="Field5" schema-element="xnat:demographicData.age"/>
- <DisplayFieldElement name="Field4" schema-element="xnat:petSessionData.age"/>
- <Content type="sql">CAST(FLOOR(CAST(COALESCE(@Field4,@Field5,EXTRACT(YEAR FROM AGE(@Field1, @Field2)),(EXTRACT(YEAR FROM @Field1)) - (@Field3)) AS numeric)) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_PETSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:petSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:petSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:petSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:petSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:petSessionData/search_field/xnat:petSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:petSessionData','xnat:petSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_PETSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_PETSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_petsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:petSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:petSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:petSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:petSessionData/search_field/xnat:petSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:petSessionData','xnat:petSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_petsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:petSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_PETSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:petSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:petSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="STABILIZATION" header="stabilization" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/stabilization"/>
- </DisplayField>
- <DisplayField id="STUDYTYPE" header="studyType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/studyType"/>
- </DisplayField>
- <DisplayField id="PATIENTID" header="patientID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/patientID"/>
- </DisplayField>
- <DisplayField id="PATIENTNAME" header="patientName" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/patientName"/>
- </DisplayField>
- <DisplayField id="TRACER_DOSE_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/dose/units"/>
- </DisplayField>
- <DisplayField id="TRACER_DOSE" header="dose" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/dose"/>
- </DisplayField>
- <DisplayField id="TRACER_SPECIFICACTIVITY" header="specificActivity" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/specificActivity"/>
- </DisplayField>
- <DisplayField id="TRACER_TOTALMASS_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/totalMass/units"/>
- </DisplayField>
- <DisplayField id="TRACER_TOTALMASS" header="totalMass" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/totalMass"/>
- </DisplayField>
- <DisplayField id="TRACER_INTERMEDIATE_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/intermediate/units"/>
- </DisplayField>
- <DisplayField id="TRACER_INTERMEDIATE" header="intermediate" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/intermediate"/>
- </DisplayField>
- <DisplayField id="TRACER_ISOTOPE_HALF_LIFE" header="half-life" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/isotope/half-life"/>
- </DisplayField>
- <DisplayField id="TRACER_ISOTOPE" header="isotope" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/isotope"/>
- </DisplayField>
- <DisplayField id="TRACER_TRANSMISSIONS_STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/transmissions_starttime"/>
- </DisplayField>
- <DisplayField id="TRACER_TRANSMISSIONS" header="transmissions" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/transmissions"/>
- </DisplayField>
- <DisplayField id="TRACER_NAME" header="name" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/name"/>
- </DisplayField>
- <DisplayField id="TRACER_STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/tracer/startTime"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petSessionData/UID"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="PETSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_PETSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="UID"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_PETSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_PETSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:petSessionData" fieldElement="xnat:petSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_PETSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:petSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_petmrSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_petmrSessionData_display.xml
deleted file mode 100644
index c04a249684021a1ef337552fb20a3d9b66d600e5..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_petmrSessionData_display.xml
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:petmrSessionData" full-description="PETMRSession" brief-description="PETMRSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:petmrSessionData','xnat:petmrSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:petmrSessionData','xnat:petmrSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_PETMRSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:petmrSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:petmrSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:petmrSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:petmrSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:petmrSessionData/search_field/xnat:petmrSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:petmrSessionData','xnat:petmrSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_PETMRSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_PETMRSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_petmrsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:petmrSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:petmrSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:petmrSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:petmrSessionData/search_field/xnat:petmrSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_petmrsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:petmrSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_PETMRSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:petmrSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:petmrSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="COIL" header="coil" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/coil"/>
- </DisplayField>
- <DisplayField id="FIELDSTRENGTH" header="fieldStrength" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/fieldStrength"/>
- </DisplayField>
- <DisplayField id="MARKER" header="marker" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/marker"/>
- </DisplayField>
- <DisplayField id="STABILIZATION" header="stabilization" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/stabilization"/>
- </DisplayField>
- <DisplayField id="STUDYTYPE" header="studyType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/studyType"/>
- </DisplayField>
- <DisplayField id="PATIENTID" header="patientID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/patientID"/>
- </DisplayField>
- <DisplayField id="PATIENTNAME" header="patientName" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/patientName"/>
- </DisplayField>
- <DisplayField id="TRACER_DOSE_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/dose/units"/>
- </DisplayField>
- <DisplayField id="TRACER_DOSE" header="dose" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/dose"/>
- </DisplayField>
- <DisplayField id="TRACER_SPECIFICACTIVITY" header="specificActivity" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/specificActivity"/>
- </DisplayField>
- <DisplayField id="TRACER_TOTALMASS_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/totalMass/units"/>
- </DisplayField>
- <DisplayField id="TRACER_TOTALMASS" header="totalMass" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/totalMass"/>
- </DisplayField>
- <DisplayField id="TRACER_INTERMEDIATE_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/intermediate/units"/>
- </DisplayField>
- <DisplayField id="TRACER_INTERMEDIATE" header="intermediate" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/intermediate"/>
- </DisplayField>
- <DisplayField id="TRACER_ISOTOPE_HALF_LIFE" header="half-life" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/isotope/half-life"/>
- </DisplayField>
- <DisplayField id="TRACER_ISOTOPE" header="isotope" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/isotope"/>
- </DisplayField>
- <DisplayField id="TRACER_TRANSMISSIONS" header="transmissions" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/transmissions"/>
- </DisplayField>
- <DisplayField id="TRACER_TRANSMISSIONS_STARTTIME" header="transmissions_starttime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/transmissions_starttime"/>
- </DisplayField>
- <DisplayField id="TRACER_NAME" header="name" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/name"/>
- </DisplayField>
- <DisplayField id="TRACER_STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/tracer/startTime"/>
- </DisplayField>
- <DisplayField id="START_TIME" header="start_time" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/start_time"/>
- </DisplayField>
- <DisplayField id="START_TIME_SCAN" header="start_time_scan" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/start_time_scan"/>
- </DisplayField>
- <DisplayField id="START_TIME_INJECTION" header="start_time_injection" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/start_time_injection"/>
- </DisplayField>
- <DisplayField id="BLOOD_GLUCOSE" header="blood_glucose" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/blood_glucose"/>
- </DisplayField>
- <DisplayField id="BLOOD_GLUCOSE_UNITS" header="blood_glucose_units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/blood_glucose_units"/>
- </DisplayField>
- <DisplayField id="BLOOD_GLUCOSE_TIME" header="blood_glucose_time" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:petmrSessionData/blood_glucose_time"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="COIL"/>
- <DisplayFieldRef id="FIELDSTRENGTH"/>
- <DisplayFieldRef id="MARKER"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="START_TIME"/>
- <DisplayFieldRef id="START_TIME_SCAN"/>
- <DisplayFieldRef id="START_TIME_INJECTION"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="COIL"/>
- <DisplayFieldRef id="FIELDSTRENGTH"/>
- <DisplayFieldRef id="MARKER"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="START_TIME"/>
- <DisplayFieldRef id="START_TIME_SCAN"/>
- <DisplayFieldRef id="START_TIME_INJECTION"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="COIL"/>
- <DisplayFieldRef id="FIELDSTRENGTH"/>
- <DisplayFieldRef id="MARKER"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="START_TIME"/>
- <DisplayFieldRef id="START_TIME_SCAN"/>
- <DisplayFieldRef id="START_TIME_INJECTION"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="COIL"/>
- <DisplayFieldRef id="FIELDSTRENGTH"/>
- <DisplayFieldRef id="MARKER"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="START_TIME"/>
- <DisplayFieldRef id="START_TIME_SCAN"/>
- <DisplayFieldRef id="START_TIME_INJECTION"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="PETMRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_PETMRSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- <DisplayFieldRef id="COIL"/>
- <DisplayFieldRef id="FIELDSTRENGTH"/>
- <DisplayFieldRef id="MARKER"/>
- <DisplayFieldRef id="STABILIZATION"/>
- <DisplayFieldRef id="STUDYTYPE"/>
- <DisplayFieldRef id="PATIENTID"/>
- <DisplayFieldRef id="PATIENTNAME"/>
- <DisplayFieldRef id="TRACER_DOSE_UNITS"/>
- <DisplayFieldRef id="TRACER_DOSE"/>
- <DisplayFieldRef id="TRACER_SPECIFICACTIVITY"/>
- <DisplayFieldRef id="TRACER_TOTALMASS_UNITS"/>
- <DisplayFieldRef id="TRACER_TOTALMASS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE_UNITS"/>
- <DisplayFieldRef id="TRACER_INTERMEDIATE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE_HALF_LIFE"/>
- <DisplayFieldRef id="TRACER_ISOTOPE"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS"/>
- <DisplayFieldRef id="TRACER_TRANSMISSIONS_STARTTIME"/>
- <DisplayFieldRef id="TRACER_NAME"/>
- <DisplayFieldRef id="TRACER_STARTTIME"/>
- <DisplayFieldRef id="START_TIME"/>
- <DisplayFieldRef id="START_TIME_SCAN"/>
- <DisplayFieldRef id="START_TIME_INJECTION"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_UNITS"/>
- <DisplayFieldRef id="BLOOD_GLUCOSE_TIME"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_PETMRSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_PETMRSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:petmrSessionData" fieldElement="xnat:petmrSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_PETMRSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:petmrSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_projectData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_projectData_display.xml
deleted file mode 100644
index 8a1921c85052402f71b0a8fb7fba3ba92bfcc8fb..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_projectData_display.xml
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/display/xnat_projectData_display.xml
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/7/14 12:19 PM
- -->
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:projectData" full-description="Project" brief-description="Project">
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData/ID"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:projectData/search_field/xnat:projectData.ID">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:projectData','xnat:projectData.ID');">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="NAME" header="Title" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData/name"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:projectData/search_field/xnat:projectData.ID">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:projectData','xnat:projectData.ID');">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="NAME_CSV" header="Title" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData/name"/>
- <HTML-Link>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:projectData/search_field/xnat:projectData.ID">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:projectData','xnat:projectData.ID');">
- <InsertValue id="Field1" field="ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DESCRIPTION" header="Description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData/description"/>
- <Content type="sql">substring(@Field1 FROM 0 FOR 162)</Content>
- </DisplayField>
- <DisplayField id="DESCRIPTION_CSV" header="Description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData/description"/>
- </DisplayField>
- <DisplayField id="SECONDARY_ID" header="Running Title" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData/secondary_ID"/>
- </DisplayField>
- <DisplayField id="KEYWORDS" header="Keywords" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData/keywords"/>
- </DisplayField>
- <DisplayField id="PI" header="PI" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:projectData/PI/firstname"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:projectData/PI/lastname"/>
- <Content type="sql">@Field1 || ' ' || @Field2</Content>
- </DisplayField>
- <DisplayField id="PROJECT_INVS" header="Investigators" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="PROJECT_INVS" viewColumn="PROJ_INVS"/>
- </DisplayField>
- <DisplayField id="PROJECT_ACCESS" header="Accessibility" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="PROJECT_ACCESS" viewColumn="accessibility"/>
- </DisplayField>
- <DisplayField id="PROJECT_USERS" header="Users" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="PROJECT_USERS" viewColumn="users"/>
- </DisplayField>
- <DisplayField id="PROJECT_OWNERS" header="Owners" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="PROJECT_OWNERS" viewColumn="users"/>
- </DisplayField>
- <DisplayField id="PROJECT_MEMBERS" header="Members" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="PROJECT_MEMBERS" viewColumn="users"/>
- </DisplayField>
- <DisplayField id="PROJECT_COLLABS" header="Collaborators" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="PROJECT_COLLABS" viewColumn="users"/>
- </DisplayField>
- <DisplayField id="PROJECT_LAST_WORKFLOW" header="Last Workflow" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="PROJECT_LAST_WORKFLOW" viewColumn="LAST_WORKFLOW"/>
- </DisplayField>
- <DisplayField id="PROJECT_LAST_ACCESS" header="Last Access" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="PROJECT_LAST_ACCESS" viewColumn="users"/>
- </DisplayField>
- <DisplayField id="PROJECT_FAV" header="Favorites" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" viewName="PROJECT_FAVS" viewColumn="users"/>
- </DisplayField>
- <DisplayField id="PROJECT_ACCESS_IMG" header="Access" visible="true" image="true">
- <DisplayFieldElement name="Field1" viewName="PROJECT_ACCESS" viewColumn="accessibility"/>
- <Content type="sql">CASE @Field1 WHEN 'public' THEN '/@WEBAPPimages/globe.gif' ELSE '/@WEBAPPimages/key.gif' END</Content>
- </DisplayField>
- <DisplayField id="USER_ROLE" header="Role" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">project_role</Content>
- <SubQuery>SELECT tag AS project_id, displayname AS project_role FROM xdat_userGroup grp LEFT JOIN xdat_user_groupid map ON grp.id=map.groupid WHERE map.groups_groupid_xdat_user_xdat_user_id=@WHERE</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:projectData.ID" queryField="project_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="LAST_ACCESSED" header="Last Accessed" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">accessed</Content>
- <SubQuery>SELECT DISTINCT ON (search_value) search_value AS project_id,accessed FROM xdat_search.xs_item_access WHERE xdat_user_id::text=@WHERE::text ORDER BY project_id ASC,accessed DESC</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:projectData.ID" queryField="project_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="PROJ_EXPT_COUNT" header="Count" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">sub_project_count</Content>
- <SubQuery>SELECT COUNT(*) as sub_project_count, subject_id FROM xnat_subjectAssessorData sad LEFT JOIN xnat_experimentData ex ON sad.ID=ex.ID JOIN xdat_meta_element xme ON ex.extension=xme.xdat_meta_element_id WHERE xme.element_name='@WHERE' GROUP BY subject_id</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:subjectData.ID" queryField="subject_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="PROJ_MR_COUNT" header="MR Count" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" viewName="PROJ_MR_COUNTS" viewColumn="PROJ_EXPT_COUNT"/>
- </DisplayField>
- <DisplayField id="PROJ_CT_COUNT" header="CT Count" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" viewName="PROJ_CT_COUNTS" viewColumn="PROJ_EXPT_COUNT"/>
- </DisplayField>
- <DisplayField id="PROJ_PET_COUNT" header="PET Count" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" viewName="PROJ_PET_COUNTS" viewColumn="PROJ_EXPT_COUNT"/>
- </DisplayField>
- <DisplayField id="PROJ_UT_COUNT" header="UT Count" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" viewName="PROJ_UT_COUNTS" viewColumn="PROJ_EXPT_COUNT"/>
- </DisplayField>
- <DisplayField id="PROJ_QUARANTINE" header="Quarantine Code" visible="true" data-type="integer">
- <DisplayFieldElement name="Field1" viewName="PROJ_ARC" viewColumn="quarantine_code"/>
- </DisplayField>
- <DisplayField id="PROJ_PREARCHIVE_CODE" header="Prearchive Code" visible="true" data-type="integer">
- <DisplayFieldElement name="Field1" viewName="PROJ_ARC" viewColumn="prearchive_code"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="ID" default-sort-order="DESC" brief-description="Project" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="SECONDARY_ID"/>
- <DisplayFieldRef id="KEYWORDS"/>
- <DisplayFieldRef id="PROJ_MR_COUNT"/>
- <DisplayFieldRef id="PROJ_PET_COUNT"/>
- <DisplayFieldRef id="PROJ_CT_COUNT"/>
- <DisplayFieldRef id="USER_ROLE" value="{XDAT_USER_ID}" visible="false"/>
- <DisplayFieldRef id="PROJECT_ACCESS" visible="false"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="ID" default-sort-order="DESC" brief-description="Project" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="SECONDARY_ID"/>
- <DisplayFieldRef id="KEYWORDS"/>
- <DisplayFieldRef id="PROJ_MR_COUNT"/>
- <DisplayFieldRef id="PROJ_PET_COUNT"/>
- <DisplayFieldRef id="PROJ_CT_COUNT"/>
- <DisplayFieldRef id="USER_ROLE" value="{XDAT_USER_ID}" visible="false"/>
- <DisplayFieldRef id="PROJECT_ACCESS" visible="false"/>
- </DisplayVersion>
- <ViewLink alias="PROJECT_INVS">
- <Mapping TableName="PROJECT_INVS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJECT_ACCESS">
- <Mapping TableName="PROJECT_ACCESS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJECT_USERS">
- <Mapping TableName="PROJECT_USERS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJECT_OWNERS">
- <Mapping TableName="PROJECT_OWNERS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJECT_MEMBERS">
- <Mapping TableName="PROJECT_MEMBERS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJECT_COLLABS">
- <Mapping TableName="PROJECT_COLLABS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="xnat_projectdata_id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJECT_LAST_WORKFLOW">
- <Mapping TableName="PROJECT_LAST_WORKFLOW">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJECT_LAST_ACCESS">
- <Mapping TableName="PROJECT_LAST_ACCESS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="search_value"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJECT_FAVS">
- <Mapping TableName="PROJECT_FAVS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project_id"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJ_MR_COUNTS">
- <Mapping TableName="PROJ_MR_COUNTS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJ_CT_COUNTS">
- <Mapping TableName="PROJ_CT_COUNTS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJ_UT_COUNTS">
- <Mapping TableName="PROJ_UT_COUNTS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJ_PET_COUNTS">
- <Mapping TableName="PROJ_PET_COUNTS">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="project"/>
- </Mapping>
- </ViewLink>
- <ViewLink alias="PROJ_ARC">
- <Mapping TableName="PROJ_ARC">
- <MappingColumn rootElement="xnat:projectData" fieldElement="xnat:projectData.ID" mapsTo="PROJ_ID"/>
- </Mapping>
- </ViewLink>
- <SQLView name="PROJECT_INVS" sql="SELECT proj.id AS xnat_projectdata_id, COALESCE(((pi.lastname::text || ', '::text) || pi.firstname::text),'') || COALESCE(others.other_invs,'') AS proj_invs FROM xnat_projectData proj LEFT JOIN xnat_investigatorData pi ON proj.pi_xnat_investigatorData_id=pi.xnat_investigatorData_id LEFT JOIN ( SELECT xnat_projectdata_id, xs_a_concat(' <br/> ' || lastname || ', ' || firstname) AS other_invs FROM xnat_projectData_investigator pinv LEFT JOIN xnat_investigatorData inv ON pinv.xnat_investigatordata_xnat_investigatordata_id=inv.xnat_investigatordata_id GROUP BY xnat_projectdata_id) others ON proj.id=xnat_projectdata_id"/>
- <SQLView name="PROJECT_ACCESS" sql="SELECT proj.id,CASE WHEN (project_read=1 AND subject_read=1) THEN 'public' WHEN (project_read=1) THEN 'protected' ELSE 'private' END AS accessibility FROM xnat_projectData proj LEFT JOIN ( SELECT field_value,read_element AS project_read FROM xdat_element_access ea LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id LEFT JOIN xdat_user u ON ea.xdat_user_xdat_user_id=u.xdat_user_id LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id WHERE login='guest' AND element_name='xnat:projectData' )project_read ON proj.id=project_read.field_value LEFT JOIN ( SELECT field_value,read_element AS subject_read FROM xdat_element_access ea LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id LEFT JOIN xdat_user u ON ea.xdat_user_xdat_user_id=u.xdat_user_id LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id WHERE login='guest' AND field='xnat:subjectData/project' )subject_read ON proj.id=subject_read.field_value"/>
- <SQLView name="PROJECT_USERS" sql="SELECT FIELD_VALUE AS xnat_projectdata_id, TRIM('<br/>' FROM xs_a_concat( ' '|| login || ' <br/>')) AS users FROM (SELECT DISTINCT FIELD_VALUE,login FROM xdat_element_access ea LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id RIGHT JOIN xdat_userGroup grp ON ea.xdat_usergroup_xdat_usergroup_id=grp.xdat_usergroup_id RIGHT JOIN xdat_user_groupid map ON grp.id=map.groupid RIGHT JOIN xdat_user u ON map.groups_groupid_xdat_user_xdat_user_id=u.xdat_user_id WHERE field='xnat:subjectData/sharing/share/project') PROJ_USERS GROUP BY FIELD_VALUE"/>
- <SQLView name="PROJECT_OWNERS" sql="SELECT FIELD_VALUE AS xnat_projectdata_id, TRIM('<br/>' FROM xs_a_concat( ' '|| login || ' <br/>')) AS users FROM (SELECT DISTINCT FIELD_VALUE,login FROM xdat_element_access ea LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id RIGHT JOIN xdat_userGroup grp ON ea.xdat_usergroup_xdat_usergroup_id=grp.xdat_usergroup_id AND grp.displayname='Owners' RIGHT JOIN xdat_user_groupid map ON grp.id=map.groupid RIGHT JOIN xdat_user u ON map.groups_groupid_xdat_user_xdat_user_id=u.xdat_user_id WHERE field='xnat:subjectData/sharing/share/project') PROJ_USERS GROUP BY FIELD_VALUE"/>
- <SQLView name="PROJECT_MEMBERS" sql="SELECT FIELD_VALUE AS xnat_projectdata_id, TRIM('<br/>' FROM xs_a_concat( ' '|| login || ' <br/>')) AS users FROM (SELECT DISTINCT FIELD_VALUE,login FROM xdat_element_access ea LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id RIGHT JOIN xdat_userGroup grp ON ea.xdat_usergroup_xdat_usergroup_id=grp.xdat_usergroup_id AND grp.displayname='Members' RIGHT JOIN xdat_user_groupid map ON grp.id=map.groupid RIGHT JOIN xdat_user u ON map.groups_groupid_xdat_user_xdat_user_id=u.xdat_user_id WHERE field='xnat:subjectData/sharing/share/project') PROJ_USERS GROUP BY FIELD_VALUE"/>
- <SQLView name="PROJECT_COLLABS" sql="SELECT FIELD_VALUE AS xnat_projectdata_id, TRIM('<br/>' FROM xs_a_concat( ' '|| login || ' <br/>')) AS users FROM (SELECT DISTINCT FIELD_VALUE,login FROM xdat_element_access ea LEFT JOIN xdat_field_mapping_set fms ON ea.xdat_element_access_id=fms.permissions_allow_set_xdat_elem_xdat_element_access_id LEFT JOIN xdat_field_mapping fm ON fms.xdat_field_mapping_set_id=fm.xdat_field_mapping_set_xdat_field_mapping_set_id RIGHT JOIN xdat_userGroup grp ON ea.xdat_usergroup_xdat_usergroup_id=grp.xdat_usergroup_id AND grp.displayname='Collaborators' RIGHT JOIN xdat_user_groupid map ON grp.id=map.groupid RIGHT JOIN xdat_user u ON map.groups_groupid_xdat_user_xdat_user_id=u.xdat_user_id WHERE field='xnat:subjectData/sharing/share/project') PROJ_USERS GROUP BY FIELD_VALUE"/>
- <SQLView name="PROJECT_LAST_WORKFLOW" sql="SELECT ID, LAST_WORKFLOW FROM xnat_projectData proj LEFT JOIN (SELECT externalid,MAX(launch_time) as LAST_WORKFLOW FROM wrk_workflowData GROUP BY externalid)launch_times ON proj.id=launch_times.externalid"/>
- <SQLView name="PROJECT_LAST_ACCESS" sql="SELECT search_value,TRIM('<br/>' FROM xs_a_concat( ' '|| login || ' <br/>')) AS users FROM (SELECT DISTINCT search_value,xdat_user_id FROM xdat_search.xs_item_access WHERE search_element='xnat:projectData' AND accessed > (NOW()-interval '1 month')) last_access LEFT JOIN xdat_user u ON last_access.xdat_user_id::text=u.xdat_user_id::text GROUP BY search_value"/>
- <SQLView name="PROJECT_FAVS" sql="SELECT id AS project_id,TRIM('<br/>' FROM xs_a_concat( ' '|| login || ' <br/>')) AS users FROM ( SELECT DISTINCT id,xdat_user_id FROM xdat_search.xs_fav_entries WHERE dataType='Project' ) last_access LEFT JOIN xdat_user u ON last_access.xdat_user_id::integer=u.xdat_user_id::integer GROUP BY id"/>
- <SQLView name="PROJ_EXPT_COUNTS" sql="SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name"/>
- <SQLView name="PROJ_MR_COUNTS" sql="SELECT project, proj_expt_count FROM (
-SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name
-) GROUPING WHERE element_name='xnat:mrSessionData'"/>
- <SQLView name="PROJ_PET_COUNTS" sql="SELECT project, proj_expt_count FROM (
-SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name
-) GROUPING WHERE element_name='xnat:petSessionData'"/>
- <SQLView name="PROJ_CT_COUNTS" sql="SELECT project, proj_expt_count FROM (
-SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name
-) GROUPING WHERE element_name='xnat:ctSessionData'"/>
- <SQLView name="PROJ_UT_COUNTS" sql="SELECT project, proj_expt_count FROM (
-SELECT project, element_name, COUNT(ID) AS PROJ_EXPT_COUNT FROM (
-SELECT project,ID,element_name FROM xnat_experimentData expt LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-UNION
-SELECT ep.project, ep.label, element_name FROM xnat_experimentdata_share ep LEFT JOIN xnat_experimentData expt ON ep.sharing_share_xnat_experimentda_id=expt.id LEFT JOIN xdat_meta_element xme ON expt.extension=xme.xdat_meta_element_id
-) GROUPING GROUP BY project,element_name
-) GROUPING WHERE element_name='xnat:utSessionData'"/>
- <SQLView name="PROJ_ARC" sql="SELECT id AS PROJ_ID,current_arc,COALESCE(quarantine_code,0) AS quarantine_code,COALESCE(prearchive_code,0) AS prearchive_code FROM arc_project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_qcAssessmentData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_qcAssessmentData_display.xml
deleted file mode 100644
index 68a766bbc8a03dac2c7caefd4fa2cec02e9f320b..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_qcAssessmentData_display.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:qcAssessmentData" full-description="QCAssessment" brief-description="QCAssessment">
- <Arc name="ASSESSOR">
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- <CommonField id="ASSESSED_EXPT_ID" local-field="SESSION_ID"/>
- </Arc>
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="MR_DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SESSION_ID" header="Session" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.imageSession_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:mrSessionData','xnat:mrSessionData.ID');">
- <InsertValue id="Field1" field="SESSION_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="MR_DATE" header="MR Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="false" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:qcAssessmentData','xnat:qcAssessmentData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:qcAssessmentData','xnat:qcAssessmentData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:mrSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_QCASSESSMENTDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:qcAssessmentData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:qcAssessmentData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:qcAssessmentData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:qcAssessmentData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:qcAssessmentData/search_field/xnat:qcAssessmentData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:qcAssessmentData','xnat:qcAssessmentData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_QCASSESSMENTDATA_PROJECT_IDENTIFIER" header="XNAT_QCASSESSMENTDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_qcassessmentdata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:qcAssessmentData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:qcAssessmentData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:qcAssessmentData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:qcAssessmentData/search_field/xnat:qcAssessmentData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_qcassessmentdata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:qcAssessmentData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="XNAT_QCASSESSMENTDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:qcAssessmentData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:qcAssessmentData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcAssessmentData/type"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="LABEL" element_name="xnat:mrSessionData"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="TYPE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="LABEL" element_name="xnat:mrSessionData"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="TYPE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="LABEL" element_name="xnat:mrSessionData"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="TYPE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="TYPE"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="QCAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_QCASSESSMENTDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="MR_PROJECT_IDENTIFIER" element_name="xnat:mrSessionData"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="TYPE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_QCASSESSMENTDATA_PROJECTS">
- <Mapping TableName="XNAT_QCASSESSMENTDATA_PROJECTS">
- <MappingColumn rootElement="xnat:qcAssessmentData" fieldElement="xnat:qcAssessmentData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_QCASSESSMENTDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:qcAssessmentData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_qcManualAssessorData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_qcManualAssessorData_display.xml
deleted file mode 100644
index 1e17af64c3bbbfac938a43700b8a44a5d2018876..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_qcManualAssessorData_display.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:qcManualAssessorData" full-description="QCManualAssessment" brief-description="QCManualAssessment">
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:qcManualAssessorData','xnat:qcManualAssessorData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:qcManualAssessorData','xnat:qcManualAssessorData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.date"/>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_QCMANUALASSESSORDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:qcManualAssessorData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:qcManualAssessorData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:qcManualAssessorData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:qcManualAssessorData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:qcManualAssessorData/search_field/xnat:qcManualAssessorData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:qcManualAssessorData','xnat:qcManualAssessorData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_QCMANUALASSESSORDATA_PROJECT_IDENTIFIER" header="XNAT_QCMANUALASSESSORDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_qcmanualassessordata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:qcManualAssessorData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:qcManualAssessorData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:qcManualAssessorData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:qcManualAssessorData/search_field/xnat:qcManualAssessorData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_qcmanualassessordata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:qcManualAssessorData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_QCMANUALASSESSORDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:qcManualAssessorData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:qcManualAssessorData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="RATER" header="rater" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/rater"/>
- </DisplayField>
- <DisplayField id="STEREOTACTICMARKER" header="stereotacticMarker" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/stereotacticMarker"/>
- </DisplayField>
- <DisplayField id="INCIDENTALFINDINGS" header="incidentalFindings" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/incidentalFindings"/>
- </DisplayField>
- <DisplayField id="COMMENTS" header="comments" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/comments"/>
- </DisplayField>
- <DisplayField id="PASS" header="pass" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/pass"/>
- </DisplayField>
- <DisplayField id="PAYABLE" header="payable" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/payable"/>
- </DisplayField>
- <DisplayField id="RESCAN" header="rescan" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/rescan"/>
- </DisplayField>
- <DisplayField id="RESOLVABLE" header="resolvable" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/resolvable"/>
- </DisplayField>
- <DisplayField id="RETRAIN" header="retrain" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:qcManualAssessorData/retrain"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="STEREOTACTICMARKER"/>
- <DisplayFieldRef id="INCIDENTALFINDINGS"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- <DisplayFieldRef id="PAYABLE"/>
- <DisplayFieldRef id="RESCAN"/>
- <DisplayFieldRef id="RESOLVABLE"/>
- <DisplayFieldRef id="RETRAIN"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="STEREOTACTICMARKER"/>
- <DisplayFieldRef id="INCIDENTALFINDINGS"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- <DisplayFieldRef id="PAYABLE"/>
- <DisplayFieldRef id="RESCAN"/>
- <DisplayFieldRef id="RESOLVABLE"/>
- <DisplayFieldRef id="RETRAIN"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="STEREOTACTICMARKER"/>
- <DisplayFieldRef id="INCIDENTALFINDINGS"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- <DisplayFieldRef id="PAYABLE"/>
- <DisplayFieldRef id="RESCAN"/>
- <DisplayFieldRef id="RESOLVABLE"/>
- <DisplayFieldRef id="RETRAIN"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="STEREOTACTICMARKER"/>
- <DisplayFieldRef id="INCIDENTALFINDINGS"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- <DisplayFieldRef id="PAYABLE"/>
- <DisplayFieldRef id="RESCAN"/>
- <DisplayFieldRef id="RESOLVABLE"/>
- <DisplayFieldRef id="RETRAIN"/>
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="QCManualAssessment" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_QCMANUALASSESSORDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="RATER"/>
- <DisplayFieldRef id="STEREOTACTICMARKER"/>
- <DisplayFieldRef id="INCIDENTALFINDINGS"/>
- <DisplayFieldRef id="COMMENTS"/>
- <DisplayFieldRef id="PASS"/>
- <DisplayFieldRef id="PAYABLE"/>
- <DisplayFieldRef id="RESCAN"/>
- <DisplayFieldRef id="RESOLVABLE"/>
- <DisplayFieldRef id="RETRAIN"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_QCMANUALASSESSORDATA_PROJECTS">
- <Mapping TableName="XNAT_QCMANUALASSESSORDATA_PROJECTS">
- <MappingColumn rootElement="xnat:qcManualAssessorData" fieldElement="xnat:qcManualAssessorData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_QCMANUALASSESSORDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:qcManualAssessorData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_reconstructedImageData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_reconstructedImageData_display.xml
deleted file mode 100644
index 47060bfbd0b3ee7c62744bda9eeffe55289cbf46..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_reconstructedImageData_display.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:reconstructedImageData" full-description="ReconstructedImage" brief-description="ReconstructedImage">
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData/type"/>
- </DisplayField>
- <DisplayField id="BASESCANTYPE" header="baseScanType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:reconstructedImageData/baseScanType"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ReconstructedImage" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="BASESCANTYPE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="ReconstructedImage" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="BASESCANTYPE"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_regionResource_display.xml b/src/main/webapp/schemas/xnat/display/xnat_regionResource_display.xml
deleted file mode 100644
index 4606164a8be1fb46d4e3a88cee6e142170a404de..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_regionResource_display.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:regionResource" full-description="ImageRegionResource" brief-description="ImageRegionResource">
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:regionResource.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:regionResource.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="CREATOR_FIRSTNAME" header="firstname" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:regionResource/creator/firstname"/>
- </DisplayField>
- <DisplayField id="CREATOR_LASTNAME" header="lastname" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:regionResource/creator/lastname"/>
- </DisplayField>
- <DisplayField id="NAME" header="name" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:regionResource/name"/>
- </DisplayField>
- <DisplayField id="HEMISPHERE" header="hemisphere" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:regionResource/hemisphere"/>
- </DisplayField>
- <DisplayField id="SESSION_ID" header="session_id" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:regionResource/session_id"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="CREATOR_FIRSTNAME" default-sort-order="DESC" brief-description="ImageRegionResource" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="CREATOR_FIRSTNAME"/>
- <DisplayFieldRef id="CREATOR_LASTNAME"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="HEMISPHERE"/>
- <DisplayFieldRef id="SESSION_ID"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="CREATOR_FIRSTNAME" default-sort-order="DESC" brief-description="ImageRegionResource" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="CREATOR_FIRSTNAME"/>
- <DisplayFieldRef id="CREATOR_LASTNAME"/>
- <DisplayFieldRef id="NAME"/>
- <DisplayFieldRef id="HEMISPHERE"/>
- <DisplayFieldRef id="SESSION_ID"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_resourceCatalog_display.xml b/src/main/webapp/schemas/xnat/display/xnat_resourceCatalog_display.xml
deleted file mode 100644
index 6cc411c1c226f10efe9a348cbd12d8dc8139fc13..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_resourceCatalog_display.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:resourceCatalog" full-description="ResourceCatalog" brief-description="ResourceCatalog">
- <DisplayField id="URI" header="URI" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/URI"/>
- </DisplayField>
- <DisplayField id="FORMAT" header="format" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/format"/>
- </DisplayField>
- <DisplayField id="DESCRIPTION" header="description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/description"/>
- </DisplayField>
- <DisplayField id="CONTENT" header="content" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/content"/>
- </DisplayField>
- <DisplayField id="CACHEPATH" header="cachePath" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/cachePath"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/note"/>
- </DisplayField>
- <DisplayField id="LABEL" header="label" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/label"/>
- </DisplayField>
- <DisplayField id="FILE_COUNT" header="file_count" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/file_count"/>
- </DisplayField>
- <DisplayField id="FILE_SIZE" header="file_size" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog/file_size"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:resourceCatalog.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="URI" default-sort-order="DESC" brief-description="ResourceCatalog" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="URI"/>
- <DisplayFieldRef id="FORMAT"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="CONTENT"/>
- <DisplayFieldRef id="CACHEPATH"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="FILE_COUNT"/>
- <DisplayFieldRef id="FILE_SIZE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="URI" default-sort-order="DESC" brief-description="ResourceCatalog" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="URI"/>
- <DisplayFieldRef id="FORMAT"/>
- <DisplayFieldRef id="DESCRIPTION"/>
- <DisplayFieldRef id="CONTENT"/>
- <DisplayFieldRef id="CACHEPATH"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="FILE_COUNT"/>
- <DisplayFieldRef id="FILE_SIZE"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_rfScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_rfScanData_display.xml
deleted file mode 100644
index c41504ab4917a5012827086f2ac5947167e1c739..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_rfScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:rfScanData" full-description="RFScan" brief-description="RFScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="RFScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="RFScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_rfSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_rfSessionData_display.xml
deleted file mode 100644
index 451432493516490da755248ff68c8af8d0d0f79f..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_rfSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:rfSessionData" full-description="RFSession" brief-description="RFSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:rfSessionData','xnat:rfSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:rfSessionData','xnat:rfSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_RFSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:rfSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:rfSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:rfSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:rfSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:rfSessionData/search_field/xnat:rfSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:rfSessionData','xnat:rfSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_RFSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_RFSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_rfsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:rfSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:rfSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:rfSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:rfSessionData/search_field/xnat:rfSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_rfsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:rfSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rfSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_RFSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:rfSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:rfSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="RFSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_RFSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_RFSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_RFSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:rfSessionData" fieldElement="xnat:rfSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_RFSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:rfSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_rtImageScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_rtImageScanData_display.xml
deleted file mode 100644
index 7a4de14b99c16de4c00ad56ed00348d5c338e6d8..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_rtImageScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:rtImageScanData" full-description="RTImageScan" brief-description="RTImageScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtImageScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="RTImageScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="RTImageScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_rtSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_rtSessionData_display.xml
deleted file mode 100644
index 4c36043adff48e8059d86e4a551146bd5d263c73..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_rtSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:rtSessionData" full-description="RTSession" brief-description="RTSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:rtSessionData','xnat:rtSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:rtSessionData','xnat:rtSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_RTSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:rtSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:rtSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:rtSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:rtSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:rtSessionData/search_field/xnat:rtSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:rtSessionData','xnat:rtSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_RTSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_RTSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_rtsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:rtSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:rtSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:rtSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:rtSessionData/search_field/xnat:rtSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_rtsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:rtSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:rtSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_RTSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:rtSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:rtSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="RTSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_RTSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_RTSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_RTSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:rtSessionData" fieldElement="xnat:rtSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_RTSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:rtSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_scScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_scScanData_display.xml
deleted file mode 100644
index 3860e29a1397c7b3913b104b53cfe1f58034dc0f..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_scScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:scScanData" full-description="SCScan" brief-description="SCScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:scScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SCScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SCScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_segScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_segScanData_display.xml
deleted file mode 100644
index 29ea28c9bd743b05786d911c6af0973771e2cf86..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_segScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:segScanData" full-description="SegScan" brief-description="SegScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:segScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SegScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SegScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_smScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_smScanData_display.xml
deleted file mode 100644
index 417ff11e4818bfe11222f1254caf37b2350f22b0..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_smScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:smScanData" full-description="SMScan" brief-description="SMScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:smScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SMScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SMScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_smSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_smSessionData_display.xml
deleted file mode 100644
index e08c8e916b9d1cfca74fde7bc95d8b21b807f5d6..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_smSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:smSessionData" full-description="SMSession" brief-description="SMSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:smSessionData','xnat:smSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:smSessionData','xnat:smSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_SMSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:smSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:smSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:smSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:smSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:smSessionData/search_field/xnat:smSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:smSessionData','xnat:smSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_SMSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_SMSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_smsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:smSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:smSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:smSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:smSessionData/search_field/xnat:smSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_smsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:smSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:smSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_SMSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:smSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:smSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SMSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_SMSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_SMSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_SMSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:smSessionData" fieldElement="xnat:smSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_SMSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:smSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_srScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_srScanData_display.xml
deleted file mode 100644
index b49d1f2cdf58f145c0020bcf8a690a1cfa2d22cb..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_srScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:srScanData" full-description="SRScan" brief-description="SRScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:srScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SRScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="SRScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_srSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_srSessionData_display.xml
deleted file mode 100644
index d6a935536f10f3273f0b4ad9319c091604921125..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_srSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:srSessionData" full-description="SRSession" brief-description="SRSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:srSessionData','xnat:srSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:srSessionData','xnat:srSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_SRSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:srSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:srSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:srSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:srSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:srSessionData/search_field/xnat:srSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:srSessionData','xnat:srSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_SRSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_SRSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_srsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:srSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:srSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:srSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:srSessionData/search_field/xnat:srSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_srsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:srSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:srSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_SRSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:srSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:srSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SRSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_SRSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_SRSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_SRSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:srSessionData" fieldElement="xnat:srSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_SRSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:srSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_subjectVariablesData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_subjectVariablesData_display.xml
deleted file mode 100644
index abd65f0bbfb5e6d7845bc53e34d5c4b1f600a3c7..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_subjectVariablesData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:subjectVariablesData" full-description="SubjectVariables" brief-description="SubjectVariables">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectVariablesData','xnat:subjectVariablesData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectVariablesData','xnat:subjectVariablesData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_SUBJECTVARIABLESDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:subjectVariablesData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:subjectVariablesData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:subjectVariablesData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:subjectVariablesData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectVariablesData/search_field/xnat:subjectVariablesData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectVariablesData','xnat:subjectVariablesData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_SUBJECTVARIABLESDATA_PROJECT_IDENTIFIER" header="XNAT_SUBJECTVARIABLESDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_subjectvariablesdata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:subjectVariablesData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:subjectVariablesData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:subjectVariablesData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:subjectVariablesData/search_field/xnat:subjectVariablesData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_subjectvariablesdata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:subjectVariablesData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:subjectVariablesData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_SUBJECTVARIABLESDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:subjectVariablesData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:subjectVariablesData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="SubjectVariables" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_SUBJECTVARIABLESDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_SUBJECTVARIABLESDATA_PROJECTS">
- <Mapping TableName="XNAT_SUBJECTVARIABLESDATA_PROJECTS">
- <MappingColumn rootElement="xnat:subjectVariablesData" fieldElement="xnat:subjectVariablesData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_SUBJECTVARIABLESDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:subjectVariablesData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_usScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_usScanData_display.xml
deleted file mode 100644
index 807f34980788ef0edbbacced0f61e32084d10ef2..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_usScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:usScanData" full-description="USScan" brief-description="USScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:usScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="USScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="USScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_usSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_usSessionData_display.xml
deleted file mode 100644
index 0da8569050cc64635175ccb98b47bec1e65446fc..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_usSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:usSessionData" full-description="USSession" brief-description="USSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:usSessionData','xnat:usSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:usSessionData','xnat:usSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_USSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:usSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:usSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:usSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:usSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:usSessionData/search_field/xnat:usSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:usSessionData','xnat:usSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_USSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_USSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_ussessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:usSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:usSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:usSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:usSessionData/search_field/xnat:usSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_ussessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:usSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:usSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_USSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:usSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:usSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="USSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_USSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_USSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_USSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:usSessionData" fieldElement="xnat:usSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_USSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:usSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_voiceAudioScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_voiceAudioScanData_display.xml
deleted file mode 100644
index 6be1cb7b606d085f585ddad84d9147f447dd5c26..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_voiceAudioScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:voiceAudioScanData" full-description="VoiceAudioScan" brief-description="VoiceAudioScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:voiceAudioScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="VoiceAudioScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="VoiceAudioScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xa3DScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xa3DScanData_display.xml
deleted file mode 100644
index 4b48e1293a52fcf3f4b69f35a92319694bd34909..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xa3DScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xa3DScanData" full-description="XA3DScan" brief-description="XA3DScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XA3DScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XA3DScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xa3DSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xa3DSessionData_display.xml
deleted file mode 100644
index 8a3812c37bb5c1f01a398ec14c361dab262d9876..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xa3DSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xa3DSessionData" full-description="XA3DSession" brief-description="XA3DSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xa3DSessionData','xnat:xa3DSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xa3DSessionData','xnat:xa3DSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_XA3DSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:xa3DSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:xa3DSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xa3DSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xa3DSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xa3DSessionData/search_field/xnat:xa3DSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xa3DSessionData','xnat:xa3DSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_XA3DSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_XA3DSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_xa3dsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:xa3DSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xa3DSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xa3DSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xa3DSessionData/search_field/xnat:xa3DSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_xa3dsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:xa3DSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xa3DSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_XA3DSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:xa3DSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:xa3DSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="XA3DSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_XA3DSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_XA3DSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_XA3DSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:xa3DSessionData" fieldElement="xnat:xa3DSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_XA3DSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:xa3DSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xaScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xaScanData_display.xml
deleted file mode 100644
index e8e0e744076c0a512914b4e62480b831923bd0cc..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xaScanData_display.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xaScanData" full-description="XAScan" brief-description="XAScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PIXELRES_UNITS" header="units" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/pixelRes/units"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PIXELRES_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/pixelRes/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_PIXELRES_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/pixelRes/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_ORIENTATION" header="orientation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/orientation"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FOV_X" header="x" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/fov/x"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_FOV_Y" header="y" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/fov/y"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_IMAGETYPE" header="imageType" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/imageType"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_OPTIONS" header="options" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/options"/>
- </DisplayField>
- <DisplayField id="PARAMETERS_DERIVATION" header="derivation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaScanData/parameters/derivation"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XAScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="PARAMETERS_PIXELRES_UNITS"/>
- <DisplayFieldRef id="PARAMETERS_PIXELRES_X"/>
- <DisplayFieldRef id="PARAMETERS_PIXELRES_Y"/>
- <DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
- <DisplayFieldRef id="PARAMETERS_FOV_X"/>
- <DisplayFieldRef id="PARAMETERS_FOV_Y"/>
- <DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
- <DisplayFieldRef id="PARAMETERS_OPTIONS"/>
- <DisplayFieldRef id="PARAMETERS_DERIVATION"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XAScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- <DisplayFieldRef id="PARAMETERS_PIXELRES_UNITS"/>
- <DisplayFieldRef id="PARAMETERS_PIXELRES_X"/>
- <DisplayFieldRef id="PARAMETERS_PIXELRES_Y"/>
- <DisplayFieldRef id="PARAMETERS_ORIENTATION"/>
- <DisplayFieldRef id="PARAMETERS_FOV_X"/>
- <DisplayFieldRef id="PARAMETERS_FOV_Y"/>
- <DisplayFieldRef id="PARAMETERS_IMAGETYPE"/>
- <DisplayFieldRef id="PARAMETERS_OPTIONS"/>
- <DisplayFieldRef id="PARAMETERS_DERIVATION"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xaSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xaSessionData_display.xml
deleted file mode 100644
index 5b58c42245c432796043c1b05b8fae77d0d6f9cf..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xaSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xaSessionData" full-description="XASession" brief-description="XASession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xaSessionData','xnat:xaSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xaSessionData','xnat:xaSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_XASESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:xaSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:xaSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xaSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xaSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xaSessionData/search_field/xnat:xaSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xaSessionData','xnat:xaSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_XASESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_XASESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_xasessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:xaSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xaSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xaSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xaSessionData/search_field/xnat:xaSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_xasessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:xaSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xaSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_XASESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:xaSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:xaSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="XASession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_XASESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_XASESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_XASESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:xaSessionData" fieldElement="xnat:xaSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_XASESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:xaSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xcScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xcScanData_display.xml
deleted file mode 100644
index 380092c1be69bb41a5cdd8158225f52dfe8db92f..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xcScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xcScanData" full-description="XCScan" brief-description="XCScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XCScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XCScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xcSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xcSessionData_display.xml
deleted file mode 100644
index f54854e5063266dde87f7897e01d43a933eefefd..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xcSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xcSessionData" full-description="XCSession" brief-description="XCSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xcSessionData','xnat:xcSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xcSessionData','xnat:xcSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_XCSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:xcSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:xcSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xcSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xcSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xcSessionData/search_field/xnat:xcSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xcSessionData','xnat:xcSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_XCSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_XCSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_xcsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:xcSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xcSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xcSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xcSessionData/search_field/xnat:xcSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_xcsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:xcSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_XCSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:xcSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:xcSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="XCSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_XCSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_XCSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_XCSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:xcSessionData" fieldElement="xnat:xcSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_XCSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:xcSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xcvScanData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xcvScanData_display.xml
deleted file mode 100644
index 7500ea48a8f34f692508b2fd381eda64665aa978..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xcvScanData_display.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xcvScanData" full-description="XCVScan" brief-description="XCVScan">
- <DisplayField id="IMAGE_SESSION_ID" header="image_session_ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/image_session_ID"/>
- </DisplayField>
- <DisplayField id="NOTE" header="note" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/note"/>
- </DisplayField>
- <DisplayField id="QUALITY" header="quality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/quality"/>
- </DisplayField>
- <DisplayField id="CONDITION" header="condition" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/condition"/>
- </DisplayField>
- <DisplayField id="SERIES_DESCRIPTION" header="series_description" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/series_description"/>
- </DisplayField>
- <DisplayField id="DOCUMENTATION" header="documentation" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/documentation"/>
- </DisplayField>
- <DisplayField id="SCANNER" header="scanner" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/scanner"/>
- </DisplayField>
- <DisplayField id="SCANNER_MANUFACTURER" header="manufacturer" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/scanner/manufacturer"/>
- </DisplayField>
- <DisplayField id="SCANNER_MODEL" header="model" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/scanner/model"/>
- </DisplayField>
- <DisplayField id="MODALITY" header="modality" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/modality"/>
- </DisplayField>
- <DisplayField id="FRAMES" header="frames" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/frames"/>
- </DisplayField>
- <DisplayField id="OPERATOR" header="operator" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/operator"/>
- </DisplayField>
- <DisplayField id="STARTTIME" header="startTime" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/startTime"/>
- </DisplayField>
- <DisplayField id="ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/ID"/>
- </DisplayField>
- <DisplayField id="TYPE" header="type" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/type"/>
- </DisplayField>
- <DisplayField id="UID" header="UID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/UID"/>
- </DisplayField>
- <DisplayField id="PROJECT" header="project" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData/project"/>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvScanData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XCVScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="IMAGE_SESSION_ID" default-sort-order="DESC" brief-description="XCVScan" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="IMAGE_SESSION_ID"/>
- <DisplayFieldRef id="NOTE"/>
- <DisplayFieldRef id="QUALITY"/>
- <DisplayFieldRef id="CONDITION"/>
- <DisplayFieldRef id="SERIES_DESCRIPTION"/>
- <DisplayFieldRef id="DOCUMENTATION"/>
- <DisplayFieldRef id="SCANNER"/>
- <DisplayFieldRef id="SCANNER_MANUFACTURER"/>
- <DisplayFieldRef id="SCANNER_MODEL"/>
- <DisplayFieldRef id="MODALITY"/>
- <DisplayFieldRef id="FRAMES"/>
- <DisplayFieldRef id="OPERATOR"/>
- <DisplayFieldRef id="STARTTIME"/>
- <DisplayFieldRef id="ID"/>
- <DisplayFieldRef id="TYPE"/>
- <DisplayFieldRef id="UID"/>
- <DisplayFieldRef id="PROJECT"/>
- </DisplayVersion>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/display/xnat_xcvSessionData_display.xml b/src/main/webapp/schemas/xnat/display/xnat_xcvSessionData_display.xml
deleted file mode 100644
index 4661c0ce9d0d2c0f1bac95d6e11ffc29574f51ef..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/display/xnat_xcvSessionData_display.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xdat/display.xsd" schema-element="xnat:xcvSessionData" full-description="XCVSession" brief-description="XCVSession">
- <Arc name="PARTICIPANT_EXPERIMENT">
- <CommonField id="PART_ID" local-field="SUBJECT_ID"/>
- <CommonField id="DATE" local-field="DATE"/>
- <CommonField id="EXPT_ID" local-field="EXPT_ID"/>
- </Arc>
- <DisplayField id="SUBJECT_ID" header="Subject" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.subject_ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:subjectData','xnat:subjectData.ID');">
- <InsertValue id="Field1" field="SUBJECT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="EXPT_ID" header="ID" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.ID"/>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xcvSessionData','xnat:xcvSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="RPT" header="ID" visible="true" image="true">
- <Content type="sql">'/@WEBAPP/images/r.gif'::text</Content>
- <HTML-Link>
- <Property name="HREF" value="none"/>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xcvSessionData','xnat:xcvSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="DATE" header="Date" visible="true" searchable="true">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.date"/>
- </DisplayField>
- <DisplayField id="AGE" header="Age" visible="true" searchable="true" data-type="integer">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.date"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:demographicData.dob"/>
- <DisplayFieldElement name="Field3" schema-element="xnat:demographicData.yob"/>
- <Content type="sql">CAST(COALESCE(FLOOR(CAST((CAST(((@Field1) - (@Field2))AS FLOAT4)/365) AS numeric)),FLOOR((EXTRACT(YEAR FROM @Field1)) - (@Field3))) AS numeric)</Content>
- </DisplayField>
- <DisplayField header="Projects" id="PROJECTS" data-type="string">
- <DisplayFieldElement name="Field1" viewName="XNAT_XCVSESSIONDATA_PROJECTS" viewColumn="PROJECTS"/>
- </DisplayField>
- <DisplayField header="Label" id="LABEL" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.ID"/>
- <DisplayFieldElement name="Field2" schema-element="xnat:xcvSessionData.label"/>
- <Content type="sql">COALESCE(@Field2, @Field1)</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:xcvSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xcvSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xcvSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xcvSessionData/search_field/xnat:xcvSessionData.ID">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="ONCLICK" value="return rpt('@Field1','xnat:xcvSessionData','xnat:xcvSessionData.ID');">
- <InsertValue id="Field1" field="EXPT_ID"/>
- </Property>
- <Property name="TITLE" value="Inserted: @Field1 (@Field2)">
- <InsertValue id="Field1" field="INSERT_DATE"/>
- <InsertValue id="Field2" field="INSERT_USER"/>
- </Property>
- </HTML-Link>
- </DisplayField>
- <DisplayField id="PROJECT" header="Project" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.project"/>
- </DisplayField>
- <DisplayField id="XNAT_XCVSESSIONDATA_PROJECT_IDENTIFIER" header="XNAT_XCVSESSIONDATA ID" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">xnat_xcvsessiondata_project_id</Content>
- <HTML-Link>
- <SecureLink elementName="xnat:xcvSessionData">
- <securityMappingValue displayFieldId="PROJECTS" schemaElementMap="xnat:xcvSessionData/sharing/share/project"/>
- <securityMappingValue displayFieldId="PROJECT" schemaElementMap="xnat:xcvSessionData/project"/>
- </SecureLink>
- <Property name="HREF" value="@WEBAPPapp/action/DisplayItemAction/search_value/@Field1/search_element/xnat:xcvSessionData/search_field/xnat:xcvSessionData.ID/project/@Field2">
- <InsertValue id="Field1" field="EXPT_ID"/>
- <InsertValue id="Field2" field="@WHERE"/>
- </Property>
- </HTML-Link>
- <SubQuery>SELECT DISTINCT COALESCE(label,sharing_share_xnat_experimentda_id) AS xnat_xcvsessiondata_project_id,sharing_share_xnat_experimentda_id FROM ( SELECT sharing_share_xnat_experimentda_id,label FROM xnat_experimentdata_share WHERE project='@WHERE' UNION SELECT id,label FROM xnat_experimentData WHERE project='@WHERE' )SEARCH</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:xcvSessionData.ID" queryField="sharing_share_xnat_experimentda_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayField id="INSERT_DATE" header="Inserted" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.meta.insert_date"/>
- </DisplayField>
- <DisplayField id="INSERT_USER" header="Creator" visible="true" searchable="true" data-type="string">
- <DisplayFieldElement name="Field1" schema-element="xnat:xcvSessionData.meta.insert_user.login"/>
- </DisplayField>
- <DisplayField id="XNAT_XCVSESSIONDATA_FIELD_MAP" header="Field" visible="true" searchable="false" data-type="string" xsi:type="SubQueryField">
- <Content type="sql">field</Content>
- <SubQuery>SELECT DISTINCT ON ( e.ID) e.ID AS expt_id,field FROM xnat_experimentData_field ef JOIN (SELECT ID,extension,element_name FROM xnat_experimentData e JOIN xdat_meta_element xme ON e.extension=xme.xdat_meta_element_id WHERE xme.element_name='xnat:xcvSessionData') e on ef.fields_field_xnat_experimentdat_id=e.id WHERE name='@WHERE'</SubQuery>
- <MappingColumns>
- <MappingColumn schemaField="xnat:xcvSessionData.ID" queryField="expt_id"/>
- </MappingColumns>
- </DisplayField>
- <DisplayVersion versionName="listing" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="RPT"/>
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="GENDER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="listing_csv" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="LABEL"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="full" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="EXPT_ID"/>
- <DisplayFieldRef id="SUBJECT_LABEL" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <DisplayVersion versionName="detailed" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
- </DisplayVersion>
- <DisplayVersion versionName="project_bundle" default-order-by="DATE" default-sort-order="DESC" brief-description="XCVSession" dark-color="9999CC" light-color="CCCCFF">
- <DisplayFieldRef id="XNAT_XCVSESSIONDATA_PROJECT_IDENTIFIER"/>
- <DisplayFieldRef id="SUB_PROJECT_IDENTIFIER" element_name="xnat:subjectData"/>
- <DisplayFieldRef id="DATE"/>
- <DisplayFieldRef id="AGE"/>
- </DisplayVersion>
- <ViewLink alias="XNAT_XCVSESSIONDATA_PROJECTS">
- <Mapping TableName="XNAT_XCVSESSIONDATA_PROJECTS">
- <MappingColumn rootElement="xnat:xcvSessionData" fieldElement="xnat:xcvSessionData.ID" mapsTo="id"/>
- </Mapping>
- </ViewLink>
- <SQLView name="XNAT_XCVSESSIONDATA_PROJECTS" sql="SELECT id, '<' || expt.project || '>' || xs_a_concat(',<' || shared.project || '>') AS projects FROM xnat_experimentData expt LEFT JOIN xnat_experimentData_share shared ON expt.id=shared.sharing_share_xnat_experimentda_id LEFT JOIN xdat_meta_element xme ON expt.extension = xme.xdat_meta_element_id WHERE element_name='xnat:xcvSessionData' GROUP BY expt.id,expt.project"/>
-</Displays>
diff --git a/src/main/webapp/schemas/xnat/xnat.xsd b/src/main/webapp/schemas/xnat/xnat.xsd
deleted file mode 100644
index 03aaa200553f80c03deb90dca7fecf13ce0b94ba..0000000000000000000000000000000000000000
--- a/src/main/webapp/schemas/xnat/xnat.xsd
+++ /dev/null
@@ -1,4179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ D:/Development/XNAT/1.6/xnat_builder_1_6dev/plugin-resources/project-skeletons/xnat/src/schemas/xnat/xnat.xsd
- ~ XNAT http://www.xnat.org
- ~ Copyright (c) 2014, Washington University School of Medicine
- ~ All Rights Reserved
- ~
- ~ Released under the Simplified BSD.
- ~
- ~ Last modified 2/13/14 5:34 PM
- -->
-<xs:schema targetNamespace="http://nrg.wustl.edu/xnat" xmlns:xnat="http://nrg.wustl.edu/xnat" xmlns:prov="http://www.nbirn.net/prov" xmlns:xdat="http://nrg.wustl.edu/xdat" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:import namespace="http://www.nbirn.net/prov" schemaLocation="../birn/birnprov.xsd"/>
- <xs:element name="Project" type="xnat:projectData"/>
- <xs:element name="Subject" type="xnat:subjectData"/>
- <xs:element name="Investigator" type="xnat:investigatorData"/>
- <xs:element name="MRSession" type="xnat:mrSessionData"/>
- <xs:element name="CTSession" type="xnat:ctSessionData"/>
- <xs:element name="EPSSession" type="xnat:epsSessionData"/>
- <xs:element name="HDSession" type="xnat:hdSessionData"/>
- <xs:element name="ECGSession" type="xnat:ecgSessionData"/>
- <xs:element name="USSession" type="xnat:usSessionData"/>
- <xs:element name="IOSession" type="xnat:ioSessionData"/>
- <xs:element name="MGSession" type="xnat:mgSessionData"/>
- <xs:element name="DXSession" type="xnat:dxSessionData"/>
- <xs:element name="CRSession" type="xnat:crSessionData"/>
- <xs:element name="GMVSession" type="xnat:gmvSessionData"/>
- <xs:element name="GMSession" type="xnat:gmSessionData"/>
- <xs:element name="ESVSession" type="xnat:esvSessionData"/>
- <xs:element name="ESSession" type="xnat:esSessionData"/>
- <xs:element name="NMSession" type="xnat:nmSessionData"/>
- <xs:element name="SRSession" type="xnat:srSessionData"/>
- <xs:element name="DX3DCraniofacialSession" type="xnat:dx3DCraniofacialSessionData"/>
- <xs:element name="XA3DSession" type="xnat:xa3DSessionData"/>
- <xs:element name="RFSession" type="xnat:rfSessionData"/>
- <xs:element name="XASession" type="xnat:xaSessionData"/>
- <xs:element name="SMSession" type="xnat:smSessionData"/>
- <xs:element name="XCSession" type="xnat:xcSessionData"/>
- <xs:element name="XCVSession" type="xnat:xcvSessionData"/>
- <xs:element name="OPSession" type="xnat:opSessionData"/>
- <xs:element name="OPTSession" type="xnat:optSessionData"/>
- <xs:element name="RTSession" type="xnat:rtSessionData"/>
- <xs:element name="MEGSession" type="xnat:megSessionData"/>
- <xs:element name="EEGSession" type="xnat:eegSessionData"/>
- <xs:element name="OtherDicomSession" type="xnat:otherDicomSessionData"/>
- <xs:element name="SubjectVariables" type="xnat:subjectVariablesData"/>
- <xs:element name="PETSession" type="xnat:petSessionData"/>
- <xs:element name="PETMRSession" type="xnat:petmrSessionData"/>
- <xs:element name="MRScan" type="xnat:mrScanData"/>
- <xs:element name="CTScan" type="xnat:ctScanData"/>
- <xs:element name="PETScan" type="xnat:petScanData"/>
- <xs:element name="EPSScan" type="xnat:epsScanData"/>
- <xs:element name="HDScan" type="xnat:hdScanData"/>
- <xs:element name="ECGScan" type="xnat:ecgScanData"/>
- <xs:element name="USScan" type="xnat:usScanData"/>
- <xs:element name="IOScan" type="xnat:ioScanData"/>
- <xs:element name="MGScan" type="xnat:mgScanData"/>
- <xs:element name="DXScan" type="xnat:dxScanData"/>
- <xs:element name="CRScan" type="xnat:crScanData"/>
- <xs:element name="GMVScan" type="xnat:gmvScanData"/>
- <xs:element name="GMScan" type="xnat:gmScanData"/>
- <xs:element name="ESVScan" type="xnat:esvScanData"/>
- <xs:element name="ESScan" type="xnat:esScanData"/>
- <xs:element name="NMScan" type="xnat:nmScanData"/>
- <xs:element name="SRScan" type="xnat:srScanData"/>
- <xs:element name="DX3DCraniofacialScan" type="xnat:dx3DCraniofacialScanData"/>
- <xs:element name="XA3DScan" type="xnat:xa3DScanData"/>
- <xs:element name="RFScan" type="xnat:rfScanData"/>
- <xs:element name="XAScan" type="xnat:xaScanData"/>
- <xs:element name="SMScan" type="xnat:smScanData"/>
- <xs:element name="XCScan" type="xnat:xcScanData"/>
- <xs:element name="XCVScan" type="xnat:xcvScanData"/>
- <xs:element name="OPScan" type="xnat:opScanData"/>
- <xs:element name="OPTScan" type="xnat:optScanData"/>
- <xs:element name="RTImageScan" type="xnat:rtImageScanData"/>
- <xs:element name="SCScan" type="xnat:scScanData"/>
- <xs:element name="SegScan" type="xnat:segScanData"/>
- <xs:element name="MRSScan" type="xnat:mrsScanData"/>
- <xs:element name="MEGScan" type="xnat:megScanData"/>
- <xs:element name="EEGScan" type="xnat:eegScanData"/>
- <xs:element name="VoiceAudioScan" type="xnat:voiceAudioScanData"/>
- <xs:element name="OtherDicomScan" type="xnat:otherDicomScanData"/>
- <xs:element name="ImageRegionResource" type="xnat:regionResource"/>
- <xs:element name="QCAssessment" type="xnat:qcAssessmentData"/>
- <xs:element name="ReconstructedImage" type="xnat:reconstructedImageData"/>
- <xs:element name="FieldDefinitionSet" type="xnat:fieldDefinitionGroup"/>
- <xs:element name="ResourceCatalog" type="xnat:resourceCatalog"/>
- <xs:element name="QCManualAssessment" type="xnat:qcManualAssessorData"/>
- <xs:element name="Generic" type="xnat:genericData"/>
- <xs:element name="PVisit" type="xnat:pVisitData"/>
-
-
- <xs:complexType name="projectData">
- <xs:annotation>
- <xs:documentation>A collection of subject involved in a unit of research</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="name" type="xs:string" minOccurs="0"/>
- <xs:element name="description" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="keywords" type="xs:string" minOccurs="0"/>
- <xs:element name="aliases" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="alias" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="alias"/>
- <xdat:field uniqueComposite="VALUE">
- <xdat:relation uniqueComposite="VALUE"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="source" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="publications" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="publication" type="xnat:publicationResource" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="resources" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="resource" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="multi" relationName="xnat_projectData_resource"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="studyProtocol" type="xnat:abstractProtocol" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="PI" type="xnat:investigatorData" minOccurs="0"/>
- <xs:element name="investigators" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="investigator" type="xnat:investigatorData" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="multi" relationName="xnat_projectData_investigator"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="fields" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="field" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- <xdat:field>
- <xdat:relation uniqueComposite="NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="secondary_ID" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="subjectData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="label"/>
- </xs:appinfo>
- <xs:documentation>An individual person involved in experimental research</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="sharing" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="share" type="xnat:projectParticipant" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="subject_id"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="resources" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="resource" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="multi" relationName="xnat_subjectData_resource"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="investigator" type="xnat:investigatorData" minOccurs="0"/>
- <xs:element name="demographics" type="xnat:abstractDemographicData" minOccurs="0"/>
- <xs:element name="metadata" type="xnat:abstractSubjectMetadata" minOccurs="0"/>
- <xs:element name="addID" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- <xdat:field uniqueComposite="UNIQUE_NAME_VALUE">
- <xdat:relation uniqueComposite="UNIQUE_SUBJECT_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="UNIQUE_NAME_VALUE,UNIQUE_SUBJECT_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="fields" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="field" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- <xdat:field>
- <xdat:relation uniqueComposite="SUBJECT_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SUBJECT_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="experiments" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="experiment" type="xnat:subjectAssessorData" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="subject_ID"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="project" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:projectData" baseCol="id" uniqueComposite="PROJ_SUBJ">
- <xdat:sqlField name="project"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="group" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="_group"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="label" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="PROJ_SUBJ"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="src" type="xs:string" use="optional"/>
- <xs:attribute name="initials" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="projectParticipant">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="project"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:attribute name="label" type="xs:string" use="optional"/>
- <xs:attribute name="project" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:projectData" baseCol="id" uniqueComposite="PROJ_SUBJ">
- <xdat:relation onDelete="CASCADE"/>
- <xdat:sqlField name="project"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="subject_ID" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:subjectData" baseCol="id" uniqueComposite="PROJ_SUBJ">
- <xdat:relation onDelete="CASCADE"/>
- <xdat:sqlField name="subject_id"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="group" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="_group"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="experimentData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="label"/>
- </xs:appinfo>
- <xs:documentation>A specific individual event in which primary data is obtained</xs:documentation>
- </xs:annotation>
- <xs:sequence minOccurs="0">
- <xs:element name="sharing" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="share" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="project"/>
- <xdat:field>
- <xdat:relation uniqueComposite="PROJECT_EXPT"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="label" type="xs:string" use="optional"/>
- <xs:attribute name="project" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:projectData" baseCol="ID" uniqueComposite="PROJECT_EXPT"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="visit" type="xs:string"> <!-- foreign key to visitData -->
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:pVisitData" baseCol="id"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="protocol" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="date" type="xs:date" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Date on which experiment was conducted</xs:documentation>
- <xs:appinfo>
- <xdat:field filter="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="time" type="xs:time" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Time experiment was conducted</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="duration" type="xs:duration" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Duration of experiment</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="delay" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:integer">
- <xs:attribute name="ref_expt_id" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="note" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text for misc. information</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1500"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="investigator" type="xnat:investigatorData" minOccurs="0"/>
- <xs:element name="validation" type="xnat:validationData" minOccurs="0"/>
- <xs:element name="resources" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="resource" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="multi" relationName="xnat_experimentData_resource"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="fields" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="field" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- <xdat:field>
- <xdat:relation uniqueComposite="NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="acquisition_site" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField primaryKey="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="project" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:projectData" baseCol="id" uniqueComposite="PROJ_LABEL"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="visit_id" type="xs:string" use="optional"/> <!-- Left here for legacy visit impl. -->
- <xs:attribute name="visit" type="xs:string"> <!-- foreign key to visitData -->
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:pVisitData" baseCol="id"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="version" type="xs:integer" use="optional"/>
- <xs:attribute name="original" type="xs:string" use="optional"/>
- <xs:attribute name="protocol" type="xs:string" use="optional"/>
- <xs:attribute name="label" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="PROJ_LABEL"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="genericData">
- <xs:complexContent>
- <xs:extension base="xnat:experimentData">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="pVisitData">
- <xs:complexContent>
- <xs:extension base="xnat:genericData">
- <xs:sequence>
- <xs:element name="subject_ID" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:subjectData" baseCol="id"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="visit_type" type="xs:string" minOccurs="0"/>
- <xs:element name="visit_name" type="xs:string" minOccurs="0"/> <!-- interval... -->
- <xs:element name="notes" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:documentation>
- Can be used to take visit notes, explain reason for status (e.g. missed visit), etc.
- </xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="start_date" type="xs:dateTime" minOccurs="0" maxOccurs="1"/>
- <xs:element name="end_date" type="xs:dateTime" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- <xs:attribute name="closed" type="xs:boolean" use="optional"/>
- <xs:attribute name="terminal" type="xs:boolean" use="optional"/>
- <xs:attribute name="status" type="xs:string" use="optional"/>
- <xs:attribute name="protocolVersion" type="xs:integer" use="optional"/>
- <xs:attribute name="protocolId" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="abstractSubjectMetadata">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:complexType>
- <xs:complexType name="subjectMetadata">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:abstractSubjectMetadata">
- <xs:sequence>
- <xs:element name="cohort" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate recruitment/subject pool</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="abstractDemographicData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:complexType>
- <xs:complexType name="demographicData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:abstractDemographicData">
- <xs:sequence>
- <xs:choice minOccurs="0">
- <xs:element name="dob" type="xs:date"/>
- <xs:element name="yob">
- <xs:simpleType>
- <xs:restriction base="xs:integer"/>
- </xs:simpleType>
- </xs:element>
- <xs:element name="age" type="xs:integer"/>
- </xs:choice>
- <xs:element name="gender" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="male"/>
- <xs:enumeration value="female"/>
- <xs:enumeration value="other"/>
- <xs:enumeration value="unknown"/>
- <xs:enumeration value="M"/>
- <xs:enumeration value="F"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="handedness" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="left"/>
- <xs:enumeration value="right"/>
- <xs:enumeration value="ambidextrous"/>
- <xs:enumeration value="unknown"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="ses" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Socioeconomic status</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer"/>
- </xs:simpleType>
- </xs:element>
- <xs:element name="employment" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Employment status:
- 0: Employed
- 1: Unemployed
- 2: Retired
- 3: Unknown or N/A
- </xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="education" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="30"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="educationDesc" type="xs:string" minOccurs="0"/>
- <xs:element name="race" type="xs:string" minOccurs="0"/>
- <xs:element name="race2" type="xs:string" minOccurs="0"/>
- <xs:element name="race3" type="xs:string" minOccurs="0"/>
- <xs:element name="race4" type="xs:string" minOccurs="0"/>
- <xs:element name="race5" type="xs:string" minOccurs="0"/>
- <xs:element name="race6" type="xs:string" minOccurs="0"/>
- <xs:element name="ethnicity" type="xs:string" minOccurs="0"/>
- <xs:element name="weight" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:float">
- <xs:attribute name="units" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="height" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:float">
- <xs:attribute name="units" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="gestational_age" type="xs:float" minOccurs="0"/>
- <xs:element name="post_menstrual_age" type="xs:float" minOccurs="0"/>
- <xs:element name="birth_weight" type="xs:float" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="subjectAssessorData">
- <xs:complexContent>
- <xs:extension base="xnat:experimentData">
- <xs:sequence>
- <xs:element name="subject_ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:subjectData" baseCol="id"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="age" type="xs:float" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="subjectVariablesData">
- <xs:complexContent>
- <xs:extension base="xnat:subjectAssessorData">
- <xs:sequence>
- <xs:element name="variables" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="variable" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="FK_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FK_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="imageSessionData">
- <xs:complexContent>
- <xs:extension base="xnat:subjectAssessorData">
- <xs:sequence>
- <xs:element name="regions" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="region" type="xnat:regionResource" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="session_id"/>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="scanner" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate name/ID of scanner</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="manufacturer" type="xs:string" use="optional"/>
- <xs:attribute name="model" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="operator" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate individuals who operated scanner</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="prearchivePath" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="scans" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="scan" type="xnat:imageScanData" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="image_session_id"/>
- <xdat:relation uniqueComposite="mr_id_fk" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="reconstructions" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="reconstructedImage" type="xnat:reconstructedImageData" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="image_session_id"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="assessors" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="assessor" type="xnat:imageAssessorData" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="imageSession_ID"/>
- <xdat:relation relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="dcmAccessionNumber" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>DICOM Accession Number (0008,0050)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="dcmPatientId" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>DICOM Patient ID (0010,0020)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="dcmPatientName" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>DICOM Patient's Name (0010,0010)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="dcmPatientBirthDate" type="xs:date" minOccurs="0">
- <xs:annotation>
- <xs:documentation>DICOM Patient's Birth Date (0010,0030)</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="session_type" type="xs:string" use="optional"/>
- <xs:attribute name="modality" type="xs:string"/>
- <xs:attribute name="UID" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>DICOM Study Instance UID (0020,000D)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="mrSessionData">
- <xs:annotation>
- <xs:documentation>An event in which MR scans are obtained on a subject</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData">
- <xs:sequence minOccurs="0">
- <xs:element name="coil" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate the coil used in this scanning session</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="fieldStrength" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate the field strength used in this scanning session</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="marker" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate method used to mark left-right (e.g. Vitamin E capsule)</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="stabilization" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate method used to stabilize head</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <!-- DEPRECATED: This data type is deprecated. You should only extend from imageAssessorData directly. -->
- <xs:complexType name="mrAssessorData">
- <xs:annotation>
- <xs:documentation>A processing event in which primary or derived MR data is analyzed</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageAssessorData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="mrScanData">
- <xs:annotation>
- <xs:documentation>Information about an individual MR scan sequence</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData">
- <xs:sequence minOccurs="0">
- <xs:element name="coil" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate the coil used in this scanning session</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="fieldStrength" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate the field strength used in this scanning session</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="marker" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate method used to mark left-right (e.g. Vitamin E capsule)</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="stabilization" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate method used to stabilize head</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="parameters" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="voxelRes" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="units" type="xs:string"/>
- <xs:attribute name="x" type="xs:float"/>
- <xs:attribute name="y" type="xs:float"/>
- <xs:attribute name="z" type="xs:float"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="orientation" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="5"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="fov" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer"/>
- <xs:attribute name="y" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="matrix" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer" use="optional"/>
- <xs:attribute name="y" type="xs:integer" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="partitions" type="xs:integer" minOccurs="0"/>
- <xs:element name="tr" type="xs:float" minOccurs="0"/>
- <xs:element name="te" type="xs:float" minOccurs="0"/>
- <xs:element name="ti" type="xs:float" minOccurs="0"/>
- <xs:element name="flip" type="xs:integer" minOccurs="0"/>
- <xs:element name="sequence" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="origin" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="imageType" type="xs:string" minOccurs="0"/>
- <xs:element name="scanSequence" type="xs:string" minOccurs="0"/>
- <xs:element name="seqVariant" type="xs:string" minOccurs="0"/>
- <xs:element name="scanOptions" type="xs:string" minOccurs="0"/>
- <xs:element name="acqType" type="xs:string" minOccurs="0"/>
- <xs:element name="coil" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate the coil used in this scan</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="dtiAcqCount" type="xs:integer" minOccurs="0"/>
- <xs:element name="pixelBandwidth" type="xs:double" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Reciprocal of the total sampling period, in Hz/pixel</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="diffusion" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="bValues" minOccurs="0" type="xs:string"/>
- <xs:element name="directionality" minOccurs="0" type="xs:string"/>
- <xs:element name="orientations" minOccurs="0" type="xs:string"/>
- <xs:element name="anisotropyType" minOccurs="0" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="addParam" type="xnat:addField" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="SCAN"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="dcmValidation" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="status" type="xs:boolean" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="derivedData">
- <xs:annotation>
- <xs:documentation>A processing event in which data is analyzed</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:experimentData">
- <xs:sequence minOccurs="0">
- <xs:element name="provenance" type="prov:process" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="reconstructedImageData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="ID"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="image_session_ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:imageSessionData" baseCol="ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="inScans" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="scanID" type="xs:string" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="IN_SCAN">
- <xdat:relation uniqueComposite="IN_SCAN"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="in" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field displayName="in resource">
- <xdat:relation relationType="multi" relationName="recon_in_resource"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="out" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field displayName="out resource">
- <xdat:relation relationType="multi" relationName="recon_out_resource"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="provenance" type="prov:process" minOccurs="0"/>
- <xs:element name="parameters" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="addParam" type="xnat:addField" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="RECON"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="computations" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="datum" type="xnat:computationData" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="PET_RECON"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="type" type="xs:string"/>
- <xs:attribute name="baseScanType" type="xs:string"/>
- </xs:complexType>
- <xs:complexType name="investigatorData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="lastname"/>
- </xs:appinfo>
- <xs:documentation>An indivudal who maintains authority over experimental data</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="title" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="firstname">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="25"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="lastname">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="25"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="institution" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="department" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="128"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="email" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="64"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="phone" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="25"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string"/>
- </xs:complexType>
- <xs:complexType name="volumetricRegion">
- <xs:annotation>
- <xs:documentation>Generic volumetric region type</xs:documentation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true" matchByValues="true" displayIdentifiers="name"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence minOccurs="0">
- <xs:element name="subregions" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="subregion" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- <xdat:field>
- <xdat:relation uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="voxels" type="xs:float"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="units" type="xs:string" use="optional"/>
- <xs:attribute name="voxels" type="xs:integer"/>
- <xs:attribute name="hemisphere">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="both"/>
- <xs:enumeration value="left"/>
- <xs:enumeration value="right"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="addField">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SCAN,RECON,ASSESSOR,PET_SCAN"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="validationData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true" displayIdentifiers="status"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="method" type="xs:string" minOccurs="0"/>
- <xs:element name="date" type="xs:date" minOccurs="0"/>
- <xs:element name="notes" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="500"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="validated_by" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="status" type="xs:string"/>
- </xs:complexType>
- <xs:complexType name="abstractResource">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element ignoreWarnings="true" abstract="true" displayIdentifiers="label"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence minOccurs="0">
- <xs:element name="note" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="tags" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="tag" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- <xdat:field uniqueComposite="catalog_tag">
- <xdat:relation uniqueComposite="catalog_tag"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="label" type="xs:string" use="optional"/>
- <xs:attribute name="file_count" type="xs:integer" use="optional"/>
- <xs:attribute name="file_size" type="xs:long" use="optional"/>
- </xs:complexType>
- <xs:complexType name="resource">
- <xs:complexContent>
- <xs:extension base="xnat:abstractResource">
- <xs:sequence>
- <xs:element name="provenance" type="prov:process" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="URI" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:anyURI">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="format" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>Format of file. E.g. DICOM, Analyze, 4dfp</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>Free-form comments about file</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="content" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>Code indicating the contents of the image. E.g. GFC, T88</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="cachePath" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="imageResource">
- <xs:complexContent>
- <xs:extension base="xnat:resource">
- <xs:sequence>
- <xs:element name="dimensions" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer"/>
- <xs:attribute name="y" type="xs:integer"/>
- <xs:attribute name="z" type="xs:integer"/>
- <xs:attribute name="volumes" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="voxelRes" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:float"/>
- <xs:attribute name="y" type="xs:float"/>
- <xs:attribute name="z" type="xs:float"/>
- <xs:attribute name="units" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="orientation" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="resourceSeries">
- <xs:complexContent>
- <xs:extension base="xnat:abstractResource">
- <xs:attribute name="path" type="xs:anyURI" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="PATTERN_PATH"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="pattern" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="PATTERN_PATH"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="count" type="xs:integer" use="optional"/>
- <xs:attribute name="name" type="xs:string" use="optional"/>
- <xs:attribute name="format" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>Format of file. E.g. DICOM, Analyze, 4dfp</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>Free-form comments about files</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="content" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>Code indicating the contents of the image. E.g. GFC, T88</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="cachePath" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="imageResourceSeries">
- <xs:complexContent>
- <xs:extension base="xnat:resourceSeries">
- <xs:sequence>
- <xs:element name="dimensions" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer"/>
- <xs:attribute name="y" type="xs:integer"/>
- <xs:attribute name="z" type="xs:integer"/>
- <xs:attribute name="volumes" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="voxelRes" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:float"/>
- <xs:attribute name="y" type="xs:float"/>
- <xs:attribute name="z" type="xs:float"/>
- <xs:attribute name="units" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="orientation" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="dicomSeries">
- <xs:complexContent>
- <xs:extension base="xnat:abstractResource">
- <xs:sequence>
- <xs:element name="dimensions" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer"/>
- <xs:attribute name="y" type="xs:integer"/>
- <xs:attribute name="z" type="xs:integer"/>
- <xs:attribute name="volumes" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="voxelRes" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:float"/>
- <xs:attribute name="y" type="xs:float"/>
- <xs:attribute name="z" type="xs:float"/>
- <xs:attribute name="units" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="orientation" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
- </xs:element>
- <xs:element name="imageSet">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="image" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="URI" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:anyURI">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="sop_instance_UID" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="instance_number" type="xs:integer" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="format" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>Format of file. E.g. DICOM, Analyze, 4dfp</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>Free-form comments about files</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="content" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>Code indicating the contents of the image. E.g. GFC, T88</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="cachePath" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="UID" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="publicationResource">
- <xs:complexContent>
- <xs:extension base="xnat:abstractResource">
- <xs:sequence minOccurs="0">
- <xs:element name="title" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="citation" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="abstract" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="commentary" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="isPrimary" type="xs:boolean" use="optional"/>
- <xs:attribute name="doi" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="pubmed" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="medline" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="uri" type="xs:anyURI" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="other" type="xs:string" use="optional"/>
- <xs:attribute name="type" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="abstractProtocol">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="ID"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:attribute name="ID" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field unique="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="name" type="xs:string" use="optional"/>
- <xs:attribute name="description" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="data-type" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="studyProtocol">
- <xs:complexContent>
- <xs:extension base="xnat:abstractProtocol">
- <xs:sequence>
- <xs:element name="acqConditions" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="condition" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="FK_ID,FK_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FK_ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FK_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="subjectGroups" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="group" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="FK_ID,FK_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FK_ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FK_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="subjectVariables" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="variable" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="FK_ID,FK_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FK_ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FK_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="imageSessionTypes" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="session" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="FK_ID,FK_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FK_ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FK_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <!-- DEPRECATED: This data type is deprecated. You should only extend from imageAssessorData directly. -->
- <xs:complexType name="petAssessorData">
- <xs:annotation>
- <xs:documentation>A processing event in which primary or derived PET data is analyzed</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageAssessorData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="petSessionData">
- <xs:annotation>
- <xs:documentation>An event in which PET scans are obtained on a subject</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData">
- <xs:sequence minOccurs="0">
- <xs:element name="stabilization" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate method used to stabilize head</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="studyType" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Study descriptor</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="patientID" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Patient identification descriptor</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="patientName" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Patient name (free format ASCII)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="tracer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Radio-Pharmaceutical</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="dose" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:float">
- <xs:attribute name="units" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="specificActivity" type="xs:float" minOccurs="0"/>
- <xs:element name="totalMass" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:float">
- <xs:attribute name="units" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="intermediate" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:float">
- <xs:attribute name="units" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="isotope" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="half-life" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>half-life in seconds</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="transmissions" type="xs:integer" minOccurs="0"/>
- <xs:element name="transmissions_starttime" type="xs:dateTime" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="startTime" type="xs:dateTime" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="start_time" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="start_time_scan" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="start_time_injection" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="blood_glucose" type="xs:float" minOccurs="0"/>
- <xs:element name="blood_glucose_units" type="xs:string" minOccurs="0"/>
- <xs:element name="blood_glucose_time" type="xs:dateTime" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="petmrSessionData">
- <xs:annotation>
- <xs:documentation>An event in which scans are obtained by a device capable of both PET and MR acquisitions</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData">
- <xs:sequence minOccurs="0">
- <xs:element name="coil" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate the coil used in this scanning session</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="fieldStrength" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate the field strength used in this scanning session</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="marker" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate method used to mark left-right (e.g. Vitamin E capsule)</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="stabilization" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate method used to stabilize head</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="studyType" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Study descriptor</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="patientID" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Patient identification descriptor</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="patientName" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Patient name (free format ASCII)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="tracer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Radio-Pharmaceutical</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="dose" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:float">
- <xs:attribute name="units" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="specificActivity" type="xs:float" minOccurs="0"/>
- <xs:element name="totalMass" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:float">
- <xs:attribute name="units" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="intermediate" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:float">
- <xs:attribute name="units" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="isotope" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="half-life" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>half-life in seconds</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="transmissions" type="xs:integer" minOccurs="0"/>
- <xs:element name="transmissions_starttime" type="xs:dateTime" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="startTime" type="xs:dateTime" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="start_time" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="start_time_scan" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="start_time_injection" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="blood_glucose" type="xs:float" minOccurs="0"/>
- <xs:element name="blood_glucose_units" type="xs:string" minOccurs="0"/>
- <xs:element name="blood_glucose_time" type="xs:dateTime" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="petScanData">
- <xs:annotation>
- <xs:documentation>Information about an individual PET scan sequence</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData">
- <xs:sequence minOccurs="0">
- <xs:element name="parameters" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="orientation" type="xs:integer" minOccurs="0"/>
- <xs:element name="addParam" type="xnat:addField" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="PET_SCAN"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="originalFileName" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Scan file creation name</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="systemType" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Scanner model (i.e., 951, 951R, 953, 953B, 921,
-922, 925, 961, 962, 966)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="fileType" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Enumerated type (00=unknown, 01=Sinogram,
-02=Image-16, 03=Attenuation Correction,
-04=Normalization, 05=Polar Map, 06=Volume 8,
-07=Volume 16, 08=Projection 8, 09=Projection
-16, 10=Image 8, 11=3D Sinogram 16, 12=3D
-Sinogram 8, 13=3D Normalization, 14=3D
-Sinogram Fit)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="transaxialFOV" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Diameter (in cm.) of transaxial view</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="acqType" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Enumerated type (0=Undefined, 1=Blank,
-2=Transmission, 3=Static emission, 4=Dynamic
-emission, 5=Gated emission, 6=Transmission
-rectilinear, 7=Emission rectilinear)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="facility" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:element>
- <xs:element name="numPlanes" type="xs:integer" minOccurs="0"/>
- <xs:element name="frames" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="frame" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="number"/>
- <xdat:field>
- <xdat:relation uniqueComposite="true"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="number" type="xs:int" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="starttime" type="xs:float" use="required"/>
- <xs:attribute name="length" type="xs:float" use="required"/>
- <xs:attribute name="units" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="sec"/>
- <xs:enumeration value="min"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="numFrames" type="xs:int" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="numGates" type="xs:integer" minOccurs="0"/>
- <xs:element name="planeSeparation" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Physical distance between adjacent planes (in
-cm.)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="binSize" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Width of view sample (in cm)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="dataType" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Enumerated type (0=Unkonwn Matrix Data Type,
-1=Byte Data, 2=VAX_Ix2, 3=VAX_Ix4,
-4=VAX_Rx4, 5=IEEE Float, 6=Sun short, 7=Sun
-long)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="dimensions" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation>Dimension along x axis</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="y" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation>Dimension along y axis</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="z" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation>Dimension along z axis</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="num" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation>Number of dimensions</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="offset" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>Offset in x axis for recon target (in cm)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="y" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>Offset in y axis for recon target (in cm)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="z" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>Offset in z axis for recon target (in cm)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="reconZoom" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Reconstruction magnification factor (zoom)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="pixelSize" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>X dimension pixel size (in cm)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="y" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>Y dimension pixel size (in cm)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="z" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>Z dimension pixel size (in cm)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="filterCode" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Enumerated type (0=all pass, 1=ramp,
-2=Butterworth, 3=Hanning,
-4=Hamming,5=Parzen, 6=Shepp,
-7=Butterworth-order 2, 8=Gaussian,
-9=Median,10=Boxcar)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="resolution" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>Resolution in the x dimension (in cm)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="y" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>Resolution in the y dimension (in cm)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="z" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>Resolution in the z dimension (in cm)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="numRElements" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Number R elements from sinogram</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="numAngles" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Number of angles from sinogram</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ZRotationAngle" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Rotation in the xy plane (in degrees). Use righthand
-coordinate system for rotation angle sign.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="processingCode" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Bit mask (0=Not Processed, 1=Normalized,
-2=Measured Attenuation Correction,
-4=Calculated Attenuation Correction, 8=X
-smoothing, 16=Y smoothing, 32=Z smoothing,
-64=2D scatter correction, 128=3D scatter
-correction, 256=Arc correction, 512=Decay
-correction, 1024=Online compression)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="gateDuration" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Gate duration (in msec)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="rWaveOffset" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>R wave offset (For phase sliced studies, average,
-in msec)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="numAcceptedBeats" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Number of accepted beats for this gate</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="filter" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="cutoff" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation>Cutoff frequency</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="annotation" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_1_1" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (1,1).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_1_2" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (1,2).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_1_3" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (1,3).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_1_4" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (1,4).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_2_1" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (2,1).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_2_2" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (2,2).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_2_3" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (2,3).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_2_4" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (2,4).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_3_1" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (3,1).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_3_2" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (3,2).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_3_3" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (3,3).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MT_3_4" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Matrix transformation element (3,4).</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RFilter" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="cutoff" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="resolution" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="code" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="order" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="ZFilter" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="cutoff" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="resolution" type="xs:float" use="optional">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="code" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="order" type="xs:integer" use="optional">
- <xs:annotation>
- <xs:documentation/>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="scatterType" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Enumerated type (0=None, 1=Deconvolution,
-2=Simulated, 3=Dual Energy)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="reconType" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Enumerated type (0=Filtered backprojection,
-1=Forward projection 3D (PROMIS), 2=Ramp
-3D, 3=FAVOR 3D, 4=SSRB, 5=Multi-slice
-rebinning, 6=FORE)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="reconViews" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Number of views used to reconstruct the data</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="bedPosition" type="xs:float" minOccurs="0"/>
- <xs:element name="ecatCalibrationFactor" type="xs:float" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="ecatValidation" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="status" type="xs:boolean" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="computationData">
- <xs:attribute name="name" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="PET_RECON"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="value" type="xs:string" use="required"/>
- <xs:attribute name="source" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="PET_RECON"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="units" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="regionResource">
- <xs:sequence>
- <xs:element name="file" type="xnat:abstractResource">
- <xs:annotation>
- <xs:documentation>details of the region file</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="baseimage" type="xnat:abstractResource">
- <xs:annotation>
- <xs:documentation>the details of the file against which this region was created</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="creator">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="firstname" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SESSION"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="lastname" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SESSION"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="subregionlabels" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="label" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="UNIQUE_REGION"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="id" type="xs:int" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="UNIQUE_REGION"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="hemisphere" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="left"/>
- <xs:enumeration value="right"/>
- <xs:enumeration value="both"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>Name of the region eg Brainstem
-</xs:documentation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SESSION"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="hemisphere" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SESSION"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="left"/>
- <xs:enumeration value="right"/>
- <xs:enumeration value="both"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="session_id" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:imageSessionData" baseCol="ID" uniqueComposite="SESSION"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="resourceCatalog">
- <xs:complexContent>
- <xs:extension base="xnat:resource"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="statisticsData">
- <xs:complexContent>
- <xs:extension base="xnat:abstractStatistics">
- <xs:sequence>
- <xs:element name="mean" type="xs:double" minOccurs="0"/>
- <xs:element name="snr" type="xs:double" minOccurs="0"/>
- <xs:element name="min" type="xs:double" minOccurs="0"/>
- <xs:element name="max" type="xs:double" minOccurs="0"/>
- <xs:element name="stddev" type="xs:double" minOccurs="0"/>
- <xs:element name="no_of_voxels" type="xs:integer" minOccurs="0"/>
- <xs:element name="additionalStatistics" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="ADD_STAT_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="name" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="ADD_STAT_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="addField" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- <xdat:field>
- <xdat:relation uniqueComposite="ADD_FIELD_NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="ADD_FIELD_NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="abstractStatistics"/>
- <xs:complexType name="qcAssessmentData">
- <xs:complexContent>
- <xs:extension base="xnat:mrAssessorData">
- <xs:sequence>
- <xs:element name="scans">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="scan" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="ASSESSOR_ID"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="sliceQC" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="slice" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="SLICE_ID"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="sliceStatistics" type="xnat:abstractStatistics" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="number" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="SLICE_ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="scanStatistics" type="xnat:abstractStatistics" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="ASSESSOR_ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="datatypeProtocol">
- <xs:complexContent>
- <xs:extension base="xnat:abstractProtocol">
- <xs:sequence minOccurs="0">
- <xs:element name="definitions" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="definition" type="xnat:fieldDefinitionGroup" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation relationType="multi" relationName="xnat_datatypeProtocol_fieldGroups"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="fieldDefinitionGroup">
- <xs:sequence minOccurs="0">
- <xs:element name="fields" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="field" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- <xdat:field>
- <xdat:relation uniqueComposite="NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="possibleValues" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="possibleValue" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="pValue">
- <xdat:relation uniqueComposite="pValue"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="display" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="NAME"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="type" use="optional" default="standard">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="standard"/>
- <xs:enumeration value="custom"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="datatype" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="integer"/>
- <xs:enumeration value="float"/>
- <xs:enumeration value="boolean"/>
- <xs:enumeration value="string"/>
- <xs:enumeration value="date"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="required" type="xs:boolean" use="optional" default="false"/>
- <xs:attribute name="sequence" type="xs:integer" use="optional"/>
- <xs:attribute name="xmlPath" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="group" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:sqlField name="_group"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="data-type" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="true"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="description">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="10000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="shareable" type="xs:boolean"/>
- <xs:attribute name="project-specific" type="xs:boolean"/>
- </xs:complexType>
- <xs:complexType name="contrastBolus">
- <xs:annotation>
- <xs:documentation>Description of contrast/bolus used for image acquisition</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="agent" type="xs:string" minOccurs="0"/>
- <xs:element name="route" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Administration route</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="volume" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Total amount of diluted agent (in ml)</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="totalDose" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Total amount of undiluted agent (in ml)</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="flowRate" minOccurs="0">
- <xs:annotation>
- <xs:documentation>In ml/s</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="flowDuration" minOccurs="0">
- <xs:annotation>
- <xs:documentation>In s</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="activeIngredient" type="xs:string" minOccurs="0"/>
- <xs:element name="concentration" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Concentration of active ingredient in diluted agent, in mg/ml</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="imageAssessorData">
- <xs:annotation>
- <xs:documentation>A processing event in which primary or derived image data is analyzed</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:derivedData">
- <xs:sequence>
- <xs:element name="in" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field displayName="in resource">
- <xdat:relation relationType="multi" relationName="img_assessor_in_resource"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="out" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field displayName="out resource">
- <xdat:relation relationType="multi" relationName="img_assessor_out_resource"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="imageSession_ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:imageSessionData" baseCol="ID"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="parameters" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="addParam" type="xnat:addField" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="ASSESSOR"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="imageScanData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="ID"/>
- </xs:appinfo>
- <xs:documentation>Information about an individual image scan sequence</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="sharing" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="share" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="PROJECT_SCAN"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="label" type="xs:string" use="optional"/>
- <xs:attribute name="project" type="xs:string" use="optional">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:projectData" baseCol="ID" uniqueComposite="PROJECT_SCAN"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="image_session_ID" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field baseElement="xnat:imageSessionData" baseCol="ID" uniqueComposite="mr_id_fk"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="note" type="xs:string" minOccurs="0"/>
- <xs:element name="quality" type="xs:string" minOccurs="0"/>
- <xs:element name="condition" type="xs:string" minOccurs="0"/>
- <xs:element name="series_description" type="xs:string" minOccurs="0"/>
- <xs:element name="documentation" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="scanner" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate name/ID of scanner</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="manufacturer" type="xs:string" use="optional"/>
- <xs:attribute name="model" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="modality" type="xs:string" minOccurs="0"/>
- <xs:element name="frames" type="xs:integer" minOccurs="0"/>
- <xs:element name="operator" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Free form text to indicate individuals who operated scanner</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="255"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="file" type="xnat:abstractResource" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field displayName="resource"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="validation" type="xnat:validationData" minOccurs="0"/>
- <xs:element name="startTime" type="xs:time" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Time the scan started</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="ID" type="xs:string" use="required">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="mr_id_fk"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="type" type="xs:string" use="optional"/>
- <xs:attribute name="UID" type="xs:string" use="optional">
- <xs:annotation>
- <xs:documentation>DICOM Series Instance UID (0020,000E)</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="project" type="xs:string" use="optional"/>
- </xs:complexType>
- <xs:complexType name="ctSessionData">
- <xs:annotation>
- <xs:documentation>An event in which CT scans are obtained on a subject</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ctScanData">
- <xs:annotation>
- <xs:documentation>An individual CT scan sequence</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData">
- <xs:sequence>
- <xs:element name="parameters" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="voxelRes" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="units" type="xs:string"/>
- <xs:attribute name="x" type="xs:float"/>
- <xs:attribute name="y" type="xs:float"/>
- <xs:attribute name="z" type="xs:float"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="orientation" type="xs:string" minOccurs="0"/>
- <xs:element name="fov" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer"/>
- <xs:attribute name="y" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="rescale" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Relationship between stored values (SV) and Hounsfield (HU): HU=m*SV+b</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="intercept" minOccurs="0">
- <xs:annotation>
- <xs:documentation>b</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="slope" minOccurs="0">
- <xs:annotation>
- <xs:documentation>m</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="kvp" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Peak output of X-ray generator, in kV</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="acquisitionNumber" type="xs:integer" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Number identifying the single continuous gathering of data over a period of time resulting in this image</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="imageType" type="xs:string" minOccurs="0"/>
- <xs:element name="options" type="xs:string" minOccurs="0"/>
- <xs:element name="collectionDiameter" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Diameter of the region from which data were used to reconstruct this image, in mm</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="distanceSourceToDetector" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Distance from source to detector center, in mm</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="distanceSourceToPatient" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Distance from source to isocenter, in mm</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="gantryTilt" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Nominal scanning gantry tilt angle, in degrees</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="tableHeight" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Distance from top of patient table to center of rotation (below table > 0), in mm</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="rotationDirection" minOccurs="0">
- <xs:annotation>
- <xs:documentation>CW=clockwise; CC=counterclockwise</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="CW"/>
- <xs:enumeration value="CC"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="exposureTime" minOccurs="0">
- <xs:annotation>
- <xs:documentation>in ms</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="xrayTubeCurrent" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>in mA</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="exposure" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>in mA</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="filter" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Label for the type of filter inserted into the x-ray beam</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="generatorPower" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Power to the x-ray generator, in kW</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="focalSpots" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="focalSpot" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Size of focal spot, in mm; if multiple values, small dimensions before large</xs:documentation>
- <xs:appinfo>
- <xdat:field uniqueComposite="FSPOT">
- <xdat:relation uniqueComposite="FSPOT"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="convolutionKernel" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Label describing convolution kernel or algorithm used for reconstruction</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="collimationWidth" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="single" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Width of a single row of acquired data, in mm</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="total" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Width of total collimation over the area of active x-ray detection, in mm</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:float">
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="tableSpeed" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>in mm/s</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="tableFeedPerRotation" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Motion of table during a complete revolution of the source around the gantry orbit, in mm</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="pitchFactor" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Ratio of table feed per rotation to total collimation width</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="estimatedDoseSaving" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Percent value of dose saving due to modulation; negative value indicates increased exposure</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:float">
- <xs:attribute name="modulation">
- <xs:annotation>
- <xs:documentation>Label describing type of exposure modulation used to limit dose</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="ctDIvol" type="xs:float" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Computed Tomography Dose Index (CTDI_vol), according to IEC 60601-2-44, Ed. 2.1 (Clause 29.1.103.4); describes average dose for this image, in mGy</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="derivation" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Text description of how this image was derived</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string"/>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="contrastBolus" type="xnat:contrastBolus" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="dcmValidation" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="status" type="xs:boolean"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="crSessionData">
- <xs:annotation>
- <xs:documentation>Computed Radiography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="crScanData">
- <xs:annotation>
- <xs:documentation>Computed Radiography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="dxSessionData">
- <xs:annotation>
- <xs:documentation>An event in which Digital Radiography scans are obtained on a subject</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="dxScanData">
- <xs:annotation>
- <xs:documentation>Digital Radiography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="mgSessionData">
- <xs:annotation>
- <xs:documentation>Digital Mammography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="mgScanData">
- <xs:annotation>
- <xs:documentation>Digital Mammography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ioSessionData">
- <xs:annotation>
- <xs:documentation>Intraoral Radiography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ioScanData">
- <xs:annotation>
- <xs:documentation>Intraoral Radiography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="usSessionData">
- <xs:annotation>
- <xs:documentation>Ultrasound Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="usScanData">
- <xs:annotation>
- <xs:documentation>Ultrasound Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ecgSessionData">
- <xs:annotation>
- <xs:documentation>Electrocardiography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ecgScanData">
- <xs:annotation>
- <xs:documentation>Electrocardiography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="hdSessionData">
- <xs:annotation>
- <xs:documentation>Hemodynamic Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="hdScanData">
- <xs:annotation>
- <xs:documentation>Hemodynamic Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="epsSessionData">
- <xs:annotation>
- <xs:documentation>Cardiac Electrophysiology Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="epsScanData">
- <xs:annotation>
- <xs:documentation>Cardiac Electrophysiology Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="xaSessionData">
- <xs:annotation>
- <xs:documentation>An event in which X-ray Angiography scans are obtained on a subject</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="xaScanData">
- <xs:annotation>
- <xs:documentation>An individual XA scan sequence</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData">
- <xs:sequence>
- <xs:element name="parameters" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="pixelRes" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="units" type="xs:string"/>
- <xs:attribute name="x" type="xs:integer"/>
- <xs:attribute name="y" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="orientation" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Orientation(s), separated by comma if multiple</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="fov" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer"/>
- <xs:attribute name="y" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="imageType" type="xs:string" minOccurs="0"/>
- <xs:element name="options" type="xs:string" minOccurs="0"/>
- <xs:element name="derivation" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Text description of how this image was derived</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="contrastBolus" type="xnat:contrastBolus" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="rfSessionData">
- <xs:annotation>
- <xs:documentation>Radiofluoroscopy Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="rfScanData">
- <xs:annotation>
- <xs:documentation>Radiofluoroscopy Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="xa3DSessionData">
- <xs:annotation>
- <xs:documentation>X-Ray 3D Angiography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="xa3DScanData">
- <xs:annotation>
- <xs:documentation>X-Ray 3D Angiography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="dx3DCraniofacialSessionData">
- <xs:annotation>
- <xs:documentation>X-Ray 3D Craniofacial Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="dx3DCraniofacialScanData">
- <xs:annotation>
- <xs:documentation>X-Ray 3D Craniofacial Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="nmSessionData">
- <xs:annotation>
- <xs:documentation>Nuclear Medicine Image Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="nmScanData">
- <xs:annotation>
- <xs:documentation>Nuclear Medicine Image</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="srSessionData">
- <xs:annotation>
- <xs:documentation>Structured Report Image Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="srScanData">
- <xs:annotation>
- <xs:documentation>Structured Report Image</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="esSessionData">
- <xs:annotation>
- <xs:documentation>Visible Light Endoscopy Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="esScanData">
- <xs:annotation>
- <xs:documentation>Visible Light Endoscopy Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="esvSessionData">
- <xs:annotation>
- <xs:documentation>Video Endoscopy Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="esvScanData">
- <xs:annotation>
- <xs:documentation>Video Endoscopy Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="gmSessionData">
- <xs:annotation>
- <xs:documentation>Visible Light Microscopy Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="gmScanData">
- <xs:annotation>
- <xs:documentation>Visible Light Microscopy Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="gmvSessionData">
- <xs:annotation>
- <xs:documentation>Video Microscopy Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="gmvScanData">
- <xs:annotation>
- <xs:documentation>Video Microscopy Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="smSessionData">
- <xs:annotation>
- <xs:documentation>Visible Light Slide-Coordinates Microscopy Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="smScanData">
- <xs:annotation>
- <xs:documentation>Visible Light Slide-Coordinates Microscopy Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="xcSessionData">
- <xs:annotation>
- <xs:documentation>Visible Light Photography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="xcScanData">
- <xs:annotation>
- <xs:documentation>Visible Light Photography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="xcvSessionData">
- <xs:annotation>
- <xs:documentation>Video Photography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="xcvScanData">
- <xs:annotation>
- <xs:documentation>Video Photography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="opSessionData">
- <xs:annotation>
- <xs:documentation>Ophthalmic Photography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="opScanData">
- <xs:annotation>
- <xs:documentation>Ophthalmic Photography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="optSessionData">
- <xs:annotation>
- <xs:documentation>Ophthalmic Tomography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="optScanData">
- <xs:annotation>
- <xs:documentation>Ophthalmic Tomography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData">
- <xs:sequence>
- <xs:element name="parameters" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="voxelRes" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="units" type="xs:string"/>
- <xs:attribute name="x" type="xs:float"/>
- <xs:attribute name="y" type="xs:float"/>
- <xs:attribute name="z" type="xs:float"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="fov" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="x" type="xs:integer"/>
- <xs:attribute name="y" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="laterality" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Laterality of (paired) body part examined: R (right) or L (left)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="illumination_wavelength" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Wavelength of the illuminator, in nm</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="illumination_power" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Power of the illuminator in microwatts at corneal plane</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="imageType" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="dcmValidation" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="status" type="xs:boolean" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="rtSessionData">
- <xs:annotation>
- <xs:documentation>Radiotherapy Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="rtImageScanData">
- <xs:annotation>
- <xs:documentation>Radiotherapy Image</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="otherDicomSessionData">
- <xs:annotation>
- <xs:documentation>DICOM study of undetermined type</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="scScanData">
- <xs:annotation>
- <xs:documentation>DICOM Secondary Capture Image Series</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="segScanData">
- <xs:annotation>
- <xs:documentation>DICOM Segmentation Series</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="mrsScanData">
- <xs:annotation>
- <xs:documentation>MR Spectroscopy Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="voiceAudioScanData">
- <xs:annotation>
- <xs:documentation>DICOM Basic Voice Audio Series</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="otherDicomScanData">
- <xs:annotation>
- <xs:documentation>DICOM series of undetermined type</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <!-- Base Scan QC data. Should be applicable to all modalities -->
- <xs:complexType name="qcScanData">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="imageScan_ID"/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="imageScan_ID" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="qc_scan_id_fk"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="rater" type="xs:string" minOccurs="0"/>
- <xs:element name="coverage" type="xs:string" minOccurs="0"/>
- <xs:element name="motion" type="xs:string" minOccurs="0"/>
- <xs:element name="otherImageArtifacts" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="comments" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="pass" type="xs:string"/>
- <xs:element name="rating" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="scale" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="fields" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="0">
- <xs:element name="field" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:element displayIdentifiers="name"/>
- <xdat:field>
- <xdat:relation uniqueComposite="NAME"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="NAME"/>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <!-- Base MR Scan QC data. Should be applicable to all types of MR scans -->
- <xs:complexType name="mrQcScanData">
- <xs:complexContent>
- <xs:extension base="xnat:qcScanData">
- <xs:sequence>
- <xs:element name="blurring" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Bluring, Ghosting, or Ringing artifacts on the Scan</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="flow" type="xs:string" minOccurs="0"/>
- <xs:element name="imageContrast" type="xs:string" minOccurs="0"/>
- <xs:element name="inhomogeneity" type="xs:string" minOccurs="0"/>
- <xs:element name="wrap" type="xs:string" minOccurs="0"/>
- <xs:element name="susceptibility" type="xs:string" minOccurs="0"/>
- <xs:element name="interpacMotion" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="petQcScanData">
- <xs:complexContent>
- <xs:extension base="xnat:qcScanData">
- <xs:sequence>
- <xs:element name="acquisition" type="xs:string" minOccurs="0"/>
- <xs:element name="correctReconstructionAlgorithm" type="xs:string" minOccurs="0"/>
- <xs:element name="reconstructionAlgorithmUsed" type="xs:string" minOccurs="0"/>
- <xs:element name="correctIterationsAndSubsets" type="xs:string" minOccurs="0"/>
- <xs:element name="correctFilters" type="xs:string" minOccurs="0"/>
- <xs:element name="correctSliceThickness" type="xs:string" minOccurs="0"/>
- <xs:element name="acceptableVoxelSize" type="xs:string" minOccurs="0"/>
- <xs:element name="unacceptableFrames" type="xs:string" minOccurs="0"/>
- <xs:element name="reasonFramesUnacceptable" type="xs:string" minOccurs="0"/>
- <xs:element name="processingErrors" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="processingError" type="xs:string" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field uniqueComposite="qc_processing_error_fk">
- <xdat:relation uniqueComposite="qc_processing_error_fk" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="qcOutcome" type="xs:string" minOccurs="0"/>
- <xs:element name="qcOutcomeReason" type="xs:string" minOccurs="0"/>
- <xs:element name="topCutoff" type="xs:string" minOccurs="0"/>
- <xs:element name="bottomCutoff" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="otherQcScanData">
- <xs:complexContent>
- <xs:extension base="xnat:qcScanData">
- <xs:sequence>
- <xs:element name="other" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <!-- Session level QC assessment -->
- <xs:complexType name="qcManualAssessorData">
- <xs:complexContent>
- <xs:extension base="xnat:imageAssessorData">
- <xs:sequence>
- <xs:element name="rater" type="xs:string" minOccurs="0"/>
- <xs:element name="stereotacticMarker" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Marker placed and located correctly.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="incidentalFindings" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Possible clinical findings made during Quality Control. Not necessarily authorizative or clinical diagnoses. Further investigation required.</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="scans" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="scan" type="xnat:qcScanData" maxOccurs="unbounded">
- <xs:annotation>
- <xs:appinfo>
- <xdat:field>
- <xdat:relation uniqueComposite="qc_scan_id_fk" relationType="single"/>
- </xdat:field>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="comments" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:maxLength value="1000"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="pass" type="xs:string"/>
- <xs:element name="payable" type="xs:string" minOccurs="0"/>
- <xs:element name="rescan" type="xs:string" minOccurs="0"/>
- <xs:element name="resolvable" type="xs:string" minOccurs="0"/>
- <xs:element name="retrain" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="megSessionData">
- <xs:annotation>
- <xs:documentation>Magnetoencephalography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="megScanData">
- <xs:annotation>
- <xs:documentation>Magnetoencephalography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="eegSessionData">
- <xs:annotation>
- <xs:documentation>Electroencephalography Session</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageSessionData"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="eegScanData">
- <xs:annotation>
- <xs:documentation>Electroencephalography Scan</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="xnat:imageScanData"/>
- </xs:complexContent>
- </xs:complexType>
-</xs:schema>
diff --git a/src/main/webapp/scripts/globals.js b/src/main/webapp/scripts/globals.js
index 1198212052c90d04ada5101ad3c957d629c4a63b..2078683f8872b2fe38d7dcf25a654f553a0b2eee 100644
--- a/src/main/webapp/scripts/globals.js
+++ b/src/main/webapp/scripts/globals.js
@@ -48,6 +48,22 @@ function getParameterByName( name ){
return getQueryStringValue(name)
}
+// get the url hash string without the '#'
+function getUrlHash(){
+ return window.location.hash.split('#')[1] || '';
+}
+
+// simplest function for getting
+// a value from the url hash
+function getUrlHashValue(start, end){
+ var part = '',
+ hash = window.location.hash;
+ if (!hash) { return '' }
+ part = hash.split(start||'#')[1]||'';
+ part = part.split(end||'/')[0]||'';
+ return part;
+}
+
function firstDefined() {
var undefined, i = -1;
while (++i < arguments.length) {
@@ -257,6 +273,39 @@ function cloneObject(obj){
return extend(true, {}, obj);
}
+// add child objects to 'obj' object from string
+// OVERWRITES PROPERTIES WITH MATCHING NAMES
+// setObject(foo, 'bar.baz', 123456)
+// -> foo: { bar: { baz: 123456 } }
+function setObject(obj, str, val) {
+ var parts, part;
+ if (typeof str != 'string' || !str.length) {
+ return {};
+ }
+ obj = getObject(obj);
+ parts = str.split('.');
+ while (parts.length > 1) {
+ part = parts.shift();
+ obj = getObject(obj);
+ if (!obj[part]) {
+ obj[part] = {};
+ }
+ obj = obj[part];
+ }
+ obj[parts[0]] = val || {};
+ return obj;
+}
+
+// add child objects to 'obj' object
+// OVERWRITES PROPERTIES WITH MATCHING NAMES
+function setExtendedObject(obj, str, val){
+ var newObj = {};
+ setObject(newObj, str, val);
+ newObj = extend(true, {}, obj, newObj);
+ return newObj;
+}
+
+
// return the last item in an array-like object
function getLast(arr){
if (!arr) { return null }
diff --git a/src/main/webapp/scripts/xnat/app/customPage.js b/src/main/webapp/scripts/xnat/app/customPage.js
new file mode 100644
index 0000000000000000000000000000000000000000..c259fc6d1f6f5a2e87a8cab4f4f7120e18fb3b65
--- /dev/null
+++ b/src/main/webapp/scripts/xnat/app/customPage.js
@@ -0,0 +1,94 @@
+/*!
+ * Retrieve custom pages via AJAX
+ * Used in: /xnat-templates/screens/Page.vm
+ */
+(function(NS, factory){
+ if (typeof define === 'function' && define.amd) {
+ define(factory);
+ }
+ else if (typeof exports === 'object') {
+ module.exports = factory();
+ }
+ else {
+ return factory(NS);
+ }
+}('XNAT.app.customPage', function(NS, undefined){
+
+ // setExtendedObject() hasn't been tested yet
+ //var customPage = setExtendedObject(XNAT, NS);
+
+ var customPage = getObject(eval(NS)||{});
+
+ customPage.getName = function(){
+ var name = getQueryStringValue('view');
+ name = name || getUrlHashValue('#view=');
+ name = name || getUrlHash();
+ return customPage.name = name;
+ };
+
+ customPage.getName();
+
+ customPage.getPage = function(name, container){
+
+ var pagePaths = [],
+ themePaths = [];
+
+ name = name || customPage.getName();
+
+ // don't even bother if there's no name
+ if (!name) return;
+
+ var $container = customPage.container || $$(container);
+
+ function getPage(path){
+ return XNAT.xhr.get({
+ url: XNAT.url.rootUrl(path),
+ dataType: 'html',
+ success: function(content){
+ $container.html(content);
+ }
+ })
+ }
+
+ var setPaths = function(pg, prefixes){
+ var paths = [];
+ [].concat(prefixes).forEach(function(prefix){
+ paths.push(prefix + '/' + pg + '.jsp');
+ paths.push(prefix + '/' + pg + '.html');
+ });
+ return paths;
+ };
+
+ pagePaths = setPaths(name, ['/pages']);
+
+ // if we're using a theme, check that theme's folder
+ if (XNAT.theme){
+ themePaths = setPaths(name, [
+ '/themes/' + XNAT.theme,
+ '/themes/' + XNAT.theme + '/pages'
+ ]);
+ pagePaths = themePaths.concat(pagePaths);
+ }
+
+ function lookForPage(i) {
+ var not_found = 'page not found';
+ if (i === pagePaths.length){
+ not_found = '<b>"' + customPage.getName() + '"</b> page not found';
+ $container.html(not_found);
+ // console.log("couldn't do it");
+ return false;
+ }
+ // recursively try to get pages at different places
+ getPage(pagePaths[i]).fail(function(){
+ lookForPage(++i)
+ });
+ }
+
+ // do the stuff
+ lookForPage(0);
+
+ };
+
+ return XNAT.app.customPage = customPage;
+
+}));
diff --git a/src/main/webapp/xdat-templates/macros/TurbineMacros.vm b/src/main/webapp/xdat-templates/macros/TurbineMacros.vm
index 8306c7ed89a92b69e40f67d0b5ff5404a10e1ec7..649c48bfca2edf255843f6215018031efcd2d0ca 100644
--- a/src/main/webapp/xdat-templates/macros/TurbineMacros.vm
+++ b/src/main/webapp/xdat-templates/macros/TurbineMacros.vm
@@ -1640,15 +1640,15 @@ $!turbineUtils.escapeJS($s)
#if($turbineUtils.toBoolean($siteConfig.getProperty("UI.debug-extension-points","false")))document.write("<div class='extension_js'>/templates/screens/$subFolder</div>")#end
#foreach($screenProps in $turbineUtils.getTemplates($subFolder))
#set($templateFileName=$screenProps.getProperty("path"))
- #if($data.getSession().getAttribute("user").getUsername()=="guest")
+ #if($turbineUtils.isGuest($user))
#if($turbineUtils.toBoolean($screenProps.getProperty("allowGuest","false")))
#parse("/screens/$templateFileName")
#end
#elseif($screenProps.getProperty("adminOnly"))
- #if($turbineUtils.toBoolean($data.getSession().getAttribute("user").checkRole("Administrator"),"false"))
+ #if($turbineUtils.isSiteAdmin($user))
#parse("/screens/$templateFileName")
#end
- #elseif($data.getSession().getAttribute("user").getUsername())
+ #elseif($user.getUsername())
#parse("/screens/$templateFileName")
#end
#end
@@ -1659,15 +1659,15 @@ $!turbineUtils.escapeJS($s)
#if($turbineUtils.toBoolean($siteConfig.getProperty("UI.debug-extension-points","false")))document.write("<div class='extension_js'>/templates/screens/$dataType/$subFolder</div>")#end
#foreach($screenProps in $turbineUtils.getTemplates($dataType,$subFolder))
#set($templateFileName=$screenProps.getProperty("path"))
- #if($data.getSession().getAttribute("user").getUsername()=="guest")
+ #if($turbineUtils.isGuest($user))
#if($turbineUtils.toBoolean($screenProps.getProperty("allowGuest","false")))
#parse("/screens/$templateFileName")
#end
#elseif($screenProps.getProperty("adminOnly"))
- #if($turbineUtils.toBoolean($data.getSession().getAttribute("user").checkRole("Administrator"),"false"))
+ #if($turbineUtils.isSiteAdmin($user))
#parse("/screens/$templateFileName")
#end
- #elseif($data.getSession().getAttribute("user").getUsername())
+ #elseif($user.getUsername())
#parse("/screens/$templateFileName")
#end
#end
@@ -1678,15 +1678,15 @@ $!turbineUtils.escapeJS($s)
#if($turbineUtils.toBoolean($siteConfig.getProperty("UI.debug-extension-points","false")))<div class="extension">/templates/screens/$subFolder</div>#end
#foreach($screenProps in $turbineUtils.getTemplates($subFolder))
#set($templateFileName=$screenProps.getProperty("path"))
- #if($data.getSession().getAttribute("user").getUsername()=="guest")
+ #if($turbineUtils.isGuest($user))
#if($turbineUtils.toBoolean($screenProps.getProperty("allowGuest","false")))
#parse("/screens/$templateFileName")
#end
#elseif($screenProps.getProperty("adminOnly"))
- #if($turbineUtils.toBoolean($data.getSession().getAttribute("user").checkRole("Administrator"),"false"))
+ #if($turbineUtils.isSiteAdmin($user))
#parse("/screens/$templateFileName")
#end
- #elseif($data.getSession().getAttribute("user").getUsername())
+ #elseif($user.getUsername())
#parse("/screens/$templateFileName")
#end
#end
@@ -1697,15 +1697,15 @@ $!turbineUtils.escapeJS($s)
#if($turbineUtils.toBoolean($siteConfig.getProperty("UI.debug-extension-points","false")))<div class="extension">/templates/screens/$dataType/$subFolder</div>#end
#foreach($screenProps in $turbineUtils.getTemplates($dataType,$subFolder))
#set($templateFileName=$screenProps.getProperty("path"))
- #if($data.getSession().getAttribute("user").getUsername()=="guest")
+ #if($turbineUtils.isGuest($user))
#if($turbineUtils.toBoolean($screenProps.getProperty("allowGuest","false")))
#parse("/screens/$templateFileName")
#end
#elseif($screenProps.getProperty("adminOnly"))
- #if($turbineUtils.toBoolean($data.getSession().getAttribute("user").checkRole("Administrator"),"false"))
+ #if($turbineUtils.isSiteAdmin($user))
#parse("/screens/$templateFileName")
#end
- #elseif($data.getSession().getAttribute("user").getUsername())
+ #elseif($user.getUsername())
#parse("/screens/$templateFileName")
#end
#end
@@ -1715,15 +1715,15 @@ $!turbineUtils.escapeJS($s)
#set($hasCustomScreens = false)
#foreach($screenProps in $turbineUtils.getTemplates($dataType,$subFolder))
#set($templateFileName=$screenProps.getProperty("path"))
- #if($data.getSession().getAttribute("user").getUsername()=="guest")
+ #if($turbineUtils.isGuest($user))
#if($turbineUtils.toBoolean($screenProps.getProperty("allowGuest","false")))
#set($hasCustomScreens = true)
#end
#elseif($screenProps.getProperty("adminOnly"))
- #if($turbineUtils.toBoolean($data.getSession().getAttribute("user").checkRole("Administrator"),"false"))
+ #if($turbineUtils.isSiteAdmin($user))
#set($hasCustomScreens = true)
#end
- #elseif($data.getSession().getAttribute("user").getUsername())
+ #elseif($user.getUsername())
#set($hasCustomScreens = true)
#end
#end
diff --git a/src/main/webapp/xdat-templates/navigations/NoMenuTop.vm b/src/main/webapp/xdat-templates/navigations/NoMenuTop.vm
index 4279a873862d239b31e192aa8e014bddfd51d69b..89a5773dfc0bd668e861bee414b7b2a3b38dc207 100644
--- a/src/main/webapp/xdat-templates/navigations/NoMenuTop.vm
+++ b/src/main/webapp/xdat-templates/navigations/NoMenuTop.vm
@@ -1,16 +1,23 @@
-##Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
+#* @vtlvariable name="data" type="org.apache.turbine.util.RunData" *#
+#* @vtlvariable name="turbineUtils" type="org.nrg.xdat.turbine.utils.TurbineUtils" *#
+#* @vtlvariable name="page" type="org.apache.turbine.util.template.HtmlPageAttributes" *#
+#* @vtlvariable name="last_login" type="java.util.Date" *#
+#* @vtlvariable name="user" type="org.nrg.xft.security.UserI" *#
+#* @vtlvariable name="ui" type="org.apache.turbine.services.pull.util.UIManager" *#
+#* @vtlvariable name="link" type="org.apache.turbine.services.pull.tools.TemplateLink" *#
$page.setBgColor($ui.bgcolor)
<div id="user_bar" class="no_menu">
#if($last_login)
<span id="last_login">Last login: $turbineUtils.formatDateTime($last_login)</span>
#end
- #if($data.getSession().getAttribute("user"))
- #if($data.getSession().getAttribute("user").getUsername()=="guest")
+ #if($user)
+ #set($username = $user.getUsername())
+ #if($turbineUtils.isGuest($user))
<span id="user_info">Logged in as: <span style="color:red;">Guest</span> <b>|</b> <a href="$link.setPage("Login.vm")">Login</a> <b>|</b> <a href="$link.setPage("Register.vm")">Register</a></span>
- #elseif($data.getSession().getAttribute("user").getUsername())
+ #elseif($username)
## use default timout value from web.xml as the starting text in the "timeLeft" element
- <span id="user_info">Logged in as: <a href="$link.setPage("XDATScreen_UpdateUser.vm")">$!data.getSession().getAttribute("user").getUsername()</a> <b>|</b> <a href="$link.setAction("LogoutUser")">Logout</a></span>
+ <span id="user_info">Logged in as: <a href="$link.setPage("XDATScreen_UpdateUser.vm")">$!username</a> <b>|</b> <a href="$link.setAction("LogoutUser")">Logout</a></span>
#end
#end
<div class="clear"></div>
diff --git a/src/main/webapp/xdat-templates/navigations/NoninteractiveTop.vm b/src/main/webapp/xdat-templates/navigations/NoninteractiveTop.vm
index a6ace1ec48fe84f81ffd684aa4d40a98be030ab7..cc653ef023a5d1430be94b3ae4a2da3b87df2882 100644
--- a/src/main/webapp/xdat-templates/navigations/NoninteractiveTop.vm
+++ b/src/main/webapp/xdat-templates/navigations/NoninteractiveTop.vm
@@ -1,3 +1,10 @@
+#* @vtlvariable name="data" type="org.apache.turbine.util.RunData" *#
+#* @vtlvariable name="turbineUtils" type="org.nrg.xdat.turbine.utils.TurbineUtils" *#
+#* @vtlvariable name="page" type="org.apache.turbine.util.template.HtmlPageAttributes" *#
+#* @vtlvariable name="last_login" type="java.util.Date" *#
+#* @vtlvariable name="user" type="org.nrg.xft.security.UserI" *#
+#* @vtlvariable name="ui" type="org.apache.turbine.services.pull.util.UIManager" *#
+#* @vtlvariable name="link" type="org.apache.turbine.services.pull.tools.TemplateLink" *#
<!-- BEGIN NoninteractiveTop.vm -->
$page.setBgColor($ui.bgcolor)
@@ -5,12 +12,13 @@ $page.setBgColor($ui.bgcolor)
#if($last_login)
<span id="last_login">Last login: $turbineUtils.formatDateTime($last_login)</span>
#end
- #if($data.getSession().getAttribute("user"))
- #if($data.getSession().getAttribute("user").getUsername()=="guest")
+ #if($user)
+ #set($username = $user.getUsername())
+ #if($turbineUtils.isGuest($user))
<span id="user_info">Logged in as: <span style="color:red;">Guest</span>
- #elseif($data.getSession().getAttribute("user").getUsername())
+ #elseif($username)
## use default timout value from web.xml as the starting text in the "timeLeft" element
- <span id="user_info">Logged in as: <i>$!data.getSession().getAttribute("user").getUsername()</i> <b>|</b> <a href="$link.setAction("LogoutUser")">Logout</a></span>
+ <span id="user_info">Logged in as: <i>$!username</i> <b>|</b> <a href="$link.setAction("LogoutUser")">Logout</a></span>
#end
#end
<div class="clear"></div>
diff --git a/src/main/webapp/xdat-templates/navigations/SubMenu1.vm b/src/main/webapp/xdat-templates/navigations/SubMenu1.vm
index b836d9cf783f3f87f866082831a8fb989cd9ebf5..bc9e6dca4d7d577133bdf70b49efad5084fcec2e 100644
--- a/src/main/webapp/xdat-templates/navigations/SubMenu1.vm
+++ b/src/main/webapp/xdat-templates/navigations/SubMenu1.vm
@@ -1,5 +1,6 @@
+#* @vtlvariable name="user" type="org.nrg.xft.security.UserI" *#
##Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
-#set ($actionObjects = $data.getSession().getAttribute("user").getActionCollection() )
+#set ($actionObjects = $user.getActionCollection() )
#if ($actionObjects.size() > 1)
<table align="left" valign="top">
<tr>
diff --git a/src/main/webapp/xdat-templates/navigations/SubMenu3.vm b/src/main/webapp/xdat-templates/navigations/SubMenu3.vm
index 3d40ee01bbc7751c37d45ba072146a17e53988db..8cecd884bc2bc96abab4c175949a1223f76fa603 100644
--- a/src/main/webapp/xdat-templates/navigations/SubMenu3.vm
+++ b/src/main/webapp/xdat-templates/navigations/SubMenu3.vm
@@ -1,10 +1,10 @@
##Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
-#if ($data.getSession().getAttribute("user").getStoredSearches().size()>0)
+#if ($user.getStoredSearches().size()>0)
<table align="left" valign="top">
<tr>
<td>
<b style="text-decoration:underline">Bundles</b><br>
- ${data.getSession().getAttribute("user").outputBundleHTMLMenu()}
+ ${user.outputBundleHTMLMenu()}
</td>
</tr>
diff --git a/src/main/webapp/xdat-templates/screens/DefaultReport.vm b/src/main/webapp/xdat-templates/screens/DefaultReport.vm
index c0cd2762b6ed52b522c5f198ecad403f80bc784d..2558e1f1c31393c8badb1be83a182e024c4d3f33 100644
--- a/src/main/webapp/xdat-templates/screens/DefaultReport.vm
+++ b/src/main/webapp/xdat-templates/screens/DefaultReport.vm
@@ -8,7 +8,7 @@
$!data_item
</TD>
<td valign="top">
- #elementActionsBox($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBox($element $search_field $search_value $user $item)
</td>
</TR>
</TABLE>
\ No newline at end of file
diff --git a/src/main/webapp/xdat-templates/screens/XDATScreen_active_sessions.vm b/src/main/webapp/xdat-templates/screens/XDATScreen_active_sessions.vm
index ce8d8b40b057bc289ff3007a744e3902cd61e312..df39544455eedeb7271fc27dbdc73721139c3a1e 100644
--- a/src/main/webapp/xdat-templates/screens/XDATScreen_active_sessions.vm
+++ b/src/main/webapp/xdat-templates/screens/XDATScreen_active_sessions.vm
@@ -12,7 +12,7 @@
#foreach($session in $sessions)
<tr>
<td NOWRAP><A name="LINK${sessionCounter}" HREF="#LINK${sessionCounter}" onClick=" return blocking($sessionCounter);">
- <img ID="IMG$sessionCounter" src="$content.getURI("images/plus.jpg")" border=0> $!session.getAttribute("user").getLogin()</A></td>
+ <img ID="IMG$sessionCounter" src="$content.getURI("images/plus.jpg")" border=0> $!user.getLogin()</A></td>
<td>$!turbineUtils.formatDateTime($session.getCreationTime())</td>
<td>$!turbineUtils.formatDateTime($session.getLastAccessedTime())</td>
<td>
diff --git a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_element_security.vm b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_element_security.vm
index c6ef182478f42cfc0a920ebbfa8c1c0f0a2ebf6a..cfedb7accbbd944df00499ec50bd9f42ba021d90 100644
--- a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_element_security.vm
+++ b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_element_security.vm
@@ -170,7 +170,7 @@ $page.setVlinkColor($ui.vlink)
</TR>
</TABLE>
<td valign="top" align="right">
- #elementActionsBox($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBox($element $search_field $search_value $user $item)
</td>
</TR>
</TABLE>
diff --git a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_infoEntry.vm b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_infoEntry.vm
index 1bb97020819f584230aa45fbed731f80705328ae..77e960caed7874fe5e4f16fcf6e8153e091979ad 100644
--- a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_infoEntry.vm
+++ b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_infoEntry.vm
@@ -31,7 +31,7 @@ $page.setVlinkColor($ui.vlink)
</TABLE>
</TD>
<TD valign="top" align="right">
- #elementActionsBox($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBox($element $search_field $search_value $user $item)
</TD>
</TR>
</TABLE>
diff --git a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_newsEntry.vm b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_newsEntry.vm
index be7aad92fcb065da11f0f978d2b38d37407ce85e..28746aaded6e2c07b1f5551f1bddfd85cbbba480 100644
--- a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_newsEntry.vm
+++ b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_newsEntry.vm
@@ -31,7 +31,7 @@ $page.setVlinkColor($ui.vlink)
</TABLE>
</TD>
<TD valign="top" align="right">
- #elementActionsBox($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBox($element $search_field $search_value $user $item)
</TD>
</TR>
</TABLE>
diff --git a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_stored_search.vm b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_stored_search.vm
index 580572d85d7e6688a10fafb248e4b205286243d1..871e949dbe15ec179a311c1e1f840841728496a5 100644
--- a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_stored_search.vm
+++ b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_stored_search.vm
@@ -35,7 +35,7 @@ $page.setVlinkColor($ui.vlink)
</TABLE>
</TD>
<TD valign="top" align="right">
- #elementActionsBox($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBox($element $search_field $search_value $user $item)
</TD>
</TR>
</TABLE>
diff --git a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_userGroup.vm b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_userGroup.vm
index ebb87ee25e09c4e713e7466fbeac6f53be7aa0cc..e1a61f84c7a774d4d88a024a58710d615a6e21b8 100644
--- a/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_userGroup.vm
+++ b/src/main/webapp/xdat-templates/screens/XDATScreen_report_xdat_userGroup.vm
@@ -29,7 +29,7 @@ $page.setVlinkColor($ui.vlink)
</TABLE>
</TD>
<TD valign="top" align="right">
- #elementActionsBox($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBox($element $search_field $search_value $user $item)
</TD>
</TR>
</TABLE>
diff --git a/src/main/webapp/xnat-templates/navigations/DefaultTop.vm b/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
index 8eebccfb2a7dda7042c2ca847dcdb2cd636e778a..6b94dca32e5b3e1e9da5a9791c52897dd2e55dd1 100644
--- a/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
+++ b/src/main/webapp/xnat-templates/navigations/DefaultTop.vm
@@ -27,14 +27,14 @@
#if($last_login)
<span id="last_login">Last login: $turbineUtils.formatDateTime($last_login)</span>
#end
- #if($data.getSession().getAttribute("user").getUsername()=="guest")
+ #if($turbineUtils.isGuest($user))
<span id="user_info">Logged in as: <span style="color:red;">Guest</span> <b>|</b> <a href="$link.setPage("Login.vm")">Login</a> <b>|</b> <a href="$link.setPage("Register.vm")">Register</a></span>
<script type="text/javascript">
Cookies.set('guest','true',{path:'/'});
</script>
- #elseif($data.getSession().getAttribute("user").getUsername())
+ #elseif($user.getUsername())
## use default timeout value from web.xml as the starting text in the "#timeLeft" element
- <span id="user_info">Logged in as: <a href="$link.setPage("XDATScreen_UpdateUser.vm")">$!data.getSession().getAttribute("user").getUsername()</a> <b>|</b><span class="tip_icon" style="margin-right:3px;left:2px;top:3px;">
+ <span id="user_info">Logged in as: <a href="$link.setPage("XDATScreen_UpdateUser.vm")">$!user.getUsername()</a> <b>|</b><span class="tip_icon" style="margin-right:3px;left:2px;top:3px;">
<span class="tip shadowed" style="top:20px;z-index:10000;white-space:normal;left:-150px;width:300px;background-color:#ffc;">Your XNAT session will auto-logout after a certain period of inactivity. You can reset that timer without reloading the page by clicking "renew."</span>
</span>
## some kind of default text needs to be there so stuff doesn't shift around before the timer functions kick in
diff --git a/src/main/webapp/xnat-templates/screens/BulkDeleteActionScreen.vm b/src/main/webapp/xnat-templates/screens/BulkDeleteActionScreen.vm
index ba2eca5f5e6b3ab3e21b5e0d9114bed9e835b134..1b15934f54059b8e0620cbf8d120a8bfc4ada9b5 100644
--- a/src/main/webapp/xnat-templates/screens/BulkDeleteActionScreen.vm
+++ b/src/main/webapp/xnat-templates/screens/BulkDeleteActionScreen.vm
@@ -1,6 +1,5 @@
## Screen is for XNAT-2408
<form name="form1" method="post" action="$link.setAction("DeleteProjectData")" ONSUBMIT="return validateForm();">
-#set($user = $data.getSession().getAttribute("user"))
#if($errMsg)
<p>$errMsg</p>
<br>
diff --git a/src/main/webapp/xnat-templates/screens/Configuration.vm b/src/main/webapp/xnat-templates/screens/Configuration.vm
index 98a21e00d738c9ea0e7474c42f30edf7f76cb57a..f5dc001e8b2d648cf2b1670dfe2db8ebeb675aea 100755
--- a/src/main/webapp/xnat-templates/screens/Configuration.vm
+++ b/src/main/webapp/xnat-templates/screens/Configuration.vm
@@ -1,3 +1,4 @@
+#* @vtlvariable name="user" type="org.nrg.xft.security.UserI" *#
#* @vtlvariable name="turbineUtils" type="org.nrg.xdat.turbine.utils.TurbineUtils" *#
#* @vtlvariable name="siteConfig" type="java.util.Properties" *#
#* @vtlvariable name="content" type="org.apache.turbine.services.pull.tools.ContentTool" *#
@@ -21,7 +22,7 @@
##<div id="tp_fm" style="display:none"></div>
<div class="edit_header1">Configuration</div><br/>
-#if($data.getSession().getAttribute("user").checkRole("Administrator"))
+#if($turbineUtils.isSiteAdmin($user))
<script type="text/javascript" src="$content.getURI("scripts/yui/build/resize/resize-beta-min.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/yui/build/layout/layout-beta-min.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/search/tabManager.js")"></script>
diff --git a/src/main/webapp/xnat-templates/screens/EditArcSpecs.vm b/src/main/webapp/xnat-templates/screens/EditArcSpecs.vm
index 9fbb0e05daeca265c1c08fe898911f845321f81a..b427501d57b89cf1f303185565d18431d97b4950 100644
--- a/src/main/webapp/xnat-templates/screens/EditArcSpecs.vm
+++ b/src/main/webapp/xnat-templates/screens/EditArcSpecs.vm
@@ -1,6 +1,6 @@
#set ($template = $data.getTemplateInfo())
$!template.setLayoutTemplate("NoMenu.vm")
-#if($data.getSession().getAttribute("user").checkRole("Administrator"))
+#if($turbineUtils.isSiteAdmin($user))
<form name="form1" method="post" action="$link.setAction("SetArcSpecs")">
<table>
<TR>
diff --git a/src/main/webapp/xnat-templates/screens/EditScript.vm b/src/main/webapp/xnat-templates/screens/EditScript.vm
index 57b4fc97034099a1c9f1788d694477cff2963ccc..adf2bfecf14a464566b6a40bd4ad1fe679fbd093 100755
--- a/src/main/webapp/xnat-templates/screens/EditScript.vm
+++ b/src/main/webapp/xnat-templates/screens/EditScript.vm
@@ -57,7 +57,7 @@
<tr>
<td colspan="3">
-#if($data.getSession().getAttribute("user").checkRole("Administrator"))
+#if($turbineUtils.isSiteAdmin($user))
#if($error)
<div id="error" class="error">There was an error, which isn't so good: $error.</div>
#else
diff --git a/src/main/webapp/xnat-templates/screens/Page.vm b/src/main/webapp/xnat-templates/screens/Page.vm
new file mode 100644
index 0000000000000000000000000000000000000000..18c7aaa7e9cb85b71e8c385677c9447e5d644287
--- /dev/null
+++ b/src/main/webapp/xnat-templates/screens/Page.vm
@@ -0,0 +1,51 @@
+#* @vtlvariable name="displayManager" type="org.nrg.xdat.display.DisplayManager" *#
+#* @vtlvariable name="par_count" type="java.lang.Integer" *#
+#* @vtlvariable name="data" type="org.apache.turbine.util.RunData" *#
+#* @vtlvariable name="turbineUtils" type="org.nrg.xdat.turbine.utils.TurbineUtils" *#
+#* @vtlvariable name="siteConfig" type="java.util.Properties" *#
+#* @vtlvariable name="content" type="org.apache.turbine.services.pull.tools.ContentTool" *#
+
+<!-- start xnat-templates/screens/Page.vm -->
+
+#set ($template = $data.getTemplateInfo())
+#set ($pg = $data.getParameters().getString('view'))
+#set ($pg_path = "/screens/pages/${pg}.vm")
+
+<script src="$content.getURI('/scripts/xnat/app/customPage.js')"></script>
+
+#if ($pg)
+
+ ## if there's a page at '*templates/pages/name.vm' then use that
+ #if ($turbineUtils.resourceExists($pg_path))
+ <div id="view-page">
+ #parse($pg_path)
+ </div>
+ #else
+
+ ## try to retrieve page content using the query string value
+ <div id="view-page"></div>
+ <script>
+ XNAT.app.customPage.getPage('${pg}', '#view-page');
+ </script>
+
+ #end
+
+#else
+
+ ## do stuff if there's no "view" query string param
+ <div id="view-page"></div>
+
+<script>
+
+ XNAT.app.customPage.container = $('#view-page');
+ XNAT.app.customPage.getPage();
+
+ window.onhashchange = function(){
+ XNAT.app.customPage.getPage();
+ }
+
+</script>
+
+#end
+
+<!-- end xnat-templates/screens/Page.vm -->
diff --git a/src/main/webapp/xnat-templates/screens/PrearchiveMatch.vm b/src/main/webapp/xnat-templates/screens/PrearchiveMatch.vm
index 528e6c0daaf32f9b3b6b0f2bfcf55a214532e362..4b3e520c6e105a46b2a852314f691f10c797930f 100644
--- a/src/main/webapp/xnat-templates/screens/PrearchiveMatch.vm
+++ b/src/main/webapp/xnat-templates/screens/PrearchiveMatch.vm
@@ -1,5 +1,4 @@
<h3>Pre-archive - Database Matches</h3><br>
-#set($user=$data.getSession().getAttribute("user"))
#set($scanTypes=$data.getSession().getAttribute("userHelper").getQueryResultsAsArrayList("SELECT DISTINCT type FROM xnat_imagescandata ORDER BY type;"))
<form method="post" action="$link.setAction("MatchPrearchiveSessions")">
<input type="hidden" name="project" value="$!project"/>
diff --git a/src/main/webapp/xnat-templates/screens/ProjectSelectBox.vm b/src/main/webapp/xnat-templates/screens/ProjectSelectBox.vm
index 55373980afdf42f712ae401afffb99197bbbacd2..e4566b6b6ba9d646aa475c702d26ff25758ef557 100644
--- a/src/main/webapp/xnat-templates/screens/ProjectSelectBox.vm
+++ b/src/main/webapp/xnat-templates/screens/ProjectSelectBox.vm
@@ -1,32 +1,33 @@
#parse("/screens/LoadProjectsJS.vm")
- #set($user=$data.getSession().getAttribute("user"))
-#set($projectMap = $data.getSession().getAttribute("userHelper").getCachedItemValuesHash("xnat:projectData",null,false,"xnat:projectData/ID","xnat:projectData/secondary_ID"))
- #if($project)
+#set($projectMap = $data.getSession().getAttribute("userHelper").getCachedItemValuesHash(
+ "xnat:projectData",null,false,"xnat:projectData/ID","xnat:projectData/secondary_ID"))
+#if($project)
<INPUT type="hidden" name="project" value="$project">
-#if($projectMap.get($project))
-$projectMap.get($project)
+ #if($projectMap.get($project))
+ $projectMap.get($project)
+ #else
+ $project
+ #end
#else
-$project
-#end
-#else
-#set($create_projects= $data.getSession().getAttribute("userHelper").getAllowedValues("xnat:subjectData","xnat:subjectData/project","create"))
+ #set($create_projects= $data.getSession().getAttribute("userHelper").getAllowedValues(
+ "xnat:subjectData","xnat:subjectData/project","create"))
-#if($create_projects.size()>0)
-<SELECT name="project">
-<option value="">(SELECT)</option>
-#foreach($proj in $create_projects)
-#if($projectMap.get($proj))
-<option value="$proj">
-$projectMap.get($proj)
-</option>
-#elseif($proj!="*")
-<option value="$proj">
-$proj
-</option>
-#end
-#end
-</SELECT>
-#else
-ERROR: No $displayManager.getPluralDisplayNameForProject().toLowerCase() exist. Please create a $displayManager.getSingularDisplayNameForProject().toLowerCase() before attempting to insert this item.
-#end
+ #if($create_projects.size()>0)
+ <SELECT name="project">
+ <option value="">(SELECT)</option>
+ #foreach($proj in $create_projects)
+ #if($projectMap.get($proj))
+ <option value="$proj">
+ $projectMap.get($proj)
+ </option>
+ #elseif($proj!="*")
+ <option value="$proj">
+ $proj
+ </option>
+ #end
+ #end
+ </SELECT>
+ #else
+ ERROR: No $displayManager.getPluralDisplayNameForProject().toLowerCase() exist. Please create a $displayManager.getSingularDisplayNameForProject().toLowerCase() before attempting to insert this item.
+ #end
#end
\ No newline at end of file
diff --git a/src/main/webapp/xnat-templates/screens/ProjectSelector.vm b/src/main/webapp/xnat-templates/screens/ProjectSelector.vm
index e16c8a33bc30628ae77d630f148c7193d9d66bb8..b01b6855ff4d6b6ed17e07a2889973723d368c27 100644
--- a/src/main/webapp/xnat-templates/screens/ProjectSelector.vm
+++ b/src/main/webapp/xnat-templates/screens/ProjectSelector.vm
@@ -1,6 +1,4 @@
-##REQUIRES $item=org.nrg.xft.XFTItem $user=org.nrg.xdat.security.XDATUser
<!-- BEGIN ProjectSelector.vm -->
-#set($user=$data.getSession().getAttribute("user"))
#set($create_projects= $data.getSession().getAttribute("userHelper").getAllowedValues("$item.getXSIType()","$item.getXSIType()/project","create"))
#set($projectMap = $data.getSession().getAttribute("userHelper").getCachedItemValuesHash("xnat:projectData","read",false,"xnat:projectData/ID","xnat:projectData/secondary_ID"))
#if($project)
diff --git a/src/main/webapp/xnat-templates/screens/QuickCreateProject.vm b/src/main/webapp/xnat-templates/screens/QuickCreateProject.vm
index 9b7318b7f2e7c0498df5ce10444937d691555aaf..7d856aea45e1baa401e9c6addb8814fe66eb6d1d 100644
--- a/src/main/webapp/xnat-templates/screens/QuickCreateProject.vm
+++ b/src/main/webapp/xnat-templates/screens/QuickCreateProject.vm
@@ -27,7 +27,7 @@
<tr>
<td width="200">Manager</td>
<td width="345" valign="top" >
- <input name="manager" type="text" size="40" value="$data.getSession().getAttribute("user").getEmail()"/></td>
+ <input name="manager" type="text" size="40" value="$user.getEmail()"/></td>
</tr>
<tr>
<td valign="top">Primary Investigator</td>
diff --git a/src/main/webapp/xnat-templates/screens/RequestProjectAccessDenialEmail.vm b/src/main/webapp/xnat-templates/screens/RequestProjectAccessDenialEmail.vm
index b41ebc090700fd9cab9f3e63309faddcabe08f5d..f09b10af84c121f0bfde1facce65e106960118af 100644
--- a/src/main/webapp/xnat-templates/screens/RequestProjectAccessDenialEmail.vm
+++ b/src/main/webapp/xnat-templates/screens/RequestProjectAccessDenialEmail.vm
@@ -5,7 +5,7 @@
<TD><h3>$projectOM.getName() access denied.</h3></TD>
</TR>
<TR><TD>
-We regret to inform you that your request to access the $projectOM.getName() project has been denied. Please consult the project manager for additional details at <A href="mailto:$data.getSession().getAttribute("user").getEmail()">$data.getSession().getAttribute("user").getEmail()</A>.
+We regret to inform you that your request to access the $projectOM.getName() project has been denied. Please consult the project manager for additional details at <A href="mailto:$user.getEmail()">$user.getEmail()</A>.
</TD></TR>
<TR>
<TD><a href="$server/app/template/XDATScreen_report_xnat_projectData.vm/search_element/xnat:projectData/search_field/xnat:projectData.ID/search_value/$projectOM.getId()">Proceed to the site to get started reviewing/using the data.</A></TD>
diff --git a/src/main/webapp/xnat-templates/screens/Scripts.vm b/src/main/webapp/xnat-templates/screens/Scripts.vm
index 9186484e7d5456ffceb3aea20159dbd264e6fdfe..82bb9c3229aca6f33af64b3cba13ebe1bffdc8e1 100644
--- a/src/main/webapp/xnat-templates/screens/Scripts.vm
+++ b/src/main/webapp/xnat-templates/screens/Scripts.vm
@@ -29,7 +29,7 @@
## <div id="tp_fm" style="display:none"></div>
- #if($data.getSession().getAttribute("user").checkRole("Administrator"))
+ #if($turbineUtils.isSiteAdmin($user))
<style type="text/css">
#automation-events-scripts .yui-content > div { padding: 2px; }
diff --git a/src/main/webapp/xnat-templates/screens/Search.vm b/src/main/webapp/xnat-templates/screens/Search.vm
index 44765a5257a391c959e6eb8f4b3f5af5eb96b0de..9f38970f37396bc9fcecbacbd88acb3119f2c194 100644
--- a/src/main/webapp/xnat-templates/screens/Search.vm
+++ b/src/main/webapp/xnat-templates/screens/Search.vm
@@ -28,7 +28,7 @@
<script type="text/javascript">
var server = "$content.getURI("images")/";
- var user_email = "$data.getSession().getAttribute("user").getEmail()";
+ var user_email = "$user.getEmail()";
//build element_array
window.lTV = new LeftBarTreeView({ treeview: "l_tv", module: "search_tab_module", tabs: "search_tabs" });
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_MyXNAT.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_MyXNAT.vm
index 602ea05d96125f5960b52c8832597ba8e1fe6bb6..de26211d6b925ddd133caedf2950d7e908b99736 100644
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_MyXNAT.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_MyXNAT.vm
@@ -4,7 +4,7 @@ $page.setTitle("My XNAT")
<DIV class="error">$data.message</DIV><br>
#end
-#if($data.getSession().getAttribute("user").getUsername()!="guest")
+#if(!$turbineUtils.isGuest($user))
#parse("screens/XDATScreen_change_email.vm")
<br /><br />
#parse("screens/XDATScreen_password.vm")
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_UpdateUser.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_UpdateUser.vm
index dc438dc4fd5b765f6bbddfaf8333c93b32f2d848..5695593525abb2d1f9a6120f469acefe0420e79e 100644
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_UpdateUser.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_UpdateUser.vm
@@ -7,7 +7,7 @@ $page.setTitle("My XNAT")
<DIV class="error">$data.message</DIV><br>
#end
-#if($data.getSession().getAttribute("user").getUsername()!="guest")
+#if(!$turbineUtils.isGuest($user))
#if (!$expired && !$forgot)
#parse("screens/XDATScreen_change_email.vm")
<br /><br />
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_emailSpecifications.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_emailSpecifications.vm
index fe9f75cf612ca4e2c0fd0a17f477101696a77432..27ffc35feca4febb4a0a90d129e90457fbbe8a7b 100644
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_emailSpecifications.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_emailSpecifications.vm
@@ -1,4 +1,4 @@
-#if($data.getSession().getAttribute("user").checkRole("Administrator"))
+#if($turbineUtils.isSiteAdmin($user))
<style type="text/css">
#admin-email-configuration td { padding-top: 15px; padding-bottom: 15px; }
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_report_wrk_workflowData.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_report_wrk_workflowData.vm
index 2530af3af679e550f954bcb62c17d444c4c665a0..6abd95b0531816cdec8cdecaa9ab4f4a4316378b 100644
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_report_wrk_workflowData.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_report_wrk_workflowData.vm
@@ -50,7 +50,7 @@ $page.setVlinkColor($ui.vlink)
</TD>
<TD valign="top" align="right">
<!-- actions box -->
- #elementActionsBox($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBox($element $search_field $search_value $user $item)
<script type="text/javascript">
// hack to get rid of the "Edit" link on the "Workflow Details" page
jq('#actionsMenu').find('a[href*="/xdataction/edit/"]').closest('li').remove();
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_investigatorData.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_investigatorData.vm
index 4aeb6f00cbaa16a7ce87442fa459e2458cd35500..16db9be2c5c58cad199f4017167cf06db6761d00 100644
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_investigatorData.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_investigatorData.vm
@@ -55,7 +55,7 @@ $page.setVlinkColor($ui.vlink)
</table>
</TD>
<TD valign="top" align="right">
- #elementActionsBox($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBox($element $search_field $search_value $user $item)
</TD>
</TR>
</TABLE>
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_projectData.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_projectData.vm
index d4619b2682595b19aa599edbffeddb6abad6eb2a..b505d481fee0e5e461fa6db5401e591c5f55af31 100755
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_projectData.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_report_xnat_projectData.vm
@@ -1,7 +1,7 @@
#set($project=$om)
<script language="javascript">
var server = "$content.getURI("images")/";
- var user_email = "$data.getSession().getAttribute("user").getEmail()";
+ var user_email = "$user.getEmail()";
</script>
#set($subject_count=$project.getSubjectCount())
#if($om.getStudyprotocol().size() >= 1)
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_search_wizard2.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_search_wizard2.vm
index 846f82837673e886f77b6b1d45ba8eb8e9483e2d..1ae137f8ad0d21c84e60ac31dc484c47a792263e 100644
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_search_wizard2.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_search_wizard2.vm
@@ -1,7 +1,5 @@
+#* @vtlvariable name="user" type="org.nrg.xft.security.UserI" *#
<!-- start: screens/XDATScreen_search_wizard2.vm -->
-
-#set ($user = $data.getSession().getAttribute("user"))
-
#if(!$user || !$ELEMENT_0)
## If $user or $ELEMENT_O is null, display a message explaining that the search data has expired.
## Fixes XNAT-2195
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_validate.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_validate.vm
index 012e7798115e55a4b7213a1b617489f107730d69..8313956efa363063714f181f339d1408eb8a9d03 100644
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_validate.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_validate.vm
@@ -13,7 +13,7 @@
</TR>
<TR>
<TD align="left">User: </TD>
- <TD align="left">$data.getSession().getAttribute("user").getLastname(), $data.getSession().getAttribute("user").getFirstname() </TD>
+ <TD align="left">$user.getLastname(), $user.getFirstname() </TD>
</TR>
<TR>
<TD align="left">Status :</TD>
diff --git a/src/main/webapp/xnat-templates/screens/pages/hello.vm b/src/main/webapp/xnat-templates/screens/pages/hello.vm
new file mode 100644
index 0000000000000000000000000000000000000000..be45d32347447fdfdc9f7cfd3d87655fc30d5afa
--- /dev/null
+++ b/src/main/webapp/xnat-templates/screens/pages/hello.vm
@@ -0,0 +1 @@
+<h1>Hello.</h1>
\ No newline at end of file
diff --git a/src/main/webapp/xnat-templates/screens/project/widgets/project_actions_box.vm b/src/main/webapp/xnat-templates/screens/project/widgets/project_actions_box.vm
index f87c61c05e6b0137faa3d5c06d055ded39a3eb5b..df3d6f4820db96dea9e75d99027e6d71c538f099 100644
--- a/src/main/webapp/xnat-templates/screens/project/widgets/project_actions_box.vm
+++ b/src/main/webapp/xnat-templates/screens/project/widgets/project_actions_box.vm
@@ -7,7 +7,7 @@
</li>
</ul>
<ul>
- #if($data.getSession().getAttribute("user").canEdit("xnat:subjectData/project",$project.getId()))
+ #if($turbineUtils.canEdit($user, "xnat:subjectData/project", $project.getId()))
<li class="yuimenuitem">
<a class="yuimenuitemlabel" href="#insertbox">Add</a>
<DIV ID="insertbox" class="yuimenu">
diff --git a/src/main/webapp/xnat-templates/screens/topBar/Administer.vm b/src/main/webapp/xnat-templates/screens/topBar/Administer.vm
index 86751a047cf2175513e13fa86648a5d1f72c374a..f7576e0cd0c9c85984f781a98792d7768c85b363 100644
--- a/src/main/webapp/xnat-templates/screens/topBar/Administer.vm
+++ b/src/main/webapp/xnat-templates/screens/topBar/Administer.vm
@@ -1,5 +1,5 @@
<!-- Sequence: 40 -->
-#if($data.getSession().getAttribute("user").checkRole("Administrator"))
+#if($turbineUtils.isSiteAdmin($user))
<li><a href="#adminbox">Administer</a>
<ul>
diff --git a/src/main/webapp/xnat-templates/screens/topBar/New/Default.vm b/src/main/webapp/xnat-templates/screens/topBar/New/Default.vm
index 24350a4b518e0399d3b03de86337498c2295f138..26ee8c3e88c9cf7a747a77c8faaabbd9457e655e 100644
--- a/src/main/webapp/xnat-templates/screens/topBar/New/Default.vm
+++ b/src/main/webapp/xnat-templates/screens/topBar/New/Default.vm
@@ -3,9 +3,7 @@
#* @vtlvariable name="data" type="org.apache.turbine.util.RunData" *#
#* @vtlvariable name="link" type="org.apache.turbine.services.pull.tools.TemplateLink" *#
#* @vtlvariable name="displayManager" type="org.nrg.xdat.display.DisplayManager" *#
-#* @vtlvariable name="user" type="org.nrg.xdat.security.XDATUser" *#
#* @vtlvariable name="project" type="org.nrg.xdat.om.XnatProjectdata" *#
-#set($user = $data.getSession().getAttribute("user"))
<!-- Sequence: 10 -->
#if($siteConfig.getProperty("UI.allow-non-admin-project-creation","true").equals("true") || $data.getSession().getAttribute("userHelper").canCreate("xnat:subjectData"))
<li><a href="$link.setPage("XDATScreen_add_xnat_projectData.vm")">$displayManager.getSingularDisplayNameForProject()</a></li>
diff --git a/src/main/webapp/xnat-templates/screens/workflow_alert.vm b/src/main/webapp/xnat-templates/screens/workflow_alert.vm
index 6305c4b2263f082907c4b22b404d397fcdc996fb..dd76edf70ffd2c452b40664a661542fa1b4eb199 100644
--- a/src/main/webapp/xnat-templates/screens/workflow_alert.vm
+++ b/src/main/webapp/xnat-templates/screens/workflow_alert.vm
@@ -13,7 +13,7 @@
<td valign="middle"><b>$workflow.getOnlyPipelineName():</b>
</td><td valign="middle">$!workflow.getStatus()</td><td valign="middle">$!workflow.getPercentagecomplete()</td>
<td valign="middle">Start Time: $!workflow.getLaunchTime()</td>
- #if($data.getSession().getAttribute("user").checkRole("Administrator"))
+ #if($turbineUtils.isSiteAdmin($user))
<td valign="middle">
<a onclick="dismissNotification('$workflow.getWorkflowId()', 'Failed')">[Mark as Failed]</a>
</td>
@@ -52,7 +52,7 @@
<td valign="middle"><b>$workflow.getOnlyPipelineName():</b>
</td><td valign="middle">$!workflow.getStatus()</td><td valign="middle">$!workflow.getPercentagecomplete()</td>
<td valign="middle">Start Time: $!workflow.getLaunchTime()</td>
- #if($data.getSession().getAttribute("user").checkRole("Administrator"))
+ #if($turbineUtils.isSiteAdmin($user))
<td valign="middle">
<a onclick="dismissNotification('$workflow.getWorkflowId()', 'Failed (Dismissed)')">[Dismiss]</a>
</td>
diff --git a/src/main/webapp/xnat-templates/screens/xnat_experimentData/actions.vm b/src/main/webapp/xnat-templates/screens/xnat_experimentData/actions.vm
index 677df52a89f4276bf3418e69b407d732cf73b918..9bec83ee956a82345a08dd35a09e73bd1ac7af2b 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_experimentData/actions.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_experimentData/actions.vm
@@ -1,7 +1,14 @@
+#* @vtlvariable name="data" type="org.apache.turbine.util.RunData" *#
+#* @vtlvariable name="turbineUtils" type="org.nrg.xdat.turbine.utils.TurbineUtils" *#
+#* @vtlvariable name="page" type="org.apache.turbine.util.template.HtmlPageAttributes" *#
+#* @vtlvariable name="last_login" type="java.util.Date" *#
+#* @vtlvariable name="user" type="org.nrg.xft.security.UserI" *#
+#* @vtlvariable name="ui" type="org.apache.turbine.services.pull.util.UIManager" *#
+#* @vtlvariable name="link" type="org.apache.turbine.services.pull.tools.TemplateLink" *#
<script type="text/javascript" src="$content.getURI("scripts/BasePopup.js")"></script>
<script type="text/javascript" src="$content.getURI("scripts/FileViewer.js")"></script>
- #elementActionsBoxNoEnd($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBoxNoEnd($element $search_field $search_value $user $item)
#addCustomScreens("$element" "actionsBox")
@@ -59,12 +66,12 @@
obj.objectId = "$!om.getId()";
obj.objectType = "experiment";
- #if ($item.canEdit($data.getSession().getAttribute("user")))
+ #if ($turbineUtils.canEdit($user, $item))
obj.canEdit = true;
#else
obj.canEdit = false;
#end
- #if ($item.canDelete($data.getSession().getAttribute("user")))
+ #if ($turbineUtils.canDelete($user, $item))
obj.canDelete = true;
#else
obj.canDelete = false;
diff --git a/src/main/webapp/xnat-templates/screens/xnat_imageAssessorData/actions.vm b/src/main/webapp/xnat-templates/screens/xnat_imageAssessorData/actions.vm
index d6c7e586bc7b92c765d1670c01d80cedb9480cb3..c6471c78f26c25e3d8096b5c0e84059250fdd840 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_imageAssessorData/actions.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_imageAssessorData/actions.vm
@@ -1,4 +1,4 @@
- #elementActionsBoxNoEnd($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBoxNoEnd($element $search_field $search_value $user $item)
#addCustomScreens("$element" "actionsBox")
</DIV>
diff --git a/src/main/webapp/xnat-templates/screens/xnat_imageAssessorData/report.vm b/src/main/webapp/xnat-templates/screens/xnat_imageAssessorData/report.vm
index 091dd6599365763c85f0d13794c4270648d88b8a..7c4ac03efd1bb6884581ee6452f200820f0d21b2 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_imageAssessorData/report.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_imageAssessorData/report.vm
@@ -110,12 +110,12 @@ obj.categories={};
obj.categories.ids=[];
#if($item.isActive() || $item.isQuarantine())
- #if ($item.canEdit($data.getSession().getAttribute("user")))
+ #if ($turbineUtils.canEdit($user, $item))
obj.canEdit=true;
#else
obj.canEdit=false;
#end
- #if ($item.canDelete($data.getSession().getAttribute("user")))
+ #if ($turbineUtils.canDelete($user, $item))
obj.canDelete=true;
#else
obj.canDelete=false;
diff --git a/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/actions.vm b/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/actions.vm
index f2340493e579ed5aa5640e6fd08e1ada3c6c5df1..45385196c8b3ef96869f70aaa8b884773fac30f3 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/actions.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/actions.vm
@@ -1,5 +1,5 @@
- #elementActionsBoxNoEnd($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+ #elementActionsBoxNoEnd($element $search_field $search_value $user $item)
#addCustomScreens("$element" "actionsBox")
#parse($turbineUtils.getTemplateName("actionsBoxAddons","$om.getXSIType()",$!project))
</ul>
diff --git a/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/edit/edit.vm b/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/edit/edit.vm
index a116f64cfaf074ecfcf7f06572a372ac11c6aa25..f22d6b4cd477be4cf7350579ab7665e98f9e4d12 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/edit/edit.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/edit/edit.vm
@@ -12,7 +12,7 @@
obj.categories={};
obj.categories.ids=[];
obj.canEdit=true;
- #if (!$!item.hasPK() || $item.canDelete($data.getSession().getAttribute("user")))
+ #if (!$!item.hasPK() || $turbineUtils.canDelete($user, $item))
obj.canDelete = true;
#else
obj.canDelete = false;
@@ -40,12 +40,6 @@
window.currentLabel = "$!om.getLabel()";
</script>
-#if($user)
-
-#else
- #set($user=$data.getSession().getAttribute("user"))
-#end
-
<style>
/* custom styles for inline instances */
.yui-skin-sam .yui-ac-input { position: static; width: 20em; vertical-align: middle; }
diff --git a/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/xnat_imageSessionData_report.vm b/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/xnat_imageSessionData_report.vm
index b0f6c8ccb1b2e75cabafa7ff39a5d8bf4466b3a0..b9f4d1829ad7c9f762f6fc2092c73b28f7ee4d6d 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/xnat_imageSessionData_report.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_imageSessionData/xnat_imageSessionData_report.vm
@@ -162,12 +162,12 @@
obj.categories.ids=[];
#if($item.isActive() || $item.isQuarantine())
- #if ($item.canEdit($data.getSession().getAttribute("user")))
+ #if ($turbineUtils.canEdit($user, $item))
obj.canEdit=true;
#else
obj.canEdit=false;
#end
- #if ($item.canDelete($data.getSession().getAttribute("user")))
+ #if ($turbineUtils.canDelete($user, $item))
obj.canDelete=true;
#else
obj.canDelete=false;
diff --git a/src/main/webapp/xnat-templates/screens/xnat_mrSessionData_search.vm b/src/main/webapp/xnat-templates/screens/xnat_mrSessionData_search.vm
index 0a4462aa26dbbbe6f885fd8f3e133cfdb8eb65f8..04d18ab4a8659b7178feec14beb0c659f3c9f077 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_mrSessionData_search.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_mrSessionData_search.vm
@@ -57,7 +57,6 @@
<!-- session fields -->
<h4>$displayManager.getSingularDisplayNameForImageSession() Fields</h4>
- #set($user=$data.getSession().getAttribute("user"))
<div class="search-item">
<h5>$displayManager.getSingularDisplayNameForImageSession() ID:</h5>
diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/actionsBox/ManageFiles.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/actionsBox/ManageFiles.vm
index 89856bc51f0c326573d1dc589f6f4a1daeb8f8b4..3bc74200b3c5fe92756aa1a987d42893d6765a0e 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_projectData/actionsBox/ManageFiles.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/actionsBox/ManageFiles.vm
@@ -18,12 +18,12 @@
obj.objectId = "$!om.getId()";
obj.objectType = "project";
- #if ($item.canEdit($data.getSession().getAttribute("user")))
+ #if ($turbineUtils.canEdit($user, $item))
obj.canEdit=true;
#else
obj.canEdit=false;
#end
- #if ($item.canDelete($data.getSession().getAttribute("user")))
+ #if ($turbineUtils.canDelete($user, $item))
obj.canDelete=true;
#else
obj.canDelete=false;
diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_management.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_management.vm
index bd4ee7ea4257aabc8e68e4332ac2a8bfe3fc5b9f..7e8f2d915464d6a3f9c8a51be56ae5417f9812ad 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_management.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_summary_management.vm
@@ -3,7 +3,7 @@
#* @vtlvariable name="turbineUtils" type="org.nrg.xdat.turbine.utils.TurbineUtils" *#
#* @vtlvariable name="content" type="org.apache.turbine.services.pull.tools.ContentTool" *#
#set($showUserList = !$turbineUtils.toBoolean($siteConfig.getProperty(
- "restrictUserListAccessToAdmins", "true")) || $data.getSession().getAttribute("user").checkRole("Administrator"))
+ "restrictUserListAccessToAdmins", "true")) || $turbineUtils.isSiteAdmin($user))
<script type="text/javascript" src="$content.getURI("scripts/project/userMgmt.js")"></script>
<table class="mgmt_container">
diff --git a/src/main/webapp/xnat-templates/screens/xnat_qcManualAssessorData/edit.vm b/src/main/webapp/xnat-templates/screens/xnat_qcManualAssessorData/edit.vm
index 131cf36c32250d064cb20a0f858cf8df37b4a656..27125b6c17c6410b83ff9f49bcf84072e10d0747 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_qcManualAssessorData/edit.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_qcManualAssessorData/edit.vm
@@ -66,7 +66,7 @@ $page.setVlinkColor($ui.vlink)
<td>
<div id="project_placeholder">$!om.getProjectDisplayID()</div>
</td>
- #if($!om.getPass() && $data.getSession().getAttribute("user").canDelete($om.getItem()))
+ #if($!om.getPass() && $turbineUtils.canDelete($user, $om.getItem()))
<td>
<a onclick="modifyProject();"><img border="0" src="$content.getURI("images/e.gif")"/></a>
<input type="hidden" id="$om.getXSIType()/project" name="$om.getXSIType()/project" value="$!om.getProject()"/>
diff --git a/src/main/webapp/xnat-templates/screens/xnat_subjectData/actions.vm b/src/main/webapp/xnat-templates/screens/xnat_subjectData/actions.vm
index 5b16f13d2191e530f36225d76262995010e8c638..9082e3aa3cf01b4f2ccd007fd0e4bb37d839f1de 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_subjectData/actions.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_subjectData/actions.vm
@@ -1,4 +1,4 @@
-#elementActionsBoxNoEnd($element $search_field $search_value $data.getSession().getAttribute("user") $item)
+#elementActionsBoxNoEnd($element $search_field $search_value $user $item)
#addCustomScreens("$element" "actionsBox")
#parse($turbineUtils.getTemplateName("actionsBoxAddons","xnat:subjectData",$!project))
diff --git a/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_ProjectSelector.vm b/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_ProjectSelector.vm
index d65dab2410bdf192741996e6006f020e134e1abe..db3787105f09c0c58cb8395dfe9a1dbec35ea6c6 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_ProjectSelector.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_ProjectSelector.vm
@@ -1,6 +1,4 @@
-##REQUIRES $item=org.nrg.xft.XFTItem $user=org.nrg.xdat.security.XDATUser
<!-- BEGIN ProjectSelector.vm -->
-#set($user=$data.getSession().getAttribute("user"))
#set($create_projects= $data.getSession().getAttribute("userHelper").getAllowedValues("$item.getXSIType()","$item.getXSIType()/project","create"))
#set($projectMap = $data.getSession().getAttribute("userHelper").getCachedItemValuesHash("xnat:projectData","read",false,"xnat:projectData/ID","xnat:projectData/secondary_ID"))
#if($project)
diff --git a/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_resources.vm b/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_resources.vm
index feb7ac33ed7016914fc7a117f49e12cd055ac446..cd9994e0d12a51c3d7fa9555f93df592fa6e2159 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_resources.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_resources.vm
@@ -20,16 +20,17 @@
obj.objectId = "$!om.getId()";
obj.objectType = "subject";
- #if ($item.canEdit($data.getSession().getAttribute("user")))
- obj.canEdit=true;
- #else
- obj.canEdit=false;
- #end
- #if ($item.canDelete($data.getSession().getAttribute("user")))
- obj.canDelete=true;
- #else
- obj.canDelete=false;
- #end
+ #if ($turbineUtils.canEdit($user, $item))
+ obj.canEdit=true;
+ #else
+ obj.canEdit=false;
+ #end
+ #if ($turbineUtils.canEdit($user, $item))
+ obj.canDelete=true;
+ #else
+ obj.canDelete=false;
+ #end
+
obj.catalogs={};
obj.catalogs.ids=[];
window.viewer=new FileViewer(obj);