[sword-cvs] sword/utilities mod2osis.cpp,1.10,1.11

[sword@www.crosswire.org]

Update of /cvs/core/sword/utilities
In directory www:/tmp/cvs-serv28641/utilities

Modified Files:
	mod2osis.cpp 
Log Message:
Updated to basic osis 2.5 support


Index: mod2osis.cpp
===================================================================
RCS file: /cvs/core/sword/utilities/mod2osis.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mod2osis.cpp	20 Nov 2003 13:53:47 -0000	1.10
+++ mod2osis.cpp	14 Mar 2004 03:39:54 -0000	1.11
@@ -97,12 +97,17 @@
 
 
 	cout << "<osis";
+		cout << " xmlns=\"http://www.bibletechnologies.net/2003/OSIS/namespace\"";
 		cout << " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
-		cout << " xsi:noNamespaceSchemaLocation=\"http://www.bibletechnologies.net/osisCore.1.1.1.xsd\">\n\n";
+		cout << " xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace osisCore.2.5.xsd\">\n\n";
 	cout << "<osisText";
 		cout << " osisIDWork=\"";
 		cout << inModule->Name() << "\"";
 		cout << " osisRefWork=\"defaultReferenceScheme\"";
+		if (inModule->Lang()) {
+			if (strlen(inModule->Lang()))
+				cout << " xml:lang=\"" << inModule->Lang() << "\"";
+		}
 		cout << ">\n\n";
 
 	cout << "\t<header>\n";
@@ -110,10 +115,6 @@
 	cout << inModule->Name() << "\">\n";
 	cout << "\t\t\t<title>" << inModule->Description() << "</title>\n";
 	cout << "\t\t\t<identifier type=\"OSIS\">Bible." << inModule->Name() << "</identifier>\n";
-	if (inModule->Lang()) {
-		if (strlen(inModule->Lang()))
-			cout << "\t\t\t<language>" << inModule->Lang() << "</language>\n";
-	}
 	cout << "\t\t\t<refSystem>Bible.KJV</refSystem>\n";
 	cout << "\t\t</work>\n";
 	cout << "\t\t<work osisWork=\"defaultReferenceScheme\">\n";
@@ -145,7 +146,7 @@
 				cout << "\t</div>\n";
 			if (opentest)
 				cout << "\t</div>\n";
-			cout << "\t<div type=\"testament\">\n";
+			cout << "\t<div type=\"x-testament\">\n";
 			opentest = true;
 			newTest = true;
 		}
@@ -192,6 +193,7 @@
 		filter.ProcessText(buf,  len - 3, vkey, inModule);
 		cout << buf << endl;
 		*/
+//		cout << "<verse osisID=\"" << vkey->getOSISRef() << "\">" << inModule->RenderText() << "</verse>" << endl;
 		cout << inModule->RenderText() << endl;
 		lastChap = vkey->Chapter();
 		lastBook = vkey->Book();