Changeset 1443

Timestamp:

Jan 26, 2011, 9:47:40 PM (9 years ago)

Author:

work@…

Message:

• refactored the importer to use the dynamic entities of gdt, instead of the hardcoded entities in Config.groovy
• removed the hardcoded 'importable entities' from Config.groovy
• added xbean.jar which seems to be required for the importer to be able to import xml
• updated gdt to 0.0.5 which is required by the refactored importer

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/conf/Config.groovy (modified) (1 diff)
• grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (6 diffs)
• grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (2 diffs)
• grails-app/views/importer/common/_properties_horizontal.gsp (modified) (2 diffs)
• grails-app/views/importer/pages/_page_one.gsp (modified) (2 diffs)
• lib/xbean.jar (added)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Wed Jan 26 11:14:11 CET 2011
+#Wed Jan 26 21:41:18 CET 2011
 app.build.display.info=0
 app.build.svn.revision=1079
@@ -13 +13 @@
 plugins.db-util=0.4
 plugins.famfamfam=1.0.1
-plugins.gdt=0.0.4
+plugins.gdt=0.0.5
 plugins.grom=0.2.2
 plugins.hibernate=1.3.6

trunk/grails-app/conf/Config.groovy

@@ -94 +94 @@
 }
 
-// cryptography settings
-// @see WizardTaglib.groovy (encrypt)
-// @see TemplateEditorController.groovy (decrypt)
-crypto {
-        shared.secret = RandomStringUtils.random(32, true, true)
-}
-
-// GSCF specific configuration
-gscf {
-        domain = [
-                // importable entities
-                // use: grailsApplication.config.gscf.domain.entities
-                entities: [
-                        // dbnp.data
-                        'dbnp.data.FeatureBase',
-                        'dbnp.data.FeatureType',
-                        'dbnp.data.Ontology',
-                        'dbnp.data.Term',
-
-                        // dbnp.studycapturing
-                        'dbnp.studycapturing.Assay',
-                        'dbnp.studycapturing.AssayModule',
-                        'dbnp.studycapturing.AssayType',
-                        'dbnp.studycapturing.Compound',
-                        'dbnp.studycapturing.Event',
-                        'dbnp.studycapturing.EventGroup',
-                        'dbnp.studycapturing.Person',
-                        'dbnp.studycapturing.PersonAffilitation',
-                        'dbnp.studycapturing.PersonRole',
-                        'dbnp.studycapturing.Publication',
-                        'dbnp.studycapturing.Sample',
-                        'dbnp.studycapturing.SamplingEvent',
-                        'dbnp.studycapturing.Study',
-                        'dbnp.studycapturing.StudyPerson',
-                        'dbnp.studycapturing.Subject',
-                        'dbnp.studycapturing.Template',
-                        'dbnp.studycapturing.TemplateEntity',
-                        'dbnp.studycapturing.TemplateField',
-                        'dbnp.studycapturing.TemplateFieldListItem',
-                        'dbnp.studycapturing.TemplateFieldType'
-                ],
-
-                // importable entities
-                // use: grailsApplication.config.gscf.domain.importableEntities
-                // @see ImporterController
-                importableEntities: [
-                        event: [name: 'Event', entity: 'dbnp.studycapturing.Event', encrypted:''],
-                        sample: [name: 'Sample', entity: 'dbnp.studycapturing.Sample', encrypted:''],
-                        study: [name: 'Study', entity: 'dbnp.studycapturing.Study', encrypted:''],
-                        subject: [name: 'Subject', entity: 'dbnp.studycapturing.Subject', encrypted:''],
-                        samplingevent: [name: 'SamplingEvent', entity: 'dbnp.studycapturing.SamplingEvent', encrypted:'']
-
-                ]
-        ]
-}
-
 // jquery plugin
 grails.views.javascript.library = "jquery"

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -5 +5 @@
 import org.apache.poi.ss.usermodel.Workbook
 import grails.converters.JSON
-import cr.co.arquetipos.crypto.Blowfish
+//import cr.co.arquetipos.crypto.Blowfish
 import org.codehaus.groovy.grails.plugins.web.taglib.ValidationTagLib
 import grails.plugins.springsecurity.Secured
@@ -32 +32 @@
         def ImporterService
         def validationTagLib = new ValidationTagLib()
