geo_combine 0.1.0 → 0.5.0

data/lib/geo_combine/railtie.rb

@@ -0,0 +1,7 @@
+module GeoCombine
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      load 'tasks/geo_combine.rake'
+    end
+  end
+end

data/lib/geo_combine/version.rb

@@ -1,3 +1,3 @@
 module GeoCombine
-  VERSION = '0.1.0'
+  VERSION = '0.5.0'
 end

data/lib/tasks/geo_combine.rake

@@ -1,39 +1,73 @@
-require 'find'
 require 'net/http'
 require 'json'
 require 'rsolr'
+require 'find'
+require 'geo_combine/geo_blacklight_harvester'
 
 namespace :geocombine do
+  commit_within = (ENV['SOLR_COMMIT_WITHIN'] || 5000).to_i
   ogm_path = ENV['OGM_PATH'] || 'tmp/opengeometadata'
   solr_url = ENV['SOLR_URL'] || 'http://127.0.0.1:8983/solr/blacklight-core'
-  desc 'Clone all OpenGeoMetadata repositories'
-  task :clone do
-    ogm_api_uri = URI('https://api.github.com/orgs/opengeometadata/repos')
-    ogm_repos = JSON.parse(Net::HTTP.get(ogm_api_uri)).map{ |repo| repo['git_url']}
+  whitelist = %w[
+    https://github.com/OpenGeoMetadata/big-ten.git
+  ]
+
+  desc 'Clone OpenGeoMetadata repositories'
+  task :clone, [:repo] do |_t, args|
+    if args.repo
+      ogm_repos = ["https://github.com/OpenGeoMetadata/#{args.repo}.git"]
+    else
+      ogm_api_uri = URI('https://api.github.com/orgs/opengeometadata/repos')
+      ogm_repos = JSON.parse(Net::HTTP.get(ogm_api_uri)).map do |repo|
+        repo['clone_url'] if repo['size'] > 0
+      end.compact
+      ogm_repos.select! { |repo| whitelist.include?(repo) || repo =~ /(edu|org|uk)\..*\.git$/ }
+    end
     ogm_repos.each do |repo|
-      if repo =~ /^git:\/\/github.com\/OpenGeoMetadata\/(edu|org|uk)\..*/
-        system "mkdir -p #{ogm_path} && cd #{ogm_path} && git clone #{repo}"
-      end
+      system "echo #{repo} && mkdir -p #{ogm_path} && cd #{ogm_path} && git clone --depth 1 #{repo}"
     end
   end
+
   desc '"git pull" OpenGeoMetadata repositories'
-  task :pull do
-    Dir.glob("#{ogm_path}/*").map{ |dir| system "cd #{dir} && git pull origin master" if dir =~ /.*(edu|org|uk)\..*./ }
+  task :pull, [:repo] do |_t, args|
+    paths = if args.repo
+              [File.join(ogm_path, args.repo)]
+            else
+              Dir.glob("#{ogm_path}/*")
+            end
+    paths.each do |path|
+      next unless File.directory?(path)
+      system "echo #{path} && cd #{path} && git pull origin"
+    end
   end
-  desc 'Index all of the GeoBlacklight documents'
+
+  desc 'Index all of the GeoBlacklight JSON documents'
   task :index do
-    solr = RSolr.connect :url => solr_url
+    puts "Indexing #{ogm_path} into #{solr_url}"
+    solr = RSolr.connect url: solr_url, adapter: :net_http_persistent
     Find.find(ogm_path) do |path|
-      next unless path =~ /.*geoblacklight.json$/
+      next unless File.basename(path) == 'geoblacklight.json'
       doc = JSON.parse(File.read(path))
-      begin
-        solr.update params: { commitWithin: 500, overwrite: true },
-                    data: [doc].to_json,
-                    headers: { 'Content-Type' => 'application/json' }
-
-      rescue RSolr::Error::Http => error
-        puts error
+      [doc].flatten.each do |record|
+        begin
+          puts "Indexing #{record['layer_slug_s']}: #{path}" if $DEBUG
+          solr.update params: { commitWithin: commit_within, overwrite: true },
+                      data: [record].to_json,
+                      headers: { 'Content-Type' => 'application/json' }
+        rescue RSolr::Error::Http => error
+          puts error
+        end
       end
     end
