mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
20128: Reverse part of previous build fix that breaks other tests ... 20129: ALF-202, ALF-1488: Fixed portlets in alfresco.war - Stop excluding portlet.xml from alfresco.war - Used JSR 286 ResourceURL solution to get upload iframes to work in portlets - Removed horrific hacks concerning faces session map resolution in portlets and upload servlet - WebClientPortletAuthenticator now dispatches to a helper servlet, AuthenticatorServlet, allowing it to use identical servlet mechanisms to authenticate / sign-on the user - Portlet Authenticated user now set consistently in application-scoped attribute, so web client, web script portlets and client portlet share same notion of user ID - Application.inPortalServer flag now thread local (and thread safe!) 20130: Merged BRANCHES/V2.2 to BRANCHES/V3.3 13819: *RECORD ONLY* ACT-6420 - Office 2003 "Install for all users" - DO NOT MERGE 20131: Merged BRANCHES/V3.1 to BRANCHES/V3.3 19600: *RECORD ONLY* ALF-2205 - CLONE: Office Plugin: filename overlaps the plugin UI if longer than 40 characters without spaces Merged V3.2 to V3.1 (Adobe) 17499: ETHREEOH-2322 - Office Plugin: filename overlaps the plugin UI if longer than 40 characters without spaces 19443: ALF-2131 - Office webscripts: Missing close brace, '}' 20132: ALF-2749 - temporarily skip couple of -ve checks (for MS SQL Server only) 20133: Merged BRANCHES/V3.2 to BRANCHES/V3.3 19550: *RECORD ONLY* ALF-1091 - Only 15 tags displayed in Tags section in Browser pane 20134: Adding files missed during first commit of Meeting Workspace code 20135: Merged V3.2 to V3.3 19814: *RECORD ONLY* Fix for ALF-2322 - discussion topic containing non-ascii characters cannot be saved 19934: *RECORD ONLY* Fix for ALF-2512 - ability to execute JavaScript via cmd servlet by a non-admin user disabled by default. - user script execution privileges can be reactivated if required via web-client-config flag <allow-user-script-execute> 19935: *RECORD ONLY* Corrected imports for 3.2 compatability 20136: Merge Dev to V3.3 20104 : ALF-676 - imapFolders patch fails if versionable aspect is mandatory on cm:content 20137: Workaround for ALF-2639: Sharepoint: Share Edit Online uses Share protocol rather than Alfresco protocol to build link - Replace "https:" protocol with "http:" when generating "Edit Online" URL 20138: Merged V3.1 to V3.3 18204: *RECORD ONLY* Merged DEV/TEMPORARY to 3.1 17837: ETHREEOH-3801: Creating users via the api does not add them to the user store 18577: *RECORD ONLY* Fix for ETHREEOH-4117, based on CHK-11154 19373: *RECORD ONLY* Merged V3.2 to V3.1 19216: ENH-506 - allow script compilation to be disabled for repository tier. Fix to unreported issue with return aspect array from a ScriptNode. 20139: Merged V2.2 to V3.3 18518: *RECORD ONLY* Fix for ETWOTWO-1375 18522: *RECORD ONLY* Merged DEV-TEMPORARY to V2.2 18440: TinyMCE HTML Image gets invalid path 18503: ETWOTWO-1035: Error message when bypassing the 'close' and directly clicking on breadcrumb link after a deployment 18504: ETWOTWO-1035: Error message when bypassing the 'close' and directly clicking on breadcrumb link after a deployment 18578: Merged DEV-TEMPORARY to V2.2 18528: ETWOTWO-1114: Missing 'Required' items are not highlighted in the error when missed 19094: *RECORD ONLY* Merged V3.1 to V2.2 14015: Fixes for ETHREEOH-1864 and ETHREEOH-1840 20140: Remove unwanted @overide 20141: Lazy schema introspection to shave off a few seconds on startup - Saves about 5s on dev machine - Hibernate still has to look at the DB metadata, though 20144: Merged V2.2 to V3.3 18859: (RECORD ONLY) ALF-1882: Merged V3.2 to V2.2 17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely - AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments 18864: (RECORD ONLY) ALF-1882: Fixed compilation error from previous checkin. 20145: Merged V3,1 to V3.3 19584: (RECORD ONLY) ALF-2207: Merged V3.2 to V3.1 (Adobe) 18277: Merged DEV_TEMPORARY to V3.2 18178: ETHREEOH-3222: ERROR [org.alfresco.webdav.protocol] WebDAV method not implemented - PROPPATCH 19660: (RECORD ONLY) ALF-2266: Merged V3.2 to V3.1 (Adobe) 19562: Merged DEV/BELARUS/V3.2-2010_02_24 to V3.2 19244: ALF-1816: Email templates can no longer be selected when creating a rule for the action 'Send email to specified users' following an upgrade - New patch has been created to create invite email templates and notify email templates folders if those are absent. Also it moves default notify and invite templates into appropriate folders. 19662: (RECORD ONLY) Incremented version label 19663: (RECORD ONLY) Corrected version label 19779: (RECORD ONLY) Incremented version label 20148: Merged PATCHES/V3.2.r to V3.3 20029: ALF-2624: Avoid NPE in LDAP sync when there are dangling references and improve logging 20053: (RECORD ONLY) Incremented version number 20151: ALF-2749 - unit test fix (re-arranged -ve checks for txn boundaries, functionally equivalent) 20152: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20050: Fix ALF-2637: objectTypeId updatability reported as "readonly" rather then "oncreate" 20051: Fix for ALF-2609: CMIS ACL mapping improvements 20052: Fix for ALF-2609: CMIS ACL mapping improvements 20086: Fix re-opened ALF-2637: "objectTypeId" updatability reported as "readonly" rather then "oncreate" 20125: Fix ALF-2728: AtomPub renditions are not rendered as part of cmis:object, although their rel links are. 20153: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20067: Fix ALF-2691: Choice display names in Type Definition are not escaped properly in AtomPub binding 20154: ALF-1598: Share - Edit online missing on preview page - Note: The details page doesn't know when Office opens the file, so may show stale information. 20156: Build/unit test - comment-out force re-index (IndexCheckServiceImplTest) 20157: Office add-in: Missing i18n string found whilst investigating ALF-605: Script error appears when start typing not-existent user in "Assign to" filed - Changed behaviour slightly so that "start workflow" panel remains if error occurred during submit 20164: Fix trailing commas that MSIE doesn't like. Plus fix for renamed webscript reference. 20168: Attempting to fix failing test in ThumbnailService. The change adds some extra logging and exception info too. 20169: Build/unit test - temporarily put back "force re-index" (IndexCheckServiceImplTest) - TODO: re-work test for build env 20170: Fix NPE (AVMStoreImpl.createSnapshot) - see DBC-HEADPOSTGRESQL-34 20173: Propagate IOExceptions from retryable write transactions in AlfrescoDiskDriver 20176: Merge from V3.2 to V3.3. Merge ok'ed by Steve. 20175: JMX configuration of enterprise logging broken 20178: JodConverter loggers are now exposed in JMX. This follows on from check-ins 20175 (on V32) and 20176 (on V33) which fixed the JMX logging for enterprise code. 20180: Fixes ALF-2021 by adding new date format properties and exposing YUI widget options. 20185: Various core fixes and additional debug output. Part of ALF-1554. 20186: Fix for OpenOffice multiple versions per edit problem. ALF-1554. 20187: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20181: IndexCheckServiceImplTest - by default, check test store only (reduces current ent build time by nearly 1 hour !) 20188: Fix -exploded build target for Share to copy core classes folder 20191: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20190: Fix ALF-2774: Atompub createDocument with versioningState=checkedout followed by checkin does not create major version, Fix ALF-2782: AtomPub binding incorrectly handles atom:title when no value is provided (often done for compliant atom entry) 20193: Merge 3.2 to 3.3: 19759: Fix for CIFS/CheckInOut.exe save of working copy breaks lock on original file. ALF-2028. (Record-only) 19760: Fix for working copy checked out via CIFS is not accessible until FileStateReaper expires file state. ALF-962. (Record-only) 20195: Form fields for numbers are now rendered much smaller that text fields following feedback from meetups. Must be included in 3.3 as requested by Paul. 20197: Rules: Size property is now more userfriendly & IE bugs are solved - Numbers and booleans where posted as strings to the server making property comparisons against properties such as "Size" to fail on the server - Size, encoding & mimetype are now options by default in the "IF/Unless" drop downs - When comparing Size properties a "bytes" label is placed to the right of the text field - "Show more..." menu now displays aspect/type ids on mouse hover in the tree - "Show more..." menu now displays a new column for the property name in the list next to the property displayLabel - The list in the "Show more..." menu now stays in its place instead of being pushed down in some browsers - IE css fixes to make rules look good in IE 6, 7 & 8 - Fixed IE 6 & 7 issue with generateDomId & getAttribute("id") not being in sync - Fixed IE 6 & 7 issue where Selector.query only worked with "id" as root attribute 20199: Merge 3.1 to 3.3 (All record-only): 14483: Merged HEAD to v3.1: 13942 Added FTP IPv6 support. MOB-714. 14484: Merged HEAD to v3.1: 13943 Added FTP IPv6 configuration. Added the ftp.ipv6 property. MOB-714. 14523: Add trailing 'A' to CIFS server name, removed by recent checkin. 14916: Fixes for local domain lookup when WINS is configured. ETHREEOH-2263. 14921: Merge HEAD to V3.1: 14599: Fixes to file server ACL parsing, part of ETHREEOH-2177 14930: Updated svn:mergeinfo 15231: Fix for cut/paste file between folders on CIFS. ETHREEOH-2323. 15570: Merge 3.2 to 3.1: 15548: CIFS server memory leak fixes (clear auth context, session close). ETHREEOH-2538 15571: Merge 3.2 to 3.1: 15549: Check for null ClientInfo in the setCurrentUser() method and clear the auth context. Part of ETHREEOH-2538. 15550: Fixed performance issue in the continue search code, add warn level output of folder search timing. 15572: Update svn:mergeinfo 15627: Merge 3.2 to 3.1: 15626: Fixed NetBIOS reports an invalid packet during session connection, and connection stalls for a while. JLAN-86. 15628: Update svn:mergeinfo 15780: Fix for MS Office document locking issue. ETHREEOH-2579. 15827: Fixed bug in delete node event processing. 16160: Minor change to debug output 16162: Add support for the . and .. pseudo entries in a folder search. 16163: Added timstamp tracking via the file state cache, blend cached timestamps into file info/folder search results. 16555: Fix for processing of NetBIOS packets over 64K in the older JNI code. Part of ETHREEOH-2882. 16556: Fix for CIFS session leak and 100% CPU when connect/disconnecting quickly. ETHREEOH-2881. 16559: Fix for ACL parsing in the standalone JLAN Server build. JLAN-89. 16666: Fix for CIFS cannot handle requests over 64K in JNI code, causes session disconnect, standalone server. JLAN-91. 16709: Fixed the FTP not logged on status return code, now uses reply code 530. JLAN-90. 16710: Added CIFS NT status code/text for the 'account locked' status, 0xC0000234. ETHREEOH-2897. 16717: Fixed setAllowConsoleShutdown setting in standalone server can cause infinite loop. JLAN-38. 16718: Fix for Alfresco and AVM spaces are empty when viewed by FTP and Alfresco is run as non-root. ETHREEOH-2652. 16727: Fix for unable to connect via FTP via Firefox (when anonymous logons are not enabled). ETHREEOH-2012. 16987: Merge 2.2 to 3.1: 13089: (record-only) Fix "Read-Write transaction" exception, when the user does not exist. ETWOTWO-1055. 13091: (record-only) Fix for NFS server "Read-Write transaction started within read-only transaction" exception. ETWOTWO-1054. 14190: (record-only) Fix for cut/paste a folder from Alfresco CIFS to local drive loses folder contents. ETWOTWO-1159. 14191: (record-only) Additional fix for CIFS 'No more connections' error. ETWOTWO-556 14199: (record-only) Fix for NFS problem with Solaris doing an Access check on the share level handle. ETWOTWO-1225. 14210: (record-only) Added support for FTP EPRT and EPSV commands, on IPv4 only. ETWOTWO-325. 14216: (record-only) Fixed FTP character encoding, ported UTF8 normalizer code from v3.x. ETWOTWO-1151. 14229: (record-only) Remove unused import. 14655: (record-only) Convert content I/O exceptions to file server exceptions during write and truncate. ETWOTWO-1241. 14825: (record-only) Add support for the extended response to the CIFS NTCreateAndX call, back port of ETWOTWO-1232. 15869: (record-only) Port of desktop action client side EXE fixes from v3.x. ETWOTWO-1374. 17130: Fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115. 17359: Fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225. 17839: Rewrite the rename file logic to handle MS Office file rename patterns. ETHREEOH-1951. 17842: Missing file from previous checkin. 17843: Re-use open files for the same session/process id so that writes on each file handle go to the same file. Port of ETWOTWO-1250. 17861: Merge 2.2 to 3.1: 17803: Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250. (Record-only) 18432: Added FTP data port range configuration via <dataPorts>n:n</dataPorts> config value. ETHREEOH-4103. 18451: Fixed incorrect FTP debug level name. 20200: Merge PATCHES/V3.2.1 to 3.3: 20142: Added debug output to dump the restart file name for FindFirst/FindNext folder searches (via the 'Search' debug output level). 20201: Merge PATCHES/V3.2.1 to 3.3: 20143: Fix for files being skipped during a long folder listing via CIFS, ALF-2730. 20202: Update svn:mergeinfo 20219: Fix for ALF-2791 - correction to changes in rev 20129 so the upload file servlet path is generated for all cases. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
536 lines
16 KiB
Java
536 lines
16 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.filesys.repo;
|
|
|
|
import java.io.FileNotFoundException;
|
|
import java.util.List;
|
|
|
|
import org.alfresco.jlan.server.filesys.FileAttribute;
|
|
import org.alfresco.jlan.server.filesys.FileInfo;
|
|
import org.alfresco.jlan.server.filesys.FileName;
|
|
import org.alfresco.jlan.server.filesys.FileType;
|
|
import org.alfresco.jlan.server.filesys.SearchContext;
|
|
import org.alfresco.jlan.server.filesys.pseudo.PseudoFile;
|
|
import org.alfresco.jlan.server.filesys.pseudo.PseudoFileList;
|
|
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
|
/**
|
|
* Wrapper for simple XPath searche against the node service. The search is performed statically
|
|
* outside the context instance itself - this class merely maintains the state of the search
|
|
* results across client connections.
|
|
*
|
|
* @author Derek Hulley
|
|
*/
|
|
public class ContentSearchContext extends SearchContext
|
|
{
|
|
// Debug logging
|
|
|
|
private static final Log logger = LogFactory.getLog(ContentSearchContext.class);
|
|
|
|
// Constants
|
|
//
|
|
// Link file size, actual size will be set if/when the link is opened
|
|
|
|
public final static int LinkFileSize = 512;
|
|
|
|
// List of nodes returned from the folder search
|
|
|
|
private CifsHelper cifsHelper;
|
|
private List<NodeRef> results;
|
|
private int index = -1;
|
|
|
|
// Pseudo file list blended into a wildcard folder search
|
|
|
|
private PseudoFileList pseudoList;
|
|
private boolean donePseudoFiles = false;
|
|
|
|
// Resume id
|
|
|
|
private int resumeId;
|
|
|
|
// Relative path being searched
|
|
|
|
private String m_relPath;
|
|
|
|
// Keep track of the last file name returned for fast restartAt processing
|
|
|
|
private String m_lastFileName;
|
|
|
|
/**
|
|
* Class constructor
|
|
*
|
|
* @param cifsHelper Filesystem helper class
|
|
* @param results List of file/folder nodes that match the search pattern
|
|
* @param searchStr Search path
|
|
* @param pseudoList List of pseudo files to be blended into the returned list of files
|
|
* @param relPath Relative path being searched
|
|
*/
|
|
protected ContentSearchContext(
|
|
CifsHelper cifsHelper,
|
|
List<NodeRef> results,
|
|
String searchStr,
|
|
PseudoFileList pseudoList,
|
|
String relPath)
|
|
{
|
|
super();
|
|
super.setSearchString(searchStr);
|
|
this.cifsHelper = cifsHelper;
|
|
this.results = results;
|
|
this.pseudoList = pseudoList;
|
|
|
|
m_relPath = relPath;
|
|
if ( m_relPath != null && m_relPath.endsWith( FileName.DOS_SEPERATOR_STR) == false)
|
|
m_relPath = m_relPath + FileName.DOS_SEPERATOR_STR;
|
|
}
|
|
|
|
/**
|
|
* Return the search as a string
|
|
*
|
|
* @return String
|
|
*/
|
|
public String toString()
|
|
{
|
|
StringBuilder sb = new StringBuilder(60);
|
|
|
|
sb.append("[ContentSearchContext searchStr=");
|
|
sb.append(getSearchString());
|
|
sb.append(", resultCount=");
|
|
sb.append(results.size());
|
|
sb.append(", pseudoList=");
|
|
if ( pseudoList != null)
|
|
sb.append( pseudoList.numberOfFiles());
|
|
else
|
|
sb.append("NULL");
|
|
sb.append("]");
|
|
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Return the resume id for the current file/directory in the search.
|
|
*
|
|
* @return int
|
|
*/
|
|
public int getResumeId()
|
|
{
|
|
return resumeId;
|
|
}
|
|
|
|
/**
|
|
* Determine if there are more files for the active search.
|
|
*
|
|
* @return boolean
|
|
*/
|
|
public boolean hasMoreFiles()
|
|
{
|
|
// Pseudo files are returned first
|
|
|
|
if ( donePseudoFiles == false && pseudoList != null && index < (pseudoList.numberOfFiles() - 1))
|
|
return true;
|
|
return index < (results.size() - 1);
|
|
}
|
|
|
|
/**
|
|
* 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
|
|
|
|
if (!hasMoreFiles())
|
|
return false;
|
|
|
|
// 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
|
|
|
|
info.copyFrom( pinfo);
|
|
|
|
// Generate a file id for the current file
|
|
|
|
if ( info != null && info.getFileId() == -1)
|
|
{
|
|
StringBuilder pathStr = new StringBuilder( m_relPath);
|
|
pathStr.append ( info.getFileName());
|
|
|
|
info.setFileId( pathStr.toString().hashCode());
|
|
}
|
|
|
|
// Check if we have finished with the pseudo file list, switch to the normal file list
|
|
|
|
if ( index == (pseudoList.numberOfFiles() - 1))
|
|
{
|
|
// Switch to the main file list
|
|
|
|
donePseudoFiles = true;
|
|
index = -1;
|
|
}
|
|
|
|
// Indicate that the file information is valid
|
|
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Return the next available file information for a real file/folder
|
|
|
|
try
|
|
{
|
|
// Loop until we get a valid node, might have been deleted since the initial folder search
|
|
|
|
ContentFileInfo nextInfo = null;
|
|
|
|
while ( nextInfo == null && index < results.size())
|
|
{
|
|
// Get the next node from the search
|
|
|
|
NodeRef nextNodeRef = results.get(index);
|
|
|
|
try {
|
|
|
|
// Get the file information and copy across to the callers file info
|
|
|
|
nextInfo = cifsHelper.getFileInformation(nextNodeRef, "");
|
|
info.copyFrom(nextInfo);
|
|
}
|
|
catch ( InvalidNodeRefException ex) {
|
|
|
|
// Log a warning
|
|
|
|
if ( logger.isWarnEnabled())
|
|
logger.warn("Noderef " + nextNodeRef + " no longer valid, ignoring");
|
|
|
|
// Update the node index, node no longer exists, try the next node in the search
|
|
|
|
index++;
|
|
resumeId++;
|
|
}
|
|
}
|
|
|
|
// Check if we have finished returning file info
|
|
|
|
if ( nextInfo == null)
|
|
return false;
|
|
|
|
// Generate a file id for the current file
|
|
|
|
StringBuilder pathStr = new StringBuilder( m_relPath);
|
|
pathStr.append ( info.getFileName());
|
|
|
|
info.setFileId( pathStr.toString().hashCode());
|
|
|
|
// Check if this is a link node
|
|
|
|
if ( nextInfo.isLinkNode())
|
|
{
|
|
// Set a dummy file size for the link data that will be generated if/when the file is opened
|
|
|
|
info.setFileSize( LinkFileSize);
|
|
|
|
// Make the link read-only
|
|
|
|
if ( info.isReadOnly() == false)
|
|
info.setFileAttributes( info.getFileAttributes() + FileAttribute.ReadOnly);
|
|
|
|
// Set the file type to indicate a symbolic link
|
|
|
|
info.setFileType( FileType.SymbolicLink);
|
|
}
|
|
else
|
|
info.setFileType( FileType.RegularFile);
|
|
|
|
// Keep track of the last file name returned
|
|
|
|
m_lastFileName = info.getFileName();
|
|
|
|
// Indicate that the file information is valid
|
|
|
|
return true;
|
|
}
|
|
catch (FileNotFoundException e)
|
|
{
|
|
}
|
|
|
|
// File information is not valid
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Return the file name of the next file in the active search. Returns null is the search is
|
|
* complete.
|
|
*
|
|
* @return String
|
|
*/
|
|
public String nextFileName()
|
|
{
|
|
// 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 = -1;
|
|
|
|
if ( results == null || results.size() == 0)
|
|
return null;
|
|
}
|
|
}
|
|
|
|
// 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, "");
|
|
|
|
// Keep track of the last file name returned
|
|
|
|
m_lastFileName = nextInfo.getFileName();
|
|
|
|
// Indicate that the file information is valid
|
|
|
|
return nextInfo.getFileName();
|
|
}
|
|
catch (FileNotFoundException e)
|
|
{
|
|
}
|
|
|
|
// 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)
|
|
{
|
|
// 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 name is the last file returned
|
|
|
|
if ( m_lastFileName != null && info.getFileName().equalsIgnoreCase( m_lastFileName)) {
|
|
|
|
// Reset the index/resume id
|
|
|
|
index = index - 1;
|
|
resumeId = resId - 1;
|
|
donePseudoFiles = true;
|
|
|
|
// DEBUG
|
|
|
|
if ( logger.isDebugEnabled())
|
|
logger.debug("Fast search restart - " + m_lastFileName);
|
|
return true;
|
|
}
|
|
|
|
// 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;
|
|
}
|
|
|
|
/**
|
|
* Check if the search is returning pseudo files or real file entries
|
|
*
|
|
* @return boolean
|
|
*/
|
|
protected boolean returningPseudoFiles() {
|
|
return donePseudoFiles ? true : false;
|
|
}
|
|
|
|
/**
|
|
* Return the relative path that is being searched
|
|
*
|
|
* @return String
|
|
*/
|
|
protected String getRelativePath() {
|
|
return m_relPath;
|
|
}
|
|
|
|
/**
|
|
* Return the results array size
|
|
*
|
|
* @return int
|
|
*/
|
|
protected int getResultsSize() {
|
|
return results != null ? results.size() : 0;
|
|
}
|
|
|
|
/**
|
|
* Return the pseudo file list size
|
|
*
|
|
* @return int
|
|
*/
|
|
protected int getPseudoListSize() {
|
|
return pseudoList != null ? pseudoList.numberOfFiles() : 0;
|
|
}
|
|
}
|