diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 6728f8e7..ff4e9645 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -949,7 +949,7 @@ class Admin_DataController extends Zend_Controller_Action } //添加 else if($show){ - $sql = "select mr.id as mdid,mr.refid,r.reference,md.title,md.uuid FROM mdref mr + $sql = "select mr.id as mdid,mr.refid,r.reference,md.title,md.uuid,mr.place FROM mdref mr left join metadata md on md.uuid=mr.uuid left join reference r on r.id=mr.refid where mr.uuid='$show'; @@ -3410,6 +3410,26 @@ class Admin_DataController extends Zend_Controller_Action return true; } + if($ac == 'datalist') + { + $this->_helper->viewRenderer('fund-data-list'); + $this->view->q = $q = $this->_getParam('q'); + $rows = $fund->fetchFormData(true,0,$q); + view::addPaginator($rows,$this->view,$this->_request); + return true; + } + + if($ac == 'dataview') + { + $this->_helper->viewRenderer('fund-data-view'); + $this->view->q = $q = $this->_getParam('q'); + $id = $this->_getParam('id'); + $this->view->fund = $fund->view($id); + $rows = $fund->fetchFormData($id,0,$q); + view::addPaginator($rows,$this->view,$this->_request); + return true; + } + if($ac == "add") { $this->_helper->viewRenderer('fund-add'); @@ -3732,10 +3752,10 @@ class Admin_DataController extends Zend_Controller_Action } $doi.=' - '.$row['title'].' + <![CDATA['.$row['title'].']]> '; - $doi.=''.$row['description'].''; + $doi.=''; $doi.=''.$row['publisher'].''; $doi.=' '.$row['doi'].' diff --git a/application/admin/controllers/NewsController.php b/application/admin/controllers/NewsController.php index 5d1770d1..772be9ab 100644 --- a/application/admin/controllers/NewsController.php +++ b/application/admin/controllers/NewsController.php @@ -8,6 +8,7 @@ class Admin_NewsController extends Zend_Controller_Action $this->messenger=$this->_helper->getHelper('FlashMessenger'); $this->view->messages = $this->messenger->getMessages(); $this->_helper->layout->setLayout('administry'); + $this->view->theme = new Theme(); } function postDispatch() { @@ -628,7 +629,40 @@ class Admin_NewsController extends Zend_Controller_Action return $newString; } - + public function moveAction() + { + $up = (int)$this->_getParam('up'); + $down = (int)$this->_getParam('down'); + + include_once('helper/view.php'); + include_once('ArchiveCategory.php'); + + if(empty($up) && empty($down)) + { + view::Post("参数错误",$this,-1); + return true; + } + + $category = new ArchiveCategory($this->db); + + if(!empty($up)) + { + $s = $category->move('up',$up); + } + if(!empty($down)) + { + $s = $category->move('down',$down); + } + + if(is_array($s)) + { + $this->view->moved = $s; + }else{ + view::Post($this,$s,-1); + } + + return true; + } } diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php index cd642a33..0a58ec17 100644 --- a/application/admin/controllers/ReviewController.php +++ b/application/admin/controllers/ReviewController.php @@ -1557,6 +1557,7 @@ class Admin_ReviewController extends Zend_Controller_Action { $mail->addTo($v); } + $mail->addBcc($this->view->config->service->email); $mail->setSubject($title); if($mail->send()) diff --git a/application/admin/views/scripts/data/fund-add.phtml b/application/admin/views/scripts/data/fund-add.phtml index a159c051..1100ff4d 100644 --- a/application/admin/views/scripts/data/fund-add.phtml +++ b/application/admin/views/scripts/data/fund-add.phtml @@ -16,6 +16,7 @@ $this->theme->AppendPlus($this,'colorbox');
diff --git a/application/admin/views/scripts/data/fund-data-list.phtml b/application/admin/views/scripts/data/fund-data-list.phtml new file mode 100644 index 00000000..165908c7 --- /dev/null +++ b/application/admin/views/scripts/data/fund-data-list.phtml @@ -0,0 +1,113 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->author); +$this->headTitle()->setSeparator(' - '); +$this->breadcrumb('首页'); +$this->headLink()->appendStylesheet('/css/author.css'); +$this->breadcrumb()->setSeparator(' > '); +$this->theme->AppendPlus($this,'colorbox'); +$this->theme->AppendPlus($this,'admin_plugin'); +?> + +
+
+ partial('data/left.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/admin/views/scripts/data/fund-data-view.phtml b/application/admin/views/scripts/data/fund-data-view.phtml new file mode 100644 index 00000000..0dfd40d8 --- /dev/null +++ b/application/admin/views/scripts/data/fund-data-view.phtml @@ -0,0 +1,100 @@ +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'); ?> +
+
+ + fund)) { ?> +
+

fund['title'] ?> 的相关数据

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

error ?>

+
    + error as $v) { ?> +
    • + +
+ +
+ + msg)) { ?> +
+ × + msg ?> +
+ jump_url)) { ?> + + + +
+ paginator)): ?> + + + + + + + + + paginator as $item): + $autoindex++;?> + + + + + + +
数据操作
+ 移除 +
+ +
paginator; ?>
+
+ +
+
+ + diff --git a/application/admin/views/scripts/data/fund.phtml b/application/admin/views/scripts/data/fund.phtml index 1964f2b4..75da7fc0 100644 --- a/application/admin/views/scripts/data/fund.phtml +++ b/application/admin/views/scripts/data/fund.phtml @@ -19,8 +19,12 @@ table thead tr th {background:#EBF2F6;}
md)) { ?> @@ -124,6 +128,12 @@ table thead tr th {background:#EBF2F6;} + + md)) { ?> + 暂无数据，点击标题右侧添加按钮为此数据添加项目 + + 暂无数据 +
paginator; ?>
diff --git a/application/admin/views/scripts/data/referenceadd.phtml b/application/admin/views/scripts/data/referenceadd.phtml index 163ad3ca..084be6f3 100644 --- a/application/admin/views/scripts/data/referenceadd.phtml +++ b/application/admin/views/scripts/data/referenceadd.phtml @@ -39,7 +39,10 @@ if($this->type == 'dc')
-
+ + + +
 
headTitle($this->config->title->site); - $this->headTitle('后台管理'); - $this->headTitle()->setSeparator(' - '); - $this->headLink()->appendStylesheet('/css/admin.css'); - $this->breadcrumb('首页'); - $this->breadcrumb('后台首页'); - $this->breadcrumb('数据管理'); - $this->breadcrumb('特色推荐管理'); - $this->breadcrumb()->setSeparator(' > '); -?> -
-partial('data/left.phtml'); ?> -
-
-msg or $this->messages) :?> -
-msg) : ?> -

