From 706071835d071cb98743528852b1c0274fb95619 Mon Sep 17 00:00:00 2001
From: wlx
Date: Sun, 19 May 2013 02:30:10 +0000
Subject: [PATCH 01/12] style change
---
.../default/views/scripts/data/category.phtml | 16 ++++++++-------
.../views/scripts/data/offlinelist.phtml | 20 ++++++++++---------
.../views/scripts/data/onlinelist.phtml | 20 ++++++++++---------
3 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/application/default/views/scripts/data/category.phtml b/application/default/views/scripts/data/category.phtml
index 9f7ec15f..f84f0b4d 100755
--- a/application/default/views/scripts/data/category.phtml
+++ b/application/default/views/scripts/data/category.phtml
@@ -26,15 +26,17 @@ $this->nav[] = array('link'=>"/data/category",'title'=>'分类浏览');
当前浏览:codename; ?>
page->getNavigation(); ?>
-
metadata as $md) : ?>
- -
-
-
-
400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?>
-
+
-
page->getNavigation(); ?>
diff --git a/application/default/views/scripts/data/offlinelist.phtml b/application/default/views/scripts/data/offlinelist.phtml
index 3d5e04bc..b5dbd864 100755
--- a/application/default/views/scripts/data/offlinelist.phtml
+++ b/application/default/views/scripts/data/offlinelist.phtml
@@ -1,25 +1,27 @@
headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
-$this->headTitle('离线数据清单');
+$this->headTitle('离线数据浏览');
$this->headTitle($this->codename);
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/metadata.css');
-$this->breadcrumb('首页');
-$this->breadcrumb(''.$this->config->title->data.'');
-$this->breadcrumb('离线数据清单');
-$this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/data/offline",'title'=>'离线数据浏览');
?>
+= $this->render('breadcrumbs.phtml'); ?>
= $this->partial('data/tools.phtml'); ?>
page->getNavigation(); ?>
metadata as $md) : ?>
-
-
escape($md['title']);?>
-
-
+
diff --git a/application/default/views/scripts/data/onlinelist.phtml b/application/default/views/scripts/data/onlinelist.phtml
index 3455d55e..8ef5b45b 100755
--- a/application/default/views/scripts/data/onlinelist.phtml
+++ b/application/default/views/scripts/data/onlinelist.phtml
@@ -1,25 +1,27 @@
headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
-$this->headTitle('在线数据清单');
+$this->headTitle('在线数据浏览');
$this->headTitle($this->codename);
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/metadata.css');
-$this->breadcrumb('
首页');
-$this->breadcrumb('
'.$this->config->title->data.'');
-$this->breadcrumb('在线数据清单');
-$this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/data/offline",'title'=>'在线数据浏览');
?>
+= $this->render('breadcrumbs.phtml'); ?>
= $this->partial('data/tools.phtml'); ?>
page->getNavigation(); ?>
metadata as $md) : ?>
-
-
escape($md['title']);?>
-
-
+
From 9de8d02452f360ac02c2a5f31747ef8f75aa0d5b Mon Sep 17 00:00:00 2001
From: wlx
Date: Sun, 19 May 2013 02:35:42 +0000
Subject: [PATCH 02/12] change index page style
---
application/default/views/scripts/index/index.phtml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml
index 2b524848..e6b6bf42 100755
--- a/application/default/views/scripts/index/index.phtml
+++ b/application/default/views/scripts/index/index.phtml
@@ -69,6 +69,11 @@
+ 数据服务
+ 最近20条离线数据服务记录(共= $this->offlinenum; ?>)
+ 如何申请数据
+ 如何发布数据
+
-
数据服务
- -
最近20条离线数据服务记录(共= $this->offlinenum; ?>)
- -
联系我们
-
如何申请数据
-
如何发布数据
统计
- • 元数据
From 5c854c6e8ab47afc3a84f8b7c811101abfc0f419 Mon Sep 17 00:00:00 2001
From: wlx
Date: Sun, 19 May 2013 04:27:20 +0000
Subject: [PATCH 03/12] =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=B6=88?=
=?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/views/scripts/index/index.phtml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/application/admin/views/scripts/index/index.phtml b/application/admin/views/scripts/index/index.phtml
index 05cece24..5e7557ee 100755
--- a/application/admin/views/scripts/index/index.phtml
+++ b/application/admin/views/scripts/index/index.phtml
@@ -23,10 +23,12 @@
- WATER元数据处理工具
- 数据测试管理
-
+
+
\ No newline at end of file
From 54ea3edac5009b0f3ac2cda9e84c0e9880458e43 Mon Sep 17 00:00:00 2001
From: wlx
Date: Mon, 20 May 2013 06:56:50 +0000
Subject: [PATCH 04/12] add refdate import in ISO 19115
---
application/models/ISO19115.php | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/application/models/ISO19115.php b/application/models/ISO19115.php
index 72d3138f..00bcf451 100755
--- a/application/models/ISO19115.php
+++ b/application/models/ISO19115.php
@@ -191,11 +191,20 @@ class ISO19115
$db->setFetchMode(Zend_Db::FETCH_OBJ);
//save metadata into database
try {
- $sql="insert into metadata (uuid,title,title_en,description,citation,suppinfo,fileformat,projection,datatype,filesize,ts_created,
- timebegin,timeend,west,south,north,east,doi) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
- $db->query($sql,array($this->uuid,$this->resTitle,$this->resAltTitle,$this->idAbs,$this->citation,$this->suppinfo,$this->fileformat,
+ if ($this->refDate)
+ {
+ $sql="insert into metadata (uuid,title,title_en,description,citation,suppinfo,fileformat,projection,datatype,filesize,ts_created,
+ timebegin,timeend,west,south,north,east,doi,ts_published) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ $db->query($sql,array($this->uuid,$this->resTitle,$this->resAltTitle,$this->idAbs,$this->citation,$this->suppinfo,$this->fileformat,
+ $this->projection,$this->datatype,$this->filesize,$this->mdDateSt,$this->timebegin,$this->timeend,$this->geoBox['w'],
+ $this->geoBox['s'],$this->geoBox['n'],$this->geoBox['e'],$this->doi,$this->refDate));
+ } else {
+ $sql="insert into metadata (uuid,title,title_en,description,citation,suppinfo,fileformat,projection,datatype,filesize,ts_created,
+ timebegin,timeend,west,south,north,east,doi) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ $db->query($sql,array($this->uuid,$this->resTitle,$this->resAltTitle,$this->idAbs,$this->citation,$this->suppinfo,$this->fileformat,
$this->projection,$this->datatype,$this->filesize,$this->mdDateSt,$this->timebegin,$this->timeend,$this->geoBox['w'],
$this->geoBox['s'],$this->geoBox['n'],$this->geoBox['e'],$this->doi));
+ }
$id=$db->lastInsertId('metadata','id');
//处理在线资源
if ($this->onlineresource) foreach($this->onlineresource as $resource)
@@ -549,6 +558,15 @@ class ISO19115
}
}
}
+ //resRefDate
+ $refdates=$this->dom->getElementsByTagName('resRefDate');
+ foreach($refdates as $refdate)
+ {
+ if ($refdate->getElementsByTagName('DateTypCd')->item(0) && $refdate->getElementsByTagName('DateTypCd')->item(0)->hasAttributes() && $refdate->getElementsByTagName('DateTypCd')->item(0)->attributes->getNamedItem('value')->nodeValue=="publication")
+ {
+ $this->refDate=$refdate->getElementsByTagName('refDate');
+ }
+ }
//in ISO 19115 draft.
$ds=$this->dom->getElementsByTagName('datasetSeries');
foreach($ds as $k=>$dataset)
From 2359a99dedafac5edb24ee1172f786656c327272 Mon Sep 17 00:00:00 2001
From: wlx
Date: Mon, 20 May 2013 07:20:14 +0000
Subject: [PATCH 05/12] fix parse error
---
application/models/ISO19115.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/models/ISO19115.php b/application/models/ISO19115.php
index 00bcf451..61d129ee 100755
--- a/application/models/ISO19115.php
+++ b/application/models/ISO19115.php
@@ -559,7 +559,7 @@ class ISO19115
}
}
//resRefDate
- $refdates=$this->dom->getElementsByTagName('resRefDate');
+ $refdates=$this->dom->getElementsByTagName('resRefDate')->item(0)->nodeValue;
foreach($refdates as $refdate)
{
if ($refdate->getElementsByTagName('DateTypCd')->item(0) && $refdate->getElementsByTagName('DateTypCd')->item(0)->hasAttributes() && $refdate->getElementsByTagName('DateTypCd')->item(0)->attributes->getNamedItem('value')->nodeValue=="publication")
From 526c8b4c8855e6c448560caf276eb4986b0de1bb Mon Sep 17 00:00:00 2001
From: wlx
Date: Mon, 20 May 2013 07:23:18 +0000
Subject: [PATCH 06/12] fix parse error
---
application/models/ISO19115.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/models/ISO19115.php b/application/models/ISO19115.php
index 61d129ee..94a47f02 100755
--- a/application/models/ISO19115.php
+++ b/application/models/ISO19115.php
@@ -559,12 +559,12 @@ class ISO19115
}
}
//resRefDate
- $refdates=$this->dom->getElementsByTagName('resRefDate')->item(0)->nodeValue;
+ $refdates=$this->dom->getElementsByTagName('resRefDate');
foreach($refdates as $refdate)
{
if ($refdate->getElementsByTagName('DateTypCd')->item(0) && $refdate->getElementsByTagName('DateTypCd')->item(0)->hasAttributes() && $refdate->getElementsByTagName('DateTypCd')->item(0)->attributes->getNamedItem('value')->nodeValue=="publication")
{
- $this->refDate=$refdate->getElementsByTagName('refDate');
+ $this->refDate=$refdate->getElementsByTagName('refDate')->item(0)->nodeValue;
}
}
//in ISO 19115 draft.
From c1803dac8679f5db39dcd1d0d3a20daef18b1c37 Mon Sep 17 00:00:00 2001
From: wlx
Date: Mon, 20 May 2013 13:36:05 +0000
Subject: [PATCH 07/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=B8=83?=
=?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/default/views/scripts/data/view.phtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml
index 8312db23..eefb2d21 100755
--- a/application/default/views/scripts/data/view.phtml
+++ b/application/default/views/scripts/data/view.phtml
@@ -37,7 +37,7 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?>
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) : ?>
From 220dfb4549fce548346f411ab4a7b7eea145b7c5 Mon Sep 17 00:00:00 2001
From: wlx
Date: Mon, 20 May 2013 13:44:40 +0000
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=A6=96=E9=A1=B5doi?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E5=B9=B4=E4=BB=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/default/controllers/IndexController.php | 2 +-
application/default/views/scripts/index/index.phtml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/default/controllers/IndexController.php b/application/default/controllers/IndexController.php
index 8603a1c2..f128ace4 100755
--- a/application/default/controllers/IndexController.php
+++ b/application/default/controllers/IndexController.php
@@ -85,7 +85,7 @@ class IndexController extends Zend_Controller_Action
$this->view->list_news = $rows;
- $sql="select * from datadoi where ts_published is not null order by ts_published desc limit 4";
+ $sql="select d.*,m.ts_published as publish_year from datadoi d left join metadata m on d.uuid=m.uuid where d.ts_published is not null order by ts_published desc limit 4";
$sth = $this->db->query($sql);
$this->view->dois = $sth->fetchAll();
diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml
index e6b6bf42..03df50ba 100755
--- a/application/default/views/scripts/index/index.phtml
+++ b/application/default/views/scripts/index/index.phtml
@@ -79,7 +79,7 @@
dois as $doi) :
- echo '- '.substr($doi->authors,1,-1).'. '.$doi->title.'. '.$doi->publisher.', '.date('Y',strtotime($doi->ts_published)).'. doi:'.$doi->doi.'
';
+ echo '- '.substr($doi->authors,1,-1).'. '.$doi->title.'. '.$doi->publisher.', '.(empty($doi->publish_year)?date('Y',strtotime($md->ts_published)):date('Y',strtotime($doi->publish_year))).'. doi:'.$doi->doi.'
';
//echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']';
endforeach;
?>
From b997ee93680219e83ac30920f25a43d5d72b48f0 Mon Sep 17 00:00:00 2001
From: wlx
Date: Mon, 20 May 2013 14:10:30 +0000
Subject: [PATCH 09/12] fix error
---
application/default/views/scripts/index/index.phtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml
index 03df50ba..063367b6 100755
--- a/application/default/views/scripts/index/index.phtml
+++ b/application/default/views/scripts/index/index.phtml
@@ -79,7 +79,7 @@
dois as $doi) :
- echo '- '.substr($doi->authors,1,-1).'. '.$doi->title.'. '.$doi->publisher.', '.(empty($doi->publish_year)?date('Y',strtotime($md->ts_published)):date('Y',strtotime($doi->publish_year))).'. doi:'.$doi->doi.'
';
+ echo '- '.substr($doi->authors,1,-1).'. '.$doi->title.'. '.$doi->publisher.', '.(empty($doi->publish_year)?date('Y',strtotime($doi->ts_published)):date('Y',strtotime($doi->publish_year))).'. doi:'.$doi->doi.'
';
//echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']';
endforeach;
?>
From 014a20c053578b96d65fbecc59e75e2859172e1b Mon Sep 17 00:00:00 2001
From: wlx
Date: Mon, 20 May 2013 14:43:41 +0000
Subject: [PATCH 10/12] fix error
---
application/default/views/scripts/data/view.phtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml
index eefb2d21..1e22c420 100755
--- a/application/default/views/scripts/data/view.phtml
+++ b/application/default/views/scripts/data/view.phtml
@@ -37,7 +37,7 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?>
datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
数据的引用authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published)))'. 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) : ?>
From f0e12ab9f553816421dcdef410e5a53e251d4f1c Mon Sep 17 00:00:00 2001
From: wlx
Date: Mon, 20 May 2013 15:04:29 +0000
Subject: [PATCH 11/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=91=E5=B8=83?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../default/controllers/ServiceController.php | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/application/default/controllers/ServiceController.php b/application/default/controllers/ServiceController.php
index dc2c3a05..77723fda 100644
--- a/application/default/controllers/ServiceController.php
+++ b/application/default/controllers/ServiceController.php
@@ -1387,7 +1387,7 @@ class ServiceController extends Zend_Controller_Action
$ris='';
if ($lang=='cn' && !empty($uuid))
{
- $sql="select d.*,m.description from datadoi d left join metadata m on d.uuid=m.uuid where d.uuid='$uuid' and d.ts_published is not null";
+ $sql="select d.*,m.description,m.ts_published as publish_year from datadoi d left join metadata m on d.uuid=m.uuid where d.uuid='$uuid' and d.ts_published is not null";
$row=$this->db->fetchRow($sql);
$authors=explode(',',str_replace('"','',substr($row['authors'],1,-1)));
$ris.='TY - JOUR'."\r\n";
@@ -1396,7 +1396,7 @@ class ServiceController extends Zend_Controller_Action
{
$ris.='A1 - '.$a."\r\n";
}
- $ris.='Y1 - '.date('Y/m/d',strtotime($row['ts_published']))."\r\n";
+ $ris.='Y1 - '.(empty($row['publish_year'])?date('Y/m/d',strtotime($row['ts_published'])):date('Y/m/d',strtotime($row['publish_year'])))."\r\n";
$ris.='JF - '.$row['publisher']."\r\n";
$ris.='JA - '.$row['publisher']."\r\n";
$ris.='UR - http://dx.doi.org/'.$row['doi']."\r\n";
@@ -1407,7 +1407,7 @@ class ServiceController extends Zend_Controller_Action
}
else if ($lang=='en' && !empty($uuid))
{
- $sql="select d.*,m.description from datadoi d left join metadata m on d.uuid=m.uuid where d.uuid='$uuid' and d.ts_published is not null";
+ $sql="select d.*,m.description,m.ts_published as publish_year from datadoi d left join metadata m on d.uuid=m.uuid where d.uuid='$uuid' and d.ts_published is not null";
$row=$this->db->fetchRow($sql);
$authors=explode(',',str_replace('"','',substr($row['author_en'],1,-1)));
$ris.='TY - JOUR'."\r\n";
@@ -1416,7 +1416,7 @@ class ServiceController extends Zend_Controller_Action
{
$ris.='A1 - '.$a."\r\n";
}
- $ris.='Y1 - '.date('Y/m/d',strtotime($row['ts_published']))."\r\n";
+ $ris.='Y1 - '.(empty($row['publish_year'])?date('Y/m/d',strtotime($row['ts_published'])):date('Y/m/d',strtotime($row['publish_year'])))."\r\n";
$ris.='JF - '.$row['publisher_en']."\r\n";
$ris.='JA - '.$row['publisher_en']."\r\n";
$ris.='UR - http://dx.doi.org/'.$row['doi']."\r\n";
@@ -1443,30 +1443,30 @@ class ServiceController extends Zend_Controller_Action
$bib='';
if ($lang=='cn' && !empty($uuid))
{
- $sql="select d.*,m.description from datadoi d left join metadata m on d.uuid=m.uuid where d.uuid='$uuid' and d.ts_published is not null";
+ $sql="select d.*,m.description,m.ts_published as publish_year from datadoi d left join metadata m on d.uuid=m.uuid where d.uuid='$uuid' and d.ts_published is not null";
$row=$this->db->fetchRow($sql);
$bib.='@article{'.$row['doi'].",\r\n";
$bib.=' author = '.str_replace('"','',str_replace(',',' and ',$row['authors'])).",\r\n";
$bib.=' journal = {'.$row['publisher']."},\r\n";
$bib.=' publisher = {'.$row['publisher']."},\r\n";
$bib.=' title = {'.$row['title']."},\r\n";
- $bib.=' year = {'.date('Y',strtotime($row['ts_published']))."},\r\n";
- $bib.=' month = {'.date('m',strtotime($row['ts_published']))."},\r\n";
+ $bib.=' year = {'.(empty($row['publish_year'])?date('Y',strtotime($row['ts_published'])):date('Y',strtotime($row['publish_year'])))."},\r\n";
+ $bib.=' month = {'.(empty($row['publish_year'])?date('m',strtotime($row['ts_published'])):date('m',strtotime($row['publish_year'])))."},\r\n";
$bib.=' url = {http://dx.doi.org/'.$row['doi']."},\r\n";
$bib.=' doi = {'.$row['doi']."}\r\n";
$bib.="}\r\n";
}
else if ($lang=='en' && !empty($uuid))
{
- $sql="select d.*,m.description from datadoi d left join metadata m on d.uuid=m.uuid where d.uuid='$uuid' and d.ts_published is not null";
+ $sql="select d.*,m.description,m.ts_published as publish_year from datadoi d left join metadata m on d.uuid=m.uuid where d.uuid='$uuid' and d.ts_published is not null";
$row=$this->db->fetchRow($sql);
$bib.='@article{'.$row['doi'].",\r\n";
$bib.=' author = '.str_replace('"','',str_replace(',',' and ',$row['author_en'])).",\r\n";
$bib.=' journal = {'.$row['publisher_en']."},\r\n";
$bib.=' publisher = {'.$row['publisher_en']."},\r\n";
$bib.=' title = {'.$row['title']."},\r\n";
- $bib.=' year = {'.date('Y',strtotime($row['ts_published']))."},\r\n";
- $bib.=' month = {'.date('m',strtotime($row['ts_published']))."},\r\n";
+ $bib.=' year = {'.(empty($row['publish_year'])?date('Y',strtotime($row['ts_published'])):date('Y',strtotime($row['publish_year'])))."},\r\n";
+ $bib.=' month = {'.(empty($row['publish_year'])?date('m',strtotime($row['ts_published'])):date('m',strtotime($row['publish_year'])))."},\r\n";
$bib.=' url = {http://dx.doi.org/'.$row['doi']."},\r\n";
$bib.=' doi = {'.$row['doi']."}\r\n";
$bib.="}\r\n";
From 44436b8cf2c78cd822a6a16fcc81f89de7e52cbf Mon Sep 17 00:00:00 2001
From: wlx
Date: Mon, 20 May 2013 15:10:15 +0000
Subject: [PATCH 12/12] add date
---
application/default/views/scripts/index/index.phtml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml
index 063367b6..aa89ad72 100755
--- a/application/default/views/scripts/index/index.phtml
+++ b/application/default/views/scripts/index/index.phtml
@@ -76,10 +76,10 @@
-
+
dois as $doi) :
- echo '- '.substr($doi->authors,1,-1).'. '.$doi->title.'. '.$doi->publisher.', '.(empty($doi->publish_year)?date('Y',strtotime($doi->ts_published)):date('Y',strtotime($doi->publish_year))).'. doi:'.$doi->doi.'
';
+ echo '- ['.date('Y-m-d',strtotime($doi->ts_published)).']'.substr($doi->authors,1,-1).'. '.$doi->title.'. '.$doi->publisher.', '.(empty($doi->publish_year)?date('Y',strtotime($doi->ts_published)):date('Y',strtotime($doi->publish_year))).'. doi:'.$doi->doi.'
';
//echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']';
endforeach;
?>