X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=3e0cc03678c6a58a993b25629a54cd2752d4d899;hb=331fc5679566381e5e7c90f144e5bc6ada69809c;hp=5352bcae9007f2652ed037411165fa4284533ef4;hpb=70e24c6c61481f9836e26b6b44a9670d92a4f43b;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 5352bcae..3e0cc036 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -1,22 +1,41 @@
 #include <fstream>
-#include "gdcmlib.h"
+#include <stdlib.h>  // For getenv
+#include "gdcm.h"
 #include "gdcmUtil.h"
 
+#define PUB_DICT_NAME     "DicomV3Dict"
+#define PUB_DICT_PATH     "../Dicts/"
+#define PUB_DICT_FILENAME "dicomV3.dic"
 
 gdcmDictSet::gdcmDictSet(void) {
+	SetDictPath();
 	if (! LoadDicomV3Dict())
 			  return;
 }
 
+void gdcmDictSet::SetDictPath(void) {
+	const char* EnvPath = (char*)0;
+	EnvPath = getenv("GDCM_DICT_PATH");
+	if (EnvPath && (strlen(EnvPath) != 0)) {
+		DictPath = EnvPath;
+		if (DictPath[DictPath.length() -1] != '/' )
+			DictPath += '/';
+		dbg.Verbose(1, "gdcmDictSet::SetDictPath:",
+                     "Dictionary path set from environnement");
+	} else
+		DictPath = PUB_DICT_PATH;
+}
+
 int gdcmDictSet::LoadDicomV3Dict(void) {
-	if (dicts.count(PUBDICTNAME))
+	if (dicts.count(PUB_DICT_NAME))
 		return 1;
-	return LoadDictFromFile(PUBDICTFILENAME, PUBDICTNAME);
+	return LoadDictFromFile(DictPath + PUB_DICT_FILENAME, PUB_DICT_NAME);
 }
 
-int gdcmDictSet::LoadDictFromFile(char * FileName, DictKey Name) {
-	gdcmDict *NewDict = new gdcmDict(FileName);
-	dicts[Name] = NewDict; 
+int gdcmDictSet::LoadDictFromFile(string FileName, DictKey Name) {
+	gdcmDict *NewDict = new gdcmDict(FileName.c_str());
+	dicts[Name] = NewDict;
+	return 0;   //FIXME if this is a dummy return make the method void
 }
 
 void gdcmDictSet::Print(ostream& os) {
@@ -32,5 +51,5 @@ gdcmDict * gdcmDictSet::GetDict(DictKey DictName) {
 }
 
 gdcmDict * gdcmDictSet::GetDefaultPublicDict() {
-	return GetDict(PUBDICTNAME);
+	return GetDict(PUB_DICT_NAME);
 }