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

[sword at www.crosswire.org]

Committed by: mgruner

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

Modified Files:
	Books.java Chapters.java Parser.java Verses.java 
Log Message:
mgruner: futher fixes


Index: Books.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Books.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Books.java	7 Jun 2004 14:38:39 -0000	1.4
+++ Books.java	7 Jun 2004 19:24:49 -0000	1.5
@@ -31,6 +31,7 @@
 
     BookObject = BookName.getBookName(BookNames, BookCode) ;
     P.Book = BookObject.name ;
+    P.BookAbbrev = BookObject.abbrev ;
     P.TanachBookCount = P.TanachBookCount + 1 ;
     P.BookVerseCount = 0;
     P.BookChapterCount = 0 ;
@@ -44,9 +45,9 @@
     P.VerseNumber = 0 ;
     P.WordNumber = 0 ;
 //     A.w.openTag("tanach", 0) ;
-    A.w.openTag("div type=\"book\" osisID=\"" + BookObject.name + "\"", 1) ;
-    A.w.writeAttributedString("title", 2, "type=\"main\" short=\"" + BookObject.name +"\"",
-      BookObject.name);
+    A.w.openTag("div type=\"book\" osisID=\"" + BookObject.abbrev + "\"", 1) ;
+    A.w.writeAttributedString("title", 2, "type=\"main\" short=\"" + BookObject.abbrev +"\"",
+      BookObject.abbrev);
     
 //     A.w.openTag("names", 2) ;
 //     A.w.writeString("name", 3, BookObject.name ) ;
@@ -75,7 +76,7 @@
 //         Note.writeNotes(A.w) ;
 
 //        A.w.close() ;
-        System.out.println( BookObject.filename + " has been written." ) ;
+        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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Chapters.java	7 Jun 2004 14:38:39 -0000	1.3
+++ Chapters.java	7 Jun 2004 19:24:49 -0000	1.4
@@ -26,7 +26,7 @@
     P.VerseNumber = 0 ;
     P.WordNumber = 0 ;
     String num = new Integer(P.ChapterNumber).toString();
-    A.w.openTag("chapter osisID=\"" + P.Book + "." + num + "\"", 2) ;
+    A.w.openTag("chapter osisID=\"" + P.BookAbbrev + "." + num + "\"", 2) ;
 //    System.out.println("\nChapter " + A.F.i(P.ChapterNumber,2) + " start." ) ;
     }
 //------------------------------------------------------------------------------

Index: Parser.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Parser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Parser.java	5 Jun 2004 17:08:57 -0000	1.3
+++ Parser.java	7 Jun 2004 19:24:49 -0000	1.4
@@ -35,6 +35,7 @@
 // String BookName ;
 
 String Book ;
+String BookAbbrev ;
 int Chapter ;
 int Verse ;
 

Index: Verses.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Verses.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Verses.java	7 Jun 2004 14:38:39 -0000	1.3
+++ Verses.java	7 Jun 2004 19:24:49 -0000	1.4
@@ -26,7 +26,7 @@
     
     String chapternum = new Integer(P.ChapterNumber).toString();
     String versenum =   new Integer(P.VerseNumber).toString();
-    A.w.openTag("verse osisID=\""+P.Book+"."+chapternum+"."+versenum+"\"", 3) ;
+    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." ) ;