mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Added support for resume ids and resuming searches. This is required to support folders with large numbers of files.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -35,6 +35,7 @@ import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
import org.alfresco.service.cmr.repository.ContentData;
|
||||
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
|
||||
import org.alfresco.service.cmr.repository.MimetypeService;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
@@ -520,6 +521,14 @@ public class CifsHelper
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Move a node
|
||||
*
|
||||
* @param nodeToMoveRef Node to be moved
|
||||
* @param newParentNodeRef New parent folder node
|
||||
* @param newName New name for the moved node
|
||||
* @throws FileExistsException
|
||||
*/
|
||||
public void move(NodeRef nodeToMoveRef, NodeRef newParentNodeRef, String newName) throws FileExistsException
|
||||
{
|
||||
try
|
||||
@@ -539,4 +548,26 @@ public class CifsHelper
|
||||
e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the file name for a node
|
||||
*
|
||||
* @param node NodeRef
|
||||
* @return String
|
||||
* @throws FileNotFoundException
|
||||
*/
|
||||
public String getFileName(NodeRef node)
|
||||
{
|
||||
String fname = null;
|
||||
|
||||
try
|
||||
{
|
||||
fname = (String) nodeService.getProperty( node, ContentModel.PROP_NAME);
|
||||
}
|
||||
catch (InvalidNodeRefException ex)
|
||||
{
|
||||
}
|
||||
|
||||
return fname;
|
||||
}
|
||||
}
|
||||
|
@@ -47,6 +47,11 @@ public class ContentSearchContext extends SearchContext
|
||||
// Pseudo file list blended into a wildcard folder search
|
||||
|
||||
private PseudoFileList pseudoList;
|
||||
private boolean donePseudoFiles = false;
|
||||
|
||||
// Resume id
|
||||
|
||||
private int resumeId;
|
||||
|
||||
/**
|
||||
* Performs a search against the direct children of the given node.
|
||||
@@ -159,37 +164,52 @@ public class ContentSearchContext extends SearchContext
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized int getResumeId()
|
||||
/**
|
||||
* Return the resume id for the current file/directory in the search.
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public int getResumeId()
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
return resumeId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized boolean hasMoreFiles()
|
||||
/**
|
||||
* Determine if there are more files for the active search.
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public boolean hasMoreFiles()
|
||||
{
|
||||
// Pseudo files are returned first
|
||||
|
||||
if ( pseudoList != null && index < (pseudoList.numberOfFiles() - 1))
|
||||
if ( donePseudoFiles == false && pseudoList != null && index < (pseudoList.numberOfFiles() - 1))
|
||||
return true;
|
||||
return index < (results.size() -1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized boolean nextFileInfo(FileInfo info)
|
||||
/**
|
||||
* Return file information for the next file in the active search. Returns false if the search
|
||||
* is complete.
|
||||
*
|
||||
* @param info FileInfo to return the file information.
|
||||
* @return true if the file information is valid, else false
|
||||
*/
|
||||
public boolean nextFileInfo(FileInfo info)
|
||||
{
|
||||
// check if there is anything else to return
|
||||
// Check if there is anything else to return
|
||||
|
||||
if (!hasMoreFiles())
|
||||
return false;
|
||||
|
||||
// Increment the index
|
||||
// Increment the index and resume id
|
||||
|
||||
index++;
|
||||
resumeId++;
|
||||
|
||||
// If the pseudo file list is valid return the pseudo files first
|
||||
|
||||
if ( pseudoList != null)
|
||||
if ( donePseudoFiles == false && pseudoList != null)
|
||||
{
|
||||
if ( index < pseudoList.numberOfFiles())
|
||||
{
|
||||
@@ -210,7 +230,7 @@ public class ContentSearchContext extends SearchContext
|
||||
{
|
||||
// Switch to the main file list
|
||||
|
||||
pseudoList = null;
|
||||
donePseudoFiles = true;
|
||||
index = 0;
|
||||
|
||||
if ( results == null || results.size() == 0)
|
||||
@@ -242,21 +262,183 @@ public class ContentSearchContext extends SearchContext
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized String nextFileName()
|
||||
/**
|
||||
* Return the file name of the next file in the active search. Returns null is the search is
|
||||
* complete.
|
||||
*
|
||||
* @return String
|
||||
*/
|
||||
public String nextFileName()
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
// Check if there is anything else to return
|
||||
|
||||
if (!hasMoreFiles())
|
||||
return null;
|
||||
|
||||
// Increment the index and resume id
|
||||
|
||||
index++;
|
||||
resumeId++;
|
||||
|
||||
// If the pseudo file list is valid return the pseudo files first
|
||||
|
||||
if ( donePseudoFiles == false && pseudoList != null)
|
||||
{
|
||||
if ( index < pseudoList.numberOfFiles())
|
||||
{
|
||||
PseudoFile pfile = pseudoList.getFileAt( index);
|
||||
if ( pfile != null)
|
||||
{
|
||||
// Get the file information for the pseudo file
|
||||
|
||||
FileInfo pinfo = pfile.getFileInfo();
|
||||
|
||||
// Copy the file information to the callers file info
|
||||
|
||||
return pinfo.getFileName();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Switch to the main file list
|
||||
|
||||
donePseudoFiles = true;
|
||||
index = 0;
|
||||
|
||||
if ( results == null || results.size() == 0)
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized boolean restartAt(FileInfo info)
|
||||
// Get the next file info from the node search
|
||||
|
||||
NodeRef nextNodeRef = results.get(index);
|
||||
|
||||
try
|
||||
{
|
||||
// Get the file information and copy across to the callers file info
|
||||
|
||||
FileInfo nextInfo = cifsHelper.getFileInformation(nextNodeRef, "");
|
||||
|
||||
// Indicate that the file information is valid
|
||||
|
||||
return nextInfo.getFileName();
|
||||
}
|
||||
catch (FileNotFoundException e)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized boolean restartAt(int resumeId)
|
||||
// No more files
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Restart a search at the specified resume point.
|
||||
*
|
||||
* @param resumeId Resume point id.
|
||||
* @return true if the search can be restarted, else false.
|
||||
*/
|
||||
public boolean restartAt(FileInfo info)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
// Check if the resume point is in the pseudo file list
|
||||
|
||||
int resId = 0;
|
||||
|
||||
if (pseudoList != null)
|
||||
{
|
||||
while ( resId < pseudoList.numberOfFiles())
|
||||
{
|
||||
// Check if the current pseudo file matches the resume file name
|
||||
|
||||
PseudoFile pfile = pseudoList.getFileAt(resId);
|
||||
if ( pfile.getFileName().equals(info.getFileName()))
|
||||
{
|
||||
// Found the restart point
|
||||
|
||||
donePseudoFiles = false;
|
||||
index = resId - 1;
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
resId++;
|
||||
}
|
||||
}
|
||||
|
||||
// Check if the resume file is in the main file list
|
||||
|
||||
if ( results != null)
|
||||
{
|
||||
int idx = 0;
|
||||
|
||||
while ( idx < results.size())
|
||||
{
|
||||
// Get the file name for the node
|
||||
|
||||
String fname = cifsHelper.getFileName( results.get( idx));
|
||||
if ( fname != null && fname.equals( info.getFileName()))
|
||||
{
|
||||
index = idx - 1;
|
||||
resumeId = resId - 1;
|
||||
donePseudoFiles = true;
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
idx++;
|
||||
resId++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Failed to find resume file
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Restart the current search at the specified file.
|
||||
*
|
||||
* @param info File to restart the search at.
|
||||
* @return true if the search can be restarted, else false.
|
||||
*/
|
||||
public boolean restartAt(int resumeId)
|
||||
{
|
||||
// Check if the resume point is in the pseudo file list
|
||||
|
||||
if (pseudoList != null)
|
||||
{
|
||||
if ( resumeId < pseudoList.numberOfFiles())
|
||||
{
|
||||
// Resume at a pseudo file
|
||||
|
||||
index = resumeId;
|
||||
donePseudoFiles = false;
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Adjust the resume id so that it is an index into the main file list
|
||||
|
||||
resumeId -= pseudoList.numberOfFiles();
|
||||
}
|
||||
}
|
||||
|
||||
// Check if the resume point is valid
|
||||
|
||||
if ( results != null && resumeId < results.size())
|
||||
{
|
||||
index = resumeId;
|
||||
donePseudoFiles = true;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// Invalid resume point
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user