beagle r4459 - in trunk/beagle: beagled conf-data

[dbera svn gnome org]

Author: dbera
Date: Sun Feb  3 18:55:42 2008
New Revision: 4459
URL: http://svn.gnome.org/viewvc/beagle?rev=4459&view=rev

Log:
Rename keyword-mapping.xml to query-mapping.xml since the previous name was confusing when you consider that some of the mappings are for keywords. The word "keyword" was being used in different meaning in different context.


Added:
   trunk/beagle/conf-data/query-mapping.xml
      - copied unchanged from r4454, /trunk/beagle/conf-data/keyword-mapping.xml
Removed:
   trunk/beagle/conf-data/keyword-mapping.xml
Modified:
   trunk/beagle/beagled/PropertyKeywordFu.cs
   trunk/beagle/conf-data/Makefile.am

Modified: trunk/beagle/beagled/PropertyKeywordFu.cs
==============================================================================
--- trunk/beagle/beagled/PropertyKeywordFu.cs	(original)
+++ trunk/beagle/beagled/PropertyKeywordFu.cs	Sun Feb  3 18:55:42 2008
@@ -77,7 +77,7 @@
 			// <keyword name, can override>
 			Dictionary<string, bool> mapping_override = new Dictionary<string, bool> ();
 
-			using (Stream s = File.OpenRead (Path.Combine (PathFinder.ConfigDataDir, "keyword-mapping.xml"))) {
+			using (Stream s = File.OpenRead (Path.Combine (PathFinder.ConfigDataDir, "query-mapping.xml"))) {
 				try {			
 					query_mapping = (QueryMapping) xs.Deserialize (s);
 					foreach (QueryKeywordMapping mapping in query_mapping.Mappings) {
@@ -85,16 +85,16 @@
 						mapping_override [mapping.Keyword] = true;
 					}
 				} catch (XmlException e) {
-					Logger.Log.Error (e, "Unable to parse global keyword-mapping.xml");
+					Logger.Log.Error (e, "Unable to parse global query-mapping.xml");
 				}
 			}
 
 			// Override global mappings by local mappings
 
-			if (! File.Exists (Path.Combine (PathFinder.StorageDir, "keyword-mapping.xml")))
+			if (! File.Exists (Path.Combine (PathFinder.StorageDir, "query-mapping.xml")))
 				return;
 
-			using (Stream s = File.OpenRead (Path.Combine (PathFinder.StorageDir, "keyword-mapping.xml"))) {
+			using (Stream s = File.OpenRead (Path.Combine (PathFinder.StorageDir, "query-mapping.xml"))) {
 				try {			
 					query_mapping = (QueryMapping) xs.Deserialize (s);
 					foreach (QueryKeywordMapping mapping in query_mapping.Mappings) {
@@ -106,7 +106,7 @@
 						PropertyKeywordFu.RegisterMapping (mapping);
 					}
 				} catch (XmlException e) {
-					Logger.Log.Error (e, "Unable to parse local keyword-mapping.xml");
+					Logger.Log.Error (e, "Unable to parse local query-mapping.xml");
 				}
 			}
 		}

Modified: trunk/beagle/conf-data/Makefile.am
==============================================================================
--- trunk/beagle/conf-data/Makefile.am	(original)
+++ trunk/beagle/conf-data/Makefile.am	Sun Feb  3 18:55:42 2008
@@ -20,7 +20,7 @@
 
 confdir = $(sysconfdir)/beagle
 conf_DATA = external-filters.xml.sample \
-	    keyword-mapping.xml
+	    query-mapping.xml
 
 EXTRA_DIST =				\
 	$(CRAWL_RULES)			\