Project

General

Profile

« Previous | Next » 

Revision 5082

Added by daigle over 14 years ago

Add ability for doc owner to add user access to workflows.

View differences:

AccessControlList.java
31 31
import java.sql.*;
32 32
import java.util.Stack;
33 33
import java.util.Vector;
34
import java.util.Hashtable;
35
import java.net.URL;
36
import java.net.MalformedURLException;
37 34

  
38 35
import org.apache.log4j.Logger;
39 36
import org.xml.sax.Attributes;
......
42 39
import org.xml.sax.EntityResolver;
43 40
import org.xml.sax.ErrorHandler;
44 41
import org.xml.sax.SAXException;
45
import org.xml.sax.SAXParseException;
46 42
import org.xml.sax.XMLReader;
47 43
import org.xml.sax.helpers.XMLReaderFactory;
48 44
import org.xml.sax.helpers.DefaultHandler;
49 45

  
50 46
import edu.ucsb.nceas.metacat.database.DBConnection;
51 47
import edu.ucsb.nceas.metacat.database.DBConnectionPool;
52
import edu.ucsb.nceas.metacat.database.DatabaseService;
53 48
import edu.ucsb.nceas.metacat.properties.PropertyService;
54 49
import edu.ucsb.nceas.metacat.util.MetacatUtil;
55 50
import edu.ucsb.nceas.metacat.util.SystemUtil;
......
836 831
             endTime != null && !endTime.equals(end_prev)  ||
837 832
             beginTime != null && !beginTime.equals(begin_prev) ||
838 833
             ticketCount != ticket_prev )  {
839
          if ( (permission & READ) != 0 ) {
834
          if ( (permission & READ) == READ ) {
840 835
            outTemp.append("      <permission>read</permission>\n");
841 836
          }
842
          if ( (permission & WRITE) != 0 ) {
837
          if ( (permission & WRITE) == WRITE ) {
843 838
            outTemp.append("      <permission>write</permission>\n");
844 839
          }
845
          if ( (permission & ALL) != 0 ) {
840
          if ( (permission & ALL) == ALL ) {
846 841
            outTemp.append("      <permission>all</permission>\n");
847 842
          }
848 843
          if ( (beginTime != null) || (endTime != null) ) {

Also available in: Unified diff