[Corpusreader-svn] SF.net SVN: corpusreader:[228] trunk/corpusreader/src/main

[<syl...@us...>]

Revision: 228
          http://corpusreader.svn.sourceforge.net/corpusreader/?rev=228&view=rev
Author:   sylvainloiseau
Date:     2009-10-02 15:29:00 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
debugging

Modified Paths:
--------------
    trunk/corpusreader/src/main/java/tei/cr/filters/ExtractPhenomena.java
    trunk/corpusreader/src/main/java/tei/cr/filters/TextFormat.java
    trunk/corpusreader/src/main/java/tei/cr/querydoc/FilterArguments.java
    trunk/corpusreader/src/main/resources/schema/filters/ExtractPhenomena.rnc
    trunk/corpusreader/src/main/resources/schema/filters/TextFormat.rnc

Modified: trunk/corpusreader/src/main/java/tei/cr/filters/ExtractPhenomena.java
===================================================================
--- trunk/corpusreader/src/main/java/tei/cr/filters/ExtractPhenomena.java	2009-09-24 13:31:17 UTC (rev 227)
+++ trunk/corpusreader/src/main/java/tei/cr/filters/ExtractPhenomena.java	2009-10-02 15:29:00 UTC (rev 228)
@@ -82,7 +82,7 @@
   }
 
   public PhenomenaStream getPhenomenaStream() {
-    PhenomenaStream p = tokensStreamBuilder.getPhenomenaStrem();
+    PhenomenaStream p = tokensStreamBuilder.getPhenomenaStream();
     tokensStreamBuilder = new PhenomenaStreamBuilder();
     return p;
   }

Modified: trunk/corpusreader/src/main/java/tei/cr/filters/TextFormat.java
===================================================================
--- trunk/corpusreader/src/main/java/tei/cr/filters/TextFormat.java	2009-09-24 13:31:17 UTC (rev 227)
+++ trunk/corpusreader/src/main/java/tei/cr/filters/TextFormat.java	2009-10-02 15:29:00 UTC (rev 228)
@@ -1,4 +1,4 @@
-ptextWriter.wackage tei.cr.filters;
+package tei.cr.filters;
 
 import java.io.BufferedWriter;
 import java.io.FileOutputStream;
@@ -43,20 +43,20 @@
 
   public void setArguments(FilterArguments fA, FilterByNames nH, TeiDocument doc)
     throws WrongArgsException {
-      String phenomena_filter = fA.getText(FilterArguments.TEXT_FORMAT_PROVIDE_PHENOMENA); 
+    String phenomena_filter = fA.getText(FilterArguments.TEXT_FORMAT_PROVIDE_PHENOMENA); 
 
-      handler =
-        (ProvidingPhenomenaStream) nH.get(phenomena_filter);
-      if (handler == null) {
-        throw new WrongArgsException("No filter of name \""
-            + lexiconHandlerName + "\"found in the pipeline");
-      }
+    handler =
+      (ProvidingPhenomenaStream) nH.get(phenomena_filter);
+    if (handler == null) {
+      throw new WrongArgsException("No filter of name \""
+          + phenomena_filter + "\"found in the pipeline");
+    }
 
-      textUri = fA.getText(FilterArguments.TEXT_FORMAT_TEXT_URI); 
-      if ((textUri == null) || textUri.equals("")) {
-        throw new WrongArgsException("Text url cannot be null.");
-      }
+    textUri = fA.getText(FilterArguments.TEXT_FORMAT_TEXT_URI); 
+    if ((textUri == null) || textUri.equals("")) {
+      throw new WrongArgsException("Text url cannot be null.");
     }
+  }
 
   /**
    * Create the file.
@@ -100,15 +100,18 @@
   // Event handlers
   ///////////////////////////////
 
-  public void endDocument throws SAXException {
+  public void endDocument() throws SAXException {
     PhenomenaStream p = handler.getPhenomenaStream();
     int length = p.getPhenomenaLength();
-    for (int i = 0; i < length; i++) {
-      String phen = p.getPhenomenon(i);
-      textWriter.write(phen, 0, phen.length());  
+    try {
+      for (int i = 0; i < length; i++) {
+        String phen = p.getPhenomenon(i).toString();
+        textWriter.write(phen, 0, phen.length());  
+      }
+      textWriter.newLine();
+    } catch (IOException e) {
+      throw new FilterException("Unable to write in file: " + e.getMessage(), e);
     }
-
-    textWriter.newLine();
     super.endDocument();
   }
 }

Modified: trunk/corpusreader/src/main/java/tei/cr/querydoc/FilterArguments.java
===================================================================
--- trunk/corpusreader/src/main/java/tei/cr/querydoc/FilterArguments.java	2009-09-24 13:31:17 UTC (rev 227)
+++ trunk/corpusreader/src/main/java/tei/cr/querydoc/FilterArguments.java	2009-10-02 15:29:00 UTC (rev 228)
@@ -668,8 +668,6 @@
     public final static String ARCHIVE_PRODUCER_TYPE = "archive/@type";
 
     // TextFormat
-    public final static String TEXT_FORMAT_TOKEN_LOCAL_NAME = "token/@localName";
-    public final static String TEXT_FORMAT_PARAGRAPH_LOCAL_NAME = "paragraph/@localName";
-
+    public final static String TEXT_FORMAT_PROVIDE_PHENOMENA = "phenomena/@filter";
     public final static String TEXT_FORMAT_TEXT_URI = "textFile/@url";
 }

Modified: trunk/corpusreader/src/main/resources/schema/filters/ExtractPhenomena.rnc
===================================================================
--- trunk/corpusreader/src/main/resources/schema/filters/ExtractPhenomena.rnc	2009-09-24 13:31:17 UTC (rev 227)
+++ trunk/corpusreader/src/main/resources/schema/filters/ExtractPhenomena.rnc	2009-10-02 15:29:00 UTC (rev 228)
@@ -3,38 +3,30 @@
 start=ExtractPhenomena
 
 ExtractPhenomena = element args {
-
-  Occurrences
-    ,
-    element gram {
-      attribute n { xs:int },
-      empty
-    }
-}
-
-Occurrences = element occurrences {
-  (
-   element elementName { empty }
-   |
-   element AttributeName { empty }
-   |
-   element elementStringValue {
+  element occurrences {
+    (
+     element elementName { empty }
+     |
+     element AttributeName { empty }
+     |
+     element elementStringValue {
      attribute localName { string },
      empty
-   }
-   |
-   element use {
+     }
+     |
+     element use {
      attribute elxpath { string },
      element match {
-       attribute elxpath { string }
+     attribute elxpath { string }
      }?
-   }
-   |
-   element evaluate {
+     }
+     |
+     element evaluate {
      attribute xpath { string },
      element root {
-       attribute elxpath { string }
+     attribute elxpath { string }
      }?
-   }
-  )+
+     }
+     )+
+  }
 }

Modified: trunk/corpusreader/src/main/resources/schema/filters/TextFormat.rnc
===================================================================
--- trunk/corpusreader/src/main/resources/schema/filters/TextFormat.rnc	2009-09-24 13:31:17 UTC (rev 227)
+++ trunk/corpusreader/src/main/resources/schema/filters/TextFormat.rnc	2009-10-02 15:29:00 UTC (rev 228)
@@ -4,9 +4,11 @@
 
 TextFormat = element args {
 	element phenomena {
-	    attribute filter {string}
+	    attribute filter {string},
+            empty
 	}?,
 	element textFile {
-	    attribute url {string}
+	    attribute url {string},
+            empty
 	}
 }


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