Index: org/apache/juddi/datastore/jdbc/FindBusinessByNameQuery.java
===================================================================
RCS file: /home/cvspublic/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByNameQuery.java,v
retrieving revision 1.5
diff -r1.5 FindBusinessByNameQuery.java
128,170c128,134
<           Name name = (Name)names.elementAt(i);
<           String text = name.getValue();
<           String lang = name.getLanguageCode();
< 
<           if ((text != null) && (text.length() > 0))
<           {
<             if (qualifiers == null) // default
<             {
<               sql.append("(UPPER(NAME) LIKE ?");
<               sql.addValue(text.endsWith("%") ? text.toUpperCase() : text.toUpperCase()+"%");
<             }
<             else if ((qualifiers.caseSensitiveMatch) && (qualifiers.exactNameMatch))
<             {
<               sql.append("(NAME = ?");
<               sql.addValue(text);
<             }
<             else if ((!qualifiers.caseSensitiveMatch) && (qualifiers.exactNameMatch))
<             {
<               sql.append("(UPPER(NAME) = ?");
<               sql.addValue(text.toUpperCase());
<             }
<             else if ((qualifiers.caseSensitiveMatch) && (!qualifiers.exactNameMatch))
<             {
<               sql.append("(NAME LIKE ?");
<               sql.addValue(text.endsWith("%") ? text : text+"%");
<             }
<             else if ((!qualifiers.caseSensitiveMatch) && (!qualifiers.exactNameMatch))
<             {
<               sql.append("(UPPER(NAME) LIKE ?");
<               sql.addValue(text.endsWith("%") ? text.toUpperCase() : text.toUpperCase()+"%");
<             }
< 
<             if ((lang != null) && (lang.length() > 0))
<             {
<               sql.append(" AND LANG_CODE = ?");
<               sql.addValue(lang);
<             }
<             
<             sql.append(")");
< 
<             if (i+1 < nameSize)
<               sql.append(" OR ");
<           }
---
> 
>          if (SQLUtil.appendQualifiedNamePart(sql, (Name)names.elementAt(i), qualifiers)) {
> 
>              if (i + 1 < nameSize) {
>                  sql.append(" OR ");
>              }
>          }
Index: org/apache/juddi/datastore/jdbc/FindServiceByNameQuery.java
===================================================================
RCS file: /home/cvspublic/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByNameQuery.java,v
retrieving revision 1.5
diff -r1.5 FindServiceByNameQuery.java
135,150c135
<         Name name = (Name)names.elementAt(i);
<         String text = name.getValue();
<         String lang = name.getLanguageCode();
< 
<         if ((text != null) && (text.length() > 0))
<         {
<           if ((qualifiers != null) && (qualifiers.exactNameMatch))
<           {
<             sql.append("(NAME = ?");
<             sql.addValue(text);
<           }
<           else
<           {
<             sql.append("(NAME LIKE ?");
<             sql.addValue(text.endsWith("%") ? text : text+"%");
<           }
---
>           if (SQLUtil.appendQualifiedNamePart(sql, (Name)names.elementAt(i), qualifiers)) {
152,155c137,139
<           if ((lang != null) && (lang.length() > 0))
<           {
<             sql.append(" AND LANG_CODE = ?");
<             sql.addValue(lang);
---
>               if (i + 1 < nameSize) {
>                   sql.append(" OR ");
>               }
157,162d140
< 
<           sql.append(")");
< 
<           if (i+1 < nameSize)
<             sql.append(" OR ");
<         }