beagle r4502 - in trunk/beagle: BeagleClient beagled beagled/FileSystemQueryable beagled/KMailQueryable beagled/KonqHistoryQueryable beagled/ThunderbirdQueryable

[dbera svn gnome org]

Author: dbera
Date: Wed Feb 20 13:55:25 2008
New Revision: 4502
URL: http://svn.gnome.org/viewvc/beagle?rev=4502&view=rev

Log:
Rename Indexable.Crawled to Indexable.FlushBufferCache because that is what it actually is.


Modified:
   trunk/beagle/BeagleClient/Indexable.cs
   trunk/beagle/beagled/BuildIndex.cs
   trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs
   trunk/beagle/beagled/Filter.cs
   trunk/beagle/beagled/FilterFactory.cs
   trunk/beagle/beagled/KMailQueryable/KMailIndexer.cs
   trunk/beagle/beagled/KonqHistoryQueryable/KonqQueryable.cs
   trunk/beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs

Modified: trunk/beagle/BeagleClient/Indexable.cs
==============================================================================
--- trunk/beagle/BeagleClient/Indexable.cs	(original)
+++ trunk/beagle/BeagleClient/Indexable.cs	Wed Feb 20 13:55:25 2008
@@ -91,9 +91,12 @@
 
 		// Is this being indexed because of crawling or other
 		// background activity?
-		// If crawl is set, then the underlying file will be flushed
+		// If set, then the underlying file will be flushed
 		// from buffer cache as soon as it is indexed.
-		private bool crawled = true;
+		// Set it to true when the buffer cache should not
+		// be disturbed due to this indexable (e.g. during
+		// crawling).
+		private bool flush_buffer_cache = false;
 
 		// Is this object inherently contentless?
 		private bool no_content = false;
@@ -277,10 +280,10 @@
 			get { return ! DeleteContent && ContentUri.IsFile && ParentUri == null; }
 		}
 
-		[XmlAttribute]
-		public bool Crawled {
-			get { return crawled; }
-			set { crawled = value; }
+		[XmlAttribute ("Crawled")]
+		public bool FlushBufferCache {
+			get { return flush_buffer_cache; }
+			set { flush_buffer_cache = value; }
 		}
 
 		[XmlAttribute]

Modified: trunk/beagle/beagled/BuildIndex.cs
==============================================================================
--- trunk/beagle/beagled/BuildIndex.cs	(original)
+++ trunk/beagle/beagled/BuildIndex.cs	Wed Feb 20 13:55:25 2008
@@ -642,7 +642,7 @@
 			Uri uri = UriFu.PathToFileUri (file.FullName);
 			Indexable indexable = new Indexable (uri);
 			indexable.Timestamp = file.LastWriteTimeUtc;
-			indexable.Crawled = true;
+			indexable.FlushBufferCache = true;
 			indexable.AddProperty (Property.NewUnsearched ("fixme:filesize", file.Length));
 			FSQ.AddStandardPropertiesToIndexable (indexable, file.Name, Guid.Empty, false);
 

Modified: trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs
==============================================================================
--- trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs	(original)
+++ trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs	Wed Feb 20 13:55:25 2008
@@ -219,7 +219,7 @@
 		public Indexable FileToIndexable (string         path,
 						  Guid           id,
 						  DirectoryModel parent,
-						  bool           crawl_mode)
+						  bool           crawling)
 		{
 			Indexable indexable;
 
@@ -244,7 +244,7 @@
 
 			indexable.ContentUri = UriFu.PathToFileUri (path);
 			indexable.DisplayUri = UriFu.PathToFileUri (path);
-			indexable.Crawled = crawl_mode;
+			indexable.FlushBufferCache = crawling;
 			indexable.Filtering = Beagle.IndexableFiltering.Always;
 
 			FileInfo fi = new FileInfo (path);
@@ -257,7 +257,7 @@
 			indexable.LocalState ["Path"] = path;
 
 			MergeExternalPendingIndexable (indexable);
-			Indexable xmp_indexable = xmp_handler.MergeXmpData (ref indexable, path, id, parent, crawl_mode);
+			Indexable xmp_indexable = xmp_handler.MergeXmpData (ref indexable, path, id, parent, crawling);
 
 			// In full generality, the xmp_handler can request an entirely new indexable to be scheduled.
 			// So, we should do something with the returned xmp_indexable if it is not null.

Modified: trunk/beagle/beagled/Filter.cs
==============================================================================
--- trunk/beagle/beagled/Filter.cs	(original)
+++ trunk/beagle/beagled/Filter.cs	Wed Feb 20 13:55:25 2008
@@ -144,21 +144,6 @@
 			set { indexable = value; }
 		}
 		
