Changeset 1570

Timestamp:

Feb 25, 2011, 5:18:49 PM (9 years ago)

Author:

robert@…

Message:

Small bugfixes of bugs that appeared during deployment of metagenomics module

Location:

trunk/grails-app

Files:

• conf/BaseFilters.groovy (modified) (1 diff)
• controllers/RestController.groovy (modified) (1 diff)
• controllers/dbnp/studycapturing/PublicationController.groovy (modified) (2 diffs)
• views/study/show_assays.gsp (modified) (1 diff)

trunk/grails-app/conf/BaseFilters.groovy

@@ -41 +41 @@
                         afterView = {
                                 def actionDuration = request._timeAfterRequest ? request._timeAfterRequest - request._timeBeforeRequest : 0
-                                def viewDuration = System.currentTimeMillis() - request._timeAfterRequest
+                                def viewDuration = request._timeAfterRequest ? System.currentTimeMillis() - request._timeAfterRequest : 0
                                 log.info("Timer: ${controllerName}(${actionDuration}ms)::${actionName}(${viewDuration}ms)")
                         }

trunk/grails-app/controllers/RestController.groovy

@@ -346 +346 @@
 
                                 assays.each{ assay ->
-                                        if (assay.module.url.equals(params.consumer)) {
+                                        if (assay.module?.url && assay.module.url.equals(params.consumer)) {
                                                 if(assay) {
                                                         def map = [assayToken : assay.giveUUID()]

trunk/grails-app/controllers/dbnp/studycapturing/PublicationController.groovy

@@ -34 +34 @@
         
                 // Check whether the autorsList is not too long. If it is, split it
-                println "authors length: " + publication.authorsList.size()
                 if( publication.authorsList.size() > 255 ) {
                         def postfix = " et al.";
                         def split = publication.authorsList[ 0..255 - postfix.size()].lastIndexOf( ", " );
                         publication.authorsList = publication.authorsList[ 0..split-1] + postfix;
-                        
-                        println "new authors list: " + publication.authorsList.size() + " - " + publication.authorsList
                 }
 
@@ -173 +170 @@
                         
                                 // Check whether the autorsList is not too long. If it is, split it
-                                println "authors length: " + publication.authorsList.size()
                                 if( publication.authorsList.size() > 255 ) {
                                         def postfix = " et al.";
                                         def split = publication.authorsList[ 0..255 - postfix.size()].lastIndexOf( ", " );
                                         publication.authorsList = publication.authorsList[ 0..split-1] + postfix;
-                                        
-                                        println "new authors list: " + publication.authorsList.size() + " - " + publication.authorsList
                                 }
                         

trunk/grails-app/views/study/show_assays.gsp

@@ -29 +29 @@
                         <td>${assay.token}</td>
                   <td>${assay.name}</td>
-                  <td>${assay.module.name}</td>
-                  <td>${assay.module.platform}</td>
+                  <td>${assay.module?.name}</td>
+                  <td>${assay.module?.platform}</td>
                   <td>
                         <g:if test="${assay.module.openInFrame == null || assay.module.openInFrame == Boolean.TRUE}">