From 7c245fe9860ac0e6b39ec9353270f5c827450d21 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Sun, 15 Nov 2009 14:39:08 +0000
Subject: [PATCH] changed apptag field name to rclaptg

---
 src/index/fsindexer.h      | 2 +-
 src/qtgui/rclmain_w.cpp    | 2 +-
 src/query/reslistpager.cpp | 2 +-
 src/rcldb/rcldoc.cpp       | 1 +
 src/rcldb/rcldoc.h         | 1 +
 src/sampleconf/fields      | 4 ++--
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/index/fsindexer.h b/src/index/fsindexer.h
index 2d95c34f..e0c96cc4 100644
--- a/src/index/fsindexer.h
+++ b/src/index/fsindexer.h
@@ -82,7 +82,7 @@ class FsIndexer : public FsTreeWalkerCB {
     list<string> m_tdl;
 
     // The configuration can set attribute fields to be inherited by
-    // all files in a file system area. Ie: set "apptag = thunderbird"
+    // all files in a file system area. Ie: set "rclaptg = thunderbird"
     // inside ~/.thunderbird. The boolean is set at init to avoid
     // further wasteful processing if no local fields are set.
     bool         m_havelocalfields;
diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp
index a9371803..0681bc6f 100644
--- a/src/qtgui/rclmain_w.cpp
+++ b/src/qtgui/rclmain_w.cpp
@@ -898,7 +898,7 @@ void RclMain::startNativeViewer(Rcl::Doc doc)
     } else {
         string apptag;
         map<string,string>::const_iterator it;
-        if ((it = doc.meta.find("apptag")) != doc.meta.end())
+        if ((it = doc.meta.find(Rcl::Doc::keyapptg)) != doc.meta.end())
             apptag = it->second;
 	cmd = rclconfig->getMimeViewerDef(doc.mimetype, apptag);
     }
diff --git a/src/query/reslistpager.cpp b/src/query/reslistpager.cpp
index b7763525..159fda5b 100644
--- a/src/query/reslistpager.cpp
+++ b/src/query/reslistpager.cpp
@@ -220,7 +220,7 @@ void ResListPager::displayPage()
 
         string apptag;
         map<string,string>::const_iterator it;
-        if ((it = doc.meta.find("apptag")) != doc.meta.end())
+        if ((it = doc.meta.find(Rcl::Doc::keyapptg)) != doc.meta.end())
             apptag = it->second;
 
 	if (!RclConfig::getMainConfig()->getMimeViewerDef(doc.mimetype, apptag).empty()) {
diff --git a/src/rcldb/rcldoc.cpp b/src/rcldb/rcldoc.cpp
index f7ecf325..d1df0045 100644
--- a/src/rcldb/rcldoc.cpp
+++ b/src/rcldb/rcldoc.cpp
@@ -42,6 +42,7 @@ namespace Rcl {
     const string Doc::keymd5("md5");
     const string Doc::keybcknd("rclbes");
     const string Doc::keyudi("rcludi");
+    const string Doc::keyapptg("rclaptg");
 
     void Doc::dump(bool dotext) const
     {
diff --git a/src/rcldb/rcldoc.h b/src/rcldb/rcldoc.h
index 5e3dc1f9..1e328706 100644
--- a/src/rcldb/rcldoc.h
+++ b/src/rcldb/rcldoc.h
@@ -163,6 +163,7 @@ class Doc {
     static const string keybcknd; // backend type for data not from the filesys
     // udi back from index. Only set by Rcl::Query::getdoc().
     static const string keyudi;
+    static const string keyapptg; // apptag. Set from localfields (fsindexer)
 };
 
 
diff --git a/src/sampleconf/fields b/src/sampleconf/fields
index 7288df37..f9eb7a0a 100644
--- a/src/sampleconf/fields
+++ b/src/sampleconf/fields
@@ -41,9 +41,9 @@ recipient = XTO
 # stored twice: caption, keywords, abstract, filename, mimetype, url
 # Only canonical names should be used here, not aliases.
 # "author" used to be stored by default, now set here as optional
-# "apptag" is used for viewer specialization (depending on local config)
+# "rclaptg" is used for viewer specialization (depending on local config)
 [stored]
-stored = author apptag rclbes
+stored = author rclaptg rclbes
 
 ##########################
 # This section defines field names aliases or synonyms. Any right hand side