github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-17 05:22:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed merge conflict.

Browse source
This commit is contained in:
Winston Li 2014-12-04 19:53:19 +00:00
parent ee6273ff8c
commit d070baabde
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLiteWLDatabase.java
View file

@ -1,6 +1,7 @@
package uk.ac.ic.wlgitbridge.writelatex.model.db.sql; package uk.ac.ic.wlgitbridge.writelatex.model.db.sql;
import uk.ac.ic.wlgitbridge.writelatex.filestore.node.FileNode; import uk.ac.ic.wlgitbridge.writelatex.filestore.node.FileNode;
import uk.ac.ic.wlgitbridge.writelatex.filestore.store.FileIndexStore;
import uk.ac.ic.wlgitbridge.writelatex.model.db.sql.query.GetFileNodesForProjectNameSQLQuery; import uk.ac.ic.wlgitbridge.writelatex.model.db.sql.query.GetFileNodesForProjectNameSQLQuery;
import uk.ac.ic.wlgitbridge.writelatex.model.db.sql.query.GetProjectNamesSQLQuery; import uk.ac.ic.wlgitbridge.writelatex.model.db.sql.query.GetProjectNamesSQLQuery;
import uk.ac.ic.wlgitbridge.writelatex.model.db.sql.query.GetURLIndexTableForProjectNameSQLQuery; import uk.ac.ic.wlgitbridge.writelatex.model.db.sql.query.GetURLIndexTableForProjectNameSQLQuery;
@ -63,8 +64,8 @@ public class SQLiteWLDatabase {
return query(new GetVersionIDsForProjectNameSQLQuery(projectName)); return query(new GetVersionIDsForProjectNameSQLQuery(projectName));
} }
public List<FileNode> getFileNodesForProjectName(String projectName) throws SQLException { public List<FileNode> getFileNodesForProjectName(String projectName, FileIndexStore fileIndexStore) throws SQLException {
return query(new GetFileNodesForProjectNameSQLQuery(projectName)); return query(new GetFileNodesForProjectNameSQLQuery(projectName, fileIndexStore));
} }
public Map<String, FileNode> getURLIndexTableForProjectName(String projectName) throws SQLException { public Map<String, FileNode> getURLIndexTableForProjectName(String projectName) throws SQLException {

7
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetFileNodesForProjectNameSQLQuery.java
View file

@ -4,6 +4,7 @@ import uk.ac.ic.wlgitbridge.util.Util;
import uk.ac.ic.wlgitbridge.writelatex.filestore.node.AttachmentNode; import uk.ac.ic.wlgitbridge.writelatex.filestore.node.AttachmentNode;
import uk.ac.ic.wlgitbridge.writelatex.filestore.node.BlobNode; import uk.ac.ic.wlgitbridge.writelatex.filestore.node.BlobNode;
import uk.ac.ic.wlgitbridge.writelatex.filestore.node.FileNode; import uk.ac.ic.wlgitbridge.writelatex.filestore.node.FileNode;
import uk.ac.ic.wlgitbridge.writelatex.filestore.store.FileIndexStore;
import uk.ac.ic.wlgitbridge.writelatex.model.db.sql.SQLQuery; import uk.ac.ic.wlgitbridge.writelatex.model.db.sql.SQLQuery;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -21,9 +22,11 @@ public class GetFileNodesForProjectNameSQLQuery implements SQLQuery<List<FileNod
"SELECT `file_name`, `changed`, `is_blob`, `blob`, `url` FROM `file_node_table` WHERE `project_name` = ?"; "SELECT `file_name`, `changed`, `is_blob`, `blob`, `url` FROM `file_node_table` WHERE `project_name` = ?";
private final String projectName; private final String projectName;
private final FileIndexStore fileIndexStore;
public GetFileNodesForProjectNameSQLQuery(String projectName) { public GetFileNodesForProjectNameSQLQuery(String projectName, FileIndexStore fileIndexStore) {
this.projectName = projectName; this.projectName = projectName;
this.fileIndexStore = fileIndexStore;
} }
@Override @Override
@ -37,7 +40,7 @@ public class GetFileNodesForProjectNameSQLQuery implements SQLQuery<List<FileNod
if (isBlob) { if (isBlob) {
fileNode = new BlobNode(fileName, changed, resultSet.getBytes("blob")); fileNode = new BlobNode(fileName, changed, resultSet.getBytes("blob"));
} else { } else {
fileNode = new AttachmentNode(fileName, changed, resultSet.getString("url")); fileNode = new AttachmentNode(fileName, changed, resultSet.getString("url"), fileIndexStore);
} }
fileNodes.add(fileNode); fileNodes.add(fileNode);
} }