+    solr.commit
+  end
+
+  namespace :geoblacklight_harvester do
+    desc 'Harvest documents from a configured GeoBlacklight instance'
+    task :index, [:site] do |_t, args|
+      raise ArgumentError, 'A site argument is required' unless args.site
+
+      GeoCombine::GeoBlacklightHarvester.new(args.site).index
+    end
   end
 end

data/lib/xslt/fgdc2geoBL.xsl

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
      fgdc2geoBL.xsl - Transformation from FGDC into GeoBlacklight Solr
-     
+
           -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   version="1.0">
   <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
   <xsl:strip-space elements="*"/>
 
   <xsl:param name="zipName" select="'data.zip'"/>
-  
+
   <xsl:variable name="institution">
         <xsl:for-each select="metadata">
             <xsl:choose>
                 <xsl:when test="contains(distinfo/distrib/cntinfo/cntorgp/cntorg, 'Harvard')">
                     <xsl:text>Harvard</xsl:text>
-                </xsl:when> 
+                </xsl:when>
                 <xsl:when test="contains(distinfo/distrib/cntinfo/cntorgp/cntorg, 'Tufts')">
                     <xsl:text>Tufts</xsl:text>
-                </xsl:when> 
+                </xsl:when>
                 <xsl:when test="contains(distinfo/distrib/cntinfo/cntorgp/cntorg, 'MIT')">
                     <xsl:text>MIT</xsl:text>
                 </xsl:when>
@@ -40,18 +40,18 @@
                 <xsl:when test="contains(metainfo/metc/cntinfo/cntorgp/cntorg, 'Harvard')">
                     <xsl:text>Harvard</xsl:text>
                 </xsl:when>
-                
+
             </xsl:choose>
         </xsl:for-each>
     </xsl:variable>
-  
+
   <!-- Output bounding box -->
 <xsl:variable name="upperCorner">
     <xsl:value-of select="number(metadata/idinfo/spdom/bounding/eastbc)"/>
   <xsl:text> </xsl:text>
     <xsl:value-of select="number(metadata/idinfo/spdom/bounding/northbc)"/>
 </xsl:variable>
-  
+
   <xsl:variable name="lowerCorner">
 
       <xsl:value-of select="number(metadata/idinfo/spdom/bounding/westbc)"/>
@@ -64,28 +64,28 @@
   <xsl:variable name="y2" select="number(metadata/idinfo/spdom/bounding/northbc)"/><!-- N -->
   <xsl:variable name="y1" select="number(metadata/idinfo/spdom/bounding/southbc)"/><!-- S -->
 
-  
+
   <xsl:variable name="format">
     <xsl:choose>
       <xsl:when test="contains(metadata/idinfo/citation/citeinfo/geoform, 'raster digital data')">
-      <xsl:text>image/tiff</xsl:text>
+      <xsl:text>GeoTIFF</xsl:text>
     </xsl:when>
       <xsl:when test="contains(metadata/idinfo/citation/citeinfo/geoform, 'vector digital data')">
-        <xsl:text>application/x-esri-shapefile</xsl:text>
+        <xsl:text>Shapefile</xsl:text>
       </xsl:when>
       <xsl:when test="contains(metadata/distinfo/stdorder/digform/digtinfo/formname, 'TIFF')">
-        <xsl:text>image/tiff</xsl:text>
+        <xsl:text>GeoTIFF</xsl:text>
       </xsl:when>
       <xsl:when test="contains(metadata/distinfo/stdorder/digform/digtinfo/formname, 'JPEG2000')">
-        <xsl:text>image/tiff</xsl:text>
+        <xsl:text>image/jpeg</xsl:text>
       </xsl:when>
       <xsl:when test="contains(metadata/distinfo/stdorder/digform/digtinfo/formname, 'Shape')">
-        <xsl:text>application/x-esri-shapefile</xsl:text>
+        <xsl:text>Shapefile</xsl:text>
       </xsl:when>
     </xsl:choose>
   </xsl:variable>
-  
-  
+
+
   <xsl:variable name="uuid">
     <xsl:choose>
       <xsl:when test="$institution = 'Harvard'">
