/ - Diff - Metacat - Ecoinformatics Redmine

src/xmltables_postgres.sql
278	278	ip_address VARCHAR(512), -- the ip address inititiating the event
279	279	principal VARCHAR(512), -- the user initiiating the event
280	280	docid VARCHAR(250), -- the document id #
281		rev INT8, -- the revision number
282	281	event VARCHAR(512), -- the code symbolizing the event type
283	282	date_logged TIMESTAMP, -- the datetime on which the event occurred
284	283	CONSTRAINT access_log_pk PRIMARY KEY (entryid)

       ip_address    VARCHAR2(512),  -- the ip address inititiating the event
       principal     VARCHAR2(512),  -- the user initiiating the event
       docid         VARCHAR2(250),	-- the document id #
       rev           NUMBER(10),     -- the revision number
       event         VARCHAR2(512),  -- the code symbolizing the event type
       date_logged   DATE,           -- the datetime on which the event occurred
       CONSTRAINT access_log_pk PRIMARY KEY (entryid)
-...
         INTO :new.entryid
         FROM dual;
     END;
+    /
+    /

src/xmltables.sql
330	330	ip_address VARCHAR2(512), -- the ip address inititiating the event
331	331	principal VARCHAR2(512), -- the user initiiating the event
332	332	docid VARCHAR2(250), -- the document id #
333		rev NUMBER(10), -- the revision number
334	333	event VARCHAR2(512), -- the code symbolizing the event type
335	334	date_logged DATE, -- the datetime on which the event occurred
336	335	CONSTRAINT access_log_pk PRIMARY KEY (entryid)

     	private String ipAddress;
     	private String principal;
     	private String docid;
         private long revision;
     	private String event;
-...
     	 * @param event the string code for the event
     	 */
     	public EventLogData(String ipAddress, String principal, String docid,
     			long revision, String event) {
     			String event) {
     		this.ipAddress = ipAddress;
     		this.principal = principal;
     		this.docid = docid;
     		this.revision = revision;
     		this.event = event;
+    	}
-...
     	public void setPrincipal(String principal) {
     		this.principal = principal;
+    	}
     	/**
     	 * Get the current value of the document revision.
+    	 *
     	 * @return Returns the revision.
     	 */
     	public long getRevision() {
     		return revision;
+    	}
     	/**
     	 * Set the current value of the document revision.
+    	 *
     	 * @param revision The revision to set.
     	 */
     	public void setRevision(long revision) {
     		this.revision = revision;
+    	}
+    }

          * @param ipAddress the internet protocol address for the event
     	 * @param principal the principal for the event (a username, etc)
     	 * @param docid the identifier of the document to which the event applies
     	 * @param revision the revision of the document to which the event applies
     	 * @param event the string code for the event
          */
         public void log(String ipAddress, String principal, String docid,
     			long revision, String event)
     			String event)
+        {
             EventLogData logData = new EventLogData(ipAddress, principal, docid,
                     revision, event);
                     event);
             insertLogEntry(logData);
+        }
-...
                     "dd-MMM-yyyy HH:mm:ss");
             String insertString = "insert into access_log"
                     + "(ip_address, principal, docid, rev, "
                     + "(ip_address, principal, docid, "
                     + "event, date_logged) "
                     + "values ("
                     + "'" + logData.getIpAddress() + "', "
                     + "'" + logData.getPrincipal() + "', "
                     + "'" + logData.getDocid() + "', "
                     + logData.getRevision() + ", "
                     + "'" + logData.getEvent() + "', "
                     + "'" + simpleDateFormat.format(new Date()) + "')";

src/edu/ucsb/nceas/metacat/MetaCatServlet.java
999	999	}
1000	1000	}
1001	1001
1002		// Log the event to the event table
1003		EventLog.getInstance().log("192.168.1.103", "public",
1004		"test.1", 1, "read");
1005	1002	} catch (MalformedURLException mue) {
	1003	MetaCatUtil.debugMessage("MUE handleReadAction", 5);
1006	1004	docid = docs[i];
1007	1005	if (zip) {
1008	1006	addDocToZip(docid, zout, user, groups);
1009	1007	} else {
1010	1008	readFromMetacat(response, docid, qformat, abstrpath,
1011		user, groups, zip, zout, withInlineData, params);
	1009	user, groups, zip, zout, withInlineData, params);
1012	1010	}
1013	1011	}
1014
1015	1012	}
1016	1013
1017	1014	if (zip) {
...	...
1205	1202	}
1206	1203
1207	1204	}
	1205	EventLog.getInstance().log("192.168.1.103", "public",
	1206	docid, "read");
1208	1207	} catch (Exception except) {
1209	1208	throw except;
1210	1209	}
...	...
1348	1347	zout.write(bytestring, 0, bytestring.length);
1349	1348	zout.closeEntry();
1350	1349	}
	1350	EventLog.getInstance().log("192.168.1.103", "public",
	1351	docid, "read");
1351	1352	} catch (Exception except) {
1352	1353	throw except;
1353	1354	}

src/upgrade-db-to-1.4_postgres.sql
31	31	ip_address VARCHAR(512), -- the ip address inititiating the event
32	32	principal VARCHAR(512), -- the user initiiating the event
33	33	docid VARCHAR(250), -- the document id #
34		rev INT8, -- the revision number
35	34	event VARCHAR(512), -- the code symbolizing the event type
36	35	date_logged TIMESTAMP, -- the datetime on which the event occurred
37	36	CONSTRAINT access_log_pk PRIMARY KEY (entryid)

Metacat