X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2F__init__.py;h=4b2b8cc6ee5383b997132f2303161bf3437c5188;hb=933fb20f37f5f900c53c59b2a739e18303bd60d8;hp=8a73b05ba4637b4c804b0f0ca876d3e38343a54a;hpb=c8d390d6a732aa48eeb9d831ea83f4bebc8e19f8;p=gdcm.git

diff --git a/gdcmPython/__init__.py b/gdcmPython/__init__.py
index 8a73b05b..4b2b8cc6 100644
--- a/gdcmPython/__init__.py
+++ b/gdcmPython/__init__.py
@@ -56,7 +56,11 @@ except KeyError:
 GDCM_DICT_PATH = os.environ["GDCM_DICT_PATH"]
 
 ### Set up the path to the data images for the demos.
-GDCM_DATA_PATH = BuildInstallOrPreinstallPath("Test", "test.acr")
+if os.environ["GDCM_DATA_PATH"]:
+   GDCM_DATA_PATH = BuildInstallOrPreinstallPath(os.environ["GDCM_DATA_PATH"],
+                                                 "test.acr")
+else:
+   GDCM_DATA_PATH = BuildInstallOrPreinstallPath("Test", "test.acr")
 if not GDCM_DATA_PATH:
    print "GDCM_DATA_PATH is not setup properly: unfound Test directory"
 
@@ -85,7 +89,7 @@ gdcmDicomDirSerie   = gdcm.gdcmDicomDirSerie
 gdcmDicomDirImage   = gdcm.gdcmDicomDirImage
 
 def GetPubDictEntryNames():
-   return gdcm.cvar.gdcmGlob.GetDicts().GetPubDictEntryNames()
+   return gdcmGlobal.GetDicts().GetPubDictEntryNames()
 
 def GetPubDictEntryNamesByCategory():
-   return gdcm.cvar.gdcmGlob.GetDicts().GetPubDictEntryNamesByCategory()
+   return gdcmGlobal.GetDicts().GetPubDictEntryNamesByCategory()