beagle r4778 - in trunk/beagle/beagled: . FileSystemQueryable

[dbera svn gnome org]

Author: dbera
Date: Wed Jun 11 03:15:35 2008
New Revision: 4778
URL: http://svn.gnome.org/viewvc/beagle?rev=4778&view=rev

Log:
Incorporate the UriFu API changes.


Modified:
   trunk/beagle/beagled/DumpIndex.cs
   trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs
   trunk/beagle/beagled/LuceneQueryingDriver.cs

Modified: trunk/beagle/beagled/DumpIndex.cs
==============================================================================
--- trunk/beagle/beagled/DumpIndex.cs	(original)
+++ trunk/beagle/beagled/DumpIndex.cs	Wed Jun 11 03:15:35 2008
@@ -117,7 +117,9 @@
 					internal_uri = UriFu.UriToEscapedString (hit.ParentUri);
 					
 					hit.ParentUri = UriFu.PathToFileUri (path);
-					hit.Uri = UriFu.PathToFileUri (path, hit.Uri.Fragment);
+					hit.Uri = UriFu.AddFragment (UriFu.PathToFileUri (path),
+								     hit.Uri.Fragment,
+								     true);
 				} else {
 					internal_uri = UriFu.UriToEscapedString (hit.Uri);
 

Modified: trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs
==============================================================================
--- trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs	(original)
+++ trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs	Wed Jun 11 03:15:35 2008
@@ -1744,7 +1744,8 @@
 			string is_child = hit [Property.IsChildPropKey];
 			string fragment = null;
 			if (is_child == "true") {
-				hit.Uri = UriFu.PathToFileUri (path, old_uri.Fragment);
+				Uri uri = UriFu.PathToFileUri (path);
+				hit.Uri = UriFu.AddFragment (uri, old_uri.Fragment, true);
 				hit.ParentUri = UriFu.PathToFileUri (path);
 			}
 

Modified: trunk/beagle/beagled/LuceneQueryingDriver.cs
==============================================================================
--- trunk/beagle/beagled/LuceneQueryingDriver.cs	(original)
+++ trunk/beagle/beagled/LuceneQueryingDriver.cs	Wed Jun 11 03:15:35 2008
@@ -69,7 +69,7 @@
 				// We're in read-only mode, but we can't create an index.
 				// Maybe a different exception would be better?  This one is caught
 				// in QueryDriver.LoadStaticQueryable ()
-				throw new InvalidOperationException ();
+				throw new InvalidOperationException (String.Format ("Index {0} does not exist.", index_name));
 			}
 
 			// Initialize the user text cache only if we're not in