beagle r4454 - in trunk/beagle: . conf-data conf-data/config-files conf-data/crawl-rules tools tools/config-files tools/crawl-rules

From: dbera svn gnome org
To: svn-commits-list gnome org
Subject: beagle r4454 - in trunk/beagle: . conf-data conf-data/config-files conf-data/crawl-rules tools tools/config-files tools/crawl-rules
Date: Sun, 3 Feb 2008 18:40:58 +0000 (GMT)
Author: dbera
Date: Sun Feb  3 18:40:58 2008
New Revision: 4454
URL: http://svn.gnome.org/viewvc/beagle?rev=4454&view=rev

Log:
Move all the config data to its own directory beagle/conf-data. Set BEAGLE_CONF_DIR to point the local conf-data directory when running uninstalled.
Install the crawl-rules in /etc/beagle/crawl-rules/ directory.

Added:
   trunk/beagle/conf-data/
   trunk/beagle/conf-data/Makefile.am
   trunk/beagle/conf-data/config-files/
      - copied from r4450, /trunk/beagle/tools/config-files/
   trunk/beagle/conf-data/crawl-rules/
      - copied from r4450, /trunk/beagle/tools/crawl-rules/
   trunk/beagle/conf-data/external-filters.xml.sample
      - copied unchanged from r4452, /trunk/beagle/Filters/external-filters.xml.sample
   trunk/beagle/conf-data/keyword-mapping.xml
      - copied, changed from r4452, /trunk/beagle/Filters/keyword-mapping.xml
Removed:
   trunk/beagle/tools/config-files/
   trunk/beagle/tools/crawl-rules/
Modified:
   trunk/beagle/Makefile.am
   trunk/beagle/configure.in
   trunk/beagle/tools/Makefile.am
   trunk/beagle/tools/beagle-crawl-system.in
   trunk/beagle/tools/wrapper.in

Modified: trunk/beagle/Makefile.am
==============================================================================
--- trunk/beagle/Makefile.am	(original)
+++ trunk/beagle/Makefile.am	Sun Feb  3 18:40:58 2008
@@ -31,7 +31,8 @@
 
 SUBDIRS +=			\
 	firefox-extension	\
-	tools
+	tools			\
+	conf-data
 
 if ENABLE_EPIPHANY_EXTENSION
 SUBDIRS += epiphany-extension

Added: trunk/beagle/conf-data/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/beagle/conf-data/Makefile.am	Sun Feb  3 18:40:58 2008
@@ -0,0 +1,28 @@
+CRAWL_RULES = \
+	$(srcdir)/crawl-rules/crawl-applications	\
+	$(srcdir)/crawl-rules/crawl-documentation	\
+	$(srcdir)/crawl-rules/crawl-manpages		\
+	$(srcdir)/crawl-rules/crawl-monodoc		\
+	$(srcdir)/crawl-rules/crawl-windows
+
+# FIXME: Per-distribution specific crawl rules
+crawl_rulesdir = $(sysconfdir)/beagle/crawl-rules
+crawl_rules_DATA = $(CRAWL_RULES)
+
+GLOBAL_CONFIG_FILES = \
+	$(srcdir)/config-files/BeagleSearch.xml		\
+	$(srcdir)/config-files/Daemon.xml		\
+	$(srcdir)/config-files/FilesQueryable.xml	\
+	$(srcdir)/config-files/Networking.xml
+
+global_config_filesdir = $(sysconfdir)/beagle/config-files
+global_config_files_DATA = $(GLOBAL_CONFIG_FILES)
+
+confdir = $(sysconfdir)/beagle
+conf_DATA = external-filters.xml.sample \
+	    keyword-mapping.xml
+
+EXTRA_DIST =				\
+	$(CRAWL_RULES)			\
+	$(GLOBAL_CONFIG_FILES)		\
+	$(conf_DATA)

