factor: trim using lists

[factor.git] / extra / msxml-to-csv / msxml-to-csv.factor

diff --git a/extra/msxml-to-csv/msxml-to-csv.factor b/extra/msxml-to-csv/msxml-to-csv.factor
index 8a9ba9cf98987107683c927e4538cadb0644be19..e60d9fd00982061ed2a1a5bdf85c43841717201f 100644 (file)
--- a/extra/msxml-to-csv/msxml-to-csv.factor
+++ b/extra/msxml-to-csv/msxml-to-csv.factor
@@ -1,10 +1,7 @@
-USING: io io.files sequences xml xml.utilities ;
+USING: io.files sequences xml xml.traversal io.encodings.ascii kernel ;
 IN: msxml-to-csv
 
-: print-csv ( table -- ) [ "," join print ] each ;
-
 : (msxml>csv) ( xml -- table )
-    "Worksheet" tag-named
     "Table" tag-named
     "Row" tags-named [
         "Cell" tags-named [
@@ -12,7 +9,6 @@ IN: msxml-to-csv
         ] map
     ] map ;
 
-: msxml>csv ( infile outfile -- )
-    [
-        file>xml (msxml>csv) print-csv
-    ] with-file-writer ;
+: msxml>csv ( outfile infile -- )
+    file>xml (msxml>csv) [ "," join ] map
+    swap ascii set-file-lines ;