Changeset 1505

Timestamp:

Feb 8, 2011, 3:53:49 PM (13 years ago)

Author:

t.w.abma@…

Message:

• fuzzy matching and don't import improved in the properties step of the importer wizard, by default properties are not matched against the Excel fields, but one can now manually apply fuzzy matching
• added initial fields to ImportMapping? domain

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• domain/dbnp/importer/ImportMapping.groovy (modified) (1 diff)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (3 diffs)
• views/importer/common/_on_page.gsp (modified) (1 diff)
• views/importer/common/_properties_horizontal.gsp (modified) (2 diffs)

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

@@ -106 +106 @@
                                 flow.page = 1
                                 flow.studies = Study.findAllWhere(owner: authenticationService.getLoggedInUser())
+                flow.importer_fuzzymatching="false"
 
                                 success()
@@ -150 +151 @@
                                 success()
                         }
+            on("refresh") {
+                flow.importer_fuzzymatching="true"
+                                success()
+                        }.to "pageTwo"
+
                         on("next") {
                                 if (propertiesPage(flow, flash, params)) {

trunk/grails-app/domain/dbnp/importer/ImportMapping.groovy

@@ -1 +1 @@
 package dbnp.importer
+import org.dbnp.gdt.*
 
 class ImportMapping implements Serializable {
 
-        static hasMany = [columns: MappingColumn]
-        static String t
+        static hasMany = [columns: MappingColumn]    
+    Template template
+    Class entity
+        String name
+
 
         static constraints = {

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

@@ -94 +94 @@
          * @param matchvalue value which will be looked up via fuzzy matching against the list of options and will be selected
          * @param MappingColumn object containing all required information
+     * @param fuzzymatching boolean true if fuzzy matching should be used, otherwise false
          * @param allfieldtypes boolean true if all templatefields should be listed, otherwise only show filtered templatefields
          * @return chooser object
@@ -103 +104 @@
                 def t = Template.get(attrs['template_id'])
                 def mc = attrs['mappingcolumn']
-                def allfieldtypes = attrs['allfieldtypes']
-                def matchvalue = attrs['matchvalue']
-                def domainfields = mc.entity.giveDomainFields().findAll { it.type == mc.templatefieldtype }
+                def allfieldtypes = attrs['allfieldtypes']              
+        def matchvalue = (attrs['fuzzymatching']=="true") ? attrs['matchvalue'] : ""
+
+        def domainfields = mc.entity.giveDomainFields().findAll { it.type == mc.templatefieldtype }
                 domainfields = domainfields.findAll { it.preferredIdentifier != mc.identifier}
 
@@ -133 +135 @@
         def createPropertySelect(String name, options, matchvalue, Integer columnIndex) {
                 // Determine which field in the options list matches the best with the matchvalue
-                def mostsimilar = ImporterService.mostSimilar(matchvalue, options)
+                def mostsimilar = (matchvalue) ? ImporterService.mostSimilar(matchvalue, options) : ""
 
                 def res = "<select style=\"font-size:10px\" id=\"${name}.index.${columnIndex}\" name=\"${name}.index.${columnIndex}\">"

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

@@ -43 +43 @@
                         return false;
                 });
+
+         $('#fuzzymatchselect').click(function() {
+            refreshFlow()
+          });
+
+          // attach function to clear button to reset all selects to "don't import"
+          $('#clearselect').click(function() {
+            // for each select field on the page
+            $("select").each( function(){
+            // set its value to its first option
+            $(this).val($('option:first', this).val());
+            });
+          });
         }
 

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

@@ -41 +41 @@
 });
 
-$('#clearselect').click(function() {
-
-  // for each select field on the page
-  $("select").each( function(){
-    // set its value to its first option
-    $(this).val($('option:first', this).val());
-  });
-
-});
 
 
 });
 </script>
-<!-- saveproperties action was defined in the form --> 
+<!-- saveproperties action was defined in the form -->
     <table>
           <g:each var="stdentity" in ="${GdtService.cachedEntities}">
@@ -61 +52 @@
               <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>
+            <td class="header" width="25px"><input id="clearselect" type="button" value="Clear" name="clearselect">
+              <input id="fuzzymatchselect" type="button" value="Match" name="fuzzymatchselect">
+            </td>
             <g:each var="selentity" in="${importer_selectedentities}">
               <g:if test="${selentity.name.toLowerCase()==stdentity.entity.toLowerCase()}">
                             <td class="header" width="200px">
                                 <b>${importer_header[selentity.columnindex.toInteger()].name}</b>
-                  <importer:propertyChooser name="columnproperty" mappingcolumn="${importer_header[selentity.columnindex.toInteger()]}" matchvalue="${importer_header[selentity.columnindex.toInteger()].name}" template_id="${importer_template_id}" allfieldtypes="true"/>
+                  <importer:propertyChooser name="columnproperty" mappingcolumn="${importer_header[selentity.columnindex.toInteger()]}" matchvalue="${importer_header[selentity.columnindex.toInteger()].name}" fuzzymatching="${importer_fuzzymatching}" template_id="${importer_template_id}" allfieldtypes="true"/>
                             </td>                                       
               </g:if>