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/02/02 03:57:19 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/datastore/jdbc FindServiceByNameQuery.java FindBusinessByNameQuery.java FindTModelByNameQuery.java
sviens 2005/02/01 18:57:19
Modified: src/java/org/apache/juddi/datastore/jdbc
FindServiceByNameQuery.java
FindBusinessByNameQuery.java
FindTModelByNameQuery.java
Log:
When only the "sortByNameAsc" find qualifier is specified, BusinessList, ServiceList and TModelList were not returned in the correctly sorted order (ascending by name). See JIRA issue JUDDI-50 for more information (http://issues.apache.org/jira/browse/JUDDI-50)
Revision Changes Path
1.5 +17 -7 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FindServiceByNameQuery.java 1 May 2004 00:55:12 -0000 1.4
+++ FindServiceByNameQuery.java 2 Feb 2005 02:57:18 -0000 1.5
@@ -211,14 +211,24 @@
}
else if (qualifiers.sortByNameAsc || qualifiers.sortByNameDesc)
{
- if (qualifiers.sortByNameAsc && qualifiers.sortByDateDesc)
- sql.append("N.NAME ASC,S.LAST_UPDATE DESC");
- else if (qualifiers.sortByNameAsc && qualifiers.sortByDateAsc)
- sql.append("N.NAME ASC,S.LAST_UPDATE ASC");
- else if (qualifiers.sortByNameDesc && qualifiers.sortByDateDesc)
- sql.append("N.NAME DESC,S.LAST_UPDATE DESC");
+ if (qualifiers.sortByDateAsc || qualifiers.sortByDateDesc)
+ {
+ if (qualifiers.sortByNameAsc && qualifiers.sortByDateDesc)
+ sql.append("N.NAME ASC,S.LAST_UPDATE DESC");
+ else if (qualifiers.sortByNameAsc && qualifiers.sortByDateAsc)
+ sql.append("N.NAME ASC,S.LAST_UPDATE ASC");
+ else if (qualifiers.sortByNameDesc && qualifiers.sortByDateDesc)
+ sql.append("N.NAME DESC,S.LAST_UPDATE DESC");
+ else
+ sql.append("N.NAME DESC,S.LAST_UPDATE ASC");
+ }
else
- sql.append("N.NAME DESC,S.LAST_UPDATE ASC");
+ {
+ if (qualifiers.sortByNameAsc)
+ sql.append("N.NAME ASC,S.LAST_UPDATE DESC");
+ else
+ sql.append("N.NAME DESC,S.LAST_UPDATE DESC");
+ }
}
else if (qualifiers.sortByDateAsc || qualifiers.sortByDateDesc)
{
1.5 +17 -7 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FindBusinessByNameQuery.java 1 May 2004 00:55:12 -0000 1.4
+++ FindBusinessByNameQuery.java 2 Feb 2005 02:57:18 -0000 1.5
@@ -220,14 +220,24 @@
}
else if (qualifiers.sortByNameAsc || qualifiers.sortByNameDesc)
{
- if (qualifiers.sortByNameAsc && qualifiers.sortByDateDesc)
- sql.append("N.NAME ASC,B.LAST_UPDATE DESC");
- else if (qualifiers.sortByNameAsc && qualifiers.sortByDateAsc)
- sql.append("N.NAME ASC,B.LAST_UPDATE ASC");
- else if (qualifiers.sortByNameDesc && qualifiers.sortByDateDesc)
- sql.append("N.NAME DESC,B.LAST_UPDATE DESC");
+ if (qualifiers.sortByDateAsc || qualifiers.sortByDateDesc)
+ {
+ if (qualifiers.sortByNameAsc && qualifiers.sortByDateDesc)
+ sql.append("N.NAME ASC,B.LAST_UPDATE DESC");
+ else if (qualifiers.sortByNameAsc && qualifiers.sortByDateAsc)
+ sql.append("N.NAME ASC,B.LAST_UPDATE ASC");
+ else if (qualifiers.sortByNameDesc && qualifiers.sortByDateDesc)
+ sql.append("N.NAME DESC,B.LAST_UPDATE DESC");
+ else
+ sql.append("N.NAME DESC,B.LAST_UPDATE ASC");
+ }
else
- sql.append("N.NAME DESC,B.LAST_UPDATE ASC");
+ {
+ if (qualifiers.sortByNameAsc)
+ sql.append("N.NAME ASC,B.LAST_UPDATE DESC");
+ else
+ sql.append("N.NAME DESC,B.LAST_UPDATE DESC");
+ }
}
else if (qualifiers.sortByDateAsc || qualifiers.sortByDateDesc)
{
1.6 +17 -7 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindTModelByNameQuery.java
Index: FindTModelByNameQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindTModelByNameQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FindTModelByNameQuery.java 2 Jul 2004 20:11:40 -0000 1.5
+++ FindTModelByNameQuery.java 2 Feb 2005 02:57:18 -0000 1.6
@@ -181,14 +181,24 @@
}
else if (qualifiers.sortByNameAsc || qualifiers.sortByNameDesc)
{
- if (qualifiers.sortByNameAsc && qualifiers.sortByDateDesc)
- sql.append("M.NAME ASC,M.LAST_UPDATE DESC");
- else if (qualifiers.sortByNameAsc && qualifiers.sortByDateAsc)
- sql.append("M.NAME ASC,M.LAST_UPDATE ASC");
- else if (qualifiers.sortByNameDesc && qualifiers.sortByDateDesc)
- sql.append("M.NAME DESC,M.LAST_UPDATE DESC");
+ if (qualifiers.sortByDateAsc || qualifiers.sortByDateDesc)
+ {
+ if (qualifiers.sortByNameAsc && qualifiers.sortByDateDesc)
+ sql.append("M.NAME ASC,M.LAST_UPDATE DESC");
+ else if (qualifiers.sortByNameAsc && qualifiers.sortByDateAsc)
+ sql.append("M.NAME ASC,M.LAST_UPDATE ASC");
+ else if (qualifiers.sortByNameDesc && qualifiers.sortByDateDesc)
+ sql.append("M.NAME DESC,M.LAST_UPDATE DESC");
+ else
+ sql.append("M.NAME DESC,M.LAST_UPDATE ASC");
+ }
else
- sql.append("M.NAME DESC,M.LAST_UPDATE ASC");
+ {
+ if (qualifiers.sortByNameAsc)
+ sql.append("M.NAME ASC,M.LAST_UPDATE DESC");
+ else
+ sql.append("M.NAME DESC,M.LAST_UPDATE DESC");
+ }
}
else if (qualifiers.sortByDateAsc || qualifiers.sortByDateDesc)
{