-		//////////////////////////
-		
-		private bool crawl_mode = false;
-
-		public void EnableCrawlMode ()
-		{
-			crawl_mode = true;
-		}
-		
-		protected bool CrawlMode {
-			get { return crawl_mode; }
-		}
-
-		//////////////////////////
-
 		// Filters which deal with big files, and that don't need
 		// to read in whole files may want to set this to false
 		// to avoid wasting cycles in disk wait.
@@ -763,7 +748,7 @@
 			if (currentStream != null) {
 				// When crawling, give the OS a hint that we don't
 				// need to keep this file around in the page cache.
-				if (CrawlMode && currentStream is FileStream)
+				if (indexable.FlushBufferCache && currentStream is FileStream)
 					FileAdvise.FlushCache ((FileStream) currentStream);
 
 				currentStream.Close ();

Modified: trunk/beagle/beagled/FilterFactory.cs
==============================================================================
--- trunk/beagle/beagled/FilterFactory.cs	(original)
+++ trunk/beagle/beagled/FilterFactory.cs	Wed Feb 20 13:55:25 2008
@@ -309,9 +309,6 @@
 					}
 				}
 
-				if (indexable.Crawled)
-					candidate_filter.EnableCrawlMode ();
-
 				// Set the indexable on the filter.
 				candidate_filter.Indexable = indexable;
 

Modified: trunk/beagle/beagled/KMailQueryable/KMailIndexer.cs
==============================================================================
--- trunk/beagle/beagled/KMailQueryable/KMailIndexer.cs	(original)
+++ trunk/beagle/beagled/KMailQueryable/KMailIndexer.cs	Wed Feb 20 13:55:25 2008
@@ -375,7 +375,7 @@
 			indexable.HitType = "MailMessage";
 			indexable.MimeType = "message/rfc822";
 			indexable.CacheContent = true;
-			indexable.Crawled = crawl;
+			indexable.FlushBufferCache = crawl;
 
 			indexable.AddProperty (Property.NewUnsearched ("fixme:client", "kmail"));
 			indexable.AddProperty (Property.NewUnsearched ("fixme:account", account_name));
@@ -401,7 +401,6 @@
 			indexable.HitType = "MailMessage";
 			indexable.MimeType = "message/rfc822";
 			indexable.CacheContent = true;
-			indexable.Crawled = true; // mbox files will be stored in temp files, so flush them when done
 
 			indexable.AddProperty (Property.NewUnsearched ("fixme:client", "kmail"));
 			indexable.AddProperty (Property.NewUnsearched ("fixme:account", account_name));

Modified: trunk/beagle/beagled/KonqHistoryQueryable/KonqQueryable.cs
==============================================================================
--- trunk/beagle/beagled/KonqHistoryQueryable/KonqQueryable.cs	(original)
+++ trunk/beagle/beagled/KonqHistoryQueryable/KonqQueryable.cs	Wed Feb 20 13:55:25 2008
@@ -163,7 +163,7 @@
 
 		/////////////////////////////////////////////////
 		
-		private Indexable FileToIndexable (string path, bool crawl_mode) {
+		private Indexable FileToIndexable (string path, bool crawling) {
 			//Logger.Log.Debug ("KonqQ: Trying to index " + path);
 
 			FileStream stream;
@@ -207,7 +207,7 @@
 				indexable.AddProperty (Property.NewUnstored ("fixme:urltoken", StringFu.UrlFuzzyDivide (url)));
 				// hint for the filter about the charset
 				indexable.AddProperty (Property.NewUnsearched (StringFu.UnindexedNamespace + "charset", charset));
-				indexable.Crawled = crawl_mode;
+				indexable.FlushBufferCache = crawling;
 			
 				DateTime date = DateTimeUtil.UnixToDateTimeUtc (0);
 				date = date.AddSeconds (Int64.Parse (creation_date));

Modified: trunk/beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs
==============================================================================
--- trunk/beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs	(original)
+++ trunk/beagle/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs	Wed Feb 20 13:55:25 2008
@@ -394,9 +394,9 @@
 			indexable.MimeType = "message/rfc822";
 			indexable.Timestamp = DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date")));
 			indexable.CacheContent = true;
-			indexable.Crawled = true;
+			indexable.FlushBufferCache = true;
 			indexable.SetBinaryStream (message.Stream);
-			
+
 			indexable.AddProperty (Property.NewKeyword ("fixme:client", "thunderbird"));
 			indexable.AddProperty (Property.NewKeyword ("fixme:folder", GetText (document, "Folder")));
 			indexable.AddProperty (Property.NewUnsearched ("ParentUri", GetText (document, "FolderFile")));
@@ -526,7 +526,7 @@
 			indexable.MimeType = "text/html";
 			indexable.Timestamp = DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date")));
 			indexable.CacheContent = true;
-			indexable.Crawled = true;
+			indexable.FlushBufferCache = true;
 			
 			indexable.AddProperty (Property.NewKeyword ("fixme:client", "thunderbird"));
 			indexable.AddProperty (Property.NewKeyword ("fixme:folder", GetText (document, "Folder")));