[sword-cvs] swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse Books.java, 1.1, 1.2 Parser.java, 1.1, 1.2

[sword at www.crosswire.org]

Committed by: mgruner

Update of /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse
In directory www:/tmp/cvs-serv18844/WLC2OSIS/Parse

Modified Files:
	Books.java Parser.java 
Log Message:
mgruner: now processes into a single xml file. still buggy, no osis yet.



Index: Books.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Books.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Books.java	4 Jun 2004 09:14:52 -0000	1.1
+++ Books.java	4 Jun 2004 12:49:16 -0000	1.2
@@ -2,7 +2,7 @@
 
 import WLC2OSIS.* ;
 import WLC2OSIS.Translate.* ;
-import WLC2OSIS.Utilities.* ;
+//import WLC2OSIS.Utilities.* ;
 //==============================================================================
 /**
  *  <b>Processes books.</b>
@@ -16,7 +16,6 @@
 Parser P ;
 public BookName[] BookNames ;
 BookName BookObject ;
-String Filename ;
 //-----------------------------------------------------------------------------
 
 public Books(WLC2OSIS A, Parser P ) {
@@ -38,17 +37,8 @@
 
 //-----------------------------------------------------------------------------
 
-// Begin writing the book as a file
-
-    Filename = BookObject.filename ;
-
-    A.w = new XMLWriter(A.OutputDirectory, Filename, "Tanach",
-        "Tanach", "" ) ;
+// Begin writing the book into the existing file
 
-// Write the header
-    Header.writeHeader(A, A.w) ;
-    
-//-----------------------------------------------------------------------------
     
     P.ChapterNumber = 0 ;
     P.VerseNumber = 0 ;
@@ -81,8 +71,8 @@
 // Add the transcription notes.
         Note.writeNotes(A.w) ;
 
-        A.w.close() ;
-        System.out.println( Filename + ".xml has been written." ) ;
+//        A.w.close() ;
+        System.out.println( BookObject.filename + " has been written." ) ;
         }
     }
 //----------------------------------------------------------------------------

Index: Parser.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Parser.java	4 Jun 2004 09:14:52 -0000	1.1
+++ Parser.java	4 Jun 2004 12:49:16 -0000	1.2
@@ -2,6 +2,7 @@
 
 import WLC2OSIS.* ;
 import WLC2OSIS.Translate.* ;
+import WLC2OSIS.Utilities.* ;
 //==============================================================================
 /**
  *  <b>Parser dispatches tokens to  Books, Chapters, Markers, Tanach,
@@ -84,7 +85,15 @@
     String s ;
     boolean PreviousEOL = true ;
     System.out.println("\n") ;
+    
+    A.w = new XMLWriter(A.OutputDirectory, "WLC_OSIS", "Tanach", "Tanach", "" ) ;
+     
+     // Write the header
+    Header.writeHeader(A, A.w) ;
+
     tanach.start() ;
+
+        
     for (int k = 0; k < A.InputChars.length ; k++){
     
         s = t.nextToken() ;