diff --git a/foreign dlls/Examine.xml b/foreign dlls/Examine.xml
index 1fc46f9147..61e0e3ee4b 100644
--- a/foreign dlls/Examine.xml
+++ b/foreign dlls/Examine.xml
@@ -4,38 +4,6 @@
Examine
-
-
- Override this method so that the Distinct() operator works
-
-
-
-
-
-
- Override this method so that the Distinct() operator works
-
-
-
-
-
- Returns the key value pair for the index specified
-
-
-
-
-
-
- Returns the value for the key specified
-
-
-
-
-
-
- a data structure for storing indexing/searching instructions
-
-
An interface representing an Examine Searcher
@@ -78,44 +46,118 @@
An instance of
-
+
- Simple search method which should default to searching content nodes
+ A collection of Examine Index Providers
-
-
-
-
-
+
- Searches the data source using the Examine Fluent API
+ Adds a provider to the collection.
- The fluent API search.
-
+ The provider to be added.
+
+ The collection is read-only.
+
+
+ is null.
+
+
+ The of is null.
+ - or -
+ The length of the of is less than 1.
+
+
+
+
-
+
- Creates an instance of SearchCriteria for the provider
+ Gets the enumerator.
-
+
- Creates an instance of SearchCriteria for the provider
+ Returns an object that implements the interface to iterate through the collection.
- The max number of results.
- The type of data in the index.
- A blank SearchCriteria
+
+ An object that implements to iterate through the collection.
+
-
+
- Creates an instance of SearchCriteria for the provider
+ Gets the with the specified name.
- The max number of results.
- The type of data in the index.
- The default operation.
- A blank SearchCriteria
+
+
+
+
+ Gets the at the specified index.
+
+
+
+
+
+ Simple class to store the definition of an indexed node
+
+
+
+
+ a data structure for storing indexing/searching instructions
+
+
+
+
+ Config section for Examine
+
+
+
+
+ Gets the instance of the Examine settings.
+
+ The instance.
+
+
+
+ Gets the search providers.
+
+ The search providers.
+
+
+
+ Gets the index providers.
+
+ The index providers.
+
+
+
+ Defines the supported operation for addition of additional clauses in the fluent API
+
+
+
+
+ Sets the next operation to be AND
+
+
+
+
+
+ Sets the next operation to be OR
+
+
+
+
+
+ Sets the next operation to be NOT
+
+
+
+
+
+ Compiles this instance for fluent API conclusion
+
+
@@ -152,6 +194,194 @@
The indexer data.
+
+
+ Config section for the Examine search providers
+
+
+
+
+ Gets the search providers.
+
+ The providers.
+
+
+
+ Gets or sets the default provider.
+
+ The default provider.
+
+
+
+ Base class for an Examine Index Provider. You must implement this class to create an IndexProvider
+
+
+
+
+ Initializes a new instance of the class.
+
+
+
+
+ Initializes a new instance of the class.
+
+ The indexer data.
+
+
+
+ Initializes the provider.
+
+ The friendly name of the provider.
+ A collection of the name/value pairs representing the provider-specific attributes specified in the configuration for this provider.
+
+ The name of the provider is null.
+
+
+ The name of the provider has a length of zero.
+
+
+ An attempt is made to call on a provider after the provider has already been initialized.
+
+
+
+
+ Forces a particular XML node to be reindexed
+
+ XML node to reindex
+ Type of index to use
+
+
+
+ Deletes a node from the index
+
+ Node to delete
+
+
+
+ Re-indexes all data for the index type specified
+
+
+
+
+
+ Rebuilds the entire index from scratch for all index types
+
+
+
+
+ Called when a node is ignored by the ValidateDocument method.
+
+
+
+
+
+ Raises the event.
+
+ The instance containing the event data.
+
+
+
+ Raises the event.
+
+ The instance containing the event data.
+
+
+
+ Raises the event.
+
+ The instance containing the event data.
+
+
+
+ Raises the event.
+
+ The instance containing the event data.
+
+
+
+ Raises the event.
+
+ The instance containing the event data.
+
+
+
+ Raises the event.
+
+ The instance containing the event data.
+
+
+
+ Raises the event.
+
+ The instance containing the event data.
+
+
+
+ Raises the event.
+
+ The instance containing the event data.
+
+
+
+ If true, the IndexingActionHandler will be run to keep the default index up to date.
+
+
+
+
+ Determines if the manager will call the indexing methods when content is saved or deleted as
+ opposed to cache being updated.
+
+
+
+
+ Gets/sets the index criteria to create the index with
+
+
+
+
+ Occurs for an Indexing Error
+
+
+
+
+ Occurs when a node is in its Indexing phase
+
+
+
+
+ Occurs when a node is in its Indexed phase
+
+
+
+
+ Occurs when a collection of nodes are in their Indexing phase (before a single node is processed)
+
+
+
+
+ Occurs when the collection of nodes have been indexed
+
+
+
+
+ Occurs when the indexer is gathering the fields and their associated data for the index
+
+
+
+
+ Occurs when a node is deleted from the index
+
+
+
+
+ Occurs when a particular field is having its data obtained
+
+
+
+
+ Occurs when node is found but outside the supported node set
+
+
Uses the default provider specified to search
@@ -208,6 +438,50 @@
Singleton
+
+
+ Simple search method which should default to searching content nodes
+
+
+
+
+
+
+
+
+ Searches the data source using the Examine Fluent API
+
+ The fluent API search.
+
+
+
+
+ Creates an instance of SearchCriteria for the provider
+
+
+
+
+
+ Creates an instance of SearchCriteria for the provider
+
+ The max number of results.
+ The type of data in the index.
+ A blank SearchCriteria
+
+
+
+ Creates an instance of SearchCriteria for the provider
+
+ The max number of results.
+ The type of data in the index.
+ The default operation.
+ A blank SearchCriteria
+
+
+
+
+
+
Defines the query methods for the fluent search API
@@ -384,142 +658,6 @@
The boolean operation.
-
-
- Config section for the Examine search providers
-
-
-
-
- Gets the search providers.
-
- The providers.
-
-
-
- Gets or sets the default provider.
-
- The default provider.
-
-
-
- Config section for the Examine Index Providers
-
-
-
-
- Gets the indexing providers.
-
- The providers.
-
-
-
- A collection of Examine Index Providers
-
-
-
-
- Adds a provider to the collection.
-
- The provider to be added.
-
- The collection is read-only.
-
-
- is null.
-
-
- The of is null.
- - or -
- The length of the of is less than 1.
-
-
-
-
-
-
-
- Gets the enumerator.
-
-
-
-
-
- Returns an object that implements the interface to iterate through the collection.
-
-
- An object that implements to iterate through the collection.
-
-
-
-
- Gets the with the specified name.
-
-
-
-
-
- Gets the at the specified index.
-
-
-
-
-
- Defines the supported operation for addition of additional clauses in the fluent API
-
-
-
-
- Sets the next operation to be AND
-
-
-
-
-
- Sets the next operation to be OR
-
-
-
-
-
- Sets the next operation to be NOT
-
-
-
-
-
- Compiles this instance for fluent API conclusion
-
-
-
-
-
- Config section for Examine
-
-
-
-
- Gets the instance of the Examine settings.
-
- The instance.
-
-
-
- Gets the search providers.
-
- The search providers.
-
-
-
- Gets the index providers.
-
- The index providers.
-
-
-
-
-
-
Passes a text string which is preformatted for the underlying search API. Examine will not modify this
@@ -537,181 +675,43 @@
Indicates the type of data to search on
-
+
- Base class for an Examine Index Provider. You must implement this class to create an IndexProvider
+ Config section for the Examine Index Providers
-
+
- Initializes a new instance of the class.
+ Gets the indexing providers.
+ The providers.
-
+
- Initializes a new instance of the class.
+ Override this method so that the Distinct() operator works
- The indexer data.
+
+
-
+
- Initializes the provider.
+ Override this method so that the Distinct() operator works
- The friendly name of the provider.
- A collection of the name/value pairs representing the provider-specific attributes specified in the configuration for this provider.
-
- The name of the provider is null.
-
-
- The name of the provider has a length of zero.
-
-
- An attempt is made to call on a provider after the provider has already been initialized.
-
+
-
+
- Forces a particular XML node to be reindexed
+ Returns the key value pair for the index specified
- XML node to reindex
- Type of index to use
+
+
-
+
- Deletes a node from the index
-
- Node to delete
-
-
-
- Re-indexes all data for the index type specified
-
-
-
-
-
- Rebuilds the entire index from scratch for all index types
-
-
-
-
- Called when a node is ignored by the ValidateDocument method.
-
-
-
-
-
- Raises the event.
-
- The instance containing the event data.
-
-
-
- Raises the event.
-
- The instance containing the event data.
-
-
-
- Raises the event.
-
- The instance containing the event data.
-
-
-
- Raises the event.
-
- The instance containing the event data.
-
-
-
- Raises the event.
-
- The instance containing the event data.
-
-
-
- Raises the event.
-
- The instance containing the event data.
-
-
-
- Raises the event.
-
- The instance containing the event data.
-
-
-
- Raises the event.
-
- The instance containing the event data.
-
-
-
- If true, the IndexingActionHandler will be run to keep the default index up to date.
-
-
-
-
- Determines if the manager will call the indexing methods when content is saved or deleted as
- opposed to cache being updated.
-
-
-
-
- Gets/sets the index criteria to create the index with
-
-
-
-
- Occurs for an Indexing Error
-
-
-
-
- Occurs when a node is in its Indexing phase
-
-
-
-
- Occurs when a node is in its Indexed phase
-
-
-
-
- Occurs when a collection of nodes are in their Indexing phase (before a single node is processed)
-
-
-
-
- Occurs when the collection of nodes have been indexed
-
-
-
-
- Occurs when the indexer is gathering the fields and their associated data for the index
-
-
-
-
- Occurs when a node is deleted from the index
-
-
-
-
- Occurs when a particular field is having its data obtained
-
-
-
-
- Occurs when node is found but outside the supported node set
-
-
-
-
- Simple class to store the definition of an indexed node
+ Returns the value for the key specified
+
+
diff --git a/foreign dlls/UmbracoExamine.XML b/foreign dlls/UmbracoExamine.XML
index 20bf104d91..eda71bbcbf 100644
--- a/foreign dlls/UmbracoExamine.XML
+++ b/foreign dlls/UmbracoExamine.XML
@@ -4,62 +4,42 @@
UmbracoExamine
-
+
-
+ Initializes a new instance of the class.
+ The search.
+ The occurance.
-
-
- Returns a that represents this instance.
-
-
- A that represents this instance.
-
-
-
+
Query on the id
The id.
-
+
Query on the NodeName
Name of the node.
-
-
- Query on the NodeName
-
- Name of the node.
-
-
-
+
Query on the NodeTypeAlias
The node type alias.
-
-
- Query on the NodeTypeAlias
-
- The node type alias.
-
-
-
+
Query on the Parent ID
The id of the parent.
-
+
Query on the specified field
@@ -67,7 +47,81 @@
The field value.
-
+
+
+ Ranges the specified field name.
+
+ Name of the field.
+ The start.
+ The end.
+
+
+
+
+ Ranges the specified field name.
+
+ Name of the field.
+ The start.
+ The end.
+ if set to true [include lower].
+ if set to true [include upper].
+
+
+
+
+ Ranges the specified field name.
+
+ Name of the field.
+ The start.
+ The end.
+
+
+
+
+ Ranges the specified field name.
+
+ Name of the field.
+ The start.
+ The end.
+ if set to true [include lower].
+ if set to true [include upper].
+
+
+
+
+ Ranges the specified field name.
+
+ Name of the field.
+ The start.
+ The end.
+
+
+
+
+ Ranges the specified field name.
+
+ Name of the field.
+ The start.
+ The end.
+ if set to true [include lower].
+ if set to true [include upper].
+
+
+
+
+ Query on the NodeName
+
+ Name of the node.
+
+
+
+
+ Query on the NodeTypeAlias
+
+ The node type alias.
+
+
+
Query on the specified field
@@ -75,95 +129,413 @@
The field value.
-
+
- Passes a raw search query to the provider to handle
+ Queries multiple fields with each being an And boolean operation
+ The fields.
The query.
-
+
+
+ Queries multiple fields with each being an Or boolean operation
+
+ The fields.
+ The query.
+
+
+
+
+ Queries multiple fields with each being an Not boolean operation
+
+ The fields.
+ The query.
+
+
+
+
+ Queries on multiple fields with their inclusions customly defined
+
+ The fields.
+ The operations.
+ The query.
+
+
+
Orders the results by the specified fields
The field names.
-
+
Orders the results by the specified fields in a descending order
The field names.
-
-
- Internal operation for adding the ordered results
-
- if set to true [descending].
- The field names.
-
-
-
+
Gets the boolean operation which this query method will be added as
The boolean operation.
-
+
-
+ Defines XPath statements that map to specific umbraco nodes
-
+
- Internal cache of search results
-
-
-
-
- Creates the search result from a
-
- The doc to convert.
- The score.
- A populated search result object
-
-
-
- Skips to a particular point in the search results.
-
-
- This allows for lazy loading of the results paging. We don't go into Lucene until we have to.
-
- The skip.
-
-
-
-
- Gets the enumerator.
+ Returns a list of ALL properties names for all nodes defined in the data source
-
+
- Returns an enumerator that iterates through a collection.
+ Returns a list of ALL system property names for all nodes defined in the data source
+
+
+
+
+ A class that defines the type of index for each Umbraco field (non user defined fields)
+ Alot of standard umbraco fields shouldn't be tokenized or even indexed, just stored into lucene
+ for retreival after searching.
+
+
+
+
+ return the index policy for the field name passed in, if not found, return normal
+
+
+
+
+
+
+ Extension methods for IndexSet
+
+
+
+
+ Convert the indexset to indexerdata.
+ This detects if there are no user/system fields specified and if not, uses the data service to look them
+ up and update the in memory IndexSet.
+
+
+
+
+
+
+ Returns a string array of all fields that are indexed including Umbraco fields
+
+
+
+
+ removes html markup from a string
+
+
+
+
+
+
+ Gets published content by xpath
+
+
+
+
+
+
+ This is quite an intensive operation...
+ get all root content, then get the XML structure for all children,
+ then run xpath against the navigator that's created
+
+
+
+
+
+
+ Unfortunately, we need to implement our own IsProtected method since
+ the Umbraco core code requires an HttpContext for this method and when we're running
+ async, there is no context
+
+
+
+
+
+
+ Unfortunately, we need to implement our own IsProtected method since
+ the Umbraco core code requires an HttpContext for this method and when we're running
+ async, there is no context
+
+
+
+
+
+
+
+ Returns a list of all of the user defined property names in Umbraco
+
+
+
+
+
+ Returns a list of all system field names in Umbraco
+
+
+
+
+
+ An implementation of the fluent API boolean operations
+
+
+
+
+ Sets the next operation to be AND
+
+
+
+
+
+ Sets the next operation to be OR
+
+
+
+
+
+ Sets the next operation to be NOT
+
+
+
+
+
+ Compiles this instance for fluent API conclusion
+
+
+
+
+
+ Adds an index field to the collection
+
+
+
+
+
+ Default property for accessing an IndexField definition
+
+ Field Name
+
+
+
+
+ Manages the delegation of authority over which machine in a load balanced environment will perform the indexing.
+ This is done by an IO race on initialization of the LuceneExamineIndexer.
+ If a server's app pool is recycled at a seperate time than the rest of the servers in the cluster, it will generally
+ take over the executive role (this is dependant on the time that the last latest server's app pool was restarted).
+ The Executive is determined by file lock (.lck) file, theoretically there should only be one of these.
+ If there is only 1 server in the cluster, then obviously it is the Executive.
+
+
+
+
+ Fired every 10 minutes by the timer object. This timestamps the EXA file to
+ enure the system knows that this server is active.
+ This is to ensure that all systems in a Load Balanced environment are aware of exactly how
+ many other servers are taking part in the load balancing and who they are.
+
+
+
+
+
+
+ Creates an xml file to declare that this machine is taking part in the index writing.
+ This is used to determine the master indexer if this app exists in a load balanced environment.
+
+
+
+
+ Creates a lock file for this machine if there aren't other ones.
+
+ returns true if a lock file was successfully created for this machine.
+
+
+
+ delete all old lck files (any that are more than cutoffTime old)
+
+
+
+
+
+ delete all old exa files (any that are more than cutoffTime old)
+
+
+
+
+
+ Get all lck files that are not named by this machines name. If there are any, this means that another machine
+ has won the race and created the lck file for itself. If there is a lck file with the current machines name, then this
+ must mean it was previously the master indexer and the apppool has recycled in less than the hour.
+
+
+
+
+
+ Updates the timestamp for lck file if it exists
+
+
+
+
+ Updates the timestamp for the exa file
+
+
+
+
+ Read the machines EXA file
+
+
+
+
+
+ Read the machines LCK file
+
+
+
+
+
+ This will check for any lock files, not created by the current machine. If there are any, then this machine will flag it's
+ exa file as not being the master indexer, otherwise, it will try to create it's own lock file to let others know it is the race
+ winner and therefore the master indexer. If this succeeds, it will update it's exa file to flag it as the master indexer.
+
+
+
+
+ When the object is disposed, all data should be written
+
+
+
+
+ Ensures there is an elected Executive, otherwise starts the race.
+ Returns a bool as to whether or not this is the Executive machine.
+
+
+
+
+ Returns a boolean determining whether or not this server involved in a LoadBalanced
+ environment with Umbraco Examine.
+
+
+
+
+ Returns the machine name of the executive indexer
+
+
+
+
+ The number of servers active in indexing
+
+
+
+
+ Gets the doc id at a specified index
+
+ The index.
+
+
+
+
+ Gets the doc score for a doc at a specified index
+
+ The index.
+
+
+
+
+ Adds a single character wildcard to the string for Lucene wildcard matching
+
+ The string to wildcard.
+ An IExamineValue for the required operation
+ Thrown when the string is null or empty
+
+
+
+ Adds a multi-character wildcard to a string for Lucene wildcard matching
+
+ The string to wildcard.
+ An IExamineValue for the required operation
+ Thrown when the string is null or empty
+
+
+
+ Configures the string for fuzzy matching in Lucene using the default fuzziness level
+
+ The string to configure fuzzy matching on.
+ An IExamineValue for the required operation
+ Thrown when the string is null or empty
+
+
+
+ Configures the string for fuzzy matching in Lucene using the supplied fuzziness level
+
+ The string to configure fuzzy matching on.
+ The fuzzieness level.
- An object that can be used to iterate through the collection.
+ An IExamineValue for the required operation
+ Thrown when the string is null or empty
-
+
- Gets the total number of results for the search
+ Configures the string for boosting in Lucene
- The total item count.
+ The string to wildcard.
+ The boost level.
+
+ An IExamineValue for the required operation
+
+ Thrown when the string is null or empty
-
+
- Default property for accessing Image Sets
+ Configures the string for proximity matching
-
-
+ The string to wildcard.
+ The proximity level.
+
+ An IExamineValue for the required operation
+
+ Thrown when the string is null or empty
+
+
+
+ Escapes the string within Lucene
+
+ The string to wildcard.
+ An IExamineValue for the required operation
+ Thrown when the string is null or empty
+
+
+
+ Sets up an for an additional Examiness
+
+ The IExamineValue to continue working with.
+ The string to postfix.
+ Combined strings
+
+
+
+ Converts an Examine boolean operation to a Lucene representation
+
+ The operation.
+ The translated Boolean operation
+
+
+
+ Converts a Lucene boolean occurrence to an Examine representation
+
+ The occurrence to translate.
+ The translated boolean occurrence
@@ -356,614 +728,6 @@
-
-
- An implementation of the fluent API boolean operations
-
-
-
-
- Sets the next operation to be AND
-
-
-
-
-
- Sets the next operation to be OR
-
-
-
-
-
- Sets the next operation to be NOT
-
-
-
-
-
- Compiles this instance for fluent API conclusion
-
-
-
-
-
- Returns a list of ALL properties names for all nodes defined in the data source
-
-
-
-
-
- Returns a list of ALL system property names for all nodes defined in the data source
-
-
-
-
-
- removes html markup from a string
-
-
-
-
-
-
- Gets published content by xpath
-
-
-
-
-
-
- This is quite an intensive operation...
- get all root content, then get the XML structure for all children,
- then run xpath against the navigator that's created
-
-
-
-
-
-
- Unfortunately, we need to implement our own IsProtected method since
- the Umbraco core code requires an HttpContext for this method and when we're running
- async, there is no context
-
-
-
-
-
-
- Unfortunately, we need to implement our own IsProtected method since
- the Umbraco core code requires an HttpContext for this method and when we're running
- async, there is no context
-
-
-
-
-
-
-
- Returns a list of all of the user defined property names in Umbraco
-
-
-
-
-
- Returns a list of all system field names in Umbraco
-
-
-
-
-
- Adds an index field to the collection
-
-
-
-
-
- Default property for accessing an IndexField definition
-
- Field Name
-
-
-
-
- An instance for wiring up Examine to the Umbraco events system
-
-
-
-
- Creates a new instance of the class
-
-
-
-
- Only index using providers that SupportUnpublishedContent
-
-
-
-
-
-
- Only remove indexes using providers that SupportUnpublishedContent
-
-
-
-
-
-
- Only Update indexes for providers that dont SupportUnpublishedContent
-
-
-
-
-
-
- Only update indexes for providers that don't SupportUnpublishedContnet
-
-
-
-
-
-
- Adds a single character wildcard to the string for Lucene wildcard matching
-
- The string to wildcard.
- An IExamineValue for the required operation
- Thrown when the string is null or empty
-
-
-
- Adds a multi-character wildcard to a string for Lucene wildcard matching
-
- The string to wildcard.
- An IExamineValue for the required operation
- Thrown when the string is null or empty
-
-
-
- Configures the string for fuzzy matching in Lucene using the default fuzziness level
-
- The string to configure fuzzy matching on.
- An IExamineValue for the required operation
- Thrown when the string is null or empty
-
-
-
- Configures the string for fuzzy matching in Lucene using the supplied fuzziness level
-
- The string to configure fuzzy matching on.
- The fuzzieness level.
-
- An IExamineValue for the required operation
-
- Thrown when the string is null or empty
-
-
-
- Configures the string for boosting in Lucene
-
- The string to wildcard.
- The boost level.
-
- An IExamineValue for the required operation
-
- Thrown when the string is null or empty
-
-
-
- Configures the string for proximity matching
-
- The string to wildcard.
- The proximity level.
-
- An IExamineValue for the required operation
-
- Thrown when the string is null or empty
-
-
-
- Escapes the string within Lucene
-
- The string to wildcard.
- An IExamineValue for the required operation
- Thrown when the string is null or empty
-
-
-
- Sets up an for an additional Examiness
-
- The IExamineValue to continue working with.
- The string to postfix.
- Combined strings
-
-
-
- Converts an Examine boolean operation to a Lucene representation
-
- The operation.
- The translated Boolean operation
-
-
-
- Converts a Lucene boolean occurrence to an Examine representation
-
- The occurrence to translate.
- The translated boolean occurrence
-
-
-
- Extension methods for IndexSet
-
-
-
-
- Convert the indexset to indexerdata.
- This detects if there are no user/system fields specified and if not, uses the data service to look them
- up and update the in memory IndexSet.
-
-
-
-
-
-
- Returns a string array of all fields that are indexed including Umbraco fields
-
-
-
-
- Initializes a new instance of the class.
-
- The search.
- The occurance.
-
-
-
- Query on the id
-
- The id.
-
-
-
-
- Query on the NodeName
-
- Name of the node.
-
-
-
-
- Query on the NodeTypeAlias
-
- The node type alias.
-
-
-
-
- Query on the Parent ID
-
- The id of the parent.
-
-
-
-
- Query on the specified field
-
- Name of the field.
- The field value.
-
-
-
-
- Ranges the specified field name.
-
- Name of the field.
- The start.
- The end.
-
-
-
-
- Ranges the specified field name.
-
- Name of the field.
- The start.
- The end.
- if set to true [include lower].
- if set to true [include upper].
-
-
-
-
- Ranges the specified field name.
-
- Name of the field.
- The start.
- The end.
-
-
-
-
- Ranges the specified field name.
-
- Name of the field.
- The start.
- The end.
- if set to true [include lower].
- if set to true [include upper].
-
-
-
-
- Ranges the specified field name.
-
- Name of the field.
- The start.
- The end.
-
-
-
-
- Ranges the specified field name.
-
- Name of the field.
- The start.
- The end.
- if set to true [include lower].
- if set to true [include upper].
-
-
-
-
- Query on the NodeName
-
- Name of the node.
-
-
-
-
- Query on the NodeTypeAlias
-
- The node type alias.
-
-
-
-
- Query on the specified field
-
- Name of the field.
- The field value.
-
-
-
-
- Queries multiple fields with each being an And boolean operation
-
- The fields.
- The query.
-
-
-
-
- Queries multiple fields with each being an Or boolean operation
-
- The fields.
- The query.
-
-
-
-
- Queries multiple fields with each being an Not boolean operation
-
- The fields.
- The query.
-
-
-
-
- Queries on multiple fields with their inclusions customly defined
-
- The fields.
- The operations.
- The query.
-
-
-
-
- Orders the results by the specified fields
-
- The field names.
-
-
-
-
- Orders the results by the specified fields in a descending order
-
- The field names.
-
-
-
-
- Gets the boolean operation which this query method will be added as
-
- The boolean operation.
-
-
-
- Manages the delegation of authority over which machine in a load balanced environment will perform the indexing.
- This is done by an IO race on initialization of the LuceneExamineIndexer.
- If a server's app pool is recycled at a seperate time than the rest of the servers in the cluster, it will generally
- take over the executive role (this is dependant on the time that the last latest server's app pool was restarted).
- The Executive is determined by file lock (.lck) file, theoretically there should only be one of these.
- If there is only 1 server in the cluster, then obviously it is the Executive.
-
-
-
-
- Fired every 10 minutes by the timer object. This timestamps the EXA file to
- enure the system knows that this server is active.
- This is to ensure that all systems in a Load Balanced environment are aware of exactly how
- many other servers are taking part in the load balancing and who they are.
-
-
-
-
-
-
- Creates an xml file to declare that this machine is taking part in the index writing.
- This is used to determine the master indexer if this app exists in a load balanced environment.
-
-
-
-
- Creates a lock file for this machine if there aren't other ones.
-
- returns true if a lock file was successfully created for this machine.
-
-
-
- delete all old lck files (any that are more than cutoffTime old)
-
-
-
-
-
- delete all old exa files (any that are more than cutoffTime old)
-
-
-
-
-
- Get all lck files that are not named by this machines name. If there are any, this means that another machine
- has won the race and created the lck file for itself. If there is a lck file with the current machines name, then this
- must mean it was previously the master indexer and the apppool has recycled in less than the hour.
-
-
-
-
-
- Updates the timestamp for lck file if it exists
-
-
-
-
- Updates the timestamp for the exa file
-
-
-
-
- Read the machines EXA file
-
-
-
-
-
- Read the machines LCK file
-
-
-
-
-
- This will check for any lock files, not created by the current machine. If there are any, then this machine will flag it's
- exa file as not being the master indexer, otherwise, it will try to create it's own lock file to let others know it is the race
- winner and therefore the master indexer. If this succeeds, it will update it's exa file to flag it as the master indexer.
-
-
-
-
- When the object is disposed, all data should be written
-
-
-
-
- Ensures there is an elected Executive, otherwise starts the race.
- Returns a bool as to whether or not this is the Executive machine.
-
-
-
-
- Returns a boolean determining whether or not this server involved in a LoadBalanced
- environment with Umbraco Examine.
-
-
-
-
- Returns the machine name of the executive indexer
-
-
-
-
- The number of servers active in indexing
-
-
-
-
- Gets the doc id at a specified index
-
- The index.
-
-
-
-
- Gets the doc score for a doc at a specified index
-
- The index.
-
-
-
-
- Data service used to query for media
-
-
-
-
- This is quite an intensive operation...
- get all root media, then get the XML structure for all children,
- then run xpath against the navigator that's created
-
-
-
-
-
-
- A class that defines the type of index for each Umbraco field (non user defined fields)
- Alot of standard umbraco fields shouldn't be tokenized or even indexed, just stored into lucene
- for retreival after searching.
-
-
-
-
- return the index policy for the field name passed in, if not found, return normal
-
-
-
-
-
-
- Event arguments for a Document Writing event
-
-
-
-
-
-
-
-
-
-
-
-
- Lucene.NET Document, including all previously added fields
-
-
-
-
- Fields of the indexer
-
-
-
-
- NodeId of the document being written
-
-
@@ -1338,18 +1102,6 @@
-
-
- Defines XPath statements that map to specific umbraco nodes
-
-
-
-
- Deletes all files in the folder and returns the number deleted.
-
-
-
-
The folder path of where the lucene index is stored
@@ -1413,5 +1165,253 @@
- path
+
+
+
+
+
+
+
+ Returns a that represents this instance.
+
+
+ A that represents this instance.
+
+
+
+
+ Query on the id
+
+ The id.
+
+
+
+
+ Query on the NodeName
+
+ Name of the node.
+
+
+
+
+ Query on the NodeName
+
+ Name of the node.
+
+
+
+
+ Query on the NodeTypeAlias
+
+ The node type alias.
+
+
+
+
+ Query on the NodeTypeAlias
+
+ The node type alias.
+
+
+
+
+ Query on the Parent ID
+
+ The id of the parent.
+
+
+
+
+ Query on the specified field
+
+ Name of the field.
+ The field value.
+
+
+
+
+ Query on the specified field
+
+ Name of the field.
+ The field value.
+
+
+
+
+ Passes a raw search query to the provider to handle
+
+ The query.
+
+
+
+
+ Orders the results by the specified fields
+
+ The field names.
+
+
+
+
+ Orders the results by the specified fields in a descending order
+
+ The field names.
+
+
+
+
+ Internal operation for adding the ordered results
+
+ if set to true [descending].
+ The field names.
+
+
+
+
+ Gets the boolean operation which this query method will be added as
+
+ The boolean operation.
+
+
+
+
+
+
+
+
+ Internal cache of search results
+
+
+
+
+ Creates the search result from a
+
+ The doc to convert.
+ The score.
+ A populated search result object
+
+
+
+ Skips to a particular point in the search results.
+
+
+ This allows for lazy loading of the results paging. We don't go into Lucene until we have to.
+
+ The skip.
+
+
+
+
+ Gets the enumerator.
+
+
+
+
+
+ Returns an enumerator that iterates through a collection.
+
+
+ An object that can be used to iterate through the collection.
+
+
+
+
+ Gets the total number of results for the search
+
+ The total item count.
+
+
+
+ An instance for wiring up Examine to the Umbraco events system
+
+
+
+
+ Creates a new instance of the class
+
+
+
+
+ Only index using providers that SupportUnpublishedContent
+
+
+
+
+
+
+ Only remove indexes using providers that SupportUnpublishedContent
+
+
+
+
+
+
+ Only Update indexes for providers that dont SupportUnpublishedContent
+
+
+
+
+
+
+ Only update indexes for providers that don't SupportUnpublishedContnet
+
+
+
+
+
+
+ Event arguments for a Document Writing event
+
+
+
+
+
+
+
+
+
+
+
+
+ Lucene.NET Document, including all previously added fields
+
+
+
+
+ Fields of the indexer
+
+
+
+
+ NodeId of the document being written
+
+
+
+
+ Deletes all files in the folder and returns the number deleted.
+
+
+
+
+
+
+ Data service used to query for media
+
+
+
+
+ This is quite an intensive operation...
+ get all root media, then get the XML structure for all children,
+ then run xpath against the navigator that's created
+
+
+
+
+
+
+ Default property for accessing Image Sets
+
+
+
+
diff --git a/foreign dlls/UmbracoExamine.dll b/foreign dlls/UmbracoExamine.dll
index eabda875c6..90ae2e545b 100644
Binary files a/foreign dlls/UmbracoExamine.dll and b/foreign dlls/UmbracoExamine.dll differ
diff --git a/umbraco/presentation/config/Dashboard.config b/umbraco/presentation/config/Dashboard.config
index 46b908302f..f1b0bce91a 100644
--- a/umbraco/presentation/config/Dashboard.config
+++ b/umbraco/presentation/config/Dashboard.config
@@ -1,25 +1,17 @@
-
+
-
translator
-
default
content
-
/umbraco/dashboard/latestEdits.ascx
-
- writer
- editor
- administrator
-
-
+ writereditoradministrator
@@ -47,7 +39,26 @@
/umbraco/dashboard/latestEdits.ascx
-
-
-
+
+
+ default
+ content
+
+
+ /usercontrols/dashboards/ContactForm_logs.ascx
+
+
+ /usercontrols/dashboards/EmailAFriendForm_logs.ascx
+
+
+
+
+ default
+ member
+
+
+ /umbraco/members/membersearch.ascx
+
+
+
\ No newline at end of file
diff --git a/umbraco/presentation/config/ExamineIndex.config b/umbraco/presentation/config/ExamineIndex.config
index 058437741e..db024405fb 100644
--- a/umbraco/presentation/config/ExamineIndex.config
+++ b/umbraco/presentation/config/ExamineIndex.config
@@ -28,6 +28,9 @@ More information and documentation can be found on CodePlex: http://umbracoexami
+
+
+
diff --git a/umbraco/presentation/config/ExamineSettings.config b/umbraco/presentation/config/ExamineSettings.config
index bdcfcb9366..2d916e585d 100644
--- a/umbraco/presentation/config/ExamineSettings.config
+++ b/umbraco/presentation/config/ExamineSettings.config
@@ -21,7 +21,7 @@ More information and documentation can be found on CodePlex: http://umbracoexami
supportUnpublished="true"
supportProtected="true"
interval="10"
- analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
+ analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"/>
@@ -31,7 +31,7 @@ More information and documentation can be found on CodePlex: http://umbracoexami
analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
+ analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net" enableLeadingWildcards="true"/>
diff --git a/umbraco/presentation/config/UrlRewriting.config b/umbraco/presentation/config/UrlRewriting.config
index a4740dfcd3..58fb55ea48 100644
--- a/umbraco/presentation/config/UrlRewriting.config
+++ b/umbraco/presentation/config/UrlRewriting.config
@@ -1,6 +1,6 @@
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index eb38e50e0c..1b775ec80e 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -572,6 +572,13 @@
Code
+
+ MemberSearch.ascx
+ ASPXCodeBehind
+
+
+ MemberSearch.ascx
+
@@ -1531,6 +1538,7 @@
+
diff --git a/umbraco/presentation/umbraco/Search/QuickSearchHandler.ashx.cs b/umbraco/presentation/umbraco/Search/QuickSearchHandler.ashx.cs
index be2cb7faa7..a77c43e424 100644
--- a/umbraco/presentation/umbraco/Search/QuickSearchHandler.ashx.cs
+++ b/umbraco/presentation/umbraco/Search/QuickSearchHandler.ashx.cs
@@ -65,7 +65,7 @@ namespace umbraco.presentation.umbraco.Search
}
JavaScriptSerializer js = new JavaScriptSerializer();
- context.Response.Write(js.Serialize(results.Take(100)));
+ context.Response.Write(js.Serialize(results.Take(limit)));
}
public static void Authorize()
diff --git a/umbraco/presentation/umbraco/css/umbracoGui.css b/umbraco/presentation/umbraco/css/umbracoGui.css
index 905eed00d7..1c5bbd39ff 100644
--- a/umbraco/presentation/umbraco/css/umbracoGui.css
+++ b/umbraco/presentation/umbraco/css/umbracoGui.css
@@ -167,4 +167,5 @@ img
background-image: url('../images/throbber.gif');
background-position:right;
background-repeat:no-repeat;
-}
\ No newline at end of file
+}
+
diff --git a/umbraco/presentation/umbraco/dialogs/search.aspx b/umbraco/presentation/umbraco/dialogs/search.aspx
index 83bdb10f70..a3eceb7ddb 100644
--- a/umbraco/presentation/umbraco/dialogs/search.aspx
+++ b/umbraco/presentation/umbraco/dialogs/search.aspx
@@ -5,14 +5,9 @@