Merge pull request #103 from OpenGeoMetadata/102-fgdc-xslt

Fix bugs and add elements to generated FGDC HTML

Author: kgjenkins

lib/xslt/fgdc2html.xsl

@@ -93,7 +93,7 @@
                 <xsl:value-of select="." />
               </dd>
             </xsl:for-each>
-            <xsl:for-each select="descrip/supplinf">
+            <xsl:for-each select="descript/supplinf">
               <dt>Supplemental Information</dt>
               <dd>
                 <xsl:value-of select="." />
@@ -204,6 +204,22 @@
                 </dd>
               </xsl:if>
             </xsl:for-each>
+            <dt>Temporal Keyword</dt>
+            <xsl:for-each select="keywords/temporal/tempkey">
+              <dd>
+                <xsl:value-of select="." />
+              </dd>
+              <xsl:if test="position()=last()">
+                <dd>
+                  <dl>
+                    <dt>Temporal Keyword Thesaurus</dt>
+                    <dd>
+                      <xsl:value-of select="ancestor-or-self::*/tempkt" />
+                    </dd>
+                  </dl>
+                </dd>
+              </xsl:if>
+            </xsl:for-each>
             <xsl:for-each select="accconst">
               <dt>Access Restrictions</dt>
               <dd>
@@ -234,6 +250,9 @@
                 <dl>
                   <xsl:for-each select="cntinfo/cntperp/cntper">
                     <dt>Contact Person</dt>
+                    <dd>
+                      <xsl:value-of select="." />
+                    </dd>
                   </xsl:for-each>
                   <xsl:for-each select="cntinfo/cntorgp/cntorg">
                     <dt>Contact Organization</dt>
@@ -277,31 +296,31 @@
                       <xsl:value-of select="." />
                     </dd>
                   </xsl:for-each>
-                  <xsl:for-each select="cntvoice">
+                  <xsl:for-each select="cntinfo/cntvoice">
                     <dt>Contact Telephone</dt>
                     <dd>
                       <xsl:value-of select="." />
                     </dd>
                   </xsl:for-each>
-                  <xsl:for-each select="cntfax">
+                  <xsl:for-each select="cntinfo/cntfax">
                     <dt>Contact Facsimile Telephone</dt>
                     <dd>
                       <xsl:value-of select="." />
                     </dd>
                   </xsl:for-each>
-                  <xsl:for-each select="cntemail">
+                  <xsl:for-each select="cntinfo/cntemail">
                     <dt>Contact Electronic Mail Address</dt>
                     <dd>
                       <xsl:value-of select="." />
                     </dd>
                   </xsl:for-each>
-                  <xsl:for-each select="hours">
+                  <xsl:for-each select="cntinfo/hours">
                     <dt>Hours of Service</dt>
                     <dd>
                       <xsl:value-of select="." />
                     </dd>
                   </xsl:for-each>
-                  <xsl:for-each select="cntinst">
+                  <xsl:for-each select="cntfo/cntinst">
                     <dt>Contact Instructions</dt>
                     <dd>
                       <xsl:value-of select="." />
@@ -475,6 +494,12 @@
                         </dl>
                       </dd>
                     </xsl:for-each>
+                    <xsl:for-each select="srccontr">
+                      <dt>Contribution</dt>
+                      <dd>
+                        <xsl:value-of select="." />
+                      </dd>
+                    </xsl:for-each>
                   </dl>
                   <xsl:for-each select="procstep">
                     <dt>Process Step</dt>
@@ -1186,6 +1211,12 @@
               <xsl:value-of select="attrdef" />
               <xsl:apply-templates select="attrdomv" />
               <dl>
+                <xsl:for-each select="attrdefs">
+                  <dt>Definition Source</dt>
+                  <dd>
+                    <xsl:value-of select="." />
+                  </dd>
+                </xsl:for-each>
                 <xsl:for-each select="begdatea">
                   <dt>Beginning Date of Attribute Values</dt>
                   <dd>
@@ -1234,9 +1265,7 @@
   </xsl:template>
 
   <xsl:template match="attrdomv[edom]">
-    <br />
-    <button onclick="this.nextElementSibling.style.display = (this.nextElementSibling.style.display==='none') ? '' : 'none';">show/hide coded values</button>
-    <dl style="display:none">
+    <dl>
       <xsl:for-each select="edom">
         <dt><xsl:value-of select="edomv" /></dt>
         <dd><xsl:value-of select="edomvd" /></dd>

spec/features/fgdc2html_spec.rb

@@ -47,4 +47,48 @@
       expect(page).to have_tag '#fgdc-metadata-reference-info'
     end
   end
+
+  describe 'Point of Contact' do
+    it 'has contact info' do
+      expect(page).to have_tag '#fgdc-identification-info'
+    end
+  end
+
+  context 'with fgdc metadata from another institution' do
+    let(:page) { GeoCombine::Fgdc.new(princeton_fgdc).to_html }
+
+    it 'has temporal keywords' do
+      expect(page).to have_tag 'dt', text: 'Temporal Keyword'
+      expect(page).to have_tag 'dd', text: '2030'
+    end
+
+    it 'has supplemental information' do
+      expect(page).to have_tag 'dt', text: 'Supplemental Information'
+      expect(page).to have_tag 'dd', text: /The E\+ scenario/
+    end
+
+    it 'has a contact person' do
+      expect(page).to have_tag 'dt', text: 'Contact Person'
+      expect(page).to have_tag 'dd', text: 'Andrew Pascale'
+    end
+
+    it 'has a contact telephone' do
+      expect(page).to have_tag 'dt', text: 'Contact Telephone'
+      expect(page).to have_tag 'dd', text: '609-258-1097'
+    end
+
+    it 'has an attribute description source and a list of values' do
+      expect(page).to have_tag 'dt', text: 'Definition Source'
+      expect(page).to have_tag 'dd', text: 'Andlinger Center/HMEI'
+
+      # Attribute elements are show by default
+      expect(page).not_to have_tag 'button'
+      expect(page).to have_tag 'dd', text: 'Desert Southwest'
+    end
+
+    it 'has a attribute source contribution' do
+      expect(page).to have_tag 'dt', text: 'Contribution'
+      expect(page).to have_tag 'dd', text: 'Net-Zero America report, 2020'
+    end
+  end
 end