msg; ?>

-messages): foreach($this->messages as $msg): ?> -

- -
- -添加新的数据文献 -form; ?> -
\ No newline at end of file diff --git a/application/admin/views/scripts/news/catlog.phtml b/application/admin/views/scripts/news/catlog.phtml index 6dd5da93..c7bd805d 100644 --- a/application/admin/views/scripts/news/catlog.phtml +++ b/application/admin/views/scripts/news/catlog.phtml @@ -2,126 +2,128 @@ $this->headTitle($this->config->title->site); $this->headTitle('后台管理'); $this->headTitle()->setSeparator(' - '); - $this->headScript()->appendFile('/js/jquery-1.7.min.js'); - $this->headLink()->appendStylesheet('/css/admin.css'); - $this->headScript()->appendFile('/js/jquery.colorbox-min.js'); - $this->headLink()->appendStylesheet('/css/author.css'); - $this->headLink()->appendStylesheet('/css/colorbox.css'); $this->breadcrumb('首页'); $this->breadcrumb('后台首页'); $this->breadcrumb('新闻中心'); $this->breadcrumb('栏目管理'); + $this->theme->AppendPlus($this,"colorbox"); ?> -
-partial('news/left.phtml'); ?> -
-
-msg or $this->messages) :?> -
-msg) : ?> -

msg; ?>

-messages): foreach($this->messages as $msg): ?> -