@@ -99,27 +99,25 @@
       </xsl:when>
     </xsl:choose>
   </xsl:variable>
-  
-  
+
+
   <xsl:template match="metadata">
     <xsl:text>{</xsl:text>
-    
-    <xsl:text>"uuid": "</xsl:text>
-    <xsl:value-of select="$uuid"/>
-    <xsl:text>",</xsl:text>
-    
+
+    <xsl:text>"geoblacklight_version": "1.0",</xsl:text>
+
     <xsl:text>"dc_identifier_s": "</xsl:text>
     <xsl:value-of select="idinfo/citation/citeinfo/onlink"/>
     <xsl:text>",</xsl:text>
-    
+
     <xsl:text>"dc_title_s": "</xsl:text>
     <xsl:value-of select="idinfo/citation/citeinfo/title"/>
     <xsl:text>",</xsl:text>
-    
+
     <xsl:text>"dc_description_s": "</xsl:text>
     <xsl:value-of select="idinfo/descript/abstract"/>
     <xsl:text>",</xsl:text>
-        
+
     <xsl:text>"dc_rights_s": "</xsl:text>
     <xsl:choose>
       <xsl:when test="contains(idinfo/accconst, 'Restricted')">
@@ -151,31 +149,31 @@
       </xsl:otherwise>
     </xsl:choose>
     <xsl:text>",</xsl:text>
-     
+
     <xsl:text>"dct_provenance_s": "</xsl:text>
     <xsl:value-of select="$institution"/>
     <xsl:text>",</xsl:text>
-        
+
  <!--       <field name="dct_references_s">
           <xsl:text>{</xsl:text>
-          <xsl:text>"http://schema.org/url":"</xsl:text>              
+          <xsl:text>"http://schema.org/url":"</xsl:text>
           <xsl:value-of select="$purl"/>
           <xsl:text>",</xsl:text>
-          <xsl:text>"http://schema.org/thumbnailUrl":"</xsl:text>              
+          <xsl:text>"http://schema.org/thumbnailUrl":"</xsl:text>
           <xsl:value-of select="$stacks_root"/>
           <xsl:text>/file/druid:</xsl:text>
           <xsl:value-of select="$druid"/>
           <xsl:text>/preview.jpg",</xsl:text>
-          <xsl:text>"http://schema.org/DownloadAction":"</xsl:text>              
+          <xsl:text>"http://schema.org/DownloadAction":"</xsl:text>
           <xsl:value-of select="$stacks_root"/>
           <xsl:text>/file/druid:</xsl:text>
           <xsl:value-of select="$druid"/>
           <xsl:text>/data.zip",</xsl:text>
-          <xsl:text>"http://www.loc.gov/mods/v3":"</xsl:text>              
+          <xsl:text>"http://www.loc.gov/mods/v3":"</xsl:text>
           <xsl:text>http://earthworks.stanford.edu/opengeometadata/layers/edu.stanford.purl/</xsl:text>
           <xsl:value-of select="$druid"/>
           <xsl:text>/mods",</xsl:text>
-          <xsl:text>"http://www.isotc211.org/schemas/2005/gmd/":"</xsl:text>              
+          <xsl:text>"http://www.isotc211.org/schemas/2005/gmd/":"</xsl:text>
           <xsl:text>http://earthworks.stanford.edu/opengeometadata/layers/edu.stanford.purl/</xsl:text>
           <xsl:value-of select="$druid"/>
           <xsl:text>/iso19139",</xsl:text>
@@ -190,18 +188,18 @@
           <xsl:text>/wcs"</xsl:text>
           <xsl:text>}</xsl:text>
         </field>  -->
-       
+
     <xsl:text>"layer_id_s": "</xsl:text>
     <xsl:text>urn:</xsl:text>
     <xsl:value-of select="$uuid"/>
     <xsl:text>",</xsl:text>
-        
+
     <xsl:text>"layer_slug_s": "</xsl:text>
     <xsl:value-of select="$institution"/>
     <xsl:text>-</xsl:text>
     <xsl:value-of select="$uuid"/>
     <xsl:text>",</xsl:text>
-        
+
     <xsl:choose>
       <xsl:when test="contains(metadata/spdoinfo/ptvctinf/sdtsterm/sdtstype, 'G-polygon')">
         <xsl:text>"layer_geom_type_s": "</xsl:text>
@@ -213,7 +211,7 @@
         <xsl:text>Point</xsl:text>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="contains(metadata/spdoinfo/ptvctinf/sdtsterm/sdtstype, 'String')">
         <xsl:text>"layer_geom_type_s": "</xsl:text>
         <xsl:text>Line</xsl:text>
@@ -225,36 +223,36 @@
         <xsl:text>",</xsl:text>
       </xsl:when>
     </xsl:choose>
-    
-        
+
+
 
     <xsl:choose>
       <xsl:when test="string-length(metainfo/metd)=4">
         <xsl:text>"layer_modified_dt": "</xsl:text>
-        <xsl:value-of select="metainfo/metd"/>  
+        <xsl:value-of select="metainfo/metd"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="string-length(metainfo/metd)=6">
         <xsl:text>"layer_modified_dt": "</xsl:text>
-        <xsl:value-of select="substring(metainfo/metd,1,4)"/>  
+        <xsl:value-of select="substring(metainfo/metd,1,4)"/>
         <xsl:text>-</xsl:text>
         <xsl:value-of select="substring(metainfo/metd,5,2)"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="string-length(metainfo/metd)=8">
         <xsl:text>"layer_modified_dt": "</xsl:text>
-        <xsl:value-of select="substring(metainfo/metd,1,4)"/>  
+        <xsl:value-of select="substring(metainfo/metd,1,4)"/>
         <xsl:text>-</xsl:text>
-        <xsl:value-of select="substring(metainfo/metd,5,2)"/>  
+        <xsl:value-of select="substring(metainfo/metd,5,2)"/>
         <xsl:text>-</xsl:text>
         <xsl:value-of select="substring(metainfo/metd,7,2)"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
     </xsl:choose>
-        
-        
+
+
     <xsl:if test="idinfo/citation/citeinfo/origin">
       <xsl:text>"dc_creator_sm": [</xsl:text>
       <xsl:for-each select="idinfo/citation/citeinfo/origin">
@@ -267,9 +265,9 @@
       </xsl:for-each>
       <xsl:text>],</xsl:text>
     </xsl:if>
-    
-    
-    
+
+
+
     <xsl:if test="idinfo/citation/citeinfo/pubinfo/publish">
       <xsl:text>"dc_publisher_sm": [</xsl:text>
       <xsl:for-each select="idinfo/citation/citeinfo/pubinfo/publish">
@@ -280,26 +278,26 @@
           <xsl:text>,</xsl:text>
         </xsl:if>
       </xsl:for-each>
-      <xsl:text>],</xsl:text>      
-    </xsl:if>      
-             
-        
+      <xsl:text>],</xsl:text>
+    </xsl:if>
+
+
     <xsl:text>"dc_format_s": "</xsl:text>
     <xsl:value-of select="$format"/>
     <xsl:text>",</xsl:text>
