Ticket #310: template_name_in_omega_config.diff

omega.conf

@@ -9 +9 @@
 
 # Directory containing any cdb files for the $lookup OmegaScript command:
 cdb_dir /var/lib/omega/cdb
+
+#Template which is used:
+fmt_name query

omega.h

@@ -43 +43 @@
 extern string query_string;
 
 extern string dbname;
-extern string fmtname;
 extern string filters;
 
 extern Xapian::Database db;

configfile.h

@@ -30 +30 @@
 extern string template_dir;
 extern string log_dir;
 extern string cdb_dir;
+extern string fmtname;
 
 void read_config_file();
 

omega.cc

@@ -55 +55 @@
 const string default_dbname = "default";
 
 string dbname;
-string fmtname = "query";
+string fmtname;
 string filters;
 
 Xapian::docid topdoc = 0;

configfile.cc

@@ -94 +94 @@
             log_dir = value + "/";
         } else if (name == "cdb_dir") {
             cdb_dir = value + "/";
+        } else if (name == "fmt_name"){
+            fmtname = value;
         }
     }