servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bsny...@apache.org
Subject svn commit: r659634 - /servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java
Date Fri, 23 May 2008 19:23:42 GMT
Author: bsnyder
Date: Fri May 23 12:23:42 2008
New Revision: 659634

URL: http://svn.apache.org/viewvc?rev=659634&view=rev
Log:
SM-1364 - allow SimpleFlatFileMarshaler to use XmlEscapingCoverter

Modified:
    servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java

Modified: servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java?rev=659634&r1=659633&r2=659634&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java
(original)
+++ servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java
Fri May 23 12:23:42 2008
@@ -51,6 +51,8 @@
 
     public static final ContentConverter TEXT_STRIPPER = new TextStripConverter();
 
+    public static final ContentConverter XML_CONVERTER = new XmlEscapingConverter();
+
     public static final int LINEFORMAT_FIXLENGTH = 0;
     public static final int LINEFORMAT_CSV = 1;
     public static final int LINEFORMAT_VARIABLE = 2;
@@ -118,12 +120,16 @@
     
     private boolean alwaysStripColContents = true;
     
+    private boolean alwaysEscapeColContents;
+
     private boolean insertRawData;
 
     private boolean insertColContentInAttribut;
 
     private int headerlinesCount;
-
+    
+    private int columnNamesInLineNumber = -1;
+    
     public boolean isSkipAnyEmptyCols() {
         return skipAnyEmptyCols;
     }
@@ -201,11 +207,11 @@
                     break;
                 }
 
-                sb.append((char) b);
-
                 if ((char) b == lineSeparator.charAt(0)) {
                     break; //FIXME: handle multi-character line separators
                 }
+
+                sb.append((char) b);
             }
             next = sb.toString();
         }
@@ -260,7 +266,7 @@
         private InputStream in;
         private String path;
         private String outEncoding;
-        private int headerLinesLeft;
+        private int headerlinesRead;
         private Iterator lines;
         private int lineNumber;
         private boolean isFooterFilled;
@@ -276,7 +282,6 @@
             this.in = in;
             this.path = path;
             this.outEncoding = outEncoding;
-            this.headerLinesLeft = headerlinesCount;
             if (lineSeparator == null) {
                 lines = IOUtils.lineIterator(in, encoding);
             } else {
@@ -316,7 +321,7 @@
                 }
             }
 
-            if (headerLinesLeft > 0) {
+            if (headerlinesRead < headerlinesCount) {
                 fillHeader();
             } else {
                 fillBody();
@@ -354,9 +359,12 @@
         }
 
         private void fillHeader() throws IOException {
-            headerLinesLeft--;
             StringBuffer aBuffer = new StringBuffer(1024);
             String headerLine = (String) lines.next();
+            if (columnNamesInLineNumber == headerlinesRead++) {
+                columnNames = extractColumnContents(headerLine, lines);
+            } 
+                
             convertHeaderline(aBuffer, headerLine);
             fill(aBuffer.toString());
         }
@@ -387,7 +395,7 @@
             processHeaderLines(aBuffer, lines);
             if (aBuffer.length() != overridenCheck) {
                 //headers were proceed by an overriden method, supress futher processing
-                headerLinesLeft = 0;
+                headerlinesRead = Integer.MAX_VALUE;
             }
             fill(aBuffer.toString());
         }
@@ -547,6 +555,9 @@
             ContentConverter converter = (ContentConverter) this.columnConverters.get(index);
             return converter.convertToXml(contents);
         } else {
+            if (this.alwaysEscapeColContents) {
+                return XML_CONVERTER.convertToXml(contents);
+            }
             if (this.alwaysStripColContents) {
                 return TEXT_STRIPPER.convertToXml(contents);
             } else {
@@ -636,6 +647,14 @@
         this.alwaysStripColContents = alwaysStripColContents;
     }
 
+    public final boolean isAlwaysEscapeColContents() {
+        return alwaysEscapeColContents;
+    }
+
+    public final void setAlwaysEscapeColContents(boolean alwaysEscapeColContents) {
+        this.alwaysEscapeColContents = alwaysEscapeColContents;
+    }
+
     public final int getLineFormat() {
         return lineFormat;
     }
@@ -686,6 +705,18 @@
     public final void setHeaderlinesCount(int headerlinesCount) {
         this.headerlinesCount = headerlinesCount;
     }
+    
+    public final int getColumnNamesInLineNumber() {
+        return this.columnNamesInLineNumber;
+    }
+    
+    /**
+     * 
+     * @param columnNamesInLineNumber line number containing  
+     */
+    public void setColumnNamesInLineNumber(int columnNamesInLineNumber) {
+        this.columnNamesInLineNumber = columnNamesInLineNumber;
+    }
 
     public final boolean isInsertColContentInAttribut() {
         return insertColContentInAttribut;



Mime
View raw message