--- db/prgsrc/drupal/modules/chgk_db/templates/chgk_db_fb2.xml	2010/03/21 18:06:04	1.1
+++ db/prgsrc/drupal/modules/chgk_db/templates/chgk_db_fb2.xml	2010/04/24 13:36:29	1.2
@@ -1,40 +1,54 @@
 <?php echo '<?xml version="1.0" encoding="UTF-8"?>'?>
+<!DOCTYPE body [
+<!ENTITY reg "®">
+<!ENTITY mdash "—">
+<!ENTITY nbsp " ">
+<!ENTITY ldquo "“">
+<!ENTITY rdquo "”">
+<!ENTITY pound "£">
+<!ENTITY trade "™">
+<!ENTITY euro "€">
+<!ENTITY yen "¥">
+<!ENTITY copy "©"> ]>
+
 <?php setlocale(LC_ALL, 'ru_RU.UTF8');?>
 <FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0"
   xmlns:l="http://www.w3.org/1999/xlink">
       <description>
           <title-info>
               <genre>nonfiction</genre>
-              <author><?php print $tournament->getEditor(); ?></author>
-              <book-title><?php print $tournament->getTitle();?></book-title>
+              <author>
+                  <first-name/>
+                   <last-name>База вопросов Интернет-клуба "Что? Где? Когда?"</last-name>
+              </author>
+              <book-title><?php print $tournament->getFullTitle();?></book-title>
               <document-info>
-                  <author><first-name/><last-name>Question Database</last-name></author>
+                  <author>
+                      <first-name/>
+                      <last-name>База вопросов Интернет-клуба "Что? Где? Когда?"</last-name>
+                   </author>
                   <program-used>php, Drupal</program-used>
                   <date value='<?php print strftime("%Y-%m-%d", time());?>'><?php print strftime("%x", time());?></date>
               </document-info>
+	      <lang>ru</lang>
           </title-info>
       </description>
       <body>
           <title><?php print $tournament->getTitle();?></title>
+              <?php if ($tournament->hasEditor()) {?>
+		<p><?php print $tournament->getEditorHtml();?></p>
+              <?php }?>
+	  
               <?php if ($tournament->hasInfo()) :?><annotation>
                   <p>
                   <?php print $tournament->getInfo()."\n";?>
                   </p>
                </annotation>
               <?php endif;?>
-<?php foreach ($tournament->getTours() as $t)  :?>
-  <?php if(!$tournament->isSingleTour()) :?>
-    <section>
-        <title><p><?php print $t->getTitle(); ?></p></title>
-        <?php echo theme('chgk_db_tour_fb2', $t, FALSE); ?>
-    </section>
-   <?php else:?>
-           <?php echo theme('chgk_db_tour_fb2', $t, FALSE); ?>
-  <?php endif;?>
+              <?php print $tournament->getFb2MainPart();?>
 
-<?php endforeach;?>
       </body>
       <binary>
 <?php print_r($tournament->getImagesBinaries());?>
       </binary>
-</FictionBook>
\ No newline at end of file
+</FictionBook>
