Project

General

Profile

« Previous | Next » 

Revision 535

Modified pathquery.dtd and QuerySpecification to allow some new constraints
on queries submitted to Metacat. Now, queries can contain an optional
set of <owner> tags that identify the users for which documents should be
returned, and a list of <site> tags constraining the site identifiers
(from the accesion number) of returned datasets. For example, for a
pathquery document that contained the XML fragement:
<owner>jones</owner>
<site>MARINE</site>
only documents owned by jones and with an accession number whose scope
was the string 'MARINE' (ie, global part of the ID) would be returned from
the query. This allows us to have site specific catalogs for the MARINE
network, the NRS network, the OBFS network, etc.

Modified the various XSL and HTML forms from the MARINE catalog to utilize
this parameter and only display documents with a scope of 'MARINE'.

Changed the accession number separator to '.' (it used to be ':'). This is
more in agrrement with other systems like Genbank. Because of the replication
mechanism that berkley is developing, we will probably need to mandate the use
of a single accession number format. Right now it will likely be:
scope.uniqueid.revisionid
where "scope" is the name of the site or group responsible for the accession
number domain, "uniqueid" is the unique identifier within that domain, and
"revision" id is the revision number for a particular document. The combined
accession number is, by definition, globally unique (no two documents can be
inserted with the same "scope.uniqueid.revisionid".

BugID: 169

View differences:

marine.xsl
58 58
             value="-//NCEAS//resource//EN" />
59 59
             <input type="hidden" name="returndoc"
60 60
              value="-//NCEAS//eml-dataset//EN" />
61
             <input type="hidden" name="site" value="MARINE" />
61 62
             <input border="0" type="image" 
62 63
                    src="@image-path@/marine/browsebutton.jpg"
63 64
                    alt="browse the database"
......
98 99
             value="-//NCEAS//resource//EN" />
99 100
            <input type="hidden" name="returndoc"
100 101
             value="-//NCEAS//eml-dataset//EN" />
102
            <input type="hidden" name="site" value="MARINE" />
101 103
    	     </form>
102 104
         </td>
103 105
    	 </tr>  
......
298 300
             value="-//NCEAS//resource//EN" />
299 301
      <input type="hidden" name="returndoc"
300 302
             value="-//NCEAS//eml-dataset//EN" />
303
      <input type="hidden" name="site" value="MARINE" />
301 304
      <input type="submit" value="Search" />
302 305
      <input type="reset" value="Clear Form" />
303 306
        
......
346 349
          <td>
347 350
            <form action="@html-path@/servlet/marine" method="POST">
348 351
              <xsl:attribute name="name">
349
                <xsl:value-of select="translate(./docid,':','')"/>
352
                <xsl:value-of select="translate(./docid,'.','')"/>
350 353
              </xsl:attribute>
351 354
            <!-- abstractpath tells the servlet where the abstract is in the 
352 355
                 document.  The % sign is used because the path could be
......
369 372

  
370 373
            <font size="2">
371 374
            <a>
372
              <xsl:attribute name="href">javascript:submitform('getdocument',document.<xsl:value-of select="translate(./docid, ':', '')"/>)</xsl:attribute>
375
              <xsl:attribute name="href">javascript:submitform('getdocument',document.<xsl:value-of select="translate(./docid, '.', '')"/>)</xsl:attribute>
373 376
               Dataset Information
374 377
            </a><br />
375 378
            <a>
376
              <xsl:attribute name="href">javascript:submitform('getabstract',document.<xsl:value-of select="translate(./docid,':','')"/>)</xsl:attribute>
379
              <xsl:attribute name="href">javascript:submitform('getabstract',document.<xsl:value-of select="translate(./docid,'.','')"/>)</xsl:attribute>
377 380
              View Abstract
378 381
            </a><br />
379 382
            <a>
380
              <xsl:attribute name="href">javascript:submitform('getdatadoc',document.<xsl:value-of select="translate(./docid,':','')"/>)</xsl:attribute>
383
              <xsl:attribute name="href">javascript:submitform('getdatadoc',document.<xsl:value-of select="translate(./docid,'.','')"/>)</xsl:attribute>
381 384
               Download Data and Metadata
382 385
            </a><br />
383 386
            </font>

Also available in: Unified diff