Changeset 608 for trunk/src

Timestamp:

Jun 25, 2010, 10:27:01 AM (13 years ago)

Author:

jahn

Message:

Added methods supplying SAM urls.

File:

• trunk/src/groovy/dbnp/rest/CommunicationManager.groovy (modified) (7 diffs)

trunk/src/groovy/dbnp/rest/CommunicationManager.groovy

@@ -10 +10 @@
 import dbnp.data.CleanDataLayer
 import dbnp.studycapturing.Study 
+import dbnp.studycapturing.Assay
 
 
@@ -32 +33 @@
      *  rest resources that this communication manager connects to.
      */ 
-    def static ServerURL = "http://nbx5.nugo.org:8182/ClinicalChemistry/rest";
-    //def static ServerURL = "http://localhost:8080/gscf/rest";
+
+    def static ServerURL = "http://localhost:8182/ClinicalChemistry"
+    //def static ServerURL = "http://nbx5.nugo.org:8182/ClinicalChemistry"
+    def static RestServerURL = ServerURL + "/rest"
 
 
     /* Methods implemented for CleanDataLayer */
+
+
 
 
@@ -45 +50 @@
      */
     public String[] getFeaturesQuantitative(long assayID) {
-         return new String [20];
+         return new String [20]
     }
    
@@ -58 +63 @@
      */
     public Map getDataQuantitative(String feature, long assayID, String[] sampleIDs) {
-         return new HashMap(); 
+         return new HashMap() 
     }
 
@@ -104 +109 @@
      */
     public Object getMeasurementsResource( String keyword ) {
-        def url = new URL( ServerURL + "/" + getSearchable(keyword) )
+        def url = new URL( RestServerURL + "/" + getSearchable(keyword) )
         return  JSON.parse( url.newReader() )
     }
@@ -117 +122 @@
      */
     private Object request( String resource ) { 
-        def url = new URL( ServerURL + "/" + resource );
-        return  JSON.parse( url.newReader() );
+        def url = new URL( RestServerURL + "/" + resource )
+        return  JSON.parse( url.newReader() )
     }
 
@@ -138 +143 @@
 
 
+    /**
+     * Get the URL for importing an assay within the GSCF. 
+     * This is not a REST method! It only creates a rest resource and returns it's url.
+     *
+     * @params assay 
+     * @return list of ClinicalFloatData
+     */
+    public Object getAssayImportURL( assay ) {
+        return new URL( ServerURL + '/importer/test?externalAssayID=' + assay.externalAssayID )
+    }
 
 
 
 
-    /*  To Do for querying
-    public void getMeasurementsForValueResource() {
+    /* Methods for acessing URLs in SAM */
+
+
+    /**
+     * Get the URL for importing an assay within the GSCF. 
+     * This is not a REST method! It only creates a rest resource and returns it's url.
+     *
+     * @params assay 
+     * @return URL 
+     */
+    public Object getAssayShowURL( assay ) {
+        return new URL( ServerURL + '/simpleAssay/show/assay?externalAssayID=' + assay.externalAssayID )
     }
 
 
-    public void getMeasurementsForRangeResource() {
+    /**
+     * Get the URL for importing an assay within the GSCF. 
+     * This is not a REST method! It only creates a rest resource and returns it's url.
+     *
+     * @params assay 
+     * @return URL 
+     */
+    public Object getAssayEditURL( assay ) {
+        return new URL( ServerURL + '/simpleAssay/edit/assay?externalAssayID=' + assay.externalAssayID )
     }
 
 
-    public void getDataSimple() {
+    /**
+     * Get the URL for importing an assay within the GSCF. 
+     * This is not a REST method! It only creates a rest resource and returns it's url.
+     *
+     * @params URL 
+     * @return list of ClinicalFloatData
+     */
+    public Object getMeasurementTypesURL() {
+        return new URL( ServerURL + '/simpleAssayMeasurementType/list/nil?externalAssayID=' + assay.externalAssayID )
     }
-    */
-
-
-