Copied: trunk/beagle/conf-data/keyword-mapping.xml (from r4452, /trunk/beagle/Filters/keyword-mapping.xml)
==============================================================================
--- /trunk/beagle/Filters/keyword-mapping.xml	(original)
+++ trunk/beagle/conf-data/keyword-mapping.xml	Sun Feb  3 18:40:58 2008
@@ -1,45 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<KeywordMappingStore xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
-  <PropertyInfo>
-    <Properties Keyword="artist" PropertyName="fixme:artist" PropType="Text">Artist of the music</Properties>
-    <Properties Keyword="mailto" PropertyName="parent:fixme:to_name" PropType="Text" />
-    <Properties Keyword="mailto" PropertyName="fixme:to_name" PropType="Text">Name of receipient</Properties>
-    <Properties Keyword="author" PropertyName="dc:author" PropType="Text">Author of the content</Properties>
-    <Properties Keyword="summary" PropertyName="dc:subject" PropType="Text">Brief description of the content</Properties>
-    <Properties Keyword="imagemodel" PropertyName="exif:Model" PropType="Text">Camera model as specified in exif or IPTC tags</Properties>
-    <Properties Keyword="imagecomment" PropertyName="iptc:caption" PropType="Text">IPTC caption</Properties>
-    <Properties Keyword="imagecomment" PropertyName="exif:UserComment" PropType="Text">Exif comments</Properties>
-    <Properties Keyword="imagecomment" PropertyName="jfif:Comment" PropType="Text">JFIF comments</Properties>
-    <Properties Keyword="imagecomment" PropertyName="digikam:caption" PropType="Text">Digikam User comments</Properties>
-    <Properties Keyword="imagecomment" PropertyName="fspot:Description" PropType="Text">F-Spot User comments</Properties>
-    <Properties Keyword="speakingto" PropertyName="fixme:speakingto" PropType="Keyword">Person engaged in conversation</Properties>
-    <Properties Keyword="speakingto" PropertyName="fixme:speakingto" PropType="Keyword">Person engaged in conversation</Properties>
-    <Properties Keyword="speakingto" PropertyName="fixme:speakingto" PropType="Keyword">Person engaged in conversation</Properties>
-    <Properties Keyword="mailtoaddr" PropertyName="parent:fixme:to_address" PropType="Text" />
-    <Properties Keyword="mailtoaddr" PropertyName="fixme:to_address" PropType="Text">Email address of receipient</Properties>
-    <Properties Keyword="inattachment" PropertyName="parent:fixme:hasAttachments" PropType="Keyword">Use 'inattachment:true' for email attachments.</Properties>
-    <Properties Keyword="imagetag" PropertyName="image:tag" PropType="Text">FSpot, Digikam image tags</Properties>
-    <Properties Keyword="source" PropertyName="beagle:Source" PropType="Keyword">Name of the backend</Properties>
-    <Properties Keyword="creator" PropertyName="dc:creator" PropType="Text">Creator of the content</Properties>
-    <Properties Keyword="emblem" PropertyName="nautilus:emblem" PropType="Keyword">Use emblem to identify items tagged with a specific emblem in nautilus.</Properties>
-    <Properties Keyword="mailinglist" PropertyName="parent:fixme:mlist" PropType="Text" />
-    <Properties Keyword="mailinglist" PropertyName="fixme:mlist" PropType="Text">Mailing list id e.g. dashboard-hackers.gnome.org</Properties>
-    <Properties Keyword="mailfrom" PropertyName="parent:fixme:from_name" PropType="Text" />
-    <Properties Keyword="mailfrom" PropertyName="fixme:from_name" PropType="Text">Name of email sender</Properties>
-    <Properties Keyword="genre" PropertyName="fixme:genre" PropType="Keyword">Genre of the music</Properties>
-    <Properties Keyword="ext" PropertyName="beagle:FilenameExtension" PropType="Keyword">File extension, e.g. ext:jpeg. Use ext: to search in files with no extension.</Properties>
-    <Properties Keyword="ext" PropertyName="beagle:FilenameExtension" PropType="Keyword">File extension, e.g. ext:jpeg. Use ext: to search in files with no extension.</Properties>
-    <Properties Keyword="filetype" PropertyName="beagle:FileType" PropType="Keyword">Type of content for HitType File</Properties>
-    <Properties Keyword="email" PropertyName="vCard:EMAIL" PropType="Text">Email in KAddressbook</Properties>
-    <Properties Keyword="host" PropertyName="fixme:host" PropType="Text">The host of this entitiy.</Properties>
-    <Properties Keyword="mimetype" PropertyName="beagle:MimeType" PropType="Keyword">Mimetype of the content</Properties>
-    <Properties Keyword="notetag" PropertyName="note:tag" PropType="Text">Tag associated with a tomboy note.</Properties>
-    <Properties Keyword="type" PropertyName="beagle:HitType" PropType="Keyword">Hittype of the content e.g. File, IMLog, MailMessage</Properties>
-    <Properties Keyword="title" PropertyName="dc:title" PropType="Text">Title</Properties>
-    <Properties Keyword="mailfromaddr" PropertyName="parent:fixme:from_address" PropType="Text" />
-    <Properties Keyword="mailfromaddr" PropertyName="fixme:from_address" PropType="Text">Email address of sender</Properties>
-    <Properties Keyword="pkggroup" PropertyName="pkg:group" PropType="Text">Group to which the package belongs e.g. System/Configuration/Packaging</Properties>
-    <Properties Keyword="inarchive" PropertyName="fixme:inside_archive" PropType="Keyword">Use 'inarchive:true' for files inside an archive.</Properties>
-    <Properties Keyword="album" PropertyName="fixme:album" PropType="Text">Album name of the music</Properties>
-  </PropertyInfo>
-</KeywordMappingStore>
\ No newline at end of file
+<QueryMapping xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+  <Mappings>
+    <Mapping QueryKeyword="artist" BeagleProperty="fixme:artist" Tokenize="true">Artist of the music</Mapping>
+    <Mapping QueryKeyword="mailto" BeagleProperty="parent:fixme:to_name" Tokenize="true" />
+    <Mapping QueryKeyword="mailto" BeagleProperty="fixme:to_name" Tokenize="true">Name of receipient</Mapping>
+    <Mapping QueryKeyword="author" BeagleProperty="dc:author" Tokenize="true">Author of the content</Mapping>
+    <Mapping QueryKeyword="summary" BeagleProperty="dc:subject" Tokenize="true">Brief description of the content</Mapping>
+    <Mapping QueryKeyword="imagemodel" BeagleProperty="exif:Model" Tokenize="true">Camera model as specified in exif or IPTC tags</Mapping>
+    <Mapping QueryKeyword="imagecomment" BeagleProperty="iptc:caption" Tokenize="true">IPTC caption</Mapping>
+    <Mapping QueryKeyword="imagecomment" BeagleProperty="exif:UserComment" Tokenize="true">Exif comments</Mapping>
+    <Mapping QueryKeyword="imagecomment" BeagleProperty="jfif:Comment" Tokenize="true">JFIF comments</Mapping>
+    <Mapping QueryKeyword="imagecomment" BeagleProperty="digikam:caption" Tokenize="true">Digikam User comments</Mapping>
+    <Mapping QueryKeyword="imagecomment" BeagleProperty="fspot:Description" Tokenize="true">F-Spot User comments</Mapping>
+    <Mapping QueryKeyword="speakingto" BeagleProperty="fixme:speakingto" Tokenize="false">Person engaged in conversation</Mapping>
+    <Mapping QueryKeyword="speakingto" BeagleProperty="fixme:speakingto" Tokenize="false">Person engaged in conversation</Mapping>
+    <Mapping QueryKeyword="speakingto" BeagleProperty="fixme:speakingto" Tokenize="false">Person engaged in conversation</Mapping>
+    <Mapping QueryKeyword="mailtoaddr" BeagleProperty="parent:fixme:to_address" Tokenize="true" />
+    <Mapping QueryKeyword="mailtoaddr" BeagleProperty="fixme:to_address" Tokenize="true">Email address of receipient</Mapping>
+    <Mapping QueryKeyword="inattachment" BeagleProperty="parent:fixme:hasAttachments" Tokenize="false">Use 'inattachment:true' for email attachments.</Mapping>
+    <Mapping QueryKeyword="imagetag" BeagleProperty="image:tag" Tokenize="true">FSpot, Digikam image tags</Mapping>
+    <Mapping QueryKeyword="source" BeagleProperty="beagle:Source" Tokenize="false">Name of the backend</Mapping>
+    <Mapping QueryKeyword="creator" BeagleProperty="dc:creator" Tokenize="true">Creator of the content</Mapping>
+    <Mapping QueryKeyword="emblem" BeagleProperty="nautilus:emblem" Tokenize="false">Use emblem to identify items tagged with a specific emblem in nautilus.</Mapping>
+    <Mapping QueryKeyword="mailinglist" BeagleProperty="parent:fixme:mlist" Tokenize="true" />
+    <Mapping QueryKeyword="mailinglist" BeagleProperty="fixme:mlist" Tokenize="true">Mailing list id e.g. dashboard-hackers.gnome.org</Mapping>
+    <Mapping QueryKeyword="mailfrom" BeagleProperty="parent:fixme:from_name" Tokenize="true" />
+    <Mapping QueryKeyword="mailfrom" BeagleProperty="fixme:from_name" Tokenize="true">Name of email sender</Mapping>
+    <Mapping QueryKeyword="genre" BeagleProperty="fixme:genre" Tokenize="false">Genre of the music</Mapping>
+    <Mapping QueryKeyword="ext" BeagleProperty="beagle:FilenameExtension" Tokenize="false">File extension, e.g. ext:jpeg. Use ext: to search in files with no extension.</Mapping>
+    <Mapping QueryKeyword="filetype" BeagleProperty="beagle:FileType" Tokenize="false">Type of content for HitType File</Mapping>
+    <Mapping QueryKeyword="email" BeagleProperty="vCard:EMAIL" Tokenize="true">Email in KAddressbook</Mapping>
+    <Mapping QueryKeyword="host" BeagleProperty="fixme:host" Tokenize="true">The host of this entitiy.</Mapping>
+    <Mapping QueryKeyword="mimetype" BeagleProperty="beagle:MimeType" Tokenize="false">Mimetype of the content</Mapping>
+    <Mapping QueryKeyword="notetag" BeagleProperty="note:tag" Tokenize="true">Tag associated with a tomboy note.</Mapping>
+    <Mapping QueryKeyword="type" BeagleProperty="beagle:HitType" Tokenize="false">Hittype of the content e.g. File, IMLog, MailMessage</Mapping>
+    <Mapping QueryKeyword="title" BeagleProperty="dc:title" Tokenize="true">Title</Mapping>
+    <Mapping QueryKeyword="mailfromaddr" BeagleProperty="parent:fixme:from_address" Tokenize="true" />
+    <Mapping QueryKeyword="mailfromaddr" BeagleProperty="fixme:from_address" Tokenize="true">Email address of sender</Mapping>
+    <Mapping QueryKeyword="pkggroup" BeagleProperty="pkg:group" Tokenize="true">Group to which the package belongs e.g. System/Configuration/Packaging</Mapping>
+    <Mapping QueryKeyword="inarchive" BeagleProperty="fixme:inside_archive" Tokenize="false">Use 'inarchive:true' for files inside an archive.</Mapping>
+    <Mapping QueryKeyword="album" BeagleProperty="fixme:album" Tokenize="true">Album name of the music</Mapping>
+  </Mappings>
+</QueryMapping>

