diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php index 0632ff1e..c2a58737 100644 --- a/application/default/controllers/AuthorController.php +++ b/application/default/controllers/AuthorController.php @@ -3833,6 +3833,25 @@ class AuthorController extends Zend_Controller_Action return true; } + if($ac == 'data') + { + $this->_helper->viewRenderer('fund-data'); + $uuid = $this->_getParam('uuid'); + $this->view->q = $q = $this->_getParam('q'); + if(empty($uuid)) + { + $rows = $fund->fetchFormData($uid,$q); + view::addPaginator($rows,$this->view,$this->_request); + }else{ + include('data/Metadata.php'); + $md = new Metadata($this->db); + $this->view->md = $md->view($uuid); + $rows = $fund->fetch($uuid); + view::addPaginator($rows,$this->view,$this->_request); + } + return true; + } + if($ac == "add") { $this->_helper->viewRenderer('fund-add'); diff --git a/application/default/views/scripts/author/fund-data.phtml b/application/default/views/scripts/author/fund-data.phtml new file mode 100644 index 00000000..dd453e5a --- /dev/null +++ b/application/default/views/scripts/author/fund-data.phtml @@ -0,0 +1,113 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->author); +$this->headTitle()->setSeparator(' - '); +$this->breadcrumb('首页'); +$this->breadcrumb('数据作者'); +$this->headLink()->appendStylesheet('/css/author.css'); +$this->breadcrumb('申请成为元数据作者'); +$this->breadcrumb()->setSeparator(' > '); +$this->theme->AppendPlus($this,'colorbox'); +$this->theme->AppendPlus($this,'admin_plugin'); +?> + +
+
+ partial('author/navi.phtml'); ?> +
+
+
+ +
+ md)) { ?> +
+ ct)) { ?> + 为此数据添加项目 + + 返回 +
点击“添加此项目”即可将项目添加到元数据
+ +

《md['title'] ?>》 的支持项目

+
+
+ +
+
+
+ + +
+
+
+ error)) { ?> + AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> +
+ × + error)) { ?>

error ?>

+
    + error as $v) { ?> +
    • + +
+ +
+ + msg)) { ?> +
+ × + msg ?> +
+ jump_url)) { ?> + + + +
+ paginator)): ?> + + + + + + + + + + + paginator as $item): + $autoindex++;?> + md)) { ?> + + + + + + + + + + + +
数据名称编号操作
+ 移除 +
+ +
paginator; ?>
+
+ +
+
+ + diff --git a/application/default/views/scripts/author/fund.phtml b/application/default/views/scripts/author/fund.phtml index 4b5b96e7..3fbe7ad7 100644 --- a/application/default/views/scripts/author/fund.phtml +++ b/application/default/views/scripts/author/fund.phtml @@ -1,163 +1,167 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->author); -$this->headTitle()->setSeparator(' - '); -$this->breadcrumb('首页'); -$this->breadcrumb('数据作者'); -$this->headLink()->appendStylesheet('/css/author.css'); -$this->breadcrumb('申请成为元数据作者'); -$this->breadcrumb()->setSeparator(' > '); -$this->theme->AppendPlus($this,'colorbox'); -$this->theme->AppendPlus($this,'admin_plugin'); -?> - -
-
- partial('author/navi.phtml'); ?> -
-
-
- -
- md)) { ?> -
- ct)) { ?> - 为此数据添加项目 - - 返回 -
点击“添加此项目”即可将项目添加到元数据
- -

《md['title'] ?>》 的支持项目

-
-
- -
-
-
- - -
-
-
- error)) { ?> - AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> -
- × - error)) { ?>

error ?>

-
    - error as $v) { ?> -
    • - -
- -
- - msg)) { ?> -
- × - msg ?> -
- jump_url)) { ?> - - - -
- paginator)): ?> - - - - - - - md) { ?> - - - - - - - - - - paginator as $item): - $autoindex++;?> - md)) { ?> - - - - - - - - md) { ?> - ct) { ?> - - - - - - - - - - - - -
名称编号类型排序英文标题英文类型操作
- md)) { ?> - 编辑 - 删除 - - ct)) { ?> - 排序 - 移除 - - 添加此项目 - - -
- -
paginator; ?>
-
- -
-
- - +headTitle($this->config->title->site); +$this->headTitle($this->config->title->author); +$this->headTitle()->setSeparator(' - '); +$this->breadcrumb('首页'); +$this->breadcrumb('数据作者'); +$this->headLink()->appendStylesheet('/css/author.css'); +$this->breadcrumb('申请成为元数据作者'); +$this->breadcrumb()->setSeparator(' > '); +$this->theme->AppendPlus($this,'colorbox'); +$this->theme->AppendPlus($this,'admin_plugin'); +?> + +
+
+ partial('author/navi.phtml'); ?> +
+
+
+ +
+ md)) { ?> +
+ ct)) { ?> + 为此数据添加项目 + + 返回 +
点击“添加此项目”即可将项目添加到元数据
+ +

《md['title'] ?>》 的支持项目

+
+
+ +
+
+
+ + +
+
+
+ error)) { ?> + AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> +
+ × + error)) { ?>

error ?>

+
    + error as $v) { ?> +
    • + +
+ +
+ + msg)) { ?> +
+ × + msg ?> +
+ jump_url)) { ?> + + + +
+ paginator)): ?> + + + + + + + md) { ?> + + + + + + + + + + paginator as $item): + $autoindex++;?> + md)) { ?> + + + + + + + + md) { ?> + ct) { ?> + + + + + + + + + + + + +
名称编号类型排序英文标题英文类型操作
+ md)) { ?> + 编辑 + 删除 + + ct)) { ?> + 排序 + 移除 + + 添加此项目 + + +
+ +
paginator; ?>
+
+ +
+
+ + diff --git a/application/default/views/scripts/author/navi.phtml b/application/default/views/scripts/author/navi.phtml index 97828358..7aa38b97 100644 --- a/application/default/views/scripts/author/navi.phtml +++ b/application/default/views/scripts/author/navi.phtml @@ -1,20 +1,20 @@ -
- +
+
\ No newline at end of file diff --git a/application/models/data/Fund.php b/application/models/data/Fund.php index df9b9e28..418c5252 100644 --- a/application/models/data/Fund.php +++ b/application/models/data/Fund.php @@ -15,15 +15,34 @@ class Fund extends Zend_Controller_Plugin_Abstract $this->auth = $auth; } - function fetch($uuid = "",$include = true,$uid=0){ + function fetch($uuid = "",$include = true,$uid=0,$keyword=""){ if(empty($uuid)) { - if(empty($uid)) + $wheresql = array(); + + if(!empty($keyword)) { - $sql = "SELECT * FROM ".$this->tbl_fund." ORDER BY id desc"; - }else{ - $sql = "SELECT * FROM ".$this->tbl_fund." WHERE userid=$uid ORDER BY id desc"; + if(preg_match("/\'/",$keyword)) + { + $keyword = preg_replace("/\'/","''",$keyword); + } + $wheresql[] = " title LIKE '%$keyword%'"; } + + if(!empty($uid)) + { + $wheresql[] = " userid=$uid "; + } + + if(count($wheresql)>0) + { + $wheresql = " WHERE ".join(" AND ",$wheresql); + }else{ + $wheresql = ""; + } + + $sql = "SELECT * FROM ".$this->tbl_fund." $wheresql ORDER BY id desc"; + $rs = $this->db->query($sql); $rows = $rs->fetchAll(); return $rows; @@ -44,6 +63,15 @@ class Fund extends Zend_Controller_Plugin_Abstract { $wheresql[] = " f.userid='$uid' "; } + + if(!empty($keyword)) + { + if(preg_match("/\'/",$keyword)) + { + $keyword = preg_replace("/\'/","''",$keyword); + } + $wheresql[] = " f.title LIKE '%$keyword%'"; + } if(count($wheresql)>0) { @@ -52,7 +80,7 @@ class Fund extends Zend_Controller_Plugin_Abstract $wheresql = ""; } - if($include) + if($include === true) { $sql = "SELECT f.*,mf.place,mf.id as mfid FROM ".$this->tbl_fund." f LEFT JOIN ".$this->tbl_mdfund." mf ON mf.fid=f.id @@ -67,6 +95,43 @@ class Fund extends Zend_Controller_Plugin_Abstract } } + function fetchFormData($uid,$keyword){ + $wheresql = array(); + + if(!empty($uid) && is_int($uid)) + { + $wheresql[] = " f.userid='$uid' "; + } + + if(!empty($keyword)) + { + if(preg_match("/\'/",$keyword)) + { + $keyword = preg_replace("/\'/","''",$keyword); + } + $wheresql[] = " f.title LIKE '%$keyword%'"; + } + + $wheresql[] = " md.title IS NOT NULL "; + + if(count($wheresql)>0) + { + $wheresql = " WHERE ".join(" AND ",$wheresql); + }else{ + $wheresql = ""; + } + + $sql = "SELECT f.*,mf.place,mf.id as mfid,md.title as mdtitle,md.uuid FROM ".$this->tbl_fund." f + LEFT JOIN ".$this->tbl_mdfund." mf ON mf.fid=f.id + LEFT JOIN metadata md ON md.uuid=mf.uuid + $wheresql + ORDER BY mf.place"; + + $rs = $this->db->query($sql); + $rows = $rs->fetchAll(PDO::FETCH_BOTH); + return $rows; + } + function add($data) { include_once("helper/dbh.php"); @@ -205,6 +270,10 @@ class Fund extends Zend_Controller_Plugin_Abstract $search = ""; if(!empty($keyword)) { + if(preg_match("/\'/",$keyword)) + { + $keyword = preg_replace("/\'/","''",$keyword); + } $search = " AND md.title LIKE '%$keyword%' "; } $sql = "SELECT md.title,mf.id FROM ".$this->tbl_mdfund." mf