- -
- - - - - - - - - - - - catlogs)) - { - $top = 0; - $deep = 0; - foreach($this->catlogs as $k=>$v) - { - if($v[$this->deepField]>0) - { - $style = "text-indent:". $v[$this->deepField]*12 ."px;"; - }else{ - $style = ""; - } - echo ' - - - - - '; - } - - }else{ - echo ''; - } - ?> - -
栏目名称栏目类型栏目管理
- - '.$v['ptype'].' - - 浏览 - 文档 - 编辑 - 删除
暂无数据
-
- +
+ + 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..73dbcf53 --- /dev/null +++ b/application/default/views/scripts/author/fund-data.phtml @@ -0,0 +1,115 @@ +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..3fbe0d9e 100644 --- a/application/default/views/scripts/author/fund.phtml +++ b/application/default/views/scripts/author/fund.phtml @@ -1,163 +1,173 @@ -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)) { ?> + 排序 + 移除 + + 添加此项目 + + +
+ + md)) { ?> + 暂无数据，点击标题右侧添加按钮为此数据添加项目 + + 暂无数据 + + +
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/default/views/scripts/author/newdata.phtml b/application/default/views/scripts/author/newdata.phtml index abe534ac..b9452845 100644 --- a/application/default/views/scripts/author/newdata.phtml +++ b/application/default/views/scripts/author/newdata.phtml @@ -96,7 +96,7 @@ function getFtp(uuid){ { if(data.statu > 0) { - var html = '

临时FTP帐号信息(此帐号仅对应当前数据集！)

ftp://ftp1.westgis.ac.cn/

'+ + var html = '

临时FTP帐号信息(此帐号仅对应当前数据集！)

ftp://ftp2.westgis.ac.cn/

'+ '

用户名：'+data.user+ '

密码：'+data.passwd+'

' +'

或直接点击此链接

'; diff --git a/application/default/views/scripts/heihe/submit-unsubmit.phtml b/application/default/views/scripts/heihe/submit-unsubmit.phtml index de3271a2..db1f2755 100644 --- a/application/default/views/scripts/heihe/submit-unsubmit.phtml +++ b/application/default/views/scripts/heihe/submit-unsubmit.phtml @@ -97,7 +97,7 @@ function getFtp(uuid){ { if(data.statu > 0) { - var html = '

临时FTP帐号信息(此帐号仅对应当前数据集！)

ftp://ftp1.westgis.ac.cn/

'+ + var html = '

临时FTP帐号信息(此帐号仅对应当前数据集！)

ftp://ftp2.westgis.ac.cn/

'+ '

用户名：'+data.user+ '

密码：'+data.passwd+'

' +'

或直接点击此链接

'; diff --git a/application/default/views/scripts/heihe/view.phtml b/application/default/views/scripts/heihe/view.phtml index 6ea73d04..4128182d 100755 --- a/application/default/views/scripts/heihe/view.phtml +++ b/application/default/views/scripts/heihe/view.phtml @@ -40,10 +40,13 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?>

本数据引用方式数据引用帮助

datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用 - escape($md->citation);?>

- datadoi) && !strpos($md->citation,$md->datadoi)) : ?> + escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?> + (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式) + +

+ datadoi) && !strpos($md->citation,$md->datadoi)) : ?>