Modified: trunk/beagle/configure.in
==============================================================================
--- trunk/beagle/configure.in	(original)
+++ trunk/beagle/configure.in	Sun Feb  3 18:40:58 2008
@@ -633,6 +633,7 @@
 doc/Makefile
 doc/api/Makefile
 bludgeon/Makefile
+conf-data/Makefile
 beagle-0.0.pc
 beagle-daemon.pc
 beagle-ui-0.0.pc

Modified: trunk/beagle/tools/Makefile.am
==============================================================================
--- trunk/beagle/tools/Makefile.am	(original)
+++ trunk/beagle/tools/Makefile.am	Sun Feb  3 18:40:58 2008
@@ -11,7 +11,6 @@
 ASSEMBLIES =				\
 	$(BEAGLED_LIBS)			\
 	-r:Mono.Posix			\
-	-r:System.Data			\
 	$(LOCAL_ASSEMBLIES:%=-r:%)
 
 WRAPPER_IN = wrapper.in
@@ -36,26 +35,6 @@
 
 crondir = $(sysconfdir)/cron.daily
 
-CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-applications	\
-	$(srcdir)/crawl-rules/crawl-documentation	\
-	$(srcdir)/crawl-rules/crawl-manpages		\
-	$(srcdir)/crawl-rules/crawl-monodoc		\
-	$(srcdir)/crawl-rules/crawl-windows
-
-# FIXME: Per-distribution specific crawl rules
-configdir = $(sysconfdir)/beagle
-config_DATA = $(CRAWL_RULES)
-
-GLOBAL_CONFIG_FILES = \
-	$(srcdir)/config-files/BeagleSearch.xml		\
-	$(srcdir)/config-files/Daemon.xml		\
-	$(srcdir)/config-files/FilesQueryable.xml	\
-	$(srcdir)/config-files/Networking.xml
-
-global_config_filesdir = $(sysconfdir)/beagle/config-files
-global_config_files_DATA = $(GLOBAL_CONFIG_FILES)
-
 DOC_EXTRACTOR_TARGET  = DocExtractor.exe
 DOC_EXTRACTOR_WRAPPER = beagle-doc-extractor
 DOC_EXTRACTOR_CSFILES = $(srcdir)/DocExtractor.cs
