Changeset 1141 for trunk

Timestamp:

Nov 15, 2010, 11:10:37 PM (11 years ago)

Author:

t.w.abma@…

Message:

• added fuzzy matching to importer tag library

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (1 diff)
• services/dbnp/importer/ImporterService.groovy (modified) (1 diff)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (5 diffs)
• views/importer/common/_properties_horizontal.gsp (modified) (1 diff)

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

@@ -111 +111 @@
 
             def templates = Template.get(session.importer_template_id)
-        
+
             render(view:"step2_simple", model:[entities: selectedentities,
                                         header:session.importer_header,

trunk/grails-app/services/dbnp/importer/ImporterService.groovy

@@ -538 +538 @@
     }
 
-    static def stringSimilarity (l_str, r_str, degree=2) {
+    static def stringSimilarity (l_str, r_str, degree=2) {        
         similarity(l_str.toLowerCase().toCharArray(),
             r_str.toLowerCase().toCharArray(),

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

@@ -22 +22 @@
 class ImporterTagLib {
     static namespace = 'importer'
+    def ImporterService
 
     /**
@@ -100 +101 @@
      * @param name name for the property chooser element
      * @param importtemplate_id template identifier where fields are retrieved from
+     * @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 allfieldtypes boolean true if all templatefields should be listed, otherwise only show filtered templatefields
@@ -111 +113 @@
         def mc = attrs['mappingcolumn']
         def allfieldtypes = attrs['allfieldtypes']
+        def matchvalue = attrs['matchvalue']
         def domainfields = mc.entity.giveDomainFields().findAll { it.type == mc.templatefieldtype }
             domainfields = domainfields.findAll { it.preferredIdentifier != mc.identifier}
@@ -122 +125 @@
         def prefcolumn = mc.entity.giveDomainFields().findAll { it.preferredIdentifier == true }
 
-        (mc.identifier) ? out << createPropertySelect(attrs['name'], prefcolumn, mc.index) :
-            out << createPropertySelect(attrs['name'], templatefields, mc.index)
+        (mc.identifier) ? out << createPropertySelect(attrs['name'], prefcolumn, matchvalue, mc.index) :
+            out << createPropertySelect(attrs['name'], templatefields, matchvalue, mc.index)
     }
 
@@ -131 +134 @@
      * @param name name of the HTML select object
      * @param options list of options (fields) to be used
+     * @param matchvalue value which will be looked up via fuzzy matching against the list of options and will be selected
      * @param columnIndex column identifier (corresponding to position in header of the Excel sheet)
      * @return HTML select object
      */
-    def createPropertySelect(String name, options, Integer columnIndex)
-    {   
+    def createPropertySelect(String name, options, matchvalue, Integer columnIndex)
+    {
+        //String.metaClass.mostSimilarTo = { ImporterService.mostSimilar(delegate, it) }
+        //println "mostsimilar="+ImporterService.mostSimilar(matchvalue, options)
+
         def res = "<select style=\"font-size:10px\" name=\"${name}.index.${columnIndex}\">"
 

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

@@ -24 +24 @@
                             <td class="header" width="200px">
                                 <b>${header[selentity.columnindex.toInteger()].name}</b>
-                                <importer:propertyChooser name="columnproperty" mappingcolumn="${header[selentity.columnindex.toInteger()]}" allfieldtypes="${allfieldtypes}"/>
+                                <importer:propertyChooser name="columnproperty" mappingcolumn="${header[selentity.columnindex.toInteger()]}" matchvalue="test" "allfieldtypes="${allfieldtypes}"/>
                             </td>                                       
                     </g:if>