Project

General

Profile

« Previous | Next » 

Revision 2924

Added by Matt Jones almost 19 years ago

Initial support for displaying FGDC metadata documents in metacat.
Added new returndoctype and returnfields to all query forms in the knp
skin to allow FGDC documents to display in the resultsets. Need to add
these to the other skins as well, and to clean up the FGDC stylesheet to
be more stylistically consistent with the EML stylesheets.

View differences:

lib/style/skins/knp/index.html
71 71 
  <input name="returnfield" value="creator/organizationName" type="hidden">
72 72 
  <input name="returnfield" value="dataset/title" type="hidden">
73 73 
  <input name="returnfield" value="keyword" type="hidden">
74 
  <input name="returnfield" value="idinfo/citation/citeinfo/title" type="hidden">
75 
  <input name="returnfield" value="idinfo/citation/citeinfo/origin" type="hidden">
76 
  <input name="returnfield" value="idinfo/keywords/theme/themekey" type="hidden">
74 77 
  <input name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.1" type="hidden">
75 78 
  <input name="returndoctype" value="eml://ecoinformatics.org/eml-2.0.0" type="hidden">
76 79 
  <input name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN" type="hidden">
77 80 
  <input name="returndoctype" value="-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN" type="hidden">
78 81 
  <input name="returndoctype" value="-//NCEAS//resource//EN" type="hidden">
79 82 
  <input name="returndoctype" value="-//NCEAS//eml-dataset//EN" type="hidden">
83 
  <input name="returndoctype" value="metadata" type="hidden">
80 84 
  <input value="Search" type="submit">
81 85 
</form>
82 86 
      The repository search system is used to locate data sets of interest
......
88 92 
      biodiversity embedded within it).
89 93 
      </menu>
90 94 
  <p>&nbsp;</p>
91 
  <li><a href="@servlet-path@?action=query&amp;operator=INTERSECT&amp;anyfield=%25&amp;qformat=knp&amp;enableediting=false&amp;returndoctype=eml://ecoinformatics.org/eml-2.0.1&amp;returndoctype=eml://ecoinformatics.org/eml-2.0.0&amp;returndoctype=-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN&amp;returndoctype=-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN&amp;returnfield=dataset/title&amp;returnfield=keyword&amp;returnfield=originator/individualName/surName&amp;returnfield=creator/individualName/surName&amp;returnfield=originator/organizationName&amp;returnfield=creator/organizationName">Browse existing KNP data sets</a><br />
95 
  <li><a href="@servlet-path@?action=query&amp;operator=INTERSECT&amp;anyfield=%25&amp;qformat=knp&amp;enableediting=false&amp;returndoctype=eml://ecoinformatics.org/eml-2.0.1&amp;returndoctype=eml://ecoinformatics.org/eml-2.0.0&amp;returndoctype=-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN&amp;returndoctype=-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN&amp;returndoctype=metadata&amp;returnfield=dataset/title&amp;returnfield=keyword&amp;returnfield=originator/individualName/surName&amp;returnfield=creator/individualName/surName&amp;returnfield=originator/organizationName&amp;returnfield=creator/organizationName&amp;returnfield=idinfo/citation/citeinfo/title&amp;returnfield=idinfo/citation/citeinfo/origin&amp;returnfield=idinfo/keywords/theme/themekey">Browse existing KNP data sets</a><br />
92 96 
    <menu>
93 97 
    Browse all existing data sets by title.  This operation can be slow as the
94 98 
    number of entries in the repository grows.
lib/style/common/resultset.xsl
130 130 
                       <xsl:value-of select="./param[@name='citation/title']"/>
131 131 
                       <xsl:value-of select="./param[@name='software/title']"/>
132 132 
                       <xsl:value-of select="./param[@name='protocol/title']"/>
133 
                       <xsl:value-of select="./param[@name='idinfo/citation/citeinfo/title']"/>
133 134 
                     </xsl:otherwise>
134 135 
                   </xsl:choose>
135 136 
                 </a><br />
......
148 149 
                 <xsl:value-of select="." />
149 150 
                 <br/>
150 151 
               </xsl:for-each>
152 
               <xsl:for-each select="./param[@name='idinfo/citation/citeinfo/origin']" >
153 
                 <xsl:value-of select="." />
154 
                 <br/>
155 
               </xsl:for-each>
151 156 

  		




  152
  157
  
    
             </td>


  		




  153
  158
  
    
             <td class="text_plain">


  		




  ......




  162
  167
  
    
                 <xsl:value-of select="." />


  		




  163
  168
  
    
                 <br/>


  		




  164
  169
  
    
               </xsl:for-each>


  		




  
  170
  
    
               <xsl:for-each


  		




  
  171
  
    
                select="./param[@name='idinfo/keywords/theme/themekey']">


  		




  
  172
  
    
                 <xsl:value-of select="." />


  		




  
  173
  
    
                 <br/>


  		




  
  174
  
    
               </xsl:for-each>


  		




  165
  175
  
    

  		




  166
  176
  
    
             </td>


  		




  167
  177
  
    
	   


  		












  

    
      src/edu/ucsb/nceas/metacat/DocumentIdQuery.java
    
  





  85
  85
  
    
        operator[0] = "UNION";


  		




  86
  86
  
    
        params.put("operator", operator);


  		




  87
  87
  
    
        


  		




  88
  
  
    
        String[] doctypes = new String[4];


  		




  
  88
  
    
        String[] doctypes = new String[5];


  		




  89
  89
  
    
        doctypes[0] = "eml://ecoinformatics.org/eml-2.0.1";


  		




  90
  90
  
    
        doctypes[1] = "eml://ecoinformatics.org/eml-2.0.0";


  		




  91
  91
  
    
        doctypes[2] = "-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN";


  		




  92
  92
  
    
        doctypes[3] = "-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN";


  		




  
  93
  
    
        doctypes[4] = "metadata";


  		




  93
  94
  
    
        params.put("returndoctype", doctypes);


  		




  94
  95
  
    
        


  		




  95
  
  
    
        String[] fields = new String[8];


  		




  
  96
  
    
        String[] fields = new String[11];


  		




  96
  97
  
    
        fields[0]="originator/individualName/surName";


  		




  97
  98
  
    
        fields[1]="originator/individualName/givenName";


  		




  98
  99
  
    
        fields[2]="creator/individualName/surName";


  		




  ......




  101
  102
  
    
        fields[5]="creator/organizationName";


  		




  102
  103
  
    
        fields[6]="dataset/title";


  		




  103
  104
  
    
        fields[7]="keyword";


  		




  
  105
  
    
        fields[8]="idinfo/citation/citeinfo/title";


  		




  
  106
  
    
        fields[9]="idinfo/citation/citeinfo/origin";


  		




  
  107
  
    
        fields[10]="idinfo/keywords/theme/themekey";


  		




  104
  108
  
    
        params.put("returnfield", fields);


  		




  105
  109
  
    
        


  		




  106
  110
  
    
        return params;


  		












Also available in:  Unified diff