Changeset 1552

Timestamp:

Feb 23, 2011, 1:25:46 PM (12 years ago)

Author:

t.w.abma@…

Message:

• duplicate fuzzymatched properties fixed, when a fuzzy match has been used for a property, the next properties having the same fuzzy match will be put on "don't import"

Location:

trunk/grails-app

Files:

• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (2 diffs)
• views/importer/common/_properties_horizontal.gsp (modified) (2 diffs)

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

@@ -111 +111 @@
         def selected = (attrs['selected']) ? attrs['selected'] : ""
                 def fuzzyTreshold = attrs[ 'treshold' ] && attrs[ 'treshold' ].toString().isNumber() ? Float.valueOf( attrs[ 'treshold' ] ) : 0.1;
-
+        def returnmatchonly = attrs['returnmatchonly']
+        
         def domainfields = mc.entityclass.giveDomainFields().findAll { it.type == mc.templatefieldtype }
                 domainfields = domainfields.findAll { it.preferredIdentifier != mc.identifier}
@@ -126 +127 @@
                 /*(mc.identifier) ? out << createPropertySelect(attrs['name'], prefcolumn, matchvalue, mc.index) :
                         out << createPropertySelect(attrs['name'], templatefields, matchvalue, mc.index)*/
-                
-         out << createPropertySelect(attrs['name'], templatefields, matchvalue, selected, mc.index, fuzzyTreshold)
+
+        //  Just return the matched value only
+        if (returnmatchonly)
+            out << ImporterService.mostSimilar(matchvalue, templatefields, fuzzyTreshold)
+        else // Return a selectbox
+            out << createPropertySelect(attrs['name'], templatefields, matchvalue, selected, mc.index, fuzzyTreshold)
+
         }
 

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

@@ -36 +36 @@
                 <g:select name="importmapping_id" from="${importer_importmappings}" noSelection="['':'-Select mapping-']" optionValue="name" optionKey="id"/>
               </div>
-            </td>           
+            </td>
+            
+            <g:set var="usedfuzzymatches" value="${'-'}"/>
+
             <g:each var="mappingcolumn" in="${importer_header}">
               <!-- set selected values based on submitted columnproperties, actually refresh -->
@@ -46 +49 @@
               </g:else>
 
+              <g:set var="matchvalue" value="${mappingcolumn.name}"/>
+
                           <td class="header" width="200px">
                                 <b>${mappingcolumn.name}</b>
-                  <importer:propertyChooser name="columnproperty" mappingcolumn="${mappingcolumn}" matchvalue="${mappingcolumn.name}" selected="${selected}" fuzzymatching="${importer_fuzzymatching}" template_id="${importer_template_id}" "allfieldtypes="true"/>
-                          </td>                                 
+
+                <!-- store the found match -->
+                <g:set var="fuzzymatch" value="${importer.propertyChooser(name:columnproperty, mappingcolumn:mappingcolumn, matchvalue:mappingcolumn.name, selected:selected, fuzzymatching:importer_fuzzymatching, template_id:importer_template_id, returnmatchonly:'true')}"/>
+  
+                  <g:if test="${usedfuzzymatches.contains( fuzzymatch.toString() ) }">                       
+                       <g:set var="matchvalue" value=""/>
+                  </g:if>                  
+                
+                  <importer:propertyChooser name="columnproperty" mappingcolumn="${mappingcolumn}" matchvalue="${matchvalue}" selected="${selected}" fuzzymatching="${importer_fuzzymatching}" template_id="${importer_template_id}" allfieldtypes="true"/>
+                          </td>
+
+              <!-- build up a string with fuzzy matches used, to prevent duplicate fuzzy matching -->
+              <g:set var="usedfuzzymatches" value="${usedfuzzymatches + ',' + fuzzymatch.toString() }"/>
+
             </g:each>
                 </tr>