@@ -259,8 +238,6 @@
 	$(SETTINGS_CSFILES)		\
 	$(SETTINGS_RESOURCES)		\
 	$(man_MANS)			\
-	$(CRAWL_RULES)			\
-	$(GLOBAL_CONFIG_FILES)		\
 	$(cron_SCRIPTS)			\
 	$(desktop_in_files)		\
 	$(desktop_DATA) 		\

Modified: trunk/beagle/tools/beagle-crawl-system.in
==============================================================================
--- trunk/beagle/tools/beagle-crawl-system.in	(original)
+++ trunk/beagle/tools/beagle-crawl-system.in	Sun Feb  3 18:40:58 2008
@@ -45,11 +45,11 @@
 MONO_SHARED_DIR=`mktemp -d -p $TMPDIR .beagleindexwapi.XXXXXXXXXX`|| ( echo "$0: Can't create wapi directory!" ; exit 1 )
 chown $CRAWL_USER $MONO_SHARED_DIR
 
-for crawl_file in @sysconfdir@/beagle/crawl-*; do
-    unset CRAWL_ENABLED CRAWL_DISABLE_FILTERING CRAWL_RECURSIVE CRAWL_CACHE_TEXT CRAWL_ALLOW_PATTERNS CRAWL_DENY_PATTERNS CRAWL_PATHS CRAWL_INDEX_NAME CRAWL_REMOVE_DELETED_FILES
+for crawl_file in @sysconfdir@/beagle/crawl-rules/crawl-*; do
+    unset CRAWL_ENABLED CRAWL_DISABLE_FILTERING CRAWL_DISABLE_DIRECTORIES CRAWL_DISABLE_ON_BATTERY CRAWL_RECURSIVE CRAWL_CACHE_TEXT CRAWL_ALLOW_PATTERNS CRAWL_DENY_PATTERNS CRAWL_PATHS CRAWL_INDEX_NAME CRAWL_REMOVE_DELETED_FILES
 
     if [ "$DEBUG" = "1" ]; then
-	echo "$0: Processing files in @sysconfdir@/beagle..."
+	echo "$0: Processing files in @sysconfdir@/beagle/crawl-rules/..."
     fi
 
     if [ -f $crawl_file ] ; then

Modified: trunk/beagle/tools/wrapper.in
==============================================================================
--- trunk/beagle/tools/wrapper.in	(original)
+++ trunk/beagle/tools/wrapper.in	Sun Feb  3 18:40:58 2008
@@ -19,7 +19,7 @@
     THIS_BACKENDS="$TOOLDIR/../beagled"
 
     if [ -z $BEAGLE_CONF_DIR ]; then
-	    export BEAGLE_CONF_DIR="../tools/config-files"
+	    export BEAGLE_CONF_DIR="../conf-data"
     fi
 
 else
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]