[sword-svn] r509 - trunk/modules/conf

[refdoc at crosswire.org]

Author: refdoc
Date: 2016-01-03 08:32:24 -0700 (Sun, 03 Jan 2016)
New Revision: 509

Modified:
   trunk/modules/conf/confmaker.pl
Log:
reordered output


Modified: trunk/modules/conf/confmaker.pl
===================================================================
--- trunk/modules/conf/confmaker.pl	2015-12-26 13:39:22 UTC (rev 508)
+++ trunk/modules/conf/confmaker.pl	2016-01-03 15:32:24 UTC (rev 509)
@@ -103,10 +103,7 @@
 
 my $hs = HTML::Strip->new();
 my $doc_text = new Sword::SWBuf($hs->parse($doc->toString()));
-#my $clean_doc_text = $hs->parse( $doc->toString());
-#$doc_text->append($clean_doc_text);
 
-
 ## obtain name, type and language
 
 my @elements = $doc->getElementsByTagName('osisText');
@@ -146,10 +143,14 @@
              'note'  => "OSISFootnotes",
              'reference' => "OSISScripref",
              'gloss' => "OSISGlosses",
-             'lemma' => "OSISStrongs",
+             'lemma' => "OSISLemma",
+             'strong' => "OSISStrongs",
              'morph' => "OSISMorph",
              'q'  => "OSISRedLetterWords",
              'rdg' => 'OSISVariants',
+             'enum' => 'OSISEnum',
+             'xlit' => 'OSISXlit'
+             
             );
 
             
@@ -204,6 +205,10 @@
 print "CompressType=ZIP\n";
 print "BlockType=BOOK\n";
 
+print  "Encoding=UTF-8\n";
+print  "SourceType=OSIS\n";
+print  "SwordVersionDate=".`date +"%F"`;
+
 print  "Lang=".$doc_lang."\n";
 
 foreach (@doc_features) {
@@ -245,10 +250,7 @@
    print "Feature=".$doc_feature{'p'}."\n"
    }
 
-print  "Encoding=UTF-8\n";
-print  "SourceType=OSIS\n";
 print  "LCSH=".$doc_type.".".I18N::LangTags::List::name($doc_lang)."\n";
-print  "SwordVersionDate=".`date +"%F"`;
 
 if (@inputFile>0) {
    foreach(@inputFile) {
@@ -256,9 +258,9 @@
       }
    }
 elsif (!$makefile){
-   print "Version=1.0\n";
-   print "History=1.0 First release\n";
    print "DistributionLicense=copyrighted. Do not distribute\n";   
    print "Description=".$doc_name." Bible in ".$doc_lang_name."\n";
    print "About=".$doc_name." Bible in ".$doc_lang_name."\n";
+   print "Version=1.0\n";
+   print "History=1.0 First release\n";
 }