extraction-interface: models/extractapp.php comparison

comparison models/extractapp.php @ 67:3ada9334ebfc extractapp

New: check taglist is deprecated or not

author	Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date	Tue, 07 Apr 2015 14:45:31 +0200
parents	e71a437ae49f
children	edb8a2e8ce84

comparison

equal deleted inserted replaced

-:e71a437ae49f
+:3ada9334ebfc
 $this->lg_text = $lg_text;
 }
-public function GetBookMetaData($_postdata) {
-// TODO: get book_meta from $_postdata, depended on LGService
+public function GetBookMetaDataBySectionId() {
+// TODO: get book_meta from $$this->get_section_metadata_by_sectionId_url ...
+$section_meta_url = $this->get_section_metadata_by_sectionId_url.$this->section_id;
+$section_meta = file_get_contents($section_meta_url);
 // TODO: set $this->book_meta to an array(book_id,book_name,author,year,pagenumber,dynasty)
 $book_meta = array();
 array_push($book_meta, array($this->book_id,$this->book_name,"no_data","no_data","no_data","no_data"));    // missing author,year,pagenumber
 }
 }
-// TODO: comparison not correct
-private function Taglist_infileUpToDate($taglistArray) {
-// compare $this->taglist_infile is the same as $taglistArray
+private function TaglistSubsetIn($list1, $list2) {    // $l1 is a subset of $l2 or not
-$taglist_infile = $this->taglist_infile;
+// l1 and l2: array( $row['id'], $row['name'], $row['tag'], $row['color'] )
-if (count($taglist_infile) != count($taglistArray)) {
+$cnt_list1 = count($list1);
+$cnt_list2 = count($list2);
+if ($cnt_list1 > $cnt_list2) {
 return false;
 }
+foreach ($list1 as $v1) {
-foreach ($taglistArray as $row_indb) {
 $cnt = 0;
-foreach ($taglist_infile as $row) {
+foreach ($list2 as $v2) {
-//$taglistArray: array( $row['id'], $row['name'], $row['tag'], $row['color'] )
+$num_field = count($v2);
-if ($row[0] == $row_indb[0] && $row[1] == $row_indb[1] && $row[2] == $row_indb[2] && $row[3] == $row_indb[3]) {
+$matched = true;
+for ($i=0; $i < $num_field; $i++) {
+if ($v1[$i] != $v2[$i]) {
+$matched = false;
+break;
+}
+}
+if (!$matched) {
+// not match with this v2
+$cnt += 1;
 } else {
-$cnt ++;
+break;
 }
-}
-if ($cnt == count($row)) {
+}
-return false;
+if ($cnt == $cnt_list2) {
+return false;
 }
 }
 return true;
-}
+}
 // === for tagging ===
 public function StartTagging() {
 $section_id = $this->section_id;
 $stringInput = $this->lg_text;
 //$taglistArray = $this->GetTaglistArray();
 //for GetTaglistByTopicID:
 $taglistArray = $this->GetTaglistByTopicID($this->GetTopic());
-$data['taglist_infile'] = $this->taglist_infile;
+// $this->taglist_infile is set (1) from file or (2) from _postdata['taglistArray'] which comes from frontend that user decided
-// TODO: check if taglist_infile is up-to-date
+// $this->taglist_infile is the most up-to-date taglist decided by user. Should be written into file.
-/*
+if( $this->TaglistSubsetIn($this->taglist_infile, $taglistArray) ) {    // TaglistSubsetIn($l1,$l2): $l1 is a subset of $l2 or not
-if ( !$this->Taglist_infileUpToDate($taglistArray)) {
+$this->taglist_infile = "";
-$data['taglist_infile'] = $this->taglist_infile;
+}
-} else {
+$data['taglist_infile'] = $this->taglist_infile;    // if taglist_infile == "" means taglist in file is up-to-date (will use taglist in db), otherwise means the taglist in file
-$data['taglist_infile'] = "";
-}
-*/
 // book_meta
 $data['book_meta'] = $this->book_meta;
 // topic list
 $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,
 'current_fileId'=>$this->current_fileId);
-//'current_fileId'=>$this->file_id);
-//'current_fileId'=>'123');
 $this->messages['debug'] .= "[Debug] ";
 $this->messages['debug'] .= "file_id=".$this->file_id.", section_id=".$this->section_id;
 $this->messages['debug'] .= ", user_id=".$this->user_id.", branch_id=".$this->branch_id.", topic_id=".$this->topic;
 $this->messages['debug'] .= ", book_id=".$this->book_id.", book_name=".$this->book_name.", section_name=".$this->section_name;
 return $data;
 }
-private function _GetTag($_postdata) {
+private function GetTag($_postdata) {
 if (get_magic_quotes_gpc()) {
 $id = stripslashes($_postdata['id']);
 $name = stripslashes($_postdata['name']);
 $tag = stripslashes($_postdata['tag']);
 $color = stripslashes($_postdata['color']);
 return array($id, $name, $tag, $color);
 }
 public function NewTagElement($postdata) {
 if ($postdata['id']){
-list($id, $name, $tag, $color) = $this->_GetTag($postdata);
+list($id, $name, $tag, $color) = $this->GetTag($postdata);
 $query1 = sprintf("INSERT INTO `taglist` (`id`, `name`, `tag`, `color`, `systemName`) VALUES (%s, %s, %s, %s, %s)",
 $this->GetSQLValueString($id, "int"),
 $this->GetSQLValueString($name, "text"),
 $this->GetSQLValueString($tag, "text"),
 }
 public function SaveTagElement($postdata) {
 if ($postdata['id']){
-list($id, $name, $tag, $color) = $this->_GetTag($postdata);
+list($id, $name, $tag, $color) = $this->GetTag($postdata);
 $query = sprintf("UPDATE taglist SET `name`=%s, `tag`=%s, `color`=%s WHERE `id`=%s",
 $this->GetSQLValueString($name, "text"),
 $this->GetSQLValueString($tag, "text"),
 $this->GetSQLValueString($color, "text"),

Mercurial > hg > extraction-interface

comparison models/extractapp.php @ 67:3ada9334ebfc extractapp