+        def GdtService
 
         /**
@@ -40 +41 @@
                 // Grom a development message
                 if (pluginManager.getGrailsPlugin('grom')) "redirecting into the webflow".grom()
-
-                // TODO --> move this logic to the application Bootstrapping as this
-                //                      does not need to run every time the importer is started
-                //
-                // encrypt the importable entities
-                grailsApplication.config.gscf.domain.importableEntities.each {
-                        it.value.encrypted =
-                                URLEncoder.encode(Blowfish.encryptBase64(
-                                        it.value.entity.toString().replaceAll(/^class /, ''),
-                                        grailsApplication.config.crypto.shared.secret
-                                ))
-                }
 
                 /**
@@ -120 +109 @@
                                 flow.page = 1
                                 flow.studies = Study.findAllWhere(owner: authenticationService.getLoggedInUser())
-                                flow.importer_importableentities = grailsApplication.config.gscf.domain.importableEntities
+                                flow.importer_importableentities = GdtService.getTemplateEntities()
 
                                 success()
@@ -298 +287 @@
          */
         def ajaxGetTemplatesByEntity = {
-                def entityName = Blowfish.decryptBase64(
-                        URLDecoder.decode(params.entity),
-                        grailsApplication.config.crypto.shared.secret
-                )
-
-                //def entityClass = grailsApplication.config.gscf.domain.importableEntities.get(params.entity).entity
-                def entityClass = entityName
-
                 // fetch all templates for a specific entity
-                def templates = Template.findAllByEntity(Class.forName(entityClass, true, this.getClass().getClassLoader()))
+                def templates = Template.findAllByEntity(GdtService.getInstanceByEntity(params.entity.decodeURL()))
+
 
                 // render as JSON
@@ -330 +312 @@
                         def selectedentities = []
 
-                        def entityName = Blowfish.decryptBase64(
-                                URLDecoder.decode(params.entity),
-                                grailsApplication.config.crypto.shared.secret
-                        )
-
-                        def entityClass = Class.forName(entityName, true, this.getClass().getClassLoader())
+                        def entityName = GdtService.decryptEntity(params.entity.decodeURL())
+                        def entityClass = GdtService.getInstanceByEntityName(entityName)
 
                         // Initialize some session variables

trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy

@@ -24 +24 @@
         static namespace = 'importer'
         def ImporterService
+        def GdtService
 
         /**
@@ -168 +169 @@
                 def res = "<select style=\"font-size:10px\" name=\"${name}.index.${custval}\">"
 
-                grailsApplication.config.gscf.domain.importableEntities.each { e ->
-                        res += "<option value=\"${e.value.name}\""
-                        res += (e.value.type == sel) ? " selected" : ""
-                        res += ">${e.value.name}</option>"
+                GdtService.getTemplateEntities().each { e ->
+                        res += "<option value\"${e.name}\""
+                        res += ">${e.name} bla</option>"
                 }
 

trunk/grails-app/views/importer/common/_properties_horizontal.gsp

@@ -32 +32 @@
     <table>
           <g:each var="stdentity" in ="${importer_importableentities}">
-              <% if (importer_selectedentities.any { it.name.toLowerCase() == stdentity.value.entity.toLowerCase() } && stdentity.value.entity!="") { %>
+              <% if (importer_selectedentities.any { it.name.toLowerCase() == stdentity.entity.toLowerCase() } && stdentity.entity!="") { %>
             
-              <tr><td colspan="3"><h4>${stdentity.value.name}</h4></td></tr>
+              <tr><td colspan="3"><h4>${stdentity.name}</h4></td></tr>
                 <tr>
             <td class="header" width="25px"><input id="clearselect" type="button" value="clear" name="clearselect"></td>
             <g:each var="selentity" in="${importer_selectedentities}">
-              <g:if test="${selentity.name.toLowerCase()==stdentity.value.entity.toLowerCase()}">
+              <g:if test="${selentity.name.toLowerCase()==stdentity.entity.toLowerCase()}">
                             <td class="header" width="200px">
                                 <b>${importer_header[selentity.columnindex.toInteger()].name}</b>
@@ -60 +60 @@
                 </g:each>
 
-          <% } %> <!-- end of JSP if-->
-          </g:each>             
+          <% }  %> <!-- end of JSP if-->
+          </g:each>
     </table>

trunk/grails-app/views/importer/pages/_page_one.gsp

@@ +1 @@
+<%@ page import="nl.grails.plugins.gdt.GdtService" %>
 <%
 /**
@@ -65 +66 @@
                 name="entity"
                 id="entity"
-                from="${importer_importableentities}"
-                optionValue="${{it.value.name}}"
-                optionKey="${{it.value.encrypted}}"
+                from="${GdtService.cachedEntities}"
+                optionValue="${{it.name}}"
+                optionKey="${{it.encoded}}"
                 noSelection="['':'-Choose type of data-']"
                 onChange="${remoteFunction( controller: 'importer',