/ - Diff - Metacat - Ecoinformatics Redmine

       private static final String FIRSTTIME  = "replication.firsttimedreplication";
       private static final int    TIMEINTERVALLIMIT = 7200000;
       private static Logger logMetacat = Logger.getLogger(MetacatReplication.class);
       public static final String REPLICATIONUSER = "replication";
       /**
        * Initialize the servlet by creating appropriate database connections
-...
           Hashtable<String,String> docinfoHash = dih.getDocInfo();
           // Get user owner of this docid
     //      String user = (String)docinfoHash.get("user_owner");
           // replication user owns all docs from here on out.
           String user = SessionService.REPLICATION_USER_NAME;
           String user = (String)docinfoHash.get("user_owner");
           // Get home server of this docid
           String homeServer=(String)docinfoHash.get("home_server");
           String createdDate = (String)docinfoHash.get("date_created");
-...
           MetacatReplication.replLog("document " + docid + " added to DB with " +
                                      "action " + dbaction);
           EventLog.getInstance().log(request.getRemoteAddr(), SessionService.REPLICATION_USER_NAME, docid, dbaction);
           EventLog.getInstance().log(request.getRemoteAddr(), REPLICATIONUSER, docid, dbaction);
         }//try
         catch(Exception e)
+        {
-...
         MetacatReplication.replLog("force replication delete docid " + docid);
         logMetacat.info("Force replication delete request from: "+ server);
         logMetacat.info("Force replication delete docid: "+docid);
         DocumentImpl.delete(docid, SessionService.REPLICATION_USER_NAME, null, server);
         DocumentImpl.delete(docid, null, null, server);
         MetacatReplication.replLog("document " + docid + " was successfully deleted ");
         EventLog.getInstance().log(request.getRemoteAddr(), SessionService.REPLICATION_USER_NAME, docid, "delete");
         EventLog.getInstance().log(request.getRemoteAddr(), REPLICATIONUSER, docid, "delete");
         logMetacat.info("document " + docid + " was successfully deleted ");
+      }
       catch(Exception e)
-...
           XMLReader docinfoParser = ReplicationHandler.initParser(dih);
           docinfoParser.parse(new InputSource(new StringReader(docInfoStr)));
           Hashtable<String,String> docinfoHash = dih.getDocInfo();
           //String user = (String)docinfoHash.get("user_owner");
           String user = (String)docinfoHash.get(SessionService.REPLICATION_USER_NAME);
           String user = (String)docinfoHash.get("user_owner");
           String docName = (String)docinfoHash.get("docname");
-...
             //false means non-timed replication
             MetacatReplication.replLog("datafile " + docid + " added to DB with " +
                     "action " + dbaction);
             EventLog.getInstance().log(request.getRemoteAddr(), SessionService.REPLICATION_USER_NAME, docid, dbaction);
             EventLog.getInstance().log(request.getRemoteAddr(), REPLICATIONUSER, docid, dbaction);
+         }
+        }
-...
+        }
         catch (Exception e)
+        {
           logMetacat.error("error in " +
                              "metacatReplication.handlegetdocumentinforequest: " +
                               e.getMessage());
           logMetacat.error("error in metacatReplication.handlegetdocumentinforequest "
         		  + "for doc: " + docid + " : " + e.getMessage());
+        }
+      }
-...
+    			}
     			String docid = params.get("docid")[0];
     			logMetacat.debug("MetacatReplication.handleGetDocumentRequest for docid: " + docid);
     			DocumentImpl di = new DocumentImpl(docid);
     			String documentDir = PropertyService.getProperty("application.documentfilepath");
-...
     			if (FileUtil.getFileStatus(documentPath) == FileUtil.DOES_NOT_EXIST
     					|| FileUtil.getFileSize(documentPath) == 0) {
     				FileWriter fileWriter = new FileWriter(documentPath);
     				di.toXml(fileWriter, SessionService.REPLICATION_USER_NAME, null, true);
     				di.toXml(fileWriter, null, null, true);
+    			}
     			// read the file from disk and sent it to PrintWriter
     			// PrintWriter out = new PrintWriter(streamOut);
     			di.readFromFileSystem(out, SessionService.REPLICATION_USER_NAME, null, documentPath);
     			di.readFromFileSystem(out, null, null, documentPath);
     			// response.setContentType("text/xml");
     			// out.print(di.toString(null, null, true));

       public static final String DENY="deny";
       public static final String PUBLIC="public";
       public static final String ACLID="acl";
       public static final String ACCESS="access";
       public static final String PERMISSION="permission";
       public static final String PRINCIPAL="principal";

     import java.sql.*;
     import java.util.Enumeration;
     import java.util.Hashtable;
     import java.util.Stack;
     import java.util.Vector;
     import java.util.Iterator;
     import org.apache.log4j.Logger;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.service.SessionService;
     import edu.ucsb.nceas.metacat.util.MetacatUtil;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
-...
        private String docId = null;
        private boolean hasSubTreeAccessControl = false; // flag if has a subtree
                                                         // access for this docid
        private Vector<SubTree> subTreeList = new Vector<SubTree>();
        private Vector subTreeList = new Vector();
        private long TOPLEVELSTARTNODEID = 0; //if start node is 0, means it is top
                                              //level document
-...
+        {
           return true;
+        }
         if (user.equals(SessionService.REPLICATION_USER_NAME)) {
         	return true;
+        }
         //create a userpackage including user, public and group member
         userPackage=createUsersPackage(user, groups);
-...
+      {
         boolean flag = true;
         // Get unaccessble subtree for this user
         Hashtable<Long, SubTree> unaccessableSubTree = hasUnaccessableSubTree(user, groups,
         Hashtable unaccessableSubTree = hasUnaccessableSubTree(user, groups,
                                                                myPermission);
         Enumeration<SubTree> en = unaccessableSubTree.elements();
         Enumeration en = unaccessableSubTree.elements();
         while (en.hasMoreElements())
+        {
           SubTree tree = (SubTree)en.nextElement();
-...
        * @param groups  the groups which the use is in
        * @param myPermission  permission type to check for
        */
       public Hashtable<Long, SubTree> hasUnaccessableSubTree(String user, String[] groups,
       public Hashtable hasUnaccessableSubTree(String user, String[] groups,
                                            String myPermission) throws McdbException
+      {
         Hashtable<Long, SubTree> resultUnaccessableSubTree = new Hashtable<Long, SubTree>();
         Hashtable resultUnaccessableSubTree = new Hashtable();
         String [] principals=null;
         int permission =AccessControlList.intValue(myPermission);
-...
        * is a subtree of subtree a. And user doesn't have read permission for both
        * so we only use subtree a is enough.
        */
       private Hashtable<Long, SubTree> mergeEquivalentSubtree(Hashtable<Long, SubTree> unAccessSubTree)
       private Hashtable mergeEquivalentSubtree(Hashtable unAccessSubTree)
+      {
         Hashtable<Long, SubTree> newSubTreeHash = new Hashtable<Long, SubTree>();
         Hashtable newSubTreeHash = new Hashtable();
         boolean   needDelete = false;
         // check the parameters
         if (unAccessSubTree == null || unAccessSubTree.isEmpty())
-...
           // look every subtree start point and stop point, to see if it is embedded
           // in another one. If embedded, they are equavelent and we can use bigger
           // one to replace smaller one
           Enumeration<SubTree> en = unAccessSubTree.elements();
           Enumeration en = unAccessSubTree.elements();
           while (en.hasMoreElements())
+          {
             SubTree tree    = (SubTree)en.nextElement();
-...
             long    startId = tree.getStartNodeId();
             long    endId   = tree.getEndNodeId();
             Enumeration<SubTree> enu = unAccessSubTree.elements();
             Enumeration enu = unAccessSubTree.elements();
             while (enu.hasMoreElements())
+            {
               SubTree subTree = (SubTree)enu.nextElement();
               //String subTreeId= subTree.getSubTreeId();
               String subTreeId= subTree.getSubTreeId();
               long   subTreeStartId = subTree.getStartNodeId();
               long   subTreeEndId   = subTree.getEndNodeId();
               //compare and if the first subtree is a subtree of the second
-...
                       throws SQLException, Exception
+      {
     	Vector<AccessControlForSingleFile> accessControl = new Vector<AccessControlForSingleFile>();
         //boolean hasRow;
         boolean hasRow;
         PreparedStatement pStmt = null;
         DBConnection conn = null;
         int serialNumber = -1;
-...
        PreparedStatement pStmt = null;
        int permissionValue=permission;
        int permissionValueInTable;
        //int ticketCount;
        int ticketCount;
        DBConnection conn = null;
        int serialNumber = -1;
        boolean topLever = false;
-...
                                    boolean withRevision)
                                  throws SQLException,McdbException, Exception
+       {
           Hashtable<String, String> unAccessibleIdList = new Hashtable<String, String>();
           Hashtable<String, String> allIdList = getAllInlineDataIdList(docid);
           Hashtable<String, String> unAccessibleIdList = new Hashtable();
           if (user == null) {
         	  return unAccessibleIdList;
+          }
           Hashtable allIdList = getAllInlineDataIdList(docid);
           Enumeration<String> en = allIdList.keys();
           while (en.hasMoreElements())
+          {
-...
         * about the inline data. The key is subtree id and data is a inline internal
         * file name
         */
        private static Hashtable<String, String> getAllInlineDataIdList(String docid) throws SQLException
        private static Hashtable getAllInlineDataIdList(String docid) throws SQLException
+       {
          Hashtable<String, String> inlineDataList = new Hashtable<String, String>();
          Hashtable inlineDataList = new Hashtable();
          String sql = "SELECT subtreeid, docid FROM xml_access WHERE " +
                        "accessfileid = ? AND subtreeid  IS NOT NULL";
          PreparedStatement pStmt=null;

     import edu.ucsb.nceas.metacat.service.DatabaseService;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.service.SessionService;
     import edu.ucsb.nceas.metacat.util.MetacatUtil;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     import java.sql.*;
     import java.util.*;
     import java.util.Date;
     import java.lang.Thread;
     import java.io.*;
     import java.net.*;
     import java.text.*;
-...
     import org.apache.log4j.Logger;
     import org.xml.sax.AttributeList;
     import org.xml.sax.ContentHandler;
     import org.xml.sax.DTDHandler;
     import org.xml.sax.EntityResolver;
     import org.xml.sax.ErrorHandler;
     import org.xml.sax.InputSource;
     import org.xml.sax.XMLReader;
     import org.xml.sax.SAXException;
     import org.xml.sax.SAXParseException;
     import org.xml.sax.helpers.XMLReaderFactory;
     import org.xml.sax.helpers.DefaultHandler;
-...
                                             // ReplicationServer got from
                                             // Server list
         String server = null; // Variable to store server name
     //    String update;
         Vector<String> responses = new Vector<String>();
         String update;
         Vector responses = new Vector();
         URL u;
-...
               REVINSERTNUMBER++;
+          }
           String ip = getIpFromURL(u);
           EventLog.getInstance().log(ip, SessionService.REPLICATION_USER_NAME, accNumber, actions);
           EventLog.getInstance().log(ip, MetacatReplication.REPLICATIONUSER, accNumber, actions);
         }//try
-...
                 REVINSERTNUMBER++;
+            }
             String ip = getIpFromURL(u);
             EventLog.getInstance().log(ip, SessionService.REPLICATION_USER_NAME, accNumber, actions);
             EventLog.getInstance().log(ip, MetacatReplication.REPLICATIONUSER, accNumber, actions);
           }//if
           else
-...
              MetacatReplication.replLog("Doc " + docId + " deleted");
              URL u = new URL("https://"+notifyServer);
              String ip = getIpFromURL(u);
              EventLog.getInstance().log(ip, SessionService.REPLICATION_USER_NAME, docId, "delete");
              EventLog.getInstance().log(ip, MetacatReplication.REPLICATIONUSER, docId, "delete");
+          }
         }//try
-...
     					continue;
+    				}
+    			}
     			catch (Exception e) {
     				logMetacat.error("error handling update doc in " + tableName
     						+ " in timed replication: " + e.getMessage());
     			} catch (Exception e) {
     				logMetacat.error("error to handle update doc in " + tableName
     						+ " in time replication" + e.getMessage());
     				continue;
+    			}

     	private static Hashtable<String, SessionData> sessionHash = null;
     	private static final String PUBLIC_SESSION_ID = "0";
     	public static final String PUBLIC_USER_NAME = "public";
     	private static final String REPLICATION_SESSION_ID = "1";
     	public static final String REPLICATION_USER_NAME = "replication";
     	/**
     	 * private constructor since this is a singleton
-...
     	private SessionService() throws ServiceException {
     		sessionHash = new Hashtable<String, SessionData>();
     		logMetacat.debug("Registering public session id: " + PUBLIC_SESSION_ID);
     		registerSession(PUBLIC_SESSION_ID, PUBLIC_USER_NAME, null, null);
     		registerSession(REPLICATION_SESSION_ID, REPLICATION_USER_NAME, null, null);
     		registerSession(PUBLIC_SESSION_ID, "public", null, null);
+    	}
     	/**
-...
+    	}
     	/**
     	 * Get the replication session from the session hash table.
     	 */
     	public static SessionData getReplicationSession() {
     		return sessionHash.get(REPLICATION_SESSION_ID);
+    	}
     	/**
     	 * Keep a session active by updating its last accessed time.
+    	 *
     	 * @param sessionId

src/edu/ucsb/nceas/metacat/AccessControlForSingleFile.java
125	125	catch (Exception e)
126	126	{
127	127	logMetacat.error("Error in construct of AccessControlForSingle" +
128		"File: " + e.getMessage());
	128	"File for docid: " + docId + " : " + e.getMessage());
129	129	throw e;
130	130	}
131	131	}

+    {
       private static String sysdate = DatabaseService.getDBAdapter().getDateTimeFunction();
       private static String isnull = DatabaseService.getDBAdapter().getIsNULLFunction();
     //  private static String sysdate = DatabaseService.getDBAdapter().getDateTimeFunction();
     //  private static String isnull = DatabaseService.getDBAdapter().getIsNULLFunction();
       private DBConnection connection;
       private String parserName;
-...
         return 0;
+      }
       /* Get the int value of READ, WRITE or ALL. */
       public static int intValue ( String permission )
