From d3c5d07b9e04dcc3e8ebc491c111410fa5f11ae6 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@8a9318a1-56ba-4d59-b755-99d26321be01>
Date: Wed, 18 Aug 2010 19:54:13 +0000
Subject: [PATCH] added code to form the documentation path relative to the
variable directories
git-svn-id: https://svn.ssec.wisc.edu/repos/glance/trunk@130 8a9318a1-56ba-4d59-b755-99d26321be01
---
pyglance/glance/compare.py | 9 ++++++++-
pyglance/glance/io.py | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/pyglance/glance/compare.py b/pyglance/glance/compare.py
index 6986e34..981f5cc 100644
--- a/pyglance/glance/compare.py
+++ b/pyglance/glance/compare.py
@@ -1338,7 +1338,14 @@ def reportGen_library_call (a_path, b_path, var_list=[ ],
LOG.debug("Variable directory (" + variableDir + ") does not exist.")
LOG.debug("Creating variable directory.")
os.makedirs(variableDir)
- varRunInfo['doc_path'] = quote(os.path.join(pathsTemp['out'], './' + 'doc.html')) # should this be somewhere else?
+
+ # form the doc path relative to where the variable is
+ docPath = './'
+ for number in range(len(displayName.split('/'))) : # TODO this is not general to windows
+ docPath = os.path.join(docPath, '../')
+ varRunInfo['doc_path'] = quote(os.path.join(docPath, 'doc.html')) # should this be somewhere else?
+
+ # hang onto the config file path as well
if 'config_file_name' in runInfo :
varRunInfo['config_file_path'] = quote(os.path.join(pathsTemp['out'], './' + runInfo['config_file_name']))
diff --git a/pyglance/glance/io.py b/pyglance/glance/io.py
index de5ecec..d027f11 100644
--- a/pyglance/glance/io.py
+++ b/pyglance/glance/io.py
@@ -14,7 +14,7 @@ try:
import h5py
from h5py import h5d
except ImportError:
- pass
+ print ('***** unable to load hdf5 library *****')
from pycdf import CDF, NC, strerror
import numpy as np
--
GitLab