Przeglądaj źródła

Added conditions for subject and experiment.
If no ID is set, then the label is used now in the resource uri.

Daniel Knorr 11 lat temu
rodzic
commit
d025b5acab

+ 4 - 0
Libs/XNAT/Core/ctkXnatExperiment.cpp

@@ -67,6 +67,10 @@ ctkXnatExperiment::~ctkXnatExperiment()
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 QString ctkXnatExperiment::resourceUri() const
 QString ctkXnatExperiment::resourceUri() const
 {
 {
+  if (this->id().isEmpty())
+  {
+    return QString("%1/experiments/%2").arg(parent()->resourceUri(), this->label());
+  }
   return QString("%1/experiments/%2").arg(parent()->resourceUri(), this->id());
   return QString("%1/experiments/%2").arg(parent()->resourceUri(), this->id());
 }
 }
 
 

+ 4 - 0
Libs/XNAT/Core/ctkXnatSubject.cpp

@@ -124,6 +124,10 @@ void ctkXnatSubject::setInsertUser(const QString& insertUser)
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 QString ctkXnatSubject::resourceUri() const
 QString ctkXnatSubject::resourceUri() const
 {
 {
+  if (this->id().isEmpty())
+  {
+    return QString("%1/subjects/%2").arg(parent()->resourceUri(), this->label());
+  }
   return QString("%1/subjects/%2").arg(parent()->resourceUri(), this->id());
   return QString("%1/subjects/%2").arg(parent()->resourceUri(), this->id());
 }
 }