Project

General

Profile

« Previous | Next » 

Revision 6017

include accessfileid and subtreeid when inserting xml_access values

View differences:

AccessControlForSingleFile.java
95 95
	public void insertPermissions(XMLAccessDAO xmlAccessDAO) 
96 96
			throws AccessControlException, PermOrderException{
97 97
		insertPermissions(xmlAccessDAO.getPrincipalName(), xmlAccessDAO.getPermission(), 
98
				xmlAccessDAO.getPermType(), xmlAccessDAO.getPermOrder());
98
				xmlAccessDAO.getPermType(), xmlAccessDAO.getPermOrder(), xmlAccessDAO.getAccessFileId(), xmlAccessDAO.getSubTreeId());
99 99
	}
100 100

  
101 101
	/**
......
110 110
	 * @param permOrder
111 111
	 *            the permission order
112 112
	 */
113
	public void insertPermissions(String principalName, Long permission, String permType, String permOrder) 
113
	public void insertPermissions(String principalName, Long permission, String permType, String permOrder, String accessFileId, String subTreeId) 
114 114
			throws AccessControlException, PermOrderException {
115 115
		try {
116 116
			// The addXMLAccess method will create the permission record if it does not exist.  
......
118 118
			// doc id.
119 119
			XMLAccessAccess xmlAccessAccess = new XMLAccessAccess();
120 120
			//System.out.println("permission in accessControlForSingleFile.insertPermissions: " + permission);
121
			xmlAccessAccess.addXMLAccess(_docId, principalName, new Long(permission), permType, permOrder);
121
			xmlAccessAccess.addXMLAccess(_docId, principalName, new Long(permission), permType, permOrder, accessFileId, subTreeId);
122 122
		} catch (AccessException ae) {
123 123
			throw new AccessControlException("AccessControlForSingleFile.insertPermissions - "
124 124
					+ "DB access error when inserting permissions: " + ae.getMessage());
......
196 196
				"AND principal_name = ? " +
197 197
				"AND permission = ? " +
198 198
				"AND perm_type = ? " +
199
				"AND perm_order =? ");
199
				"AND perm_order = ? ");
200 200
     
201 201
			// Bind the values to the query
202 202
			pstmt.setString(1, _docId);

Also available in: Unified diff