From f865c0289e3bdd1ae3c36d170b3214a07d94bed2 Mon Sep 17 00:00:00 2001 From: wlx Date: Sun, 16 Jun 2013 16:34:41 +0000 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E5=A4=9A=E6=96=87=E7=8C=AE=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=8Chiwater=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/scripts/data/referenceadd.phtml | 1 + .../default/controllers/DataController.php | 4 ++++ .../views/scripts/author/literature-add.phtml | 4 +++- .../default/views/scripts/heihe/view.phtml | 18 ++++++++++++++++-- .../default/views/scripts/hiwater/view.phtml | 18 ++++++++++++++++-- application/models/ReferenceForm.php | 2 +- 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/application/admin/views/scripts/data/referenceadd.phtml b/application/admin/views/scripts/data/referenceadd.phtml index 084be6f3..73fdc720 100644 --- a/application/admin/views/scripts/data/referenceadd.phtml +++ b/application/admin/views/scripts/data/referenceadd.phtml @@ -42,6 +42,7 @@ if($this->type == 'dc') +
 
diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php index 4a7a8d54..8dfc3e66 100755 --- a/application/default/controllers/DataController.php +++ b/application/default/controllers/DataController.php @@ -609,6 +609,10 @@ class DataController extends Zend_Controller_Action $sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=? and m.reftype=1"; $sql=$this->db->quoteInto($sql,$uuid); $this->view->userref=$this->db->fetchAll($sql); + //多篇引用形式：hiwater + $sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=? and m.reftype=3 order by m.place"; + $sql=$this->db->quoteInto($sql,$uuid); + $this->view->mcitation=$this->db->fetchAll($sql); //相关用户 $sql="select p.email,p.individual,p.organisation,r.role from role r left join responsible p on r.resid=p.id where r.uuid=? order by r.role,r.id"; $this->view->authors=$this->db->fetchAll($sql,array($uuid)); diff --git a/application/default/views/scripts/author/literature-add.phtml b/application/default/views/scripts/author/literature-add.phtml index 045a7ee9..66e08e88 100644 --- a/application/default/views/scripts/author/literature-add.phtml +++ b/application/default/views/scripts/author/literature-add.phtml @@ -26,7 +26,9 @@
数据作者的文献 - 数据用户的文献
+ 数据用户的文献 + 数据的直接参考文献 + 作者要求的多篇引用文献
diff --git a/application/default/views/scripts/heihe/view.phtml b/application/default/views/scripts/heihe/view.phtml index 90f44665..097ec07e 100755 --- a/application/default/views/scripts/heihe/view.phtml +++ b/application/default/views/scripts/heihe/view.phtml @@ -35,7 +35,21 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?>

',$md->description);?>

-
+
+ mcitation) : ?> +
+

本数据要求的多篇文献引用

+
    + mcitation as $ref) : + if (empty($ref->link)) + echo '
  1. '.$ref->reference.'
    2. '; + else + echo '
  2. '.$ref->reference.' 下载
    3. '; + endforeach; + ?> +
+ + citation) : ?>

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

@@ -49,7 +63,7 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?> 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.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi.']'; ?> (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

- ref) : ?> + ref) : ?>

建议参考文献

    diff --git a/application/default/views/scripts/hiwater/view.phtml b/application/default/views/scripts/hiwater/view.phtml index 999f7791..e6fea0e6 100644 --- a/application/default/views/scripts/hiwater/view.phtml +++ b/application/default/views/scripts/hiwater/view.phtml @@ -33,7 +33,21 @@ if ($md->title_en) echo '
    '.$this->escape($md->title_en);?>

    ',$md->description);?>

-
+
+ mcitation) : ?> +
+

本数据要求的多篇文献引用

+
    + mcitation as $ref) : + if (empty($ref->link)) + echo '
  1. '.$ref->reference.'
    2. '; + else + echo '
  2. '.$ref->reference.' 下载
    3. '; + endforeach; + ?> +
+ + citation) : ?>

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

@@ -47,7 +61,7 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?> 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.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi.']'; ?> (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

- ref) : ?> + ref) : ?>

建议参考文献

    diff --git a/application/models/ReferenceForm.php b/application/models/ReferenceForm.php index cb776311..9753bed5 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'=>'用户文献','2'=>'数据的参考文献'))->setValue(0); + $reftype->setRequired(true)->setLabel('文献类型')->setMultiOptions(array('0'=>'作者文献','1'=>'用户文献','2'=>'数据的参考文献','3'=>'作者要求的文献引用方式（多篇）'))->setValue(0); $submit = new Zend_Form_Element_Submit('submit'); $submit->setAttrib('id', 'submitbutton')->setLabel('发送');