[Mulgara-svn] r1324 - in trunk/src/jar: util/java/org/mulgara/util web/java/org/mulgara/webquery/html

[pag at mulgara.org]

Author: pag
Date: 2008-10-15 22:24:28 -0700 (Wed, 15 Oct 2008)
New Revision: 1324

Modified:
   trunk/src/jar/util/java/org/mulgara/util/SparqlUtil.java
   trunk/src/jar/util/java/org/mulgara/util/SparqlUtilUnitTest.java
   trunk/src/jar/web/java/org/mulgara/webquery/html/Text.java
Log:
Fixed output format to better handle SPARQL queries, and provided better detection of SPARQL

Modified: trunk/src/jar/util/java/org/mulgara/util/SparqlUtil.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/SparqlUtil.java	2008-10-16 05:23:20 UTC (rev 1323)
+++ trunk/src/jar/util/java/org/mulgara/util/SparqlUtil.java	2008-10-16 05:24:28 UTC (rev 1324)
@@ -66,7 +66,12 @@
 
     // look for the "WHERE" clause
     m = firstWherePattern.matcher(query);
-    if (!m.find()) return false;
+
+    // SPARQL allows WHERE to be skipped
+    // there should be a {. If not, then either interpreter will give an error
+    if (!m.find()) return true;
+
+    // WHERE exists, so look for the {
     return query.charAt(m.end()) == '{';
   }
 }

Modified: trunk/src/jar/util/java/org/mulgara/util/SparqlUtilUnitTest.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/SparqlUtilUnitTest.java	2008-10-16 05:23:20 UTC (rev 1323)
+++ trunk/src/jar/util/java/org/mulgara/util/SparqlUtilUnitTest.java	2008-10-16 05:24:28 UTC (rev 1324)
@@ -84,6 +84,18 @@
     assertTrue(SparqlUtil.looksLikeSparql(s1));
     assertTrue(SparqlUtil.looksLikeSparql(s1.toUpperCase()));
 
+    s1 = "select * where { ?x ?y ?z }";
+    assertTrue(SparqlUtil.looksLikeSparql(s1));
+    assertTrue(SparqlUtil.looksLikeSparql(s1.toUpperCase()));
+
+    s1 = "select *{?x ?y ?z}";
+    assertTrue(SparqlUtil.looksLikeSparql(s1));
+    assertTrue(SparqlUtil.looksLikeSparql(s1.toUpperCase()));
+
+    s1 = "select * {?x ?y ?z}";
+    assertTrue(SparqlUtil.looksLikeSparql(s1));
+    assertTrue(SparqlUtil.looksLikeSparql(s1.toUpperCase()));
+
     s1 = "select ?x ?y from <rmi://localhost/server1#> where { ?x ?y 'select ?x ?y ?z from <rmi://localhost/server1#> where { ?x ?y ?z }' }";
     assertTrue(SparqlUtil.looksLikeSparql(s1));
     assertTrue(SparqlUtil.looksLikeSparql(s1.toUpperCase()));

Modified: trunk/src/jar/web/java/org/mulgara/webquery/html/Text.java
===================================================================
--- trunk/src/jar/web/java/org/mulgara/webquery/html/Text.java	2008-10-16 05:23:20 UTC (rev 1323)
+++ trunk/src/jar/web/java/org/mulgara/webquery/html/Text.java	2008-10-16 05:24:28 UTC (rev 1324)
@@ -38,6 +38,27 @@
 
 
   /**
+   * Creates a text element from an entity object.
+   * @param e The entity to use in this object.
+   */
+  public Text(HtmlElement.Entity e) {
+    super(-1);
+    buffer = new StringBuilder(e.toString());
+  }
+
+
+  /**
+   * Appends new text from an entity to this element.
+   * @param e The entity to append to this element.
+   * @return The current instance.
+   */
+  public Text append(HtmlElement.Entity e) {
+    buffer.append(e.toString());
+    return this;
+  }
+
+
+  /**
    * Creates a text element from an arbitrary object.
    * @param obj The object to convert to text for this element.
    */