[sword-cvs] swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse Books.java, 1.5, 1.6 Chapters.java, 1.4, 1.5 Parser.java, 1.5, 1.6 Verses.java, 1.4, 1.5

[sword at www.crosswire.org]

Committed by: mgruner

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

Modified Files:
	Books.java Chapters.java Parser.java Verses.java 
Log Message:
final cleanups.



Index: Books.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Books.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Books.java	7 Jun 2004 19:24:49 -0000	1.5
+++ Books.java	14 Jul 2004 14:55:47 -0000	1.6
@@ -46,16 +46,12 @@
     P.WordNumber = 0 ;
 //     A.w.openTag("tanach", 0) ;
     A.w.openTag("div type=\"book\" osisID=\"" + BookObject.abbrev + "\"", 1) ;
-    A.w.writeAttributedString("title", 2, "type=\"main\" short=\"" + BookObject.abbrev +"\"",
-      BookObject.abbrev);
+
+/*    A.w.writeAttributedString("title", 2, "type=\"section\" subType=\"x-Section\" subtype=\"x-preverse\"",
+      BookObject.hebrewname);
+    A.w.writeAttributedString("title", 2, "type=\"main\" ",    	BookObject.hebrewname);*/
+      
     
-//     A.w.openTag("names", 2) ;
-//     A.w.writeString("name", 3, BookObject.name ) ;
-//     A.w.writeString("abbrev", 3, BookObject.abbrev) ;
-//     A.w.writeInt("number", 3, BookObject.number) ;
-//     A.w.writeString("filename", 3, BookObject.filename) ;
-//     A.w.writeString("hebrewname", 3, BookObject.hebrewname) ;
-//     A.w.closeTag("names", 2) ;   
     }
 //------------------------------------------------------------------------------
 
@@ -67,15 +63,7 @@
         P.BookChapterCount = P.ChapterNumber ;
         P.TanachChapterCount = P.TanachChapterCount + P.ChapterNumber ;
         
-//         A.w.writeInt("vs", 2, P.BookVerseCount) ;
-//         A.w.writeInt("cs", 2, P.BookChapterCount) ;
         A.w.closeTag("div", 1) ;
-//         A.w.closeTag("tanach", 0) ;
-    
-// Add the transcription notes.
-//         Note.writeNotes(A.w) ;
-
-//        A.w.close() ;
         System.out.println( BookObject.name + " has been written." ) ;
         }
     }

Index: Chapters.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Chapters.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Chapters.java	7 Jun 2004 19:24:49 -0000	1.4
+++ Chapters.java	14 Jul 2004 14:55:47 -0000	1.5
@@ -27,7 +27,6 @@
     P.WordNumber = 0 ;
     String num = new Integer(P.ChapterNumber).toString();
     A.w.openTag("chapter osisID=\"" + P.BookAbbrev + "." + num + "\"", 2) ;
-//    System.out.println("\nChapter " + A.F.i(P.ChapterNumber,2) + " start." ) ;
     }
 //------------------------------------------------------------------------------
 
@@ -39,14 +38,8 @@
         P.BookVerseCount = P.BookVerseCount + P.VerseNumber ;
         P.TanachVerseCount = P.TanachVerseCount + P.VerseNumber ;
     
-//     	String num = new Integer(P.ChapterNumber).toString();
     	A.w.closeTag("chapter", 2) ;
 	
-	
-//         A.w.writeInt("vs", 3, P.VerseNumber) ;
-//         A.w.closeTag("c", 2) ;
-//        System.out.println("Chapter " + A.F.i(P.ChapterNumber,2) + " ends with "
-//            + A.F.i(P.VerseNumber,2) + " verses." ) ;
         }
     }
 //----------------------------------------------------------------------------

Index: Parser.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Parser.java	10 Jun 2004 12:00:19 -0000	1.5
+++ Parser.java	14 Jul 2004 14:55:47 -0000	1.6
@@ -18,7 +18,6 @@
 
 //  Working classes
 
-// Tanach tanach ;
 public Books b ;
 Chapters c ;
 Verses v ;
@@ -67,7 +66,6 @@
     t = new Tokenizer(A) ;
     
 // Set up the Tanach, Books, Chapters, Verses, Words, and Markers classes.
-//     tanach = new Tanach(A, this) ;
     b = new Books(A, this) ;
     c = new Chapters(A, this) ;
     v = new Verses(A, this) ;
@@ -92,10 +90,7 @@
      
      // Write the header
     Header.writeHeader(A, A.w) ;
-
-//     tanach.start() ;
-
-        
+     
     for (int k = 0; k < A.InputChars.length ; k++){
     
         s = t.nextToken() ;
@@ -185,7 +180,6 @@
     v.end() ;
     c.end() ;
     b.end() ;   
-//     tanach.end() ;
 
      // Write the footer
     Header.writeFooter(A, A.w) ;

Index: Verses.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Verses.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Verses.java	7 Jun 2004 19:24:49 -0000	1.4
+++ Verses.java	14 Jul 2004 14:55:47 -0000	1.5
@@ -27,9 +27,6 @@
     String chapternum = new Integer(P.ChapterNumber).toString();
     String versenum =   new Integer(P.VerseNumber).toString();
     A.w.openTag("verse osisID=\""+P.BookAbbrev+"."+chapternum+"."+versenum+"\"", 3) ;
-
-//     A.w.openAttributedTag("v", 3, "n",  ) ;
-//    System.out.println("\nVerse " + A.F.i(P.VerseNumber,2) + " start." ) ;
     }
 //------------------------------------------------------------------------------
 
@@ -37,14 +34,7 @@
 
 public void end(){
     if( P.VerseNumber != 0){
-    
-// 	String chapternum = new Integer(P.ChapterNumber).toString();
-//     	String versenum =   new Integer(P.VerseNumber).toString();
     	A.w.closeTag("verse", 3) ;
-
-//         A.w.closeTag("v", 3) ;
-//        System.out.println("Verse " + A.F.i(P.VerseNumber,2) + " ends with " 
-//            + A.F.i(P.WordNumber,2) + " words." ) ;
         }
     }
 //----------------------------------------------------------------------------