+      {
         if ( permission.equalsIgnoreCase("READ") ) {
           return READ;
         } else if ( permission.equalsIgnoreCase("WRITE") ) {
           return WRITE;
         } else if ( permission.equalsIgnoreCase("ALL") ) {
           return ALL;
+        }
         return -1;
+      }
         /* Get the int value of READ, WRITE, CHMOD or ALL. */
     	public static int intValue(String permission) {
     		int thisPermission = 0;
     		if (permission.toUpperCase().contains(CHMODSTRING)) {
     			thisPermission |= CHMOD;
+    		}
     		if (permission.toUpperCase().contains(READSTRING)) {
     			thisPermission |= READ;
+    		}
     		if (permission.toUpperCase().contains(WRITESTRING)) {
     			thisPermission |= WRITE;
+    		}
     		if (permission.toUpperCase().contains(ALLSTRING)) {
     			thisPermission |= ALL;
+    		}
       /* Get the text value of READ, WRITE or ALL. */
       public static String txtValue ( int permission )
+      {
         StringBuffer txtPerm = new StringBuffer();
         if (permission == READ) {
           txtPerm.append("READ");
+        }
         if (permission == WRITE) {
           txtPerm.append("WRITE");
+        }
         if (permission == ALL) {
           txtPerm.append("ALL");
+        }
     		if (thisPermission == 0) {
     			return -1;
     		} else {
     			return thisPermission;
+    		}
+    	}
       /* Get the text value of READ, WRITE, CHMOD or ALL. */
     	public static String txtValue(int permission) {
     		StringBuffer txtPerm = new StringBuffer();
     		if ((permission & ALL) == ALL) {
     			return ALLSTRING;
+    		}
     		if ((permission & CHMOD) == CHMOD) {
     			txtPerm.append(CHMODSTRING);
+    		}
     		if ((permission & READ) == READ) {
     			if (txtPerm.length() > 0)
     				txtPerm.append(",");
     			txtPerm.append(READSTRING);
+    		}
     		if ((permission & WRITE) == WRITE) {
     			if (txtPerm.length() > 0)
     				txtPerm.append(",");
     			txtPerm.append(WRITESTRING);
+    		}
         return txtPerm.toString();
+      }
     		return txtPerm.toString();
+    	}
     // /* Get the text value of READ, WRITE or ALL. */
     //  public static String txtValue ( int permission )
     //  {
     //    StringBuffer txtPerm = new StringBuffer();
     //    if (permission == READ) {
     //      txtPerm.append("READ");
     //    }
     //    if (permission == WRITE) {
     //      txtPerm.append("WRITE");
     //    }
     //    if (permission == ALL) {
     //      txtPerm.append("ALL");
     //    }
     //
     //    return txtPerm.toString();
     //  }
       /**
         * Get Access Control List information for document from db connetion.
         * User or Group should have permissions for reading
-...
+    			}
     		}//finally
+    	}
       public static void main(String[] args) {
     	  System.out.println("text value for CHMOD (" + CHMOD + "): " + txtValue(CHMOD));
     	  System.out.println("text value for READ: (" + READ + "): " + txtValue(READ));
     	  System.out.println("text value for WRITE: (" + WRITE + "): " + txtValue(WRITE));
     	  System.out.println("text value for ALL: (" + ALL + "): " + txtValue(ALL));
     	  int chmod_read = CHMOD|READ;
     	  System.out.println("text value for CHMOD|READ: (" + chmod_read + "): " + txtValue(CHMOD|READ));
     	  int chmod_write = CHMOD|WRITE;
     	  System.out.println("text value for CHMOD|WRITE: (" + chmod_write + "): " + txtValue(CHMOD|WRITE));
     	  int chmod_all = CHMOD|ALL;
     	  System.out.println("text value for CHMOD|ALL: (" + chmod_all + "): " + txtValue(CHMOD|ALL));
     	  int read_write = READ|WRITE;
     	  System.out.println("text value for READ|WRITE: (" + read_write + "): " + txtValue(READ|WRITE));
     	  int read_all = READ|ALL;
     	  System.out.println("text value for READ|ALL: (" + read_all + "): " + txtValue(READ|ALL));
     	  int write_all = WRITE|ALL;
     	  System.out.println("text value for WRITE|ALL: (" + write_all + "): " + txtValue(WRITE|ALL));
     	  int chmod_read_write = CHMOD|READ|WRITE;
     	  System.out.println("text value for CHMOD|READ|WRITE: (" + chmod_read_write + "): " + txtValue(CHMOD|READ|WRITE));
     	  int chmod_read_all = CHMOD|READ|ALL;
     	  System.out.println("text value for CHMOD|READ|ALL: (" + chmod_read_all + "): " + txtValue(CHMOD|READ|ALL));
     	  int chmod_write_all = CHMOD|WRITE|ALL;
     	  System.out.println("text value for CHMOD|WRITE|ALL: (" + chmod_write_all + "): " + txtValue(CHMOD|WRITE|ALL));
     	  int read_write_all = READ|WRITE|ALL;
     	  System.out.println("text value for READ|WRITE|ALL: (" + read_write_all + "): " + txtValue(READ|WRITE|ALL));
     	  int chmod_read_write_all = CHMOD|READ|WRITE|ALL;
     	  System.out.println("text value for CHMOD|READ|WRITE|ALL: (" + chmod_read_write_all + "): " + txtValue(CHMOD|READ|WRITE|ALL));
     	  System.out.println();
     	  System.out.println("int value for GOOBER: " + intValue("GOOBER"));
     	  System.out.println("int value for CHANGEPERMISSION: " + intValue("CHANGEPERMISSION"));
     	  System.out.println("int value for READ: " + intValue("READ"));
     	  System.out.println("int value for WRITE: " + intValue("WRITE"));
     	  System.out.println("int value for ALL: " + intValue("ALL"));
     	  System.out.println("int value for CHANGEPERMISSION,READ: " + intValue("CHANGEPERMISSION,READ"));
     	  System.out.println("int value for CHANGEPERMISSION,WRITE: " + intValue("CHANGEPERMISSION,WRITE"));
     	  System.out.println("int value for CHANGEPERMISSION,ALL: " + intValue("CHANGEPERMISSION,ALL"));
     	  System.out.println("int value for READ,WRITE: " + intValue("READ,WRITE"));
     	  System.out.println("int value for READ,ALL: " + intValue("READ,ALL"));
     	  System.out.println("int value for WRITE,ALL: " + intValue("WRITE,ALL"));
     	  System.out.println("int value for CHANGEPERMISSION,READ,WRITE: " + intValue("CHANGEPERMISSION,READ,WRITE"));
     	  System.out.println("int value for CHANGEPERMISSION,READ,ALL: " + intValue("CHANGEPERMISSION,READ,ALL"));
     	  System.out.println("int value for CHANGEPERMISSION,READ,ALL: " + intValue("CHANGEPERMISSION,WRITE,ALL"));
     	  System.out.println("int value for READ,WRITE,ALL: " + intValue("READ,WRITE,ALL"));
     	  System.out.println("int value for CHANGEPERMISSION,READ,WRITE,ALL: " + intValue("CHANGEPERMISSION,READ,WRITE,ALL"));
+      }
+    }

Project

General

Profile

Metacat

Revision 4861

Added by daigle over 15 years ago