[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/log LogAction.java, 1.5, 1.6 LogConst.java, 1.8, 1.9

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/log
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22619/web/WEB-INF/classes/src/oscar/log

Modified Files:
	LogAction.java LogConst.java 
Log Message:
first wave of quatro merges including including updated security framework, org, lookup lists, home page
db patch will not be integrated until merge is complete, and testing has been done


Index: LogAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/log/LogAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LogAction.java	6 Oct 2008 17:35:27 -0000	1.5
--- LogAction.java	7 Dec 2008 16:54:50 -0000	1.6
***************
*** 26,33 ****
  import org.apache.commons.lang.StringEscapeUtils;
  import org.apache.log4j.Logger;
- import oscar.log.model.Log;
  
  import oscar.login.DBHelp;
  import oscar.oscarDB.DBHandler;
  
  /**
--- 26,34 ----
  import org.apache.commons.lang.StringEscapeUtils;
  import org.apache.log4j.Logger;
  
+ import oscar.log.model.Log;
  import oscar.login.DBHelp;
  import oscar.oscarDB.DBHandler;
+ import oscar.oscarDB.DBPreparedHandler;
  
  /**
***************
*** 87,89 ****
--- 88,110 ----
  	return _log;
      }
+     
+     public static boolean logAccess(String provider_no, String className, String method, String programId, String shelterId,String clientId,
+     		String queryStr,String sessionId,long timeSpan, String ex, int result) {
+         boolean ret = false;
+         DBPreparedHandler db = new DBPreparedHandler();
+         String sql = "insert into access_log (Id,provider_no,ACTIONCLASS,METHOD,QUERYSTRING,PROGRAMID,SHELTERID,CLIENTID,TIMESPAN,EXCEPTION,RESULT, SESSIONID)";
+         sql += " values(seq_log_id.nextval,'" + provider_no + "', '" + className + "','" + method + "'," ; 
+         sql += "'" + queryStr + "'," + programId + "," + shelterId + "," + clientId + "," + String.valueOf(timeSpan) + ",'" + ex + "'," + result + ",'" + sessionId + "')";
+         try {
+             db.queryExecuteUpdate(sql);
+             ret = true;
+         } catch (SQLException e) {
+         	;
+         }
+         finally
+         {
+         	try {db.closeConn();}catch(SQLException e){}
+         }
+         return ret;
+     }
  }

Index: LogConst.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/log/LogConst.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LogConst.java	9 Sep 2008 18:37:38 -0000	1.8
--- LogConst.java	7 Dec 2008 16:54:50 -0000	1.9
***************
*** 10,13 ****
--- 10,14 ----
      public static final String LOGIN = "log in";
      public static final String LOGOUT = "log out";
+     public static final String SHELTER_SELECTION="select shelter";
      public static final String READ = "read";
      public static final String ADD = "add";