-         
+
     <xsl:if test="contains(idinfo/descript/langdata, 'en')">
       <xsl:text>"dc_language_s": "</xsl:text>
       <xsl:text>English</xsl:text>
       <xsl:text>",</xsl:text>
     </xsl:if>
-    
+
     <!-- DCMI Type vocabulary: defaults to dataset -->
     <xsl:text>"dc_type_s": "</xsl:text>
     <xsl:text>Dataset</xsl:text>
     <xsl:text>",</xsl:text>
-    
-    
+
+
     <xsl:if test="idinfo/keywords/theme/themekey">
       <xsl:text>"dc_subject_sm": [</xsl:text>
       <xsl:for-each select="idinfo/keywords/theme/themekey">
@@ -314,7 +312,7 @@
       </xsl:for-each>
       <xsl:text>],</xsl:text>
     </xsl:if>
-    
+
     <xsl:if test="idinfo/keywords/place/placekey">
       <xsl:text>"dc_spatial_sm": [</xsl:text>
       <xsl:for-each select="idinfo/keywords/place/placekey">
@@ -330,47 +328,47 @@
     <xsl:choose>
       <xsl:when test="string-length(idinfo/citation/citeinfo/pubdate)=4">
         <xsl:text>"dct_issued_s": "</xsl:text>
-        <xsl:value-of select="idinfo/citation/citeinfo/pubdate"/>  
+        <xsl:value-of select="idinfo/citation/citeinfo/pubdate"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="string-length(idinfo/citation/citeinfo/pubdate)=6">
         <xsl:text>"dct_issued_s": "</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,1,4)"/>  
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,1,4)"/>
         <xsl:text>-</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,5,2)"/>  
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,5,2)"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
-      
+
       <xsl:when test="string-length(idinfo/citation/citeinfo/pubdate)=8">
         <xsl:text>"dct_issued_s": "</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,1,4)"/>  
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,1,4)"/>
         <xsl:text>-</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,5,2)"/>  
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,5,2)"/>
         <xsl:text>-</xsl:text>