数据的引用authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.$md->publish_year.'. doi:'.$md->doi; + echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi; echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']'; ?> (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

ref) : ?> diff --git a/application/models/ArchiveCategory.php b/application/models/ArchiveCategory.php index bc6fa3e7..4064fe77 100644 --- a/application/models/ArchiveCategory.php +++ b/application/models/ArchiveCategory.php @@ -220,16 +220,6 @@ class ArchiveCategory }//Insert - //获取栏目路径 - function GetRouter($lft,$rgt){ - $sql = "SELECT * FROM ".$this->CategoryTable." - WHERE ".$this->fld_left." < $lft AND ".$this->fld_right." > $rgt - ORDER BY ".$this->fld_left." ASC;"; - $sth = $this->db->query($sql); - $rows = $sth->fetchAll(); - return $rows; - } - function GetSunCount($left,$right){ return ($right-$left-1)/2; } @@ -252,4 +242,320 @@ class ArchiveCategory }//GetOne + //获得子栏目 + function getSubNode($left,$right,$data = NULL) + { + if(empty($data)) + { + $sql = "SELECT * FROM ".$this->CategoryTable." WHERE ".$this->fld_left.">$left AND ".$this->fld_right."<$right ORDER BY ".$this->fld_left." ASC"; + $rs = $this->db->query($sql); + $SN = $rs->fetchAll(); + }else{ + $SN = array(); + foreach($data as $k=>$v) + { + if($left < $v[$this->fld_left] && $v[$this->fld_right] < $right) + $SN[] = $data[$k]; + } + } + return $SN; + } + + //获取子栏目中的最大右值 + function getMaxSubRight($left,$right){ + $sql = "SELECT max(".$this->fld_right.") as mx FROM ".$this->CategoryTable." WHERE ".$this->fld_left.">".$left." AND ".$this->fld_right."<".$right; + $rs = $this->db->query($sql); + $row = $rs->fetch(); + return $row['mx']; + } + + //获取平级栏目中的上一个栏目 + function prevnode($tid,$left,$right) + { + $sql = "SELECT * FROM ".$this->CategoryTable." WHERE + ".$this->fld_tid."=$tid AND + ".$this->fld_left."<$left AND + ".$this->fld_right."<$right + ORDER BY ".$this->fld_left." DESC + LIMIT 1 + "; + $rs = $this->db->query($sql); + $row = $rs->fetch(); + + if(empty($row)) + { + return NULL; + } + + return $row; + } + + //获取平级栏目中的下一个栏目 + function nextnode($tid,$left,$right) + { + $sql = "SELECT * FROM ".$this->CategoryTable." WHERE + ".$this->fld_tid."=$tid AND + ".$this->fld_left.">$left AND + ".$this->fld_right.">$right + ORDER BY ".$this->fld_left." ASC + LIMIT 1 + "; + $rs = $this->db->query($sql); + $row = $rs->fetch(); + + if(empty($row)) + { + return NULL; + } + + return $row; + } + + //移动栏目 + function move($action,$id){ + if($action == 'up') + { + return $this->moveup($id); + } + if($action == "down") + { + return $this->movedown($id); + } + } + + //栏目上移 + function moveup($id){ + $info = $this->GetOne($id); + + $tid = $info[$this->fld_tid]; + $left = $info[$this->fld_left]; + $right = $info[$this->fld_right]; + + $prev = $this->prevnode($tid,$left,$right); + if($prev === NULL ) + { + return "此栏目已位于平级栏目的顶端"; + } + + if(is_array($prev)) + { + $this_fd = $right-$left; + $this_ft = $left - $prev[$this->fld_left]; + $prve_fd = $prev[$this->fld_right] - $prev[$this->fld_left]; + + $new_right = $prev[$this->fld_left] + $this_fd; + $new_left = $right - $prve_fd; + + $prev_ft = $new_left - $prev[$this->fld_left]; + + $exec = array( + 'success' => array(), + 'error' => array() + ); + + $sql_1 = "UPDATE ".$this->CategoryTable." SET + ".$this->fld_left."=".$prev[$this->fld_left].",".$this->fld_right."=".$new_right. + " WHERE id=$id"; + + $sql_2 = "UPDATE ".$this->CategoryTable." SET + ".$this->fld_left."=".$new_left.",".$this->fld_right."=".$right. + " WHERE id=".$prev['id']; + + if($this->db->exec($sql_1)) + { + $exec['success'][] = $info['title']."[$id] :移动成功!"; + }else{ + $exec['error'][] = $info['title']."[$id] :移动失败! 请手动在数据库中修改，目标左右值 ".$prev[$this->fld_left].":".$new_right; + } + + if($this->db->exec($sql_2)) + { + $exec['success'][] = $prev['title']."[".$prev['id']."] :移动成功!"; + }else{ + $exec['error'][] = $prev['title']."[".$prev['id']."] :移动失败! 请手动在数据库中修改，目标左右值 ".$new_left.":".$right; + } + + $thisnode = $this->getSubNode($left,$right); + $prevnode = $this->getSubNode($prev[$this->fld_left],$prev[$this->fld_right]); + + /* + $a = array(); + echo $prev[$this->fld_left].':'.$prev[$this->fld_right]." - ".$left.":".$right; + echo "
"; + echo $prev[$this->fld_left].':'.$new_right." - ".$new_left.":".$right; + echo "
"; + */ + + if(!empty($thisnode)) + { + foreach($thisnode as $k=>$v) + { + $node_new_left = ($v[$this->fld_left]-$this_ft); + $fd = $v[$this->fld_right] - $v[$this->fld_left]; + $node_new_right = $node_new_left + $fd; + /* + echo ($v['lft']) .":". ($v['rgt'])."
"; + echo $node_new_left .":". $node_new_right."
"; + echo "
"; + */ + $sql = "UPDATE ".$this->CategoryTable." SET + ".$this->fld_left."=".$node_new_left.",".$this->fld_right."=".$node_new_right. + " WHERE id=".$v['id']; + if($this->db->exec($sql)) + { + $exec['success'][] = $info['title']."的子栏目".$v['title']."[".$v['id']."] :移动成功!"; + }else{ + $exec['error'][] = $info['title']."的子栏目".$v['title']."[".$v['id']."] :移动失败! 请手动在数据库中修改，目标左右值 ".$node_new_left.":".$node_new_right; + } + } + } + + if(!empty($prevnode)) + { + foreach($prevnode as $k=>$v) + { + $node_new_left = ($v[$this->fld_left]+$prev_ft); + $fd = $v[$this->fld_right] - $v[$this->fld_left]; + $node_new_right = $node_new_left + $fd; + /* + echo ($v['lft']) .":". ($v['rgt'])."
"; + echo $node_new_left .":". $node_new_right."
"; + echo "
"; + */ + $sql = "UPDATE ".$this->CategoryTable." SET + ".$this->fld_left."=".$node_new_left.",".$this->fld_right."=".$node_new_right. + " WHERE id=".$v['id']; + if($this->db->exec($sql)) + { + $exec['success'][] = $prev['title']."的子栏目".$v['title']."[".$v['id']."] :移动成功!"; + }else{ + $exec['error'][] = $prev['title']."的子栏目".$v['title']."[".$v['id']."] :移动失败! 请手动在数据库中修改，目标左右值 ".$node_new_left.":".$node_new_right; + } + } + } + + return $exec; + } + + if(is_string($prev)) + { + return $prev; + } + }//栏目上移 + + //栏目下移 + function movedown($id){ + $info = $this->GetOne($id); + + $tid = $info[$this->fld_tid]; + $left = $info[$this->fld_left]; + $right = $info[$this->fld_right]; + + $next = $this->nextnode($tid,$left,$right); + if($next === NULL ) + { + return "此栏目已位于平级栏目的末端"; + } + + if(is_array($next)) + { + $this_fd = $right-$left; + $next_fd = $next[$this->fld_right] - $next[$this->fld_left]; + + $new_right = $left + $next_fd; + $new_left = $next[$this->fld_right] - $this_fd; + + $this_ft = $new_left - $left; + $next_ft = $next[$this->fld_left] - $left; + + //echo $id."[".$left .":".$right ."]-".$next['id']."[".$next[$this->fld_left].":".$next[$this->fld_right] . "]
"; + //echo $next['id']."[".$left .":".$new_right ."]-".$id."[".$new_left.":".$next[$this->fld_right]."]

