You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2005/03/15 03:07:37 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/datastore/jdbc FindServiceByNameQuery.java FindBusinessByNameQuery.java
sviens 2005/03/14 18:07:37
Modified: src/java/org/apache/juddi/datastore/jdbc
FindServiceByNameQuery.java
FindBusinessByNameQuery.java
Log:
Fix for bug# JUDDI-65 - Searching for Business & Service by LANG_CODE shouldn't require exact match (see: http://issues.apache.org/jira/browse/JUDDI-65).
Revision Changes Path
1.6 +3 -2 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByNameQuery.java
Index: FindServiceByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByNameQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FindServiceByNameQuery.java 2 Feb 2005 02:57:18 -0000 1.5
+++ FindServiceByNameQuery.java 15 Mar 2005 02:07:37 -0000 1.6
@@ -149,10 +149,11 @@
sql.addValue(text.endsWith("%") ? text : text+"%");
}
+ // If lang is "en" we'll need to match with "en", "en_US" or "en_UK"
if ((lang != null) && (lang.length() > 0))
{
- sql.append(" AND LANG_CODE = ?");
- sql.addValue(lang);
+ sql.append(" AND (UPPER(LANG_CODE) LIKE ?)");
+ sql.addValue(lang.toUpperCase()+"%");
}
sql.append(")");
1.6 +3 -2 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByNameQuery.java
Index: FindBusinessByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBusinessByNameQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FindBusinessByNameQuery.java 2 Feb 2005 02:57:18 -0000 1.5
+++ FindBusinessByNameQuery.java 15 Mar 2005 02:07:37 -0000 1.6
@@ -157,10 +157,11 @@
sql.addValue(text.endsWith("%") ? text.toUpperCase() : text.toUpperCase()+"%");
}
+ // If lang is "en" we'll need to match with "en", "en_US" or "en_UK"
if ((lang != null) && (lang.length() > 0))
{
- sql.append(" AND LANG_CODE = ?");
- sql.addValue(lang);
+ sql.append(" AND (UPPER(LANG_CODE) LIKE ?)");
+ sql.addValue(lang.toUpperCase()+"%");
}
sql.append(")");