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

[sword at www.crosswire.org]

Committed by: mgruner

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

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


Index: Books.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Books.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Books.java	5 Jun 2004 17:08:57 -0000	1.3
+++ Books.java	7 Jun 2004 14:38:39 -0000	1.4
@@ -44,9 +44,9 @@
     P.VerseNumber = 0 ;
     P.WordNumber = 0 ;
 //     A.w.openTag("tanach", 0) ;
-    A.w.openTag("div type=\"book\"", 1) ;
-    A.w.writeAttributedString("title", 2, "type=\"main\" short=\"" + 
-    	BookObject.name +"\"",  BookObject.name);
+    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("names", 2) ;
 //     A.w.writeString("name", 3, BookObject.name ) ;

Index: Chapters.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Chapters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Chapters.java	5 Jun 2004 17:08:57 -0000	1.2
+++ Chapters.java	7 Jun 2004 14:38:39 -0000	1.3
@@ -26,9 +26,7 @@
     P.VerseNumber = 0 ;
     P.WordNumber = 0 ;
     String num = new Integer(P.ChapterNumber).toString();
-    A.w.writeMarker("chapter sID=\""+P.Book+"."+num+ 
-    	"\" osisID=\""+P.Book+"."+num+ 
-	"\" n=\""+num+"\"", 2) ;
+    A.w.openTag("chapter osisID=\"" + P.Book + "." + num + "\"", 2) ;
 //    System.out.println("\nChapter " + A.F.i(P.ChapterNumber,2) + " start." ) ;
     }
 //------------------------------------------------------------------------------
@@ -41,8 +39,8 @@
         P.BookVerseCount = P.BookVerseCount + P.VerseNumber ;
         P.TanachVerseCount = P.TanachVerseCount + P.VerseNumber ;
     
-    	String num = new Integer(P.ChapterNumber).toString();
-    	A.w.writeMarker("chapter eID=\""+P.Book+"."+num+"\"", 2) ;
+//     	String num = new Integer(P.ChapterNumber).toString();
+    	A.w.closeTag("chapter", 2) ;
 	
 	
 //         A.w.writeInt("vs", 3, P.VerseNumber) ;

Index: Verses.java
===================================================================
RCS file: /cvs/core/swordtools/modules/hebrew-wlc/WLC2OSIS/WLC2OSIS/Parse/Verses.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Verses.java	5 Jun 2004 17:08:57 -0000	1.2
+++ Verses.java	7 Jun 2004 14:38:39 -0000	1.3
@@ -26,8 +26,7 @@
     
     String chapternum = new Integer(P.ChapterNumber).toString();
     String versenum =   new Integer(P.VerseNumber).toString();
-    A.w.writeMarker("verse sID=\""+P.Book+"."+chapternum+"."+versenum+ 
-    	"\" osisID=\""+P.Book+"."+chapternum+"."+versenum+"\"", 3) ;
+    A.w.openTag("verse osisID=\""+P.Book+"."+chapternum+"."+versenum+"\"", 3) ;
 
 //     A.w.openAttributedTag("v", 3, "n",  ) ;
 //    System.out.println("\nVerse " + A.F.i(P.VerseNumber,2) + " start." ) ;
@@ -39,9 +38,9 @@
 public void end(){
     if( P.VerseNumber != 0){
     
-	String chapternum = new Integer(P.ChapterNumber).toString();
-    	String versenum =   new Integer(P.VerseNumber).toString();
-    	A.w.writeMarker("verse eID=\""+P.Book+"."+chapternum+"."+versenum+"\"", 3) ;
+// 	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 "