Changeset 1989

Timestamp:

Sep 1, 2011, 4:04:20 PM (12 years ago)

Author:

work@…

Message:

• fixed restcontroller's getAssays method and removed temporary debug lines

File:

• trunk/grails-app/controllers/RestController.groovy (modified) (1 diff)

trunk/grails-app/controllers/RestController.groovy

@@ -443 +443 @@
                                 assayModuleURL = new URL(assay.module.url)
                                 assayModuleInet = InetAddress.getByName(assayModuleURL.getHost())
-                                println "assay module check: ${moduleInet.hostAddress == assayModuleInet.hostAddress}, ${moduleURL.path.replaceAll("/","") == assayModuleURL.path.replaceAll("/","")}, ${assay}"
-                                println "modulePath: ${moduleURL.path}"
-                                println "assayModulePath: ${assayModuleURL.path}"
-
+
+                                // check if
+                                //      1. we've got an assay
+                                //      2. ip address of module matches
+                                //      3. the path part of the module matches
                                 if (
-                                        moduleInet.hostAddress == assayModuleInet.hostAddress &&                                                // match ip addresses
-                                        moduleURL.path.replaceAll("/","") == assayModuleURL.path.replaceAll("/","") &&  // match host path
-                                        assay                                                                                           // got assay?
+                                        assay &&
+                                        moduleInet.hostAddress == assayModuleInet.hostAddress &&
+                                        (
+                                                moduleURL.path.replaceAll(/[^a-zA-Z0-9]/,"") ==
+                                                assayModuleURL.path.replaceAll(/[^a-zA-Z0-9]/,"")
+                                        )
                                 ) {
                                         def map = [assayToken : assay.giveUUID()]