Changeset 1077 for trunk

Timestamp:

Nov 4, 2010, 12:23:20 PM (12 years ago)

Author:

robert@…

Message:

Resolved bugs in adding ontology-template-fields to a template. See also bug #84

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/TemplateEditorController.groovy (modified) (4 diffs)
• grails-app/views/templateEditor/template.gsp (modified) (1 diff)
• web-app/js/ontology-chooser.js (modified) (4 diffs)
• web-app/js/templateEditor.js (modified) (1 diff)

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

@@ -747 +747 @@
                 } catch( Exception e ) {
                         response.status = 500;
-                        render e.getMessage();
+                        render 'Ontology with ID ' + id + ' not found';
                         return;
                 }
@@ -770 +770 @@
 
         /**
-         * Adds a ontolgy based on the ID given
+         * Adds a ontolgy based on the term ID given
          *
          * @param       ncboID
          * @return      JSON    Ontology object
+         * @deprecated  User addOntologyById instead, using the ncboId given by the JSON call
          */
         def addOntologyByTerm = {
@@ -790 +791 @@
                 } catch( Exception e ) {
                         response.status = 500;
-                        render e.getMessage();
+
+                        if( e.getMessage() )
+                                render e.getMessage()
+                        else
+                                render "Unknown error: " + e.getClass()
                         return;
                 }
@@ -811 +816 @@
                 render ontology as JSON
         }
-
 
     /**

trunk/grails-app/views/templateEditor/template.gsp

@@ -22 +22 @@
                 <link rel="stylesheet" href="${createLinkTo(dir: 'css', file: 'templateEditor.css')}" />
                 <g:if env="production">
-                  <script type="text/javascript" src="${resource(dir: 'js', file: 'ontology-chooser.min.js')}"></script>
+                        <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.ui.autocomplete.html.min.js')}"></script>
+                        <script type="text/javascript" src="${resource(dir: 'js', file: 'ontology-chooser.min.js')}"></script>
                 </g:if><g:else>
+                        <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.ui.autocomplete.html.js')}"></script>
                   <script type="text/javascript" src="${resource(dir: 'js', file: 'ontology-chooser.js')}"></script>
                 </g:else>

trunk/web-app/js/ontology-chooser.js

@@ -19 +19 @@
  * we use 'ontology' instead of 'bp_form_complete' to
  * identify ontology fields.
+ *
+ * N.B. In order to show the labels of the terms correctly (i.e.
+ * no ugly HTML tags, you also have to include jquery.ui.autocomplete.html.js
+ * in your page!
  *
  * @author      Jeroen Wesbeek
@@ -145 +149 @@
                 that.setInputValue(element, 'concept_id', ui.item.concept_id);
                 that.setInputValue(element, 'ontology_id', ui.item.ontology_id);
+                that.setInputValue(element, 'ncbo_id', ui.item.ncbo_id);
                 that.setInputValue(element, 'full_id', ui.item.full_id);
 
@@ -165 +170 @@
                     that.setInputValue(element, 'concept_id', '');
                     that.setInputValue(element, 'ontology_id', '');
+                    that.setInputValue(element, 'ncbo_id', '');
                     that.setInputValue(element, 'full_id', '');
 
@@ -218 +224 @@
                 parsed[ parsed.length ] = {
                     value           : cols[0],
-                    label           : cols[0] + ' <span class="about">(' + cols[2] + ')</span> <span class="from">from: ' + cols[ (cols.length-1) ] + '</span>',
+                    label           : cols[0] + ' <span class="about">(' + cols[2] + ')</span> <span class="from">from: ' + cols[ (cols.length-2) ] + '</span>',
                     preferred_name  : cols[0],  // e.g. Mus musculus musculus
                     concept_id      : cols[1],  // e.g. birnlex_161
                     ontology_id     : cols[3],  // e.g. 29684
-                    full_id         : cols[4]   // e.g. http://bioontology.org/projects/ontologies/birnlex#birnlex_161
+                    full_id         : cols[4],  // e.g. http://bioontology.org/projects/ontologies/birnlex#birnlex_161
+                    ncbo_id         : cols[8]   // e.g. 1494
                 }
             }

trunk/web-app/js/templateEditor.js

@@ -626 +626 @@
 
     // Create a URL to call and call it
-        if( $( '#ncboID' ).val() ) {
+        if( $( '#ncboIDText' ).val() ) {
             url = baseUrl + '/templateEditor/addOntologyById';
-                data = 'ncboID=' + $( '#ncboID' ).val();
+                data = 'ncboID=' + $( '#ncboIDText' ).val();
                 $( '#ncbo_spinner' ).show();
         } else {
-            url = baseUrl + '/templateEditor/addOntologyByTerm';
-                data = 'termID=' + $( '#termID' ).val();
+            // url = baseUrl + '/templateEditor/addOntologyByTerm';
+                // data = 'termID=' + $( '#addOntology input[name=termID-ontology_id]' ).val();
+            url = baseUrl + '/templateEditor/addOntologyById';
+                data = 'ncboID=' + $( '#addOntology input[name=termID-ncbo_id]' ).val();
+
                 $( '#term_spinner' ).show();
         }