[Mxquery-commit] SF.net SVN: mxquery:[4485] trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel

[<et...@us...>]

Revision: 4485
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4485&view=rev
Author:   etterth
Date:     2011-10-17 13:27:30 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- Fixed some number printing

Modified Paths:
--------------
    trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java
    trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java

Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java	2011-10-17 08:44:52 UTC (rev 4484)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java	2011-10-17 13:27:30 UTC (rev 4485)
@@ -246,17 +246,17 @@
 			for (int i=0; i < scale; i++) {
 				if ( this.val.setScale(i, BigDecimal.ROUND_DOWN).setScale(scale).compareTo(this.val) == 0){
 					//	for 1.5, 1.6 use
-					//return this.val.setScale(i).toPlainString();
+					return this.val.setScale(i).toPlainString();
 					//	for 1.4 use
-					return this.val.setScale(i).toString();
+//					return this.val.setScale(i).toString();
 
 				}
 			}  
 		}
 		// for 1.5, 1.6 use
-//		return this.val.toPlainString();
+		return this.val.toPlainString();
 		// for 1.4 use  
-		return this.val.toString();
+//		return this.val.toString();
 	}
 	
 	public String toDecimalString() {

Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java	2011-10-17 08:44:52 UTC (rev 4484)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java	2011-10-17 13:27:30 UTC (rev 4485)
@@ -295,6 +295,7 @@
     protected static String toString(double value, String javaStrValue, boolean isNegativeZero) {
 
 	javaStrValue = javaStrValue.replace("e+", "E");
+	javaStrValue = javaStrValue.replace("e-", "E-");
     	if (value==0.0) {
             if (javaStrValue.charAt(0) == '-' || isNegativeZero) {
                 return "-0";
@@ -328,6 +329,9 @@
 	            s = s.substring(0, s.length()-1);
 	        }
 	        return sign + firstchar + "." + s + "E" + e;
+      } else if (s.indexOf(".")<0) {
+	  int epos = s.indexOf("E");
+	  return s.substring(0,epos) + ".0" + s.substring(epos);
       } else {
           return s;
       }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.