[Debtags-commits] [svn] r1063 - libdebtags1/trunk/debtags

[Enrico Zini]

Author: enrico
Date: Wed Aug  3 21:13:55 2005
New Revision: 1063

Modified:
   libdebtags1/trunk/debtags/Update.cc
Log:
Avoid trying to read /etc/tagvoc.d

Modified: libdebtags1/trunk/debtags/Update.cc
==============================================================================
--- libdebtags1/trunk/debtags/Update.cc	(original)
+++ libdebtags1/trunk/debtags/Update.cc	Wed Aug  3 21:13:55 2005
@@ -45,7 +45,7 @@
 static const char* fn_sources = "/etc/debtags/sources.list";
 static const char* path_cache = "/var/cache/debtags";
 //static const char* fn_dist_vocab = "/usr/share/debtags/vocabulary";
-static const char* path_tagvoc_d = "/etc/debtags/tagvoc.d";
+//static const char* path_tagvoc_d = "/etc/debtags/tagvoc.d";
 
 //fn_dist_vocab = '$(usr/share/debtags)'/vocabulary
 //path_tagpatch_d = '$(sysconfigdir)'/debtags/tagpatch.d
@@ -222,12 +222,12 @@
 	// (unneeded as InputMerger already returns an empty tagset for non-existing items)
 }
 
-static void importData(const std::string& local, InputMerger<string, string>& merger, VocabularyMerger& systemvoc) throw (FileException, ParserException)
+static void importData(const std::string& local, InputMerger<string, string>& merger, VocabularyMerger& systemvoc)
 {
 	zreadCollection(local, systemvoc, merger);
 }
 
-static void importData(const std::string& local, const std::string& localVoc, InputMerger<string, string>& merger, VocabularyMerger& systemvoc) throw (FileException, ParserException)
+static void importData(const std::string& local, const std::string& localVoc, InputMerger<string, string>& merger, VocabularyMerger& systemvoc)
 {
 	Debtags::VocabularyMerger voc;
 	ZlibParserInput in(localVoc);
@@ -240,13 +240,14 @@
 	systemvoc.read(in2);
 }
 
-static void readBasicVocabularies(VocabularyMerger& systemvoc) throw (FileException, ParserException)
+static void readBasicVocabularies(VocabularyMerger& systemvoc)
 {
 	/*
 	StdioParserInput mainInput(fn_dist_vocab);
 	systemvoc.read(mainInput);
 	*/
 	
+	/*
 	DIR* dir = opendir(path_tagvoc_d);
 	if (!dir)
 		throw SystemException(errno, string("reading directory ") + path_tagvoc_d);
@@ -265,6 +266,7 @@
 		}
 	}
 	closedir(dir);
+	*/
 }
 
 static vector<source> readSources() throw (FileException)