Project

General

Profile

« Previous | Next » 

Revision 6744

refactor Metacat access handling to be on a per-revision basis so that it more closely aligns with the DataONE approach
http://bugzilla.ecoinformatics.org/show_bug.cgi?id=5560

View differences:

QuerySpecification.java
272 272
    {
273 273
        String allowQuery = null;
274 274
        String allowString = constructAllowString();
275
        allowQuery = "SELECT docid from xml_access WHERE( " + allowString;
275
        allowQuery = "SELECT id.docid from xml_access xa, identifier id WHERE id.guid = xa.guid AND ( " + allowString;
276 276
        allowQuery = allowQuery + ")";
277 277
        logMetacat.info("QuerySpecification.createAllowRuleQuery - allow query is: " + allowQuery);
278 278
        return allowQuery;
......
319 319
    {
320 320
        String denyQuery = null;
321 321
        String denyString = constructDenyString();
322
        denyQuery = "SELECT docid from xml_access WHERE( " + denyString;
322
        denyQuery = "SELECT id.docid from xml_access xa, identifier id WHERE id.guid = xa.guid AND ( " + denyString;
323 323
        denyQuery = denyQuery + ") ";
324 324
        logMetacat.info("QuerySpecification.createDenyRuleQuery - denyquery is: " + denyQuery);
325 325
        return denyQuery;

Also available in: Unified diff