Skip to content
This repository was archived by the owner on Oct 20, 2022. It is now read-only.

Commit 4146e2f

Browse files
author
shubay
committed
Prepare for release 1.0.2.
1 parent 3e47951 commit 4146e2f

File tree

6 files changed

+28
-16
lines changed

6 files changed

+28
-16
lines changed

ReleaseNotes.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Version 1.0.2
2+
-----------------------------------------
3+
- Added maven build (pom.xml).
4+
- Starting with this version this library is available in a maven web repository.
5+
- Added tests.
6+
- Added support for LIKE operator in the query language.
7+
- Fixed bug: Export to HTML double escapes &nbsp (Issue 2).
8+
- Fixed bug: Format and label clauses do not work for queries that contain
9+
scalar functions (Issue 3).
10+
- Fixed bug: "is null" in the where clause of a query does not work for SQL
11+
datasources (Issue 4).
12+
- Fixed bug: CSV output does not escape non text values with commas (Issue 5).

build-src/build.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- User properties -->
1818
<property file="build.properties"/>
19-
19+
2020
<!-- Clean build output -->
2121
<target name="clean">
2222
<delete dir="${build}"/>
@@ -58,7 +58,7 @@
5858
<pathelement location="${servlet-api.jar}"/>
5959
</classpath>
6060
</javac>
61-
<jar destfile="${build}/visualization-datasource-1.0.1.jar"
61+
<jar destfile="${build}/visualization-datasource-1.0.2.jar"
6262
basedir="${build.class.main}"/>
6363
</target>
6464

@@ -79,7 +79,7 @@
7979
<pathelement location="${servlet-api.jar}"/>
8080
</classpath>
8181
</javac>
82-
<jar destfile="${build}/datasource-examples.jar"
82+
<jar destfile="${build}/visualization-datasource-examples.jar"
8383
basedir="${build.class.example}"/>
8484
</target>
8585

@@ -124,12 +124,12 @@
124124

125125
<!-- Jar the sources. -->
126126
<target name="source-jar">
127-
<jar destfile="${build}/visualization-datasource-1.0.1-src.jar"
127+
<jar destfile="${build}/visualization-datasource-1.0.2-src.jar"
128128
basedir="${src}/main/java" />
129129
</target>
130130

131131
<target name="build" depends="datasource"/>
132132

133133
<target name="all" depends="clean,build,example,test"/>
134-
134+
135135
</project>

examples/src/html/web.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,19 +110,19 @@
110110
<servlet>
111111
<servlet-name>My Servlet</servlet-name>
112112
<description>My servlet description.</description>
113-
<servlet-class>com.google.visualization.datasource.example.SimpleExampleServlet</servlet-class>
113+
<servlet-class>SimpleExampleServlet</servlet-class>
114114
</servlet>
115115

116116
<servlet>
117117
<servlet-name>CSV Example</servlet-name>
118118
<description>CsvDataSourceServlet</description>
119-
<servlet-class>com.google.visualization.datasource.example.CsvDataSourceServlet</servlet-class>
119+
<servlet-class>CsvDataSourceServlet</servlet-class>
120120
</servlet>
121121

122122
<servlet>
123123
<servlet-name>AdvancedExampleServlet2</servlet-name>
124124
<description>AdvancedExampleServlet2</description>
125-
<servlet-class>com.google.visualization.datasource.example.AdvancedExampleServlet2</servlet-class>
125+
<servlet-class>AdvancedExampleServlet2</servlet-class>
126126
</servlet>
127127

128128
<!-- Define mappings that are used by the servlet container to

examples/src/java/CsvDataSourceServlet.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* empty implementation of method getCapabilities(). This servlet therefore ignores the
4242
* user query (as passed in the 'tq' url parameter), leaving the
4343
* query engine to apply it to the data table created here.
44-
*
44+
*
4545
* @author Nimrod T.
4646
*/
4747
public class CsvDataSourceServlet extends DataSourceServlet {
@@ -52,10 +52,10 @@ public class CsvDataSourceServlet extends DataSourceServlet {
5252
private static final Log log = LogFactory.getLog(CsvDataSourceServlet.class.getName());
5353

5454
/**
55-
* The name of the parameter that contains the url of the csv to load.
55+
* The name of the parameter that contains the url of the CSV to load.
5656
*/
5757
private static final String URL_PARAM_NAME = "url";
58-
58+
5959
/**
6060
* Generates the data table.
6161
* This servlet assumes a special parameter that contains the CSV URL from which to load
@@ -69,7 +69,7 @@ public DataTable generateDataTable(Query query, HttpServletRequest request)
6969
log.error("url parameter not provided.");
7070
throw new DataSourceException(ReasonType.INVALID_REQUEST, "url parameter not provided");
7171
}
72-
72+
7373
Reader reader;
7474
try {
7575
reader = new BufferedReader(new InputStreamReader(new URL(url).openStream()));
@@ -83,7 +83,7 @@ public DataTable generateDataTable(Query query, HttpServletRequest request)
8383
DataTable dataTable = null;
8484
ULocale requestLocale = DataSourceHelper.getLocaleFromRequest(request);
8585
try {
86-
// Note: We assumes that all the columns in the CSV file are TEXT columns. In cases where the
86+
// Note: We assume that all the columns in the CSV file are text columns. In cases where the
8787
// column types are known in advance, this behavior can be overridden by passing a list of
8888
// ColumnDescription objects specifying the column types. See CsvDataSourceHelper.read() for
8989
// more details.

examples/src/java/SimpleExampleServlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class SimpleExampleServlet extends DataSourceServlet {
3333

3434
@Override
3535
public DataTable generateDataTable(Query query, HttpServletRequest request) {
36-
// Create a data-table,
36+
// Create a data table.
3737
DataTable data = new DataTable();
3838
ArrayList<ColumnDescription> cd = new ArrayList<ColumnDescription>();
3939
cd.add(new ColumnDescription("name", ValueType.TEXT, "Animal name"));
@@ -43,7 +43,7 @@ public DataTable generateDataTable(Query query, HttpServletRequest request) {
4343

4444
data.addColumns(cd);
4545

46-
// Fill the data-table.
46+
// Fill the data table.
4747
try {
4848
data.addRowFromValues("Aye-aye", "http://en.wikipedia.org/wiki/Aye-aye", 100, true);
4949
data.addRowFromValues("Sloth", "http://en.wikipedia.org/wiki/Sloth", 300, true);

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<groupId>com.google.visualization</groupId>
1111
<artifactId>visualization-datasource</artifactId>
1212
<name>Google Visualization Data Source Library</name>
13-
<version>1.0.1</version>
13+
<version>1.0.2</version>
1414
<description>This library makes it easy to implement a Visualization data source so that you can
1515
easily chart or visualize your data from any of your data stores.
1616
The library implements the Google Visualization API wire protocol and query language.

0 commit comments

Comments
 (0)