[gnumeric] Export all validations to ODF.

[Andreas J. Guelzow <guelzow src gnome org>]

commit 3ba3446c11fd65420e21923476611d83b56e4ca4
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon May 16 09:01:54 2011 -0600

    Export all validations to ODF.
    
    2011-05-16  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-write.c (odf_validation_base_cell_address): new
    	(odf_validation_append_expression): new
    	(odf_validation_append_expression_pair): new
    	(odf_validation_general): implement
    	(odf_validation_length): implement
    	(odf_validation_custom): implement
    	(odf_validation_in_list): use odf_validation_append_expression, don't
    	write base cell address
    	(odf_print_spreadsheet_content_validations): write base cell address
    	and pass initialized parse position onwards

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |   18 +++-
 plugins/openoffice/openoffice-write.c |  191 +++++++++++++++++++++++++++------
 3 files changed, 174 insertions(+), 36 deletions(-)
---
diff --git a/NEWS b/NEWS
index 9c568ba..9485973 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Andreas:
 	* Export external references to ODF.
 	* Fix ODF style handling on import. [#649851]
 	* Import more validations from ODF.
+	* Export all validations to ODF.
 
 Jean:
 	* Fixed critical. [#649901]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index de42bd6..bfbb0b0 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,6 +1,20 @@
-2011-05-13  Andreas J. Guelzow <aguelzow pyrshep ca>
-
-	* openoffice-read.c (odf_validations_analyze): warn if we drop part of a validation condition
+2011-05-16  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-write.c (odf_validation_base_cell_address): new
+	(odf_validation_append_expression): new
+	(odf_validation_append_expression_pair): new
+	(odf_validation_general): implement
+	(odf_validation_length): implement
+	(odf_validation_custom): implement
+	(odf_validation_in_list): use odf_validation_append_expression, don't
+	write base cell address
+	(odf_print_spreadsheet_content_validations): write base cell address
+	and pass initialized parse position onwards
+
+2011-05-15  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-read.c (odf_validations_analyze): warn if we drop part of a
+	validation condition
 
 2011-05-13  Andreas J. Guelzow <aguelzow pyrshep ca>
 
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index a957976..233b464 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -3802,54 +3802,175 @@ odf_validation_general_attributes (GnmOOExport *state, GnmValidation const *val)
 }
 
 static void
+odf_validation_base_cell_address (GnmOOExport *state,
+				  Sheet *sheet, GnmStyleRegion const *sr,
+				  GnmParsePos *pp)
+{
+	GnmExprTop const *texpr;
+	char *formula;
+	GnmCellRef ref;
+
+	gnm_cellref_init (&ref, sheet,
+			  sr->range.start.col,
+			  sr->range.start.row, TRUE);
+	texpr =  gnm_expr_top_new (gnm_expr_new_cellref (&ref));
+	parse_pos_init (pp, (Workbook *)state->wb, sheet,
+			sr->range.start.col,
+			sr->range.start.row);
+	formula = gnm_expr_top_as_string (texpr, pp, state->conv);
+	gsf_xml_out_add_cstr (state->xml, TABLE "base-cell-address",
+			      odf_strip_brackets (formula));
+	g_free (formula);
+	gnm_expr_top_unref (texpr);
+}
+
+static void
+odf_validation_append_expression (GnmOOExport *state, GString *str, GnmExprTop const *texpr, 
+				  GnmParsePos *pp)
+{
+	char *formula;
+
+	formula = gnm_expr_top_as_string (texpr, pp, state->conv);
+	str = g_string_append (str, formula);
+	g_free (formula);
+}
+
+static void
+odf_validation_append_expression_pair (GnmOOExport *state, GString *str, 
+				       GnmValidation const *val, 
+				       GnmParsePos *pp)
+{
+		str = g_string_append_c (str, '(');
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		str = g_string_append_c (str, ',');
+		odf_validation_append_expression (state, str, val->texpr[1], pp);
+		str = g_string_append_c (str, ')');
+}
+
+
+static void
 odf_validation_general (GnmOOExport *state, GnmValidation const *val,
 			Sheet *sheet, GnmStyleRegion const *sr,
-			char const *prefix)
+			char const *prefix, GnmParsePos *pp)
 {
+	GString *str = g_string_new ("of:");
+
+	str = g_string_append (str, prefix);
+
+	switch (val->op) {
+	case VALIDATION_OP_NONE:
+		str = g_string_append (str, "is-true-formula(1)");
+		break;
+	case VALIDATION_OP_BETWEEN:
+		str = g_string_append (str, "cell-content-is-between");
+		odf_validation_append_expression_pair (state, str, val, pp);
+		break;
+	case VALIDATION_OP_NOT_BETWEEN:
+		str = g_string_append (str, "cell-content-is-not-between");
+		odf_validation_append_expression_pair (state, str, val, pp);
+		break;
+	case VALIDATION_OP_EQUAL:
+		str = g_string_append (str, "cell-content() = ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_NOT_EQUAL:
+		str = g_string_append (str, "cell-content() != ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_GT:
+		str = g_string_append (str, "cell-content() > ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_LT:
+		str = g_string_append (str, "cell-content() < ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_GTE:
+		str = g_string_append (str, "cell-content() >= ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_LTE:
+		str = g_string_append (str, "cell-content() <= ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	}
+
+	gsf_xml_out_add_cstr (state->xml, TABLE "condition", str->str);
+	g_string_free (str, TRUE);
 }
 
 static void
 odf_validation_length (GnmOOExport *state, GnmValidation const *val,
-			Sheet *sheet, GnmStyleRegion const *sr)
+			Sheet *sheet, GnmStyleRegion const *sr, GnmParsePos *pp)
 {
+	GString *str = g_string_new ("of:");
+
+	switch (val->op) {
+	case VALIDATION_OP_NONE:
+		str = g_string_append (str, "is-true-formula(1)");
+		break;
+	case VALIDATION_OP_BETWEEN:
+		str = g_string_append (str, "cell-content-text-length-is-between");
+		odf_validation_append_expression_pair (state, str, val, pp);
+		break;
+	case VALIDATION_OP_NOT_BETWEEN:
+		str = g_string_append (str, "cell-content-text-length-is-not-between");
+		odf_validation_append_expression_pair (state, str, val, pp);
+		break;
+	case VALIDATION_OP_EQUAL:
+		str = g_string_append (str, "cell-content-text-length() = ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_NOT_EQUAL:
+		str = g_string_append (str, "cell-content-text-length() != ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_GT:
+		str = g_string_append (str, "cell-content-text-length() > ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_LT:
+		str = g_string_append (str, "cell-content-text-length() < ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_GTE:
+		str = g_string_append (str, "of:cell-content-text-length() >= ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	case VALIDATION_OP_LTE:
+		str = g_string_append (str, "cell-content-text-length() <= ");
+		odf_validation_append_expression (state, str, val->texpr[0], pp);
+		break;
+	}
+
+	gsf_xml_out_add_cstr (state->xml, TABLE "condition", str->str);
+	g_string_free (str, TRUE);
 }
 
 static void
 odf_validation_custom (GnmOOExport *state, GnmValidation const *val,
-			Sheet *sheet, GnmStyleRegion const *sr)
+			Sheet *sheet, GnmStyleRegion const *sr, GnmParsePos *pp)
 {
+	GString *str = g_string_new (NULL);
+
+	str = g_string_append (str, "of:is-true-formula(");
+	odf_validation_append_expression (state, str, val->texpr[0], pp);
+	str = g_string_append_c (str, ')');
+
+	gsf_xml_out_add_cstr (state->xml, TABLE "condition", str->str);
+	g_string_free (str, TRUE);
 }
 
 static void
 odf_validation_in_list (GnmOOExport *state, GnmValidation const *val,
-			Sheet *sheet, GnmStyleRegion const *sr)
+			Sheet *sheet, GnmStyleRegion const *sr, GnmParsePos *pp)
 {
-	GnmExprTop const *texpr;
-	GnmParsePos pp;
-	char *formula;
-	GnmCellRef ref;
 	GString *str;
 
-	gnm_cellref_init (&ref, sheet,
-			  sr->range.start.col,
-			  sr->range.start.row, TRUE);
-	texpr =  gnm_expr_top_new (gnm_expr_new_cellref (&ref));
-	parse_pos_init (&pp, (Workbook *)state->wb, sheet,
-			sr->range.start.col,
-			sr->range.start.row);
-	formula = gnm_expr_top_as_string (texpr, &pp, state->conv);
-	gsf_xml_out_add_cstr (state->xml, TABLE "base-cell-address",
-			      odf_strip_brackets (formula));
-	g_free (formula);
-	gnm_expr_top_unref (texpr);
-
-	/* Note that this is really not valid ODF1.1 but will be valid in ODF1.2 */
-	formula = gnm_expr_top_as_string (val->texpr[0], &pp, state->conv);
 	str = g_string_new ("of:cell-content-is-in-list(");
-	g_string_append (str, formula);
-	g_string_append_c (str, ')');
+	odf_validation_append_expression (state, str, val->texpr[0], pp);
+	str = g_string_append_c (str, ')');
 
-	g_free (formula);
 	gsf_xml_out_add_cstr (state->xml, TABLE "condition", str->str);
 	g_string_free (str, TRUE);
 }
@@ -3869,6 +3990,7 @@ odf_print_spreadsheet_content_validations (GnmOOExport *state)
 		for (l = list; l != NULL; l = l->next) {
 			GnmStyleRegion const *sr  = l->data;
 			GnmValidation const *val = gnm_style_get_validation (sr->style);
+			GnmParsePos pp;
 
 			if (!element_written) {
 				gsf_xml_out_start_element
@@ -3878,34 +4000,35 @@ odf_print_spreadsheet_content_validations (GnmOOExport *state)
 			gsf_xml_out_start_element (state->xml,
 						   TABLE "content-validation");
 			odf_validation_general_attributes (state, val);
+			odf_validation_base_cell_address (state, sheet, sr, &pp);
 			switch (val->type) {
 			case VALIDATION_TYPE_ANY:
-				odf_validation_general (state, val, sheet, sr, "");
+				odf_validation_general (state, val, sheet, sr, "", &pp);
 				break;
 			case VALIDATION_TYPE_AS_INT:
 				odf_validation_general (state, val, sheet, sr, 
-							"cell-content-is-whole-number() and ");
+							"cell-content-is-whole-number() and ", &pp);
 				break;
 			case VALIDATION_TYPE_AS_NUMBER:
 				odf_validation_general (state, val, sheet, sr, 
-							"cell-content-is-decimal-number() and ");
+							"cell-content-is-decimal-number() and ", &pp);
 				break;
 			case VALIDATION_TYPE_AS_DATE:
 				odf_validation_general (state, val, sheet, sr, 
-							"ell-content-is-date() and ");
+							"ell-content-is-date() and ", &pp);
 				break;
 			case VALIDATION_TYPE_AS_TIME:
 				odf_validation_general (state, val, sheet, sr, 
-							"ell-content-is-time() and ");
+							"ell-content-is-time() and ", &pp);
 				break;
 			case VALIDATION_TYPE_IN_LIST:
-				odf_validation_in_list (state, val, sheet, sr);
+				odf_validation_in_list (state, val, sheet, sr, &pp);
 				break;
 			case VALIDATION_TYPE_TEXT_LENGTH:
-				odf_validation_length (state, val, sheet, sr);
+				odf_validation_length (state, val, sheet, sr, &pp);
 				break;
 			case VALIDATION_TYPE_CUSTOM:
-				odf_validation_custom (state, val, sheet, sr);
+				odf_validation_custom (state, val, sheet, sr, &pp);
 				break;
 			}
 			gsf_xml_out_end_element (state->xml);