[Uni-d-cvs] SF.net SVN: uni-d:[3864] trunk/Uni-d/generate/src/main/velocity/ddltool/Map .java.vm

[<max...@us...>]

Revision: 3864
          http://uni-d.svn.sourceforge.net/uni-d/?rev=3864&view=rev
Author:   max_brod
Date:     2009-07-22 08:37:23 +0000 (Wed, 22 Jul 2009)

Log Message:
-----------
[UNI-470]
Fixes in ddltool:
- Don't try to create indices for huge description fields.
- Create proper indices for multiple fields which are "full-text-searchable".

Modified Paths:
--------------
    trunk/Uni-d/generate/src/main/velocity/ddltool/Map.java.vm

Modified: trunk/Uni-d/generate/src/main/velocity/ddltool/Map.java.vm
===================================================================
--- trunk/Uni-d/generate/src/main/velocity/ddltool/Map.java.vm	2009-07-19 08:52:02 UTC (rev 3863)
+++ trunk/Uni-d/generate/src/main/velocity/ddltool/Map.java.vm	2009-07-22 08:37:23 UTC (rev 3864)
@@ -76,7 +76,7 @@
         #if( $field.isUnique() || $field.isIndexed() )
         indexedFields.add( "$fieldName" );
         #end
-        #if( $field.isString() )
+        #if( $field.isString() && !$field.isMultiple() &&  $field.FieldLength<252 )
         #if( $field.isDescription() || $field.getName().toUpperCase().equals( "DESCRIPTION" ) || $field.getName().toUpperCase().equals( "NAME" ) || $field.isFullTextSearchable() )
         upperCaseIndexedFields.add("$fieldName");
         #end
@@ -103,12 +103,18 @@
 #foreach( $table in $tables )
     #foreach( $field in $table.Fields )
         #if( !$field.isLink() && $field.isMultiple() )
+            upperCaseIndexedFields = new ArrayList<String>();
             #set( $fieldDef="" )
             #set( $default="" )
             #getFieldDefinition($field)
             tablesForMultiple.add(new String[]{ "$dbtype.convertTable("M_${table.Name}_${field.Name}")", "$dbtype.convertField("f_${field.Name}")", "$fieldDef" });
-            #set( $tableName = $dbtype.convertTable("T_${table.Name}") )
-            tables.add( "$tableName" );
+            #set( $tableName = $dbtype.convertTable("M_${table.Name}_${field.Name}") )
+            #if( $field.isString()  && $field.isFullTextSearchable() && $field.FieldLength<252 )
+            #set( $fieldName = $dbtype.convertField("f_${field.Name}") )
+            upperCaseIndexedFields.add("$fieldName");
+            #end
+            upperCaseIndexedFieldsMap.put( "$tableName", upperCaseIndexedFields );
+            // tables.add( "$tableName" ); // ???? That's not useful.
         #end
     #end
 #end
@@ -143,7 +149,7 @@
     public Collection<String> getTables() { return tables; }
 
     public Collection<String[]> getTablesForMultiples() { return tablesForMultiple; }
-    
+
     public Collection<String[]> getTablesForLinks() { return tablesForLinks; }
 
     public Hashtable<String, Collection<String>> getDbFields() { return dbFields; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.