-        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,7,2)"/> 
+        <xsl:value-of select="substring(idinfo/citation/citeinfo/pubdate,7,2)"/>
         <xsl:text>",</xsl:text>
       </xsl:when>
     </xsl:choose>
-    
+
     <!-- singular content date: YYYY -->
-    
+
     <xsl:for-each select="idinfo/timeperd/timeinfo/sngdate/caldate">
       <xsl:if test="text() !='' ">
-        <xsl:text>"dct_temporal_sm": "</xsl:text>
+        <xsl:text>"dct_temporal_sm": ["</xsl:text>
         <xsl:value-of select="substring(.,1,4)"/>
-        <xsl:text>",</xsl:text>
+        <xsl:text>"],</xsl:text>
       </xsl:if>
     </xsl:for-each>
-    
-    
-    <xsl:for-each select="idinfo/timeperd/timeinfo/mdattim/sngdate">  
-      <xsl:text>"dct_temporal_sm": "</xsl:text>
+
+
+    <xsl:for-each select="idinfo/timeperd/timeinfo/mdattim/sngdate">
+      <xsl:text>"dct_temporal_sm": ["</xsl:text>
       <xsl:value-of select="substring(caldate,1,4)"/>
-      <xsl:text>",</xsl:text>
-    </xsl:for-each>  
-    
-    
+      <xsl:text>"],</xsl:text>
+    </xsl:for-each>
+
+
     <!-- months, days YYYY-MM, YYYY-MM-DD
              <xsl:when test="string-length(idinfo/timeperd/timeinfo/sngdate/caldate)=4">
              <xsl:value-of select="idinfo/timeperd/timeinfo/sngdate/caldate"/>
@@ -387,29 +385,29 @@
              <xsl:text>-</xsl:text>
              <xsl:value-of select="substring(idinfo/timeperd/timeinfo/sngdate/caldate,7,2)"/>
              </xsl:when>  -->
-    
+
     <!-- content date range: YYYY-YYYY if dates in range differ -->
-    
+
     <xsl:for-each select="idinfo/timeperd/timeinfo/rngdates">
-      <xsl:text>"dct_temporal_sm": "</xsl:text>
+      <xsl:text>"dct_temporal_sm": ["</xsl:text>
       <xsl:value-of select="substring(begdate, 1,4)"/>
-      <xsl:if test="substring(begdate,1,4) != substring(enddate,1,4)"> 
+      <xsl:if test="substring(begdate,1,4) != substring(enddate,1,4)">
         <xsl:text>-</xsl:text>
         <xsl:value-of select="substring(enddate,1,4)"/>
       </xsl:if>
-      <xsl:text>",</xsl:text>  
+      <xsl:text>"],</xsl:text>
     </xsl:for-each>
-    
+
     <xsl:for-each select="idinfo/keywords/temporal/tempkey">
       <xsl:if test="text() != substring(idinfo/timeperd/timeinfo/sngdate/caldate,1,4)">
-        <xsl:text>"dct_temporal_sm": "</xsl:text>
+        <xsl:text>"dct_temporal_sm": ["</xsl:text>
         <xsl:value-of select="."/>
-        <xsl:text>",</xsl:text>
+        <xsl:text>"],</xsl:text>
       </xsl:if>
     </xsl:for-each>
-    
+
     <!-- collection -->
-    
+
     <xsl:if test="idinfo/citation/citeinfo/lworkcit/citeinfo | idinfo/citation/citeinfo/serinfo/sername">
       <xsl:text>"dct_isPartOf_sm": [</xsl:text>
       <xsl:for-each select="idinfo/citation/citeinfo/lworkcit/citeinfo | idinfo/citation/citeinfo/serinfo">
@@ -422,45 +420,7 @@
     </xsl:for-each>
       <xsl:text>],</xsl:text>
     </xsl:if>
-    
-    
-    <!-- cross-references -->
-    <xsl:if test="idinfo/crossref/citeinfo">
-      <xsl:text>"dct_relation_sm": [</xsl:text>
-      <xsl:for-each select="idinfo/crossref/citeinfo">
-        <xsl:text>"</xsl:text>
-        <xsl:value-of select="title"/>
-        <xsl:text>"</xsl:text>
-        <xsl:if test="position() != last()">
-          <xsl:text>,</xsl:text>
-        </xsl:if>
-        <xsl:text>],</xsl:text>
-      </xsl:for-each>
-    </xsl:if>
-    
-    <xsl:text>"georss_polygon_s": "</xsl:text> 
-    <xsl:text></xsl:text>
-    <xsl:value-of select="$y1"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$x1"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$y2"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$x1"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$y2"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$x2"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$y1"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$x2"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$y1"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$x1"/>
-    <xsl:text>",</xsl:text>
-    
+
     <xsl:text>"solr_geom": "ENVELOPE(</xsl:text>
     <xsl:value-of select="$x1"/>
     <xsl:text>, </xsl:text>
@@ -470,55 +430,36 @@
     <xsl:text>, </xsl:text>
     <xsl:value-of select="$y1"/>
     <xsl:text>)",</xsl:text>
-    
-    <xsl:text>"georss_box_s": "</xsl:text>
-    <xsl:value-of select="$y1"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$x1"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$y2"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$x2"/>
-    <xsl:text>",</xsl:text>
-    
-    
+
     <!-- content date for solr year: choose singular, or beginning date of range: YYYY -->
     <xsl:if test="idinfo/timeperd/timeinfo">
       <xsl:choose>
         <xsl:when test="idinfo/timeperd/timeinfo/sngdate/caldate/text() != ''">
 
             <xsl:text>"solr_year_i": </xsl:text>
-            <xsl:text>"</xsl:text>
             <xsl:value-of select="substring(idinfo/timeperd/timeinfo/sngdate/caldate,1,4)"/>
-            <xsl:text>"</xsl:text>
-          
+
         </xsl:when>
-        
+
         <xsl:when test="idinfo/timeperd/timeinfo/mdattim/sngdate/caldate">
           <xsl:if test="position() = 1">
             <xsl:text>"solr_year_i": </xsl:text>
-            <xsl:text>"</xsl:text>
             <xsl:value-of select="substring(caldate,1,4)"/>
-            <xsl:text>"</xsl:text>
           </xsl:if>
         </xsl:when>
-        
+
         <xsl:when test="idinfo/timeperd/timeinfo/rngdates/begdate/text() != ''[1]">
           <xsl:if test="position() = 1">
             <xsl:text>"solr_year_i": </xsl:text>
-            <xsl:text>"</xsl:text>
             <xsl:value-of select="substring(rngdates/begdate/text(), 1,4)"/>
-            <xsl:text>"</xsl:text>
           </xsl:if>
         </xsl:when>
-        
+
         <xsl:when test="//metadata/idinfo/keywords/temporal/tempkey">
           <xsl:for-each select="//metadata/idinfo/keywords/temporal/tempkey[1]">
             <xsl:if test="text() != ''">
               <xsl:text>"solr_year_i": </xsl:text>
-              <xsl:text>"</xsl:text>
               <xsl:value-of select="."/>
-              <xsl:text>"</xsl:text>
             </xsl:if>
           </xsl:for-each>
         </xsl:when>
@@ -526,6 +467,6 @@
     </xsl:if>
 
 
-    <xsl:text>}</xsl:text>  
+    <xsl:text>}</xsl:text>
    </xsl:template>
 </xsl:stylesheet>