Skip to content

Cursor #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cursor #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6998702
Fix the problem that at the end of the cursor no new page is loaded.
hangy Jul 22, 2010
f4dd159
Change the parameter regex to support pattern/range parameters, ie. d…
hangy Jun 22, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/narphorium/freebase/query/io/QueryParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

public class QueryParser {

private static Pattern parameterNamePattern = Pattern.compile("([\\d\\w_]+):([\\d\\w_\\/]+)");
private static Pattern parameterNamePattern = Pattern.compile("([\\d\\w_]+):([\\d\\w_\\/]+)(?:>|<|<=|>=|~=|\\|=)?");
private static Matcher parameterNameMatcher = parameterNamePattern.matcher("");

public Query parse(String name, String queryString) {
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/narphorium/freebase/results/AbstractResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public abstract class AbstractResultSet implements ResultSet {
protected int currentResult;
protected Object cursor;
protected int numPages;
protected boolean fetchedFirstPage = false;
protected boolean fetchedFirstPage;

public AbstractResultSet(Query query, ReadService readService) {
this.readService = readService;
Expand All @@ -36,6 +36,7 @@ public Result current() {
}

public void reset() {
fetchedFirstPage = false;
currentResult = -1;
cursor = true;
}
Expand All @@ -52,8 +53,8 @@ public boolean isEmpty() {
}

public Result next() throws FreebaseServiceException {
currentResult++;
if (currentResult >= results.size() &&
++currentResult;
if (currentResult >= (results.size() - 1) &&
((cursor instanceof Boolean && (Boolean)cursor == true) || (cursor instanceof String)))
{
fetchNextPage();
Expand Down