More clean-up and fixed overlooked attribute value URL determination.

Author: JimBiardCics

ncldDump/ncldDump.py

@@ -273,8 +273,9 @@ def resolveValue(name, value, aliasDict):
     Determine if the value associated with the name has an entry in the alias
     dictionary. If it does, build a URL and return it.
     
-    name      [in] A name to attempt to resolve into a hot-link string.
-    value     [in] A value to attempt to resolve into a hot-link string.
+    name      [in] A name associated with the value to attempt to resolve into
+                   a URL.
+    value     [in] A value to attempt to resolve into a URL.
     aliasDict [in] A dictionary of URI patterns keyed by the elements they
                    replace.
     returns        A URL, or None if there was no resolution.
@@ -285,18 +286,23 @@ def resolveValue(name, value, aliasDict):
     result = None
 
     # If the name exists in the alias dictionary, and if the value exists in
-    # the sub-dictionary for the name, create a hot-link string using the
-    # pattern for the value. A wildcard (*) for a value key in the dictionary
-    # matches any value.
+    # the sub-dictionary for the name, create a URL using the pattern for the
+    # value. A wildcard (*) for a value key in the dictionary matches any
+    # value.
     #
     if name in aliasDict['values']:
         subDict = aliasDict['values'][name]
 
+        pattern = None
+        
         if value in subDict:
             pattern = subDict[value]
-            
-            result = makeURL(value, pattern)
+        elif '*' in subDict:
+            pattern = subDict['*']
 
+        if pattern is not None:
+            result = makeURL(value, pattern)
+    
     # Return the resolved name if one was found.
     #
     return result

ncldDump/ncldDump_template.html

@@ -21,7 +21,7 @@
             <li>netcdf {{ filePath|e }} {
                 <ul>
                 {%- if dimensions is defined %}
-                    <li>dimensions: //<a href="#dimensions_list" class="btn btn-default btn-xs" data-toggle="collapse">&darr;</a>
+                    <li>dimensions: // <a href="#dimensions_list" class="btn btn-default btn-xs" data-toggle="collapse">&darr;</a>
                         <ul class="collapse in" id="dimensions_list">
                         {%- for dimension in dimensions %}
                             <li>{{ dimension.name|e }}&nbsp;=&nbsp;{{ dimension.value|e }} ;
@@ -32,23 +32,23 @@
                     </li>
                 {%- endif %}
                 {%- if variables is defined %}
-                    <li>variables: //<a href="#variables_list" class="btn btn-default btn-xs" data-toggle="collapse">&darr;</a>
+                    <li>variables: // <a href="#variables_list" class="btn btn-default btn-xs" data-toggle="collapse">&darr;</a>
                         <ul class="collapse in" id="variables_list">
                         {%- for variable in variables %}
-                        <li id="variable_{{ variable.name }}">{{ variable.type|e }}&nbsp;
+                            <li id="variable_{{ variable.name }}">{{ variable.type|e }}&nbsp;
                             {%- if variable.url is defined -%}
                                 <a href="{{ variable.url }}" target="_blank">{{ variable.name }}</a>
                             {%- else -%}
                                 {{ variable.name }}
                             {%- endif -%}
                             {%- if variable.dimensions is defined -%}
                                 ({{ variable.dimensions|join(', ')|e }})
-                            {%- endif -%}&nbsp;; //
-                            <a href="#variable_{{ variable.name }}_attrs" class="btn btn-default btn-xs" data-toggle="collapse">&darr;</a>
+                            {%- endif -%}
+                            &nbsp;; // <a href="#variable_{{ variable.name }}_attrs" class="btn btn-default btn-xs" data-toggle="collapse">&darr;</a>
                             {%- if variable.attributes is defined %}
-                            <ul class="collapse in" id="variable_{{ variable.name }}_attrs">
+                                <ul class="collapse in" id="variable_{{ variable.name }}_attrs">
                                 {%- for attribute in variable.attributes %}
-                                <li>{{ variable.name }}:
+                                    <li>{{ variable.name }}:
                                     {%- if attribute.url is defined -%}
                                         <a href="{{ attribute.url }}" target="_blank">{{ attribute.name }}</a>
                                     {%- else -%}
@@ -68,7 +68,7 @@
                                         {%- endif -%}
                                     {%- endfor -%}
                                     &nbsp;;
-                                </li>
+                                    </li>
                                 {%- endfor %}
                                 </ul>
                             {% endif -%}
@@ -83,25 +83,25 @@
                         <ul class="collapse in" id="attribute_list">
                         {%- for attribute in attributes %}
                             <li>:
-                                {%- if attribute.url is defined -%}
-                                    <a href="{{ attribute.url }}" target="_blank">{{ attribute.name }}</a>
+                            {%- if attribute.url is defined -%}
+                                <a href="{{ attribute.url }}" target="_blank">{{ attribute.name }}</a>
+                            {%- else -%}
+                                {{ attribute.name }}
+                            {%- endif -%}
+                            &nbsp;=
+                            {%- for value in attribute.value -%}
+                                &nbsp;
+                                {%- if value.url is defined -%}
+                                    <a href="{{ value.url }}" target="_blank">{{ value.element }}</a>
                                 {%- else -%}
-                                    {{ attribute.name }}
+                                    {{ value.element }}
                                 {%- endif -%}
-                                &nbsp;=
-                                {%- for value in attribute.value -%}
-                                    &nbsp;
-                                    {%- if value.url is defined -%}
-                                        <a href="{{ value.url }}" target="_blank">{{ value.element }}</a>
-                                    {%- else -%}
-                                        {{ value.element }}
-                                    {%- endif -%}
-                                    {{ attribute.type }}
-                                    {%- if not loop.last -%}
-                                        ,
-                                    {%- endif -%}
-                                {%- endfor -%}
-                                &nbsp;;
+                                {{ attribute.type }}
+                                {%- if not loop.last -%}
+                                    ,
+                                {%- endif -%}
+                            {%- endfor -%}
+                            &nbsp;;
                             </li>
                         {%- endfor %}
                         </ul>