Adding new function cljcol to convert cell list to clojure collection

Author: beothorn

registry/data/org/openoffice/Office/CalcAddins.xcu

@@ -29,12 +29,12 @@
                         </node>
                     </node>
                 </node>
-                <node oor:name="clcol" oor:op="replace">
+                <node oor:name="cljcol" oor:op="replace">
                     <prop oor:name="DisplayName">
-                        <value xml:lang="en">clcol</value>
+                        <value xml:lang="en">cljcol</value>
                     </prop>
                     <prop oor:name="Description">
-                        Return a cell
+                        Convert cells into a Clojure collection
                         <value/>
                     </prop>
                     <prop oor:name="Category">

src/com/github/beothorn/clojurecalc/ClojureCalcImpl.java

@@ -79,7 +79,7 @@ public String clj(String exp)
        return ClojureInterpreter.runClojure(exp);
    }
 
-   public String clcol(XCellRange cells){
-       return "On compile XCellRange on idl gives some error, will investigate";
+   public String cljcol(String[][] cells){
+       return ClojureInterpreter.toClojureCollection(cells);
    }
 }

src/com/github/beothorn/clojurecalc/ClojureInterpreter.java

@@ -6,6 +6,32 @@
 import java.util.Iterator;
 
 public class ClojureInterpreter {
+    
+    public static String toClojureCollection(String[][] javaMatrix){
+        
+        if(javaMatrix.length <= 1){            
+            return getLine(javaMatrix[0]);
+        }else{
+            String result = "[";
+            for (int i = 0; i < javaMatrix.length; i++) {
+                result += getLine(javaMatrix[i])+" ";
+            }
+            result = result.substring(0, result.length() - 1);
+            result += "]";
+            return result;
+        }
+    }
+
+    private static String getLine(final String[] line) {
+        String result = "[";
+        for (int i = 0; i < line.length; i++) {
+            result += line[i]+" ";
+        }
+        result = result.substring(0, result.length() - 1);
+        result += "]";
+        return result;
+    }
+    
     public static String runClojure(String exp){
         if(exp.equals("")) return "";
         String result;

src/com/github/beothorn/clojurecalc/XClojureCalc.idl

@@ -22,7 +22,7 @@ module com { module github { module beothorn { module clojurecalc {
 
         string clj([in] string exp);
 
-        //string clcol([in] com::sun::star::table::XCellRange cells);
+        string cljcol([in] sequence< sequence< string > > cells);
     };
 }; }; }; };
 

src/description.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Created with Apache OpenOffice API plug-in for NetBeans Version 2.0.6.000205-->
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="0.0.1"/>
+    <version value="0.1.0"/>
     <identifier value="com.github.beothorn.clojurecalc.ClojureCalc"/>
 </description>

test/com/github/beothorn/clojurecalc/ClojureInterpreterTests.java

@@ -1,6 +1,7 @@
 package com.github.beothorn.clojurecalc;
 
 import junit.framework.TestCase;
+import junit.framework.Assert;
 
 public class ClojureInterpreterTests extends TestCase{
     public void testExp(){
@@ -10,9 +11,16 @@ public void testExp(){
         runAndAssert("(map #(* % 2) [1 2 3])", "[2 4 6]");
         runAndAssert("[ [ 2 4 6 ] ]", "[[2 4 6]]");
     }    
+    
+    public void testCellsToMatrix(){
+        final String clojureCollection = ClojureInterpreter.toClojureCollection(new String[][]{{"1", "2", "3"}});
+        Assert.assertEquals("[1 2 3]", clojureCollection);
+        final String clojureCollectionCollections = ClojureInterpreter.toClojureCollection(new String[][]{{"1", "2", "3"},{"4", "5", "6"}});
+        Assert.assertEquals("[[1 2 3] [4 5 6]]", clojureCollectionCollections);
+    }
 
     private void runAndAssert(final String exp, final String expected) {
         final String result = ClojureInterpreter.runClojure(exp);
-        junit.framework.Assert.assertEquals(expected, result);
+        Assert.assertEquals(expected, result);
     }
 }