diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php index 456bfcd7..065b3de1 100644 --- a/application/admin/controllers/ReviewController.php +++ b/application/admin/controllers/ReviewController.php @@ -9,6 +9,7 @@ class Admin_ReviewController extends Zend_Controller_Action $this->_helper->layout->setLayout('administry'); $this->view->pageID = "review-".$this->_request->getActionName(); $this->submd=$this->view->config->sub->metadata; + $this->subsearch=$this->view->config->sub->search; } /* @@ -241,7 +242,7 @@ class Admin_ReviewController extends Zend_Controller_Action { $sql = "select m.*,md.*,u.realname from mdstatus m - right join metadata md on md.uuid=m.uuid + right join $this->submd md on md.uuid=m.uuid left join users u on u.id=m.userid where m.id=$show "; @@ -297,7 +298,7 @@ class Admin_ReviewController extends Zend_Controller_Action } $sql = "select m.id,md.title,m.status,m.uuid,u.username,u.realname from mdstatus m - right join metadata md on md.uuid=m.uuid + right join $this->submd md on md.uuid=m.uuid left join users u on u.id=m.userid where m.status in (2,3,4) $searchjoin order by m.ts_accepted desc"; $rs = $this->db->query($sql); @@ -750,7 +751,7 @@ class Admin_ReviewController extends Zend_Controller_Action //update search document $search=new Search(); //create search view in xunsearch - $sql="select * from xunsearch where uuid in (select uuid from mdstatus where id in (".$ids."))"; + $sql="select * from $this->subsearch where uuid in (select uuid from mdstatus where id in (".$ids."))"; $sth = $this->db->prepare($sql); $sth->execute(); while ($data = $sth->fetch()) @@ -761,7 +762,7 @@ class Admin_ReviewController extends Zend_Controller_Action //仅对单条数据发送email信息 if (is_numeric($ids)) { - $sql="select distinct u.email,m.title,m.uuid from mdstatus s left join metadata m on s.uuid=m.uuid + $sql="select distinct u.email,m.title,m.uuid from mdstatus s left join $this->submd m on s.uuid=m.uuid right join mdauthor a on s.uuid=a.uuid left join users u on a.userid=u.id where s.id=? order by u.email"; $rs=$this->db->query($sql,array($ids)); $rows=$rs->fetchAll(); @@ -807,7 +808,7 @@ class Admin_ReviewController extends Zend_Controller_Action } $sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_created,gn.id as gnid from mdstatus m - right join metadata md on md.uuid=m.uuid + right join $this->submd md on md.uuid=m.uuid left join users u on u.id=m.userid left join geonetworkmetadata gn on m.uuid=gn.uuid where status=0 $searchjoin order by m.ts_created desc"; @@ -869,7 +870,7 @@ class Admin_ReviewController extends Zend_Controller_Action } $sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status from mdstatus m - right join metadata md on md.uuid=m.uuid + right join $this->submd md on md.uuid=m.uuid left join users u on u.id=m.userid where status=-1 $searchjoin"; @@ -909,7 +910,7 @@ class Admin_ReviewController extends Zend_Controller_Action } $sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_finished from mdstatus m - right join metadata md on md.uuid=m.uuid + right join $this->submd md on md.uuid=m.uuid left join users u on u.id=m.userid where status=5 $searchjoin order by m.ts_finished desc"; @@ -1198,7 +1199,7 @@ class Admin_ReviewController extends Zend_Controller_Action } $sql = "select r.*,md.title,u.realname,u.id as uid from mdreview r - left join metadata md on md.uuid=r.uuid + left join $this->submd md on md.uuid=r.uuid left join users u on u.id=r.userid where r.id='$id' "; @@ -1283,7 +1284,7 @@ class Admin_ReviewController extends Zend_Controller_Action } $sql = "select md.title,md.uuid,u.realname,r.id,r.ts_created,r.is_expert from mdreview r - left join metadata md on md.uuid=r.uuid + left join $this->submd md on md.uuid=r.uuid left join users u on u.id=r.userid $wheresql order by r.ts_created desc @@ -1334,7 +1335,7 @@ class Admin_ReviewController extends Zend_Controller_Action } $sql = "select u.id,u.realname as title,count(r.id) as c from mdreview r - left join metadata md on md.uuid=r.uuid + left join $this->submd md on md.uuid=r.uuid left join users u on u.id=r.userid $wheresql GROUP BY u.id,u.realname @@ -1464,7 +1465,7 @@ class Admin_ReviewController extends Zend_Controller_Action } $sql = "select md.title,md.uuid,count(r.id) as c from mdreview r - left join metadata md on md.uuid=r.uuid + left join $this->submd md on md.uuid=r.uuid $wheresql GROUP BY md.title,md.uuid ";