1.1 --- a/src/java/isac/session/DialogGuide.java Fri Feb 17 13:26:02 2012 +0100
1.2 +++ b/src/java/isac/session/DialogGuide.java Fri Feb 17 14:44:16 2012 +0100
1.3 @@ -26,8 +26,6 @@
1.4 // log_item.printLogItem();
1.5 if(ObjectManagerPaths.LOGGER_DATABASE_ENABLED){
1.6 user_logger_.saveLogItem(log_item);
1.7 - //attention by Error
1.8 - log_item.resetLogItem();
1.9 }
1.10 }
1.11
2.1 --- a/src/java/isac/users/LogItem.java Fri Feb 17 13:26:02 2012 +0100
2.2 +++ b/src/java/isac/users/LogItem.java Fri Feb 17 14:44:16 2012 +0100
2.3 @@ -57,12 +57,33 @@
2.4 error_ = false;
2.5 error_message_ = "";
2.6 }
2.7 -
2.8 +
2.9 + public LogItem(String username, String session, String worksheet, DialogTypes dialog_type,
2.10 + String step_arg_1,String step_arg_2, Position position, String formula_from,
2.11 + String formula_to, EUIElement step) {
2.12 +
2.13 + username_ = username;
2.14 + session_id_ = session;
2.15 + worksheet_id_ = worksheet;
2.16 + dialog_type_ = dialog_type;
2.17 + position_ = position;
2.18 + step_arg_1_ = step_arg_1;
2.19 + step_arg_2_ = step_arg_2;
2.20 + time_ = new java.sql.Timestamp(new java.util.Date().getTime());
2.21 + formula_from_ = formula_from;
2.22 + formula_to_ = formula_to;
2.23 + step_ = step;
2.24 +
2.25 + error_ = false;
2.26 + error_message_ = "";
2.27 + }
2.28 +
2.29 +
2.30 +
2.31 public void completeWithError(String error_message)
2.32 {
2.33 this.error_ = true;
2.34 this.error_message_ = error_message;
2.35 - this.formula_to_ = null;
2.36 }
2.37
2.38 public void completeWithChanged(String formula_to)
2.39 @@ -96,13 +117,6 @@
2.40 System.out.println("<----------------------------------------------->");
2.41 }
2.42
2.43 - /* comment, please !
2.44 - */
2.45 - public void resetLogItem()
2.46 - {
2.47 - if(dialog_type_.toString().equals(DialogTypes.WORKSHEET.toString()));
2.48 - formula_from_ = formula_to_;
2.49 - }
2.50
2.51 public List<Object> generateListforDB()
2.52 {
3.1 --- a/src/java/isac/users/UserLogger.java Fri Feb 17 13:26:02 2012 +0100
3.2 +++ b/src/java/isac/users/UserLogger.java Fri Feb 17 14:44:16 2012 +0100
3.3 @@ -124,7 +124,7 @@
3.4 "step_arg_2 VARCHAR(255),"+
3.5 "formula_to VARCHAR(150),"+
3.6 "error TINYINT(1),"+
3.7 - "error_message VARCHAR(50),"+
3.8 + "error_message VARCHAR(255),"+
3.9 "PRIMARY KEY(userlogger_id))";
3.10 try {
3.11 stmt = connection_.createStatement();
4.1 --- a/src/java/isac/wsdialog/WorksheetDialog.java Fri Feb 17 13:26:02 2012 +0100
4.2 +++ b/src/java/isac/wsdialog/WorksheetDialog.java Fri Feb 17 14:44:16 2012 +0100
4.3 @@ -501,6 +501,7 @@
4.4
4.5 logger.fatal("calcResponse : CalcMessage -> " + ((CalcMessage )event).getText());
4.6 //LogItem false
4.7 +
4.8 log_item_.completeWithError(((CalcMessage )event).getText());
4.9 dialog_.writeToDB(log_item_);
4.10
4.11 @@ -866,20 +867,22 @@
4.12 break;
4.13
4.14 case UI_SOLVE_EDIT_ACTIVE_FORMULA_COMPLETE:
4.15 -// System.out.println("**********XXX****************");
4.16 CalcFormula formula = (CalcFormula) ((UserActionOnCalcElement) action)
4.17 .getCalcElement();
4.18 // if the position is null, the formula did not exist, so we try to
4.19 // append a new formula
4.20 if (formula.getPosition() == null) {
4.21 buildLogItem(active_formula_.onCalcHead(), user_.getUsername(), session_.getId(), worksheet_id_,
4.22 - DialogTypes.WORKSHEET, "", "", active_formula_.getPosition(), EUIElement.UI_DO_APPEND_FORMULA);
4.23 + DialogTypes.WORKSHEET, "", "", context_formula_.getPosition(), EUIElement.UI_DO_APPEND_FORMULA,
4.24 + context_formula_.getElement().toString(),formula.toString());
4.25 +
4.26 calc_tree_.appendFormula(formula);
4.27 } else {
4.28 buildLogItem(active_formula_.onCalcHead(), user_.getUsername(), session_.getId(), worksheet_id_,
4.29 - DialogTypes.WORKSHEET, "", "", active_formula_.getPosition(), EUIElement.UI_DO_EDIT_FORMULA);
4.30 - active_formula_ = new CalcIterator(((CalcTree)calc_tree_), formula
4.31 - .getPosition());
4.32 + DialogTypes.WORKSHEET, "", "", context_formula_.getPosition(), EUIElement.UI_DO_EDIT_FORMULA,
4.33 + context_formula_.getElement().toString(),formula.toString());
4.34 +
4.35 + active_formula_ = new CalcIterator(((CalcTree)calc_tree_), formula.getPosition());
4.36 calc_tree_.replaceFormula(formula);
4.37 }
4.38 break;
4.39 @@ -1255,10 +1258,19 @@
4.40 if(on_calc_head)
4.41 formula_from = ((CalcHead) (active_formula_).getElement()).getHeadLine().toSMLString();
4.42 else
4.43 - formula_from = ((CalcFormula)(active_formula_).getElement()).toString();
4.44 + formula_from = ((CalcFormula)(active_formula_).getElement()).toString();
4.45
4.46 log_item_ = new LogItem(user_name, session_id, ws_id, dialog_type, step_arg_1,
4.47 step_arg_2, pos, formula_from, chosen_step);
4.48 }
4.49
4.50 + private void buildLogItem(Boolean on_calc_head, String user_name, String session_id,
4.51 + String ws_id, DialogTypes dialog_type, String step_arg_1,
4.52 + String step_arg_2, Position pos, EUIElement chosen_step,
4.53 + String formula_from, String formula_to)
4.54 + throws RemoteException {
4.55 +
4.56 + log_item_ = new LogItem(user_name, session_id, ws_id, dialog_type, step_arg_1,
4.57 + step_arg_2, pos, formula_from,formula_to, chosen_step);
4.58 + }
4.59 }