dl-learner-svn

[DL-Learner SVN] SF.net SVN: dl-learner:[3730] trunk/components-ext/src/main/java/org/ dllearner/algorithm/tbsl/sparql/Query.java

[<chr...@us...>]

Revision: 3730
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3730&view=rev
Author:   christinaunger
Date:     2012-06-11 12:38:21 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
[tbsl] repaired GROUP BY construct

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java	2012-06-11 12:19:30 UTC (rev 3729)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java	2012-06-11 12:38:21 UTC (rev 3730)
@@ -155,16 +155,22 @@
 		if (qt == SPARQL_QueryType.SELECT)
 		{
 			retVal += "\nSELECT ";
-
-			String lastSelectTerm = null;
+                        
+                        boolean group = false;
 			for (SPARQL_Term term : selTerms)
 			{
 				retVal += term.toString() + " ";
 				if(selTerms.size() > 1 && term.toString().contains("COUNT")){
-					groupBy = lastSelectTerm;
+                                    group = true;
 				}
-				lastSelectTerm = term.toString();
 			}
+                        if (group) {
+                            groupBy = "";
+                            for (SPARQL_Term t : selTerms) {
+                                if (!t.toString().contains("COUNT"))
+                                    groupBy += t.toString() + " ";                                    
+                                }
+                        }
 		}
 		else retVal += "\nASK ";
 
@@ -185,7 +191,7 @@
 		retVal += "}\n";
 		
 		if(groupBy != null){
-			retVal += "GROUP BY (" + groupBy + ")\n";
+			retVal += "GROUP BY " + groupBy + "\n";
 		}
 
 		if (orderBy != null && !orderBy.isEmpty())

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

[DL-Learner SVN] SF.net SVN: dl-learner:[3785] trunk/components-ext/src/main/java/org/ dllearner/algorithm/tbsl/sparql/Query.java

[<lor...@us...>]

Revision: 3785
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3785&view=rev
Author:   lorenz_b
Date:     2012-07-12 13:46:06 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Fixed NPE in HAVING constructs when copying Query object.

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java	2012-07-12 12:13:02 UTC (rev 3784)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java	2012-07-12 13:46:06 UTC (rev 3785)
@@ -112,7 +112,7 @@
 			}
 		}
 		this.filter = filters;
-                this.having = having;
+                this.having = query.having;
                 this.unions = query.unions; // TODO copy unions
 		
 		this.limit = query.getLimit();

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