commit fdfd1e5116ad9271859c2c7361528fdff4bb1593 parent 6b5ba60acfb2b4f658feab5c0c226ccf50ec08f6 Author: Dan Stillman <dstillman@zotero.org> Date: Tue, 16 May 2006 07:58:02 +0000 Changed Scholar.Objects.getTreeRows() to return children of a specified folder instead of all objects -- defaults to root folder Diffstat:
| M | chrome/chromeFiles/content/scholar/data_access.js | | | 24 | ++++++++++++++++++++---- |
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/chrome/chromeFiles/content/scholar/data_access.js b/chrome/chromeFiles/content/scholar/data_access.js @@ -809,15 +809,31 @@ Scholar.Objects = new function(){ /* - * Returns an array of all folders and objects as - * Scholar.Folder and Scholar.Object instances + * Returns an array of all folders and objects that are children of a folder + * as Scholar.Folder and Scholar.Object instances * - * Type can tested with instanceof (e.g. if (obj instanceof Scholar.Folder)) + * Takes parent folderID as optional parameter; by default, returns root items + * + * Type can tested with instanceof (e.g. if (obj instanceof Scholar.Folder)) or isFolder() */ - function getTreeRows(){ + function getTreeRows(parent){ var toReturn = new Array(); + /* + // To return all items (no longer used) var sql = 'SELECT * FROM treeOrder WHERE id>0 ORDER BY orderIndex'; + */ + + if (!parent){ + parent = 0; + } + + var sql = 'SELECT TORD.* FROM treeOrder TORD ' + + 'LEFT JOIN objects O ON (TORD.id=O.objectID AND isFolder=0) ' + + 'LEFT JOIN folders F ON (TORD.id=F.folderID AND isFolder=1) ' + + 'WHERE IFNULL(O.folderID, F.parentFolderID)=' + parent + + ' ORDER BY orderIndex'; + var tree = Scholar.DB.query(sql); if (!tree){