"; + + $exec = array( + 'success' => array(), + 'error' => array() + ); + + $sql_1 = "UPDATE ".$this->CategoryTable." SET + ".$this->fld_left."=".$new_left.",".$this->fld_right."=".$next[$this->fld_right]. + " WHERE id=$id"; + + $sql_2 = "UPDATE ".$this->CategoryTable." SET + ".$this->fld_left."=".$left.",".$this->fld_right."=".$new_right. + " WHERE id=".$next['id']; + + if($this->db->exec($sql_1)) + { + $exec['success'][] = $info['title']."[$id] :移动成功!"; + }else{ + $exec['error'][] = $info['title']."[$id] :移动失败! 请手动在数据库中修改，目标左右值 ".$new_left.":".$next[$this->fld_right]; + } + + if($this->db->exec($sql_2)) + { + $exec['success'][] = $next['title']."[".$next['id']."] :移动成功!"; + }else{ + $exec['error'][] = $next['title']."[".$next['id']."] :移动失败! 请手动在数据库中修改，目标左右值 ".$left.":".$this->fld_right; + } + + $thisnode = $this->getSubNode($left,$right); + $nextnode = $this->getSubNode($next[$this->fld_left],$next[$this->fld_right]); + + if(!empty($thisnode)) + { + foreach($thisnode as $k=>$v) + { + $node_new_left = ($v[$this->fld_left]+$this_ft); + $fd = $v[$this->fld_right] - $v[$this->fld_left]; + $node_new_right = $node_new_left + $fd; + + /*echo ($v['lft']) .":". ($v['rgt'])."
"; + echo $node_new_left .":". $node_new_right."
"; + echo "
";*/ + + $sql = "UPDATE ".$this->CategoryTable." SET + ".$this->fld_left."=".$node_new_left.",".$this->fld_right."=".$node_new_right. + " WHERE id=".$v['id']; + if($this->db->exec($sql)) + { + $exec['success'][] = $info['title']."的子栏目".$v['title']."[".$v['id']."] :移动成功!"; + }else{ + $exec['error'][] = $info['title']."的子栏目".$v['title']."[".$v['id']."] :移动失败! 请手动在数据库中修改，目标左右值 ".$node_new_left.":".$node_new_right; + } + } + } + + if(!empty($nextnode)) + { + foreach($nextnode as $k=>$v) + { + $node_new_left = ($v[$this->fld_left] - $next_ft); + $fd = $v[$this->fld_right] - $v[$this->fld_left]; + $node_new_right = $node_new_left + $fd; + + /*echo ($v['lft']) .":". ($v['rgt'])."
"; + echo $node_new_left .":". $node_new_right."
"; + echo "
";*/ + + $sql = "UPDATE ".$this->CategoryTable." SET + ".$this->fld_left."=".$node_new_left.",".$this->fld_right."=".$node_new_right. + " WHERE id=".$v['id']; + if($this->db->exec($sql)) + { + $exec['success'][] = $info['title']."的子栏目".$v['title']."[".$v['id']."] :移动成功!"; + }else{ + $exec['error'][] = $info['title']."的子栏目".$v['title']."[".$v['id']."] :移动失败! 请手动在数据库中修改，目标左右值 ".$node_new_left.":".$node_new_right; + } + } + } + + return $exec; + } + + if(is_string($next)) + { + return $next; + } + }//栏目下移 + } \ No newline at end of file diff --git a/application/models/ReferenceForm.php b/application/models/ReferenceForm.php index efa66ce9..cb776311 100644 --- a/application/models/ReferenceForm.php +++ b/application/models/ReferenceForm.php @@ -22,7 +22,7 @@ class ReferenceForm extends Zend_Form $link->setLabel('URL(optional)') ->addFilter('StringTrim'); $reftype=new Zend_Form_Element_Radio('reftype'); - $reftype->setRequired(true)->setLabel('文献类型')->setMultiOptions(array('0'=>'作者文献','1'=>'用户文献'))->setValue(0); + $reftype->setRequired(true)->setLabel('文献类型')->setMultiOptions(array('0'=>'作者文献','1'=>'用户文献','2'=>'数据的参考文献'))->setValue(0); $submit = new Zend_Form_Element_Submit('submit'); $submit->setAttrib('id', 'submitbutton')->setLabel('发送'); diff --git a/application/models/data/Fund.php b/application/models/data/Fund.php index df9b9e28..6d37d2a0 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,59 @@ class Fund extends Zend_Controller_Plugin_Abstract } } + function fetchFormData($count = true,$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%'"; + } + + if($count !== true) + { + $wheresql[] = " f.id=$count "; + } + + $wheresql[] = " md.title IS NOT NULL "; + + if(count($wheresql)>0) + { + $wheresql = " WHERE ".join(" AND ",$wheresql); + }else{ + $wheresql = ""; + } + + if($count === true) + { + $sql = "SELECT f.*,count(md.uuid) as mds 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 + GROUP BY f.id"; + + }else{ + $sql = "SELECT 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 + GROUP BY md.title,md.uuid,mf.id + "; + } + + $rs = $this->db->query($sql); + $rows = $rs->fetchAll(PDO::FETCH_BOTH); + return $rows; + } + function add($data) { include_once("helper/dbh.php"); @@ -205,6 +286,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 diff --git a/application/models/data/Review.php b/application/models/data/Review.php index 1effae23..13d2291a 100644 --- a/application/models/data/Review.php +++ b/application/models/data/Review.php @@ -76,9 +76,10 @@ class Review extends Zend_Controller_Plugin_Abstract $wheresql = ""; } - $sql = "select m.id,md.uuid,md.title,u.username,u.realname,m.status,md.id as mdid,md.author,m.ts_accepted + $sql = "select m.id,g.id as gid, md.uuid,md.title,u.username,u.realname,m.status,md.id as mdid,md.author,m.ts_accepted FROM mdstatus m - right join metadata md on md.uuid=m.uuid + right join metadata md on md.uuid=m.uuid + left join geonetworkmetadata g on m.uuid=g.uuid left join users u on u.id=m.userid $wheresql order by m.status desc,m.ts_accepted desc"; diff --git a/application/models/helper/view.php b/application/models/helper/view.php index b54364d6..9143b930 100644 --- a/application/models/helper/view.php +++ b/application/models/helper/view.php @@ -80,21 +80,21 @@ class view extends Zend_Controller_Plugin_Abstract } } - static function Post(Zend_Controller_Action $ctl,$msg){ + static function Post(Zend_Controller_Action $ctl,$msg,$url=""){ if(empty($msg)) { return false; } - if(!array($msg)) + if(!is_array($msg)) { - $msg = array('content'=>$msg); + $msg = array('content'=>$msg,'url'=>$url); } $helper = new Zend_Controller_Action_HelperBroker($ctl); + $helper->layout->setLayout('layout'); $helper->viewRenderer->setNoRender(); echo $ctl->view->partial('post-message.phtml', $msg); return true; - } } \ No newline at end of file