diff models/extractapp.php @ 91:3e11a9c5a672 extractapp

new: explore table for using on LGMap
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Mon, 14 Sep 2015 14:37:29 +0200
parents 94ad33739fa4
children b0cecc104639
line wrap: on
line diff
--- a/models/extractapp.php	Fri Jun 12 14:41:30 2015 +0200
+++ b/models/extractapp.php	Mon Sep 14 14:37:29 2015 +0200
@@ -294,11 +294,11 @@
         $data['topic_name'] = $this->GetTopicName($topic_id);
         $data['topic_tag_ch'] = $this->GetTopicTagName($topic_id);
 
-
         $data['info'] = array('file_id'=>$this->file_id, 'user_id'=>$this->user_id,
                 'branch_id'=>$this->branch_id, 'section_id'=>$this->section_id, 'book_id'=>$this->book_id, 
                 'book_name'=>$this->book_name,'section_name'=>$this->section_name, 'period'=>$this->book_meta->period,
-                'current_fileId'=>$this->current_fileId);
+                'current_fileId'=>$this->current_fileId); 
+
 
         $this->messages['debug'] .= "[Debug] ";
         $this->messages['debug'] .= "file_id=".$this->file_id.", section_id=".$this->section_id;
@@ -307,10 +307,11 @@
         $this->messages['debug'] .= ", current_fileId=".$this->current_fileId."<br>";
 
         $this->messages['info'] .= "[Info] book name: ".$this->book_name;
+        $this->messages['info'] .= ", period: ".$this->book_meta->period;
         $this->messages['info'] .= ", section id: ". $this->section_id;
+        $this->messages['info'] .= ", section name: ".$this->section_name;
         $this->messages['info'] .= ", branch id: ".$this->branch_id;
         $this->messages['info'] .= ", file id: ".$this->file_id;
-        $this->messages['info'] .= ", period: ".$this->book_meta->period;
         $this->messages['info'] .= "<br>";
 
 
@@ -726,7 +727,6 @@
     }
 
     // === for export table ===
-
     public function ExportTable($postdata, $isFromFile) {
         if ($isFromFile) {
             $content = $this->lg_text;
@@ -741,7 +741,6 @@
         } else {
             $content = $postdata['content'];
             $topic = $postdata['topic'];
-
             $section_id = $postdata['sectionId'];
             $sectionName = $postdata['sectionName'];
             $bookId = $postdata['bookId'];
@@ -759,6 +758,8 @@
 
 
 
+        $bookMeta = $this->book_meta;   // just added
+
         // data for view
         $data = array();
         $data['outputTableArray'] = $outputTableArray;
@@ -766,11 +767,11 @@
         $data['section_id'] = $section_id;
         $data['bookName'] = $bookName;
         $data['sectionName'] = $sectionName;
+        $data['bookMeta'] = $bookMeta;
 
         return $data;
 
     }
-    
     // === for manage tag list ===
     public function EditTaglist